(make_directories): Do not chown intermediate directories, even

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index ccaf5fe6f1ee22c1ef842ea5654308d23b6357af..e761da5c884fbd8bfd90382f226092ad25c775d3 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -1,5 +1,5 @@
 /* Extract files from a tar archive.
 /* Extract files from a tar archive.

-   Copyright (C) 1988, 92, 93, 94, 96, 97 Free Software Foundation, Inc.
+   Copyright 1988, 92,93,94,96,97,98, 1999 Free Software Foundation, Inc.

    Written by John Gilmore, on 1985-11-19.
 
    This program is free software; you can redistribute it and/or modify it
    Written by John Gilmore, on 1985-11-19.
 
    This program is free software; you can redistribute it and/or modify it


@@ -14,12 +14,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.,
 
    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 Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 
 #include "system.h"
 
 #include <time.h>
 
 #include "system.h"
 
 #include <time.h>

+#ifndef time

 time_t time ();
 time_t time ();

+#endif

 
 #if HAVE_UTIME_H
 # include <utime.h>
 
 #if HAVE_UTIME_H
 # include <utime.h>


@@ -63,7 +65,7 @@ static struct delayed_set_stat *delayed_set_stat_head;
 void
 extr_init (void)
 {
 void
 extr_init (void)
 {

-  now = time ((time_t *) 0);
+  now = time (0);

   we_are_root = geteuid () == 0;
 
   /* Option -p clears the kernel umask, so it does not affect proper
   we_are_root = geteuid () == 0;
 
   /* Option -p clears the kernel umask, so it does not affect proper


@@ -81,7 +83,7 @@ extr_init (void)
 
   /* FIXME: Just make sure we can add files in directories we create.  Maybe
      should we later remove permissions we are adding, here?  */
 
   /* FIXME: Just make sure we can add files in directories we create.  Maybe
      should we later remove permissions we are adding, here?  */

-  newdir_umask &= ~0300;
+  newdir_umask &= ~ MODE_WXUSR;

 }
 
 /*------------------------------------------------------------------.
 }
 
 /*------------------------------------------------------------------.


@@ -91,20 +93,23 @@ extr_init (void)
 static void
 set_mode (char *file_name, struct stat *stat_info)
 {
 static void
 set_mode (char *file_name, struct stat *stat_info)
 {

-  /* We ought to force permission when -k is not selected, because if the
+  /* Do nothing unless we are restoring the original permissions.
+
+     We must force permission when -k and -U are not selected, because if the

      file already existed, open or creat would save the permission bits from
      the previously created file, ignoring the ones we specified.
 
      file already existed, open or creat would save the permission bits from
      the previously created file, ignoring the ones we specified.
 

-     But with -k selected, we know *we* created this file, so the mode
+     But with -k or -U selected, we know *we* created this file, so the mode

      bits were set by our open.  If the file has abnormal mode bits, we must
      chmod since writing or chown has probably reset them.  If the file is
      normal, we merely skip the chmod.  This works because we did umask (0)
      when -p, so umask will have left the specified mode alone.  */
 
      bits were set by our open.  If the file has abnormal mode bits, we must
      chmod since writing or chown has probably reset them.  If the file is
      normal, we merely skip the chmod.  This works because we did umask (0)
      when -p, so umask will have left the specified mode alone.  */
 

-  if (!keep_old_files_option
-      || (stat_info->st_mode & (S_ISUID | S_ISGID | S_ISVTX)))
+  if ((we_are_root || same_permissions_option)
+      && ((!keep_old_files_option && !unlink_first_option)
+         || (stat_info->st_mode & (S_ISUID | S_ISGID | S_ISVTX))))

     if (chmod (file_name, ~current_umask & stat_info->st_mode) < 0)
     if (chmod (file_name, ~current_umask & stat_info->st_mode) < 0)

-      ERROR ((0, errno, _("%s: Cannot change mode to %0.4lo"),
+      ERROR ((0, errno, _("%s: Cannot change mode to %04lo"),

              file_name,
              (unsigned long) (~current_umask & stat_info->st_mode)));
 }
              file_name,
              (unsigned long) (~current_umask & stat_info->st_mode)));
 }


@@ -240,22 +245,12 @@ make_directories (char *file_name)
        continue;
 
       *cursor = '\0';          /* truncate the path there */
        continue;
 
       *cursor = '\0';          /* truncate the path there */

