Port to latest gnulib. There were a lot of changes, so the

[chaz/tar] / src / xheader.c

diff --git a/src/xheader.c b/src/xheader.c
index 2948859ab076180a69f36807dca282d841409d05..36afd3d77509ddcda8bbb79b12347858a3861c90 100644 (file)
--- a/src/xheader.c
+++ b/src/xheader.c
@@ -264,7 +264,7 @@ xheader_format_name (struct tar_stat_info *st, const char *fmt, size_t n)
        case 'f':
          if (st)
            {
-             base = base_name (st->orig_file_name);
+             base = last_component (st->orig_file_name);
              len += strlen (base) - 2;
            }
          break;
@@ -1094,9 +1094,10 @@ ctime_decoder (struct tar_stat_info *st,
 
 static void
 mtime_coder (struct tar_stat_info const *st, char const *keyword,
-            struct xheader *xhdr, void const *data __attribute__ ((unused)))
+            struct xheader *xhdr, void const *data)
 {
-  code_time (st->mtime, keyword, xhdr);
+  const struct timespec mtime = data ? *(struct timespec *) data : st->mtime;
+  code_time (mtime, keyword, xhdr);
 }
 
 static void