(total_written): Remove; replaced with prev_written + bytes_written.

[chaz/tar] / src / list.c

diff --git a/src/list.c b/src/list.c
index 3a0ad4e65c4c0aa41b568664f5a3278a7a397262..c58eae41b44f082b2c5ac03938c5540297c1a0f8 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -14,7 +14,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.,
-   59 Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Define to non-zero for forcing old ctime() instead of isotime().  */
 #undef USE_OLD_CTIME
@@ -22,13 +22,8 @@
 #include "system.h"
 #include <quotearg.h>
 
-#include <ctype.h>
 #include <time.h>
 
-#define        ISODIGIT(Char) \
-  ((unsigned char) (Char) >= '0' && (unsigned char) (Char) <= '7')
-#define ISSPACE(Char) (ISASCII (Char) && isspace (Char))
-
 #ifndef FNM_LEADING_DIR
 # include <fnmatch.h>
 #endif
@@ -70,18 +65,12 @@ read_and (void (*do_something) ())
          /* Valid header.  We should decode next field (mode) first.
             Ensure incoming names are null terminated.  */
 
-         if (ending_file_option &&
-             fnmatch (ending_file_option, current_file_name,
-                      FNM_LEADING_DIR) == 0) {
-           goto all_done;
-         }
-
          /* FIXME: This is a quick kludge before 1.12 goes out.  */
          current_stat.st_mtime = TIME_FROM_OCT (current_header->header.mtime);
 
          if (!name_match (current_file_name)
              || current_stat.st_mtime < newer_mtime_option
-             || (exclude_option && check_exclude (current_file_name)))
+             || excluded_pathname (excluded, current_file_name))
            {
              int isextended = 0;
 
@@ -178,7 +167,6 @@ read_and (void (*do_something) ())
        }
       break;
     }
- all_done: ;
 
   apply_delayed_set_stat ();
   close_archive ();