-      status = mkdir (file_name, ~newdir_umask & 0777);
+      status = mkdir (file_name, ~newdir_umask & MODE_RWX);

 
       if (status == 0)
        {
 
       if (status == 0)
        {

-         /* Fix ownership.  */
-
-         if (we_are_root)
-           if (chown (file_name, current_stat.st_uid, current_stat.st_gid) < 0)
-             ERROR ((0, errno,
-                     _("%s: Cannot change owner to uid %lu, gid %lu"),
-                     file_name,
-                     (unsigned long) current_stat.st_uid,
-                     (unsigned long) current_stat.st_gid));
-

          print_for_mkdir (file_name, cursor - file_name,
          print_for_mkdir (file_name, cursor - file_name,

-                          ~newdir_umask & 0777);
+                          ~newdir_umask & MODE_RWX);

          did_something = 1;
 
          *cursor = '/';
          did_something = 1;
 
          *cursor = '/';


@@ -281,6 +276,25 @@ make_directories (char *file_name)
   return did_something;                /* tell them to retry if we made one */
 }
 
   return did_something;                /* tell them to retry if we made one */
 }
 

+/*--------------------------------------------------------------------.
+| Unlink the destination, if we are supposed to do so.               |
+| Return zero if extraction should not proceed.                              |
+`--------------------------------------------------------------------*/
+
+static int
+unlink_destination (char const *file_name)
+{
+  if (unlink_first_option
+      && !remove_any_file (file_name, recursive_unlink_option)
+      && errno != ENOENT)
+    {
+      ERROR ((0, errno, _("Cannot remove %s"), file_name));
+      return 0;
+    }
+
+  return 1;
+}
+

 /*--------------------------------------------------------------------.
 | Attempt repairing what went wrong with the extraction.  Delete an   |
 | already existing file or create missing intermediate directories.   |
 /*--------------------------------------------------------------------.
 | Attempt repairing what went wrong with the extraction.  Delete an   |
 | already existing file or create missing intermediate directories.   |


@@ -294,10 +308,10 @@ maybe_recoverable (char *file_name)
   switch (errno)
     {
     case EEXIST:
   switch (errno)
     {
     case EEXIST:

-      /* Attempt deleting an existing file.  However, with -k, just stay
+      /* Attempt deleting an existing file.  However, with -k or -U, just stay

         quiet.  */
 
         quiet.  */
 

-      if (keep_old_files_option)
+      if (keep_old_files_option || unlink_first_option)

        return 0;
 
       return remove_any_file (file_name, 0);
        return 0;
 
       return remove_any_file (file_name, 0);


