Update FSF postal mail address.

[chaz/tar] / src / update.c

diff --git a/src/update.c b/src/update.c
index b9987afe2935d4a84253735bcc9bfc335d166eb8..0db091de9a809d1b3b2d5c103b45dd7977f10307 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -15,14 +15,14 @@
 
    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
    of the archive.  No attempt is made to record the reads from the args; if
    they're on raw tape or something like that, it'll probably lose...  */
 
-#include "system.h"
+#include <system.h>
 #include <quotearg.h>
 #include "common.h"
 
@@ -106,7 +106,7 @@ void
 update_archive (void)
 {
   enum read_header previous_status = HEADER_STILL_UNREAD;
-  int found_end = 0;
+  bool found_end = false;
 
   name_gather ();
   open_archive (ACCESS_UPDATE);
@@ -126,30 +126,33 @@ update_archive (void)
          {
            struct name *name;
 
+           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)
              {
                struct stat s;
-               enum archive_format unused;
 
-               decode_header (current_header, &current_stat_info, &unused, 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)
                  add_avoided_name (current_stat_info.file_name);
              }
+
            skip_member ();
            break;
          }
 
        case HEADER_ZERO_BLOCK:
          current_block = current_header;
-         found_end = 1;
+         found_end = true;
          break;
 
        case HEADER_END_OF_FILE:
-         found_end = 1;
+         found_end = true;
          break;
 
        case HEADER_FAILURE:
@@ -175,6 +178,8 @@ update_archive (void)
          break;
        }
 
+      tar_stat_destroy (&current_stat_info);
+      xheader_destroy (&extended_header);
       previous_status = status;
     }