Fix bug in OLDGNU format creation.

[chaz/tar] / src / update.c

diff --git a/src/update.c b/src/update.c
index 6b4c9c06496e96a70cf3c06ca5ecb6201b8d06fa..ade42830f1395798c2fb94fba992a221fe806a85 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -1,11 +1,11 @@
 /* Update a tar archive.
 
    Copyright (C) 1988, 1992, 1994, 1996, 1997, 1999, 2000, 2001, 2003,
 /* Update a tar archive.
 
    Copyright (C) 1988, 1992, 1994, 1996, 1997, 1999, 2000, 2001, 2003,

-   2004 Free Software Foundation, Inc.
+   2004, 2005, 2007 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the

-   Free Software Foundation; either version 2, or (at your option) any later
+   Free Software Foundation; either version 3, or (at your option) any later

    version.
 
    This program is distributed in the hope that it will be useful, but
    version.
 
    This program is distributed in the hope that it will be useful, but


@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc.,
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc.,

-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */

 
 /* Implement the 'r', 'u' and 'A' options for tar.  'A' means that the
    file names are tar files, and they should simply be appended to the end
 
 /* Implement the 'r', 'u' and 'A' options for tar.  'A' means that the
    file names are tar files, and they should simply be appended to the end


@@ -110,7 +110,7 @@ update_archive (void)
 
   name_gather ();
   open_archive (ACCESS_UPDATE);
 
   name_gather ();
   open_archive (ACCESS_UPDATE);

-  xheader_write_global ();
+  buffer_write_global_xheader ();

 
   while (!found_end)
     {
 
   while (!found_end)
     {


@@ -129,7 +129,7 @@ update_archive (void)
            decode_header (current_header, &current_stat_info,
                           &current_format, 0);
            archive_format = current_format;
            decode_header (current_header, &current_stat_info,
                           &current_format, 0);
            archive_format = current_format;

-           
+

            if (subcommand_option == UPDATE_SUBCOMMAND
                && (name = name_scan (current_stat_info.file_name)) != NULL)
              {
            if (subcommand_option == UPDATE_SUBCOMMAND
                && (name = name_scan (current_stat_info.file_name)) != NULL)
              {


@@ -138,7 +138,9 @@ update_archive (void)
                chdir_do (name->change_dir);
                if (deref_stat (dereference_option,
                                current_stat_info.file_name, &s) == 0
                chdir_do (name->change_dir);
                if (deref_stat (dereference_option,
                                current_stat_info.file_name, &s) == 0

-                   && s.st_mtime <= current_stat_info.stat.st_mtime)
+                   && (tar_timespec_cmp (get_stat_mtime (&s),
+                                         current_stat_info.mtime)
+                       <= 0))

                  add_avoided_name (current_stat_info.file_name);
              }
 
                  add_avoided_name (current_stat_info.file_name);
              }
 


@@ -179,7 +181,6 @@ update_archive (void)
        }
 
       tar_stat_destroy (&current_stat_info);
        }
 
       tar_stat_destroy (&current_stat_info);

-      xheader_destroy (&extended_header);

       previous_status = status;
     }
 
       previous_status = status;
     }
 


@@ -188,10 +189,10 @@ update_archive (void)
   output_start = current_block->buffer;
 
   {
   output_start = current_block->buffer;
 
   {

-    char *file_name;
-
-    while ((file_name = name_from_list ()) != NULL)
+    struct name const *p;
+    while ((p = name_from_list ()) != NULL)

       {
       {

+       char *file_name = p->name;

        if (excluded_name (file_name))
          continue;
        if (interactive_option && !confirm ("add", file_name))
        if (excluded_name (file_name))
          continue;
        if (interactive_option && !confirm ("add", file_name))