@@ -321,29 +335,32 @@ maybe_recoverable (char *file_name)
 static void
 extract_sparse_file (int fd, off_t *sizeleft, off_t totalsize, char *name)
 {
 static void
 extract_sparse_file (int fd, off_t *sizeleft, off_t totalsize, char *name)
 {

-  union block *data_block;

   int sparse_ind = 0;
   size_t written;
   ssize_t count;
 
   int sparse_ind = 0;
   size_t written;
   ssize_t count;
 

-  /* FIXME: `data_block' might be used uninitialized in this function.
-     Reported by Bruno Haible.  */
-

   /* assuming sizeleft is initially totalsize */
 
   while (*sizeleft > 0)
     {
   /* assuming sizeleft is initially totalsize */
 
   while (*sizeleft > 0)
     {

-      data_block = find_next_block ();
+      union block *data_block = find_next_block ();

       if (data_block == NULL)
        {
          ERROR ((0, 0, _("Unexpected EOF on archive file")));
          return;
        }
       if (data_block == NULL)
        {
          ERROR ((0, 0, _("Unexpected EOF on archive file")));
          return;
        }

-      lseek (fd, sparsearray[sparse_ind].offset, 0);
+      if (lseek (fd, sparsearray[sparse_ind].offset, SEEK_SET) < 0)
+       {
+         char buf[UINTMAX_STRSIZE_BOUND];
+         ERROR ((0, errno, _("%s: lseek error at byte %s"),
+                 STRINGIFY_BIGINT (sparsearray[sparse_ind].offset, buf),
+                 name));
+         return;
+       }

       written = sparsearray[sparse_ind++].numbytes;
       while (written > BLOCKSIZE)
        {
       written = sparsearray[sparse_ind++].numbytes;
       while (written > BLOCKSIZE)
        {

-         count = write (fd, data_block->buffer, BLOCKSIZE);
+         count = full_write (fd, data_block->buffer, BLOCKSIZE);

          if (count < 0)
            ERROR ((0, errno, _("%s: Could not write to file"), name));
          written -= count;
          if (count < 0)
            ERROR ((0, errno, _("%s: Could not write to file"), name));
          written -= count;


@@ -352,7 +369,7 @@ extract_sparse_file (int fd, off_t *sizeleft, off_t totalsize, char *name)
          data_block = find_next_block ();
        }
 
          data_block = find_next_block ();
        }
 

-      count = write (fd, data_block->buffer, written);
+      count = full_write (fd, data_block->buffer, written);

 
       if (count < 0)
        ERROR ((0, errno, _("%s: Could not write to file"), name));
 
       if (count < 0)
        ERROR ((0, errno, _("%s: Could not write to file"), name));


@@ -371,8 +388,8 @@ extract_sparse_file (int fd, off_t *sizeleft, off_t totalsize, char *name)
       *sizeleft -= count;
       set_next_block_after (data_block);
     }
       *sizeleft -= count;
       set_next_block_after (data_block);
     }

+

   free (sparsearray);
   free (sparsearray);

-  set_next_block_after (data_block);

 }
 
 /*----------------------------------.
 }
 
 /*----------------------------------.


@@ -392,6 +409,7 @@ extract_archive (void)
   off_t size;
   int skipcrud;
   int counter;
   off_t size;
   int skipcrud;
   int counter;

+  char typeflag;

 #if 0
   int sparse_ind = 0;
 #endif
 #if 0
   int sparse_ind = 0;
 #endif


@@ -421,15 +439,14 @@ extract_archive (void)
   skipcrud = 0;
   while (!absolute_names_option && CURRENT_FILE_NAME[0] == '/')
     {
   skipcrud = 0;
   while (!absolute_names_option && CURRENT_FILE_NAME[0] == '/')
     {

-      static int warned_once = 0;
+      static int warned_once;

 
 

-      skipcrud++;              /* force relative path */

       if (!warned_once)
        {
          warned_once = 1;
       if (!warned_once)
        {
          warned_once = 1;

-         WARN ((0, 0, _("\
-Removing leading `/' from absolute path names in the archive")));
+         WARN ((0, 0, _("Removing leading `/' from archive names")));

        }
        }

+      skipcrud++;              /* force relative path */

     }
 
   /* Take a safety backup of a previously existing file.  */
     }
 
   /* Take a safety backup of a previously existing file.  */