@@ -487,7 +475,6 @@ decode_header (union block *header, struct stat *stat_info,
   *format_pointer = format;
 
   stat_info->st_mode = MODE_FROM_OCT (header->header.mode);
-  stat_info->st_mode &= 07777;
   stat_info->st_mtime = TIME_FROM_OCT (header->header.mtime);
 
   if (format == OLDGNU_FORMAT && incremental_option)
@@ -520,7 +507,7 @@ decode_header (union block *header, struct stat *stat_info,
        }
       switch (header->header.typeflag)
        {
-#ifdef S_IFBLK
+#ifdef S_ISBLK
        case BLKTYPE:
          stat_info->st_rdev
            = makedev (MAJOR_FROM_OCT (header->header.devmajor),
@@ -528,7 +515,7 @@ decode_header (union block *header, struct stat *stat_info,
          break;
 #endif
 
-#ifdef S_IFCHR
+#ifdef S_ISCHR
        case CHRTYPE:
          stat_info->st_rdev
            = makedev (MAJOR_FROM_OCT (header->header.devmajor),
@@ -563,7 +550,7 @@ from_oct (const char *where0, size_t digs0, const char *type, uintmax_t maxval)
                    type));
          return -1;
        }
-      if (!ISSPACE (*where))
+      if (!ISSPACE ((unsigned char) *where))
        break;
       where++;
       digs--;
@@ -580,7 +567,7 @@ from_oct (const char *where0, size_t digs0, const char *type, uintmax_t maxval)
       --digs;
     }
 
-  if (digs != 0 && *where && !ISSPACE (*where))
+  if (digs != 0 && *where && !ISSPACE ((unsigned char) *where))
     {
       if (type)
        {
@@ -590,12 +577,14 @@ from_oct (const char *where0, size_t digs0, const char *type, uintmax_t maxval)
          if (!o)
            {
              o = clone_quoting_options ((struct quoting_options *) 0);
-             set_quoting_style (o, escape_quoting_style);
+             set_quoting_style (o, c_quoting_style);
            }
 
-         quotearg_buffer (buf, sizeof buf, where0, digs0, o);
+         for (digs = digs0;  digs && ! where0[digs - 1];  digs--)
+           continue;
+         quotearg_buffer (buf, sizeof buf, where0, digs, o);
          ERROR ((0, 0,
-                 _("Header contains \"%.*s\" where octal %s value expected"),
+                 _("Header contains %.*s where octal %s value expected"),
                  (int) sizeof buf, buf, type));
        }
 
@@ -629,7 +618,20 @@ minor_from_oct (const char *p, size_t s)
 mode_t
 mode_from_oct (const char *p, size_t s)
 {
-  return from_oct (p, s, "mode_t", (uintmax_t) TYPE_MAXIMUM (mode_t));
+  /* Do not complain about unrecognized mode bits.  */
+  unsigned u = from_oct (p, s, "mode_t", TYPE_MAXIMUM (uintmax_t));
+  return ((u & TSUID ? S_ISUID : 0)
+         | (u & TSGID ? S_ISGID : 0)
+         | (u & TSVTX ? S_ISVTX : 0)
+         | (u & TUREAD ? S_IRUSR : 0)
+         | (u & TUWRITE ? S_IWUSR : 0)
+         | (u & TUEXEC ? S_IXUSR : 0)
+         | (u & TGREAD ? S_IRGRP : 0)
+         | (u & TGWRITE ? S_IWGRP : 0)
+         | (u & TGEXEC ? S_IXGRP : 0)
+         | (u & TOREAD ? S_IROTH : 0)
+         | (u & TOWRITE ? S_IWOTH : 0)
+         | (u & TOEXEC ? S_IXOTH : 0));
 }
 off_t
 off_from_oct (const char *p, size_t s)
@@ -704,25 +706,21 @@ isotime (const time_t *time)
 static void
 decode_mode (mode_t mode, char *string)
 {
-  mode_t mask;
-  const char *rwx = "rwxrwxrwx";
-
-  for (mask = 0400; mask != 0; mask >>= 1)
-    if (mode & mask)
-      *string++ = *rwx++;
-    else
-      {
-       *string++ = '-';
-       rwx++;
-      }
-
-  if (mode & S_ISUID)
-    string[-7] = string[-7] == 'x' ? 's' : 'S';
-  if (mode & S_ISGID)
-    string[-4] = string[-4] == 'x' ? 's' : 'S';
-  if (mode & S_ISVTX)
-    string[-1] = string[-1] == 'x' ? 't' : 'T';
-
+  *string++ = mode & S_IRUSR ? 'r' : '-';
+  *string++ = mode & S_IWUSR ? 'w' : '-';
+  *string++ = (mode & S_ISUID
+              ? (mode & S_IXUSR ? 's' : 'S')
+              : (mode & S_IXUSR ? 'x' : '-'));
+  *string++ = mode & S_IRGRP ? 'r' : '-';
+  *string++ = mode & S_IWGRP ? 'w' : '-';
+  *string++ = (mode & S_ISGID
+              ? (mode & S_IXGRP ? 's' : 'S')
+              : (mode & S_IXGRP ? 'x' : '-'));
+  *string++ = mode & S_IROTH ? 'r' : '-';
+  *string++ = mode & S_IWOTH ? 'w' : '-';
+  *string++ = (mode & S_ISVTX
+              ? (mode & S_IXOTH ? 't' : 'T')
+              : (mode & S_IXOTH ? 'x' : '-'));
   *string = '\0';
 }
 
@@ -757,7 +755,8 @@ print_header (void)
 {
   char modes[11];
   char *timestamp;
-  char uform[11], gform[11];   /* these hold formatted ints */
+  /* These hold formatted ints.  */
+  char uform[UINTMAX_STRSIZE_BOUND], gform[UINTMAX_STRSIZE_BOUND];
   char *user, *group;
   char size[2 * UINTMAX_STRSIZE_BOUND];
                                /* holds formatted size or major,minor */
@@ -875,7 +874,7 @@ print_header (void)
 
       switch (current_header->header.typeflag)
        {
-#if defined(S_IFBLK) || defined(S_IFCHR)
+#if defined S_ISBLK || defined S_ISCHR
        case CHRTYPE:
        case BLKTYPE:
          sprintf (size, "%lu,%lu",