if (!name_match (current_file_name)
|| current_stat.st_mtime < newer_mtime_option
- || excluded_filename (excluded, base_name (current_file_name)))
+ || excluded_pathname (excluded, current_file_name))
{
int isextended = 0;
}
switch (header->header.typeflag)
{
-#ifdef S_IFBLK
+#ifdef S_ISBLK
case BLKTYPE:
stat_info->st_rdev
= makedev (MAJOR_FROM_OCT (header->header.devmajor),
break;
#endif
-#ifdef S_IFCHR
+#ifdef S_ISCHR
case CHRTYPE:
stat_info->st_rdev
= makedev (MAJOR_FROM_OCT (header->header.devmajor),
if (!o)
{
o = clone_quoting_options ((struct quoting_options *) 0);
- set_quoting_style (o, escape_quoting_style);
+ set_quoting_style (o, c_quoting_style);
}
- quotearg_buffer (buf, sizeof buf, where0, digs0, o);
+ for (digs = digs0; digs && ! where0[digs - 1]; digs--)
+ continue;
+ quotearg_buffer (buf, sizeof buf, where0, digs, o);
ERROR ((0, 0,
- _("Header contains \"%.*s\" where octal %s value expected"),
+ _("Header contains %.*s where octal %s value expected"),
(int) sizeof buf, buf, type));
}
switch (current_header->header.typeflag)
{
-#if defined(S_IFBLK) || defined(S_IFCHR)
+#if defined S_ISBLK || defined S_ISCHR
case CHRTYPE:
case BLKTYPE:
sprintf (size, "%lu,%lu",