@@ -447,7 +464,8 @@ Removing leading `/' from absolute path names in the archive")));
 
   /* Extract the archive entry according to its type.  */
 
 
   /* Extract the archive entry according to its type.  */
 

-  switch (current_header->header.typeflag)
+  typeflag = current_header->header.typeflag;
+  switch (typeflag)

     {
       /* JK - What we want to do if the file is sparse is loop through
         the array of sparse structures in the header and read in and
     {
       /* JK - What we want to do if the file is sparse is loop through
         the array of sparse structures in the header and read in and


@@ -471,17 +489,18 @@ Removing leading `/' from absolute path names in the archive")));
       for (counter = 0; counter < SPARSES_IN_OLDGNU_HEADER; counter++)
        {
          sparsearray[counter].offset =
       for (counter = 0; counter < SPARSES_IN_OLDGNU_HEADER; counter++)
        {
          sparsearray[counter].offset =

-           OFF_FROM_OCT (current_header->oldgnu_header.sp[counter].offset);
+           OFF_FROM_CHARS (current_header->oldgnu_header.sp[counter].offset);

          sparsearray[counter].numbytes =
          sparsearray[counter].numbytes =

-           SIZE_FROM_OCT (current_header->oldgnu_header.sp[counter].numbytes);
+           SIZE_FROM_CHARS (current_header->oldgnu_header.sp[counter].numbytes);

          if (!sparsearray[counter].numbytes)
            break;
        }
 
       if (current_header->oldgnu_header.isextended)
        {
          if (!sparsearray[counter].numbytes)
            break;
        }
 
       if (current_header->oldgnu_header.isextended)
        {

-         /* Read in the list of extended headers and translate them into
-            the sparsearray as before.  */
+         /* Read in the list of extended headers and translate them
+            into the sparsearray as before.  Note that this
+            invalidates current_header.  */

 
          /* static */ int ind = SPARSES_IN_OLDGNU_HEADER;
 
 
          /* static */ int ind = SPARSES_IN_OLDGNU_HEADER;
 


@@ -505,9 +524,9 @@ Removing leading `/' from absolute path names in the archive")));
                  if (exhdr->sparse_header.sp[counter].numbytes == 0)
                    break;
                  sparsearray[counter + ind].offset =
                  if (exhdr->sparse_header.sp[counter].numbytes == 0)
                    break;
                  sparsearray[counter + ind].offset =

-                   OFF_FROM_OCT (exhdr->sparse_header.sp[counter].offset);
+                   OFF_FROM_CHARS (exhdr->sparse_header.sp[counter].offset);

                  sparsearray[counter + ind].numbytes =
                  sparsearray[counter + ind].numbytes =

-                   SIZE_FROM_OCT (exhdr->sparse_header.sp[counter].numbytes);
+                   SIZE_FROM_CHARS (exhdr->sparse_header.sp[counter].numbytes);

                }
              if (!exhdr->sparse_header.isextended)
                break;
                }
              if (!exhdr->sparse_header.isextended)
                break;


@@ -535,10 +554,10 @@ Removing leading `/' from absolute path names in the archive")));
       /* FIXME: deal with protection issues.  */
 
     again_file:
       /* FIXME: deal with protection issues.  */
 
     again_file:

-      openflag = (keep_old_files_option ?
-                 O_BINARY | O_NDELAY | O_WRONLY | O_CREAT | O_EXCL :
-                 O_BINARY | O_NDELAY | O_WRONLY | O_CREAT | O_TRUNC)
-       | ((current_header->header.typeflag == GNUTYPE_SPARSE) ? 0 : O_APPEND);
+      openflag = (keep_old_files_option || unlink_first_option ?
+                 O_WRONLY | O_BINARY | O_NONBLOCK | O_CREAT | O_EXCL :
+                 O_WRONLY | O_BINARY | O_NONBLOCK | O_CREAT | O_TRUNC)
+       | ((typeflag == GNUTYPE_SPARSE) ? 0 : O_APPEND);

 
       /* JK - The last | is a kludge to solve the problem the O_APPEND
         flag causes with files we are trying to make sparse: when a file
 
       /* JK - The last | is a kludge to solve the problem the O_APPEND
         flag causes with files we are trying to make sparse: when a file


@@ -555,21 +574,28 @@ Removing leading `/' from absolute path names in the archive")));
          goto extract_file;
        }
 
          goto extract_file;
        }
 

-      if (unlink_first_option)
-       remove_any_file (CURRENT_FILE_NAME, recursive_unlink_option);
+      if (!unlink_destination (CURRENT_FILE_NAME))
+       {
+         if (current_header->oldgnu_header.isextended)
+           skip_extended_headers ();
+         skip_file (current_stat.st_size);
+         if (backup_option)
+           undo_last_backup ();
+         break;
+       }

 
 #if O_CTG
       /* Contiguous files (on the Masscomp) have to specify the size in
         the open call that creates them.  */
 
 
 #if O_CTG
       /* Contiguous files (on the Masscomp) have to specify the size in
         the open call that creates them.  */
 

-      if (current_header->header.typeflag == CONTTYPE)
+      if (typeflag == CONTTYPE)

        fd = open (CURRENT_FILE_NAME, openflag | O_CTG,
                   current_stat.st_mode, current_stat.st_size);
       else
        fd = open (CURRENT_FILE_NAME, openflag, current_stat.st_mode);
 
 #else /* not O_CTG */
        fd = open (CURRENT_FILE_NAME, openflag | O_CTG,
                   current_stat.st_mode, current_stat.st_size);
       else
        fd = open (CURRENT_FILE_NAME, openflag, current_stat.st_mode);
 
 #else /* not O_CTG */

-      if (current_header->header.typeflag == CONTTYPE)
+      if (typeflag == CONTTYPE)

        {
          static int conttype_diagnosed = 0;
 
        {
          static int conttype_diagnosed = 0;
 


@@ -599,7 +625,7 @@ Removing leading `/' from absolute path names in the archive")));
        }
 
     extract_file:
        }
 
     extract_file:

-      if (current_header->header.typeflag == GNUTYPE_SPARSE)
+      if (typeflag == GNUTYPE_SPARSE)

        {
          char *name;
          size_t name_length_bis;
        {
          char *name;
          size_t name_length_bis;


@@ -639,24 +665,12 @@ Removing leading `/' from absolute path names in the archive")));
                break;          /* FIXME: What happens, then?  */
              }
 
                break;          /* FIXME: What happens, then?  */
              }
 

-           /* If the file is sparse, use the sparsearray that we created
-              before to lseek into the new file the proper amount, and to
-              see how many bytes we want to write at that position.  */
-
-#if 0
-           if (current_header->header.typeflag == GNUTYPE_SPARSE)
-             {
-               lseek (fd, sparsearray[sparse_ind].offset, 0);
-               written = sparsearray[sparse_ind++].numbytes;
-             }
-           else
-#endif
-             written = available_space_after (data_block);
+           written = available_space_after (data_block);

 
            if (written > size)
              written = size;
            errno = 0;          /* FIXME: errno should be read-only */
 
            if (written > size)
              written = size;
            errno = 0;          /* FIXME: errno should be read-only */

-           sstatus = write (fd, data_block->buffer, written);
+           sstatus = full_write (fd, data_block->buffer, written);

 
            set_next_block_after ((union block *)
                                  (data_block->buffer + written - 1));
 
            set_next_block_after ((union block *)
                                  (data_block->buffer + written - 1));


@@ -687,28 +701,6 @@ Removing leading `/' from absolute path names in the archive")));
       if (to_stdout_option)
        break;
 
       if (to_stdout_option)
        break;
 

-#if 0
-      if (current_header->header.isextended)
-       {
-         union block *exhdr;
-         int counter;
-
-         for (counter = 0; counter < 21; counter++)
-           {
-             off_t offset;
-
-             if (!exhdr->sparse_header.sp[counter].numbytes)
-               break;
-             offset = OFF_FROM_OCT (exhdr->sparse_header.sp[counter].offset);
-             written
-               = SIZE_FROM_OCT (exhdr->sparse_header.sp[counter].numbytes);
-             lseek (fd, offset, 0);
-             sstatus = write (fd, data_block->buffer, written);
-             if (sstatus == written)
-               continue;
-           }
-       }
-#endif

       status = close (fd);
       if (status < 0)
        {
       status = close (fd);
       if (status < 0)
        {


@@ -724,9 +716,9 @@ Removing leading `/' from absolute path names in the archive")));
       if (to_stdout_option)
        break;
 
       if (to_stdout_option)
        break;
 

-#ifdef S_ISLNK
-      if (unlink_first_option)
-       remove_any_file (CURRENT_FILE_NAME, recursive_unlink_option);
+#ifdef HAVE_SYMLINK
+      if (!unlink_destination (CURRENT_FILE_NAME))
+       break;

 
       while (status = symlink (current_link_name, CURRENT_FILE_NAME),
             status != 0)
 
       while (status = symlink (current_link_name, CURRENT_FILE_NAME),
             status != 0)


@@ -751,27 +743,27 @@ Removing leading `/' from absolute path names in the archive")));
        }
       break;
 
        }
       break;
 

-#else /* not S_ISLNK */
+#else

       {
        static int warned_once = 0;
 
        if (!warned_once)
          {
            warned_once = 1;
       {
        static int warned_once = 0;
 
        if (!warned_once)
          {
            warned_once = 1;

-           WARN ((0, 0, _("\
-Attempting extraction of symbolic links as hard links")));
+           WARN ((0, 0,
+                  _("Attempting extraction of symbolic links as hard links")));

          }
       }
       /* Fall through.  */
 
          }
       }
       /* Fall through.  */
 

-#endif /* not S_ISLNK */
+#endif

 
     case LNKTYPE:
       if (to_stdout_option)
        break;
 
 
     case LNKTYPE:
       if (to_stdout_option)
        break;
 

-      if (unlink_first_option)
-       remove_any_file (CURRENT_FILE_NAME, recursive_unlink_option);
+      if (!unlink_destination (CURRENT_FILE_NAME))
+       break;

 
     again_link:
       {
 
     again_link:
       {


@@ -812,13 +804,13 @@ Attempting extraction of symbolic links as hard links")));
       current_stat.st_mode |= S_IFBLK;
 #endif
 
       current_stat.st_mode |= S_IFBLK;
 #endif
 

-#if defined(S_IFCHR) || defined(S_IFBLK)
+#if S_IFCHR || S_IFBLK

     make_node:
       if (to_stdout_option)
        break;
 
     make_node:
       if (to_stdout_option)
        break;
 

-      if (unlink_first_option)
-       remove_any_file (CURRENT_FILE_NAME, recursive_unlink_option);
+      if (!unlink_destination (CURRENT_FILE_NAME))
+       break;

 
       status = mknod (CURRENT_FILE_NAME, current_stat.st_mode,
                      current_stat.st_rdev);
 
       status = mknod (CURRENT_FILE_NAME, current_stat.st_mode,
                      current_stat.st_rdev);


@@ -836,13 +828,13 @@ Attempting extraction of symbolic links as hard links")));
       break;
 #endif
 
       break;
 #endif
 

-#ifdef S_ISFIFO
+#if HAVE_MKFIFO || defined mkfifo

     case FIFOTYPE:
       if (to_stdout_option)
        break;
 
     case FIFOTYPE:
       if (to_stdout_option)
        break;
 

-      if (unlink_first_option)
-       remove_any_file (CURRENT_FILE_NAME, recursive_unlink_option);
+      if (!unlink_destination (CURRENT_FILE_NAME))
+       break;

 
       while (status = mkfifo (CURRENT_FILE_NAME, current_stat.st_mode),
             status != 0)
 
       while (status = mkfifo (CURRENT_FILE_NAME, current_stat.st_mode),
             status != 0)


@@ -876,7 +868,7 @@ Attempting extraction of symbolic links as hard links")));
 
          gnu_restore (skipcrud);
        }
 
          gnu_restore (skipcrud);
        }

-      else if (current_header->header.typeflag == GNUTYPE_DUMPDIR)
+      else if (typeflag == GNUTYPE_DUMPDIR)

        skip_file (current_stat.st_size);
 
       if (to_stdout_option)
        skip_file (current_stat.st_size);
 
       if (to_stdout_option)


@@ -884,7 +876,8 @@ Attempting extraction of symbolic links as hard links")));
 
     again_dir:
       status = mkdir (CURRENT_FILE_NAME,
 
     again_dir:
       status = mkdir (CURRENT_FILE_NAME,

-                    (we_are_root ? 0 : 0300) | current_stat.st_mode);
+                     ((we_are_root ? 0 : MODE_WXUSR)
+                      | current_stat.st_mode));

       if (status != 0)
        {
          /* If the directory creation fails, let's consider immediately the
       if (status != 0)
        {
          /* If the directory creation fails, let's consider immediately the


@@ -937,9 +930,9 @@ Attempting extraction of symbolic links as hard links")));
        }
 
     check_perms:
        }
 
     check_perms:

-      if (!we_are_root && 0300 != (0300 & current_stat.st_mode))
+      if (!we_are_root && MODE_WXUSR != (MODE_WXUSR & current_stat.st_mode))

        {
        {

-         current_stat.st_mode |= 0300;
+         current_stat.st_mode |= MODE_WXUSR;

          WARN ((0, 0, _("Added write and execute permission to directory %s"),
                 CURRENT_FILE_NAME));
        }
          WARN ((0, 0, _("Added write and execute permission to directory %s"),
                 CURRENT_FILE_NAME));
        }


@@ -978,8 +971,8 @@ Attempting extraction of symbolic links as hard links")));
       break;
 
     case GNUTYPE_MULTIVOL:
       break;
 
     case GNUTYPE_MULTIVOL:

-      ERROR ((0, 0, _("\
-Cannot extract `%s' -- file is continued from another volume"),
+      ERROR ((0, 0,
+             _("Cannot extract `%s' -- file is continued from another volume"),

              current_file_name));
       skip_file (current_stat.st_size);
       if (backup_option)
              current_file_name));
       skip_file (current_stat.st_size);
       if (backup_option)


@@ -997,7 +990,7 @@ Cannot extract `%s' -- file is continued from another volume"),
     default:
       WARN ((0, 0,
             _("Unknown file type '%c' for %s, extracted as normal file"),
     default:
       WARN ((0, 0,
             _("Unknown file type '%c' for %s, extracted as normal file"),

-            current_header->header.typeflag, CURRENT_FILE_NAME));
+            typeflag, CURRENT_FILE_NAME));

       goto again_file;
     }
 
       goto again_file;
     }