Added a comment

[chaz/tar] / src / create.c

diff --git a/src/create.c b/src/create.c
index 7cecd4f9e290839c43f0ccf530009088af4c3a34..78847555d83f80415b9e816917d431222ebb6208 100644 (file)
--- a/src/create.c
+++ b/src/create.c
@@ -186,6 +186,8 @@ to_chars (int negative, uintmax_t value, size_t valsize,
        {
          int negsub;
          uintmax_t sub = substitute (&negsub) & maxval;
+         /* FIXME: This is the only place where GNU_FORMAT differs from
+             OLDGNU_FORMAT. Apart from this they are completely identical. */
          uintmax_t s = (negsub &= archive_format == GNU_FORMAT) ? - sub : sub;
          char subbuf[UINTMAX_STRSIZE_BOUND + 1];
          char *sub_string = STRINGIFY_BIGINT (s, subbuf + 1);
@@ -413,6 +415,7 @@ write_gnu_long_link (struct tar_stat_info *st, const char *p, char type)
   union block *header;
 
   header = start_private_header ("././@LongLink", size);
+  strcpy (header->header.magic, OLDGNU_MAGIC);
   header->header.typeflag = type;
   finish_header (st, header, -1);
 
@@ -486,7 +489,7 @@ write_long_link (struct tar_stat_info *st)
   switch (archive_format)
     {
     case POSIX_FORMAT:
-      xheader_store ("linkpath", st);
+      xheader_store ("linkpath", st, NULL);
       break;
 
     case V7_FORMAT:                    /* old V7 tar format */
@@ -513,7 +516,7 @@ write_long_name (struct tar_stat_info *st)
   switch (archive_format)
     {
     case POSIX_FORMAT:
-      xheader_store ("path", st);
+      xheader_store ("path", st, NULL);
       break;
 
     case V7_FORMAT:                  
@@ -546,8 +549,9 @@ write_extended (struct tar_stat_info *st, union block *old_header, char type)
   size = extended_header.size;
 
   memcpy (hp.buffer, old_header, sizeof (hp));
-  
-  header = start_private_header ("././@PaxHeader", size);
+
+  header = start_private_header (p = xheader_xhdr_name (st), size);
+  free (p);
   header->header.typeflag = type;
 
   finish_header (st, header, -1);
@@ -640,17 +644,17 @@ start_header (struct tar_stat_info *st)
     MODE_TO_CHARS (st->stat.st_mode, header->header.mode);
 
   if (st->stat.st_uid > MAXOCTAL7 && archive_format == POSIX_FORMAT)
-    xheader_store ("uid", st);
+    xheader_store ("uid", st, NULL);
   else
     UID_TO_CHARS (st->stat.st_uid, header->header.uid);
   
   if (st->stat.st_gid > MAXOCTAL7 && archive_format == POSIX_FORMAT)
-    xheader_store ("gid", st);
+    xheader_store ("gid", st, NULL);
   else
     GID_TO_CHARS (st->stat.st_gid, header->header.gid);
 
   if (st->stat.st_size > MAXOCTAL11 && archive_format == POSIX_FORMAT)
-    xheader_store ("size", st);
+    xheader_store ("size", st, NULL);
   else
     OFF_TO_CHARS (st->stat.st_size, header->header.size);
 
@@ -664,12 +668,12 @@ start_header (struct tar_stat_info *st)
       st->devminor = minor (st->stat.st_rdev);
 
       if (st->devmajor > MAXOCTAL7 && archive_format == POSIX_FORMAT)
-       xheader_store ("devmajor", st);
+       xheader_store ("devmajor", st, NULL);
       else
        MAJOR_TO_CHARS (st->devmajor, header->header.devmajor);
 
       if (st->devminor > MAXOCTAL7 && archive_format == POSIX_FORMAT)
-       xheader_store ("devminor", st);
+       xheader_store ("devminor", st, NULL);
       else
        MAJOR_TO_CHARS (st->devminor, header->header.devminor);
     }
@@ -681,8 +685,8 @@ start_header (struct tar_stat_info *st)
   
   if (archive_format == POSIX_FORMAT)
     {
-      xheader_store ("atime", st);
-      xheader_store ("ctime", st);
+      xheader_store ("atime", st, NULL);
+      xheader_store ("ctime", st, NULL);
     }
   else if (incremental_option)
     if (archive_format == OLDGNU_FORMAT)
@@ -725,13 +729,13 @@ start_header (struct tar_stat_info *st)
       
       if (archive_format == POSIX_FORMAT
          && strlen (st->uname) > UNAME_FIELD_SIZE)
-       xheader_store ("uname", st);
+       xheader_store ("uname", st, NULL);
       else
        UNAME_TO_CHARS (st->uname, header->header.uname);
 
       if (archive_format == POSIX_FORMAT
          && strlen (st->gname) > GNAME_FIELD_SIZE)
-       xheader_store ("gname", st);
+       xheader_store ("gname", st, NULL);
       else
        GNAME_TO_CHARS (st->gname, header->header.gname);
     }
@@ -980,9 +984,11 @@ dump_dir0 (char *directory,
          return;
        }
     }
-  else if (!recursion_option)
+
+  if (!recursion_option)
     return;
-  else if (one_file_system_option
+
+  if (one_file_system_option
           && !top_level
           && parent_device != stat->stat.st_dev)
     {
@@ -1178,7 +1184,7 @@ dump_hard_link (struct tar_stat_info *stat)
       if ((dup = hash_lookup (link_table, &lp)))
        {
          /* We found a link.  */
-         char const *link_name = safer_name_suffix (dup->name, 1);
+         char const *link_name = safer_name_suffix (dup->name, true);
 
          dup->nlink--;
              
@@ -1274,7 +1280,7 @@ dump_file0 (struct tar_stat_info *stat, char *p,
     return;
 
   assign_string (&stat->orig_file_name, p);
-  assign_string (&stat->file_name, safer_name_suffix (p, 0));
+  assign_string (&stat->file_name, safer_name_suffix (p, false));
 
   if (deref_stat (dereference_option, p, &stat->stat) != 0)
     {
@@ -1282,7 +1288,7 @@ dump_file0 (struct tar_stat_info *stat, char *p,
       return;
     }
   stat->archive_file_size = stat->stat.st_size;
-  
+  sys_stat_nanoseconds(stat);
   original_ctime = stat->stat.st_ctime;
   restore_times.actime = stat->stat.st_atime;
   restore_times.modtime = stat->stat.st_mtime;