tar: prefer openat-style functions

[chaz/tar] / src / update.c

diff --git a/src/update.c b/src/update.c
index 6b4c9c06496e96a70cf3c06ca5ecb6201b8d06fa..de2786df3e86efc748692f0f5a6d585f220fd674 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, 2010 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


@@ -47,7 +47,7 @@ char *output_start;
 static void
 append_file (char *file_name)
 {
 static void
 append_file (char *file_name)
 {

-  int handle = open (file_name, O_RDONLY | O_BINARY);
+  int handle = openat (chdir_fd, file_name, O_RDONLY | O_BINARY);

   struct stat stat_data;
 
   if (handle < 0)
   struct stat stat_data;
 
   if (handle < 0)


@@ -110,11 +110,13 @@ 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)
     {

-      enum read_header status = read_header (false);
+      enum read_header status = read_header (&current_header,
+                                             &current_stat_info,
+                                             read_header_auto);

 
       switch (status)
        {
 
       switch (status)
        {


@@ -129,7 +131,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)
              {


@@ -137,9 +139,43 @@ update_archive (void)
 
                chdir_do (name->change_dir);
                if (deref_stat (dereference_option,
 
                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)
-                 add_avoided_name (current_stat_info.file_name);
+                               current_stat_info.file_name, &s) == 0)
+                 {
+                   if (S_ISDIR (s.st_mode))
+                     {
+                       char *p, *dirp;
+                       DIR *stream;
+                       int fd = openat (chdir_fd, name->name,
+                                        open_read_flags | O_DIRECTORY);
+                       if (fd < 0)
+                         open_error (name->name);
+                       else if (! ((stream = fdopendir (fd))
+                                   && (dirp = streamsavedir (stream))))
+                         savedir_error (name->name);
+                       else
+                         {
+                           namebuf_t nbuf = namebuf_create (name->name);
+
+                           for (p = dirp; *p; p += strlen (p) + 1)
+                             addname (namebuf_name (nbuf, p),
+                                      0, false, NULL);
+
+                           namebuf_free (nbuf);
+                           free (dirp);
+
+                           remname (name);
+                         }
+
+                       if (stream
+                           ? closedir (stream) != 0
+                           : 0 <= fd && close (fd) != 0)
+                         savedir_error (name->name);
+                     }
+                   else if (tar_timespec_cmp (get_stat_mtime (&s),
+                                              current_stat_info.mtime)
+                            <= 0)
+                     remname (name);
+                 }

              }
 
            skip_member ();
              }
 
            skip_member ();


@@ -179,7 +215,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 +223,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))


@@ -199,11 +234,12 @@ update_archive (void)
        if (subcommand_option == CAT_SUBCOMMAND)
          append_file (file_name);
        else
        if (subcommand_option == CAT_SUBCOMMAND)
          append_file (file_name);
        else

-         dump_file (file_name, 1, (dev_t) 0);
+         dump_file (0, file_name, file_name);

       }
   }
 
   write_eot ();
   close_archive ();
       }
   }
 
   write_eot ();
   close_archive ();

+  finish_deferred_unlinks ();

   names_notfound ();
 }
   names_notfound ();
 }