Minor fix.

[chaz/tar] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index b47b773ee8ea65c151db1fc8293e52ca8e58a433..444f61251f8fec9a09719784c609f5c2732ba2a5 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -54,7 +54,7 @@ enum access_mode access_mode;   /* how do we handle the archive */
 off_t records_read;             /* number of records read from this archive */
 off_t records_written;          /* likewise, for records written */
 extern off_t records_skipped;   /* number of records skipped at the start
 off_t records_read;             /* number of records read from this archive */
 off_t records_written;          /* likewise, for records written */
 extern off_t records_skipped;   /* number of records skipped at the start

-                                   of the archive, defined in delete.c */   
+                                   of the archive, defined in delete.c */

 
 static off_t record_start_block; /* block ordinal at record_start */
 
 
 static off_t record_start_block; /* block ordinal at record_start */
 


@@ -175,8 +175,8 @@ set_start_time ()
   last_stat_time = start_time;
 }
 
   last_stat_time = start_time;
 }
 

-void
-set_volume_start_time ()
+static void
+set_volume_start_time (void)

 {
   gettime (&volume_start_time);
   last_stat_time = volume_start_time;
 {
   gettime (&volume_start_time);
   last_stat_time = volume_start_time;


@@ -201,6 +201,7 @@ enum compress_type {
   ct_compress,
   ct_gzip,
   ct_bzip2,
   ct_compress,
   ct_gzip,
   ct_bzip2,

+  ct_lzip,

   ct_lzma,
   ct_lzop,
   ct_xz
   ct_lzma,
   ct_lzop,
   ct_xz


@@ -210,9 +211,9 @@ struct zip_magic
 {
   enum compress_type type;
   size_t length;
 {
   enum compress_type type;
   size_t length;

-  char *magic;
-  char *program;
-  char *option;
+  char const *magic;
+  char const *program;
+  char const *option;

 };
 
 static struct zip_magic const magic[] = {
 };
 
 static struct zip_magic const magic[] = {


@@ -221,9 +222,10 @@ static struct zip_magic const magic[] = {
   { ct_compress, 2, "\037\235",  COMPRESS_PROGRAM, "-Z" },
   { ct_gzip,     2, "\037\213",  GZIP_PROGRAM,     "-z"  },
   { ct_bzip2,    3, "BZh",       BZIP2_PROGRAM,    "-j" },
   { ct_compress, 2, "\037\235",  COMPRESS_PROGRAM, "-Z" },
   { ct_gzip,     2, "\037\213",  GZIP_PROGRAM,     "-z"  },
   { ct_bzip2,    3, "BZh",       BZIP2_PROGRAM,    "-j" },

+  { ct_lzip,     4, "LZIP",      LZIP_PROGRAM,     "--lzip" },

   { ct_lzma,     6, "\xFFLZMA",  LZMA_PROGRAM,     "--lzma" },
   { ct_lzop,     4, "\211LZO",   LZOP_PROGRAM,     "--lzop" },
   { ct_lzma,     6, "\xFFLZMA",  LZMA_PROGRAM,     "--lzma" },
   { ct_lzop,     4, "\211LZO",   LZOP_PROGRAM,     "--lzop" },

-  { ct_xz,       6, "\0xFD7zXZ", XZ_PROGRAM,       "-J" },
+  { ct_xz,       6, "\xFD" "7zXZ",  XZ_PROGRAM,       "-J" },

 };
 
 #define NMAGIC (sizeof(magic)/sizeof(magic[0]))
 };
 
 #define NMAGIC (sizeof(magic)/sizeof(magic[0]))


@@ -232,7 +234,7 @@ static struct zip_magic const magic[] = {
 #define compress_program(t) magic[t].program
 
 /* Check if the file ARCHIVE is a compressed archive. */
 #define compress_program(t) magic[t].program
 
 /* Check if the file ARCHIVE is a compressed archive. */

-enum compress_type
+static enum compress_type

 check_compressed_archive (bool *pshort)
 {
   struct zip_magic const *p;
 check_compressed_archive (bool *pshort)
 {
   struct zip_magic const *p;


@@ -241,14 +243,14 @@ check_compressed_archive (bool *pshort)
 
   if (!pshort)
     pshort = &temp;
 
   if (!pshort)
     pshort = &temp;

-  
+

   /* Prepare global data needed for find_next_block: */
   record_end = record_start; /* set up for 1st record = # 0 */
   sfr = read_full_records;
   read_full_records = true; /* Suppress fatal error on reading a partial
                                record */
   *pshort = find_next_block () == 0;
   /* Prepare global data needed for find_next_block: */
   record_end = record_start; /* set up for 1st record = # 0 */
   sfr = read_full_records;
   read_full_records = true; /* Suppress fatal error on reading a partial
                                record */
   *pshort = find_next_block () == 0;

-  
+

   /* Restore global values */
   read_full_records = sfr;
 
   /* Restore global values */
   read_full_records = sfr;
 


@@ -265,7 +267,7 @@ check_compressed_archive (bool *pshort)
 
 /* Guess if the archive is seekable. */
 static void
 
 /* Guess if the archive is seekable. */
 static void

-guess_seekable_archive ()
+guess_seekable_archive (void)

 {
   struct stat st;
 
 {
   struct stat st;
 


@@ -286,7 +288,7 @@ guess_seekable_archive ()
       seekable_archive = !!seek_option;
       return;
     }
       seekable_archive = !!seek_option;
       return;
     }

-  
+

   if (!multi_volume_option && !use_compress_program_option
       && fstat (archive, &st) == 0)
     seekable_archive = S_ISREG (st.st_mode);
   if (!multi_volume_option && !use_compress_program_option
       && fstat (archive, &st) == 0)
     seekable_archive = S_ISREG (st.st_mode);


@@ -297,8 +299,8 @@ guess_seekable_archive ()
 /* Open an archive named archive_name_array[0]. Detect if it is
    a compressed archive of known type and use corresponding decompression
    program if so */
 /* Open an archive named archive_name_array[0]. Detect if it is
    a compressed archive of known type and use corresponding decompression
    program if so */

-int
-open_compressed_archive ()
+static int
+open_compressed_archive (void)

 {
   archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
                      MODE_RW, rsh_command_option);
 {
   archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
                      MODE_RW, rsh_command_option);


@@ -318,7 +320,7 @@ open_compressed_archive ()
               if (shortfile)
                 ERROR ((0, 0, _("This does not look like a tar archive")));
               return archive;
               if (shortfile)
                 ERROR ((0, 0, _("This does not look like a tar archive")));
               return archive;

-      
+

             case ct_none:
               if (shortfile)
                 ERROR ((0, 0, _("This does not look like a tar archive")));
             case ct_none:
               if (shortfile)
                 ERROR ((0, 0, _("This does not look like a tar archive")));


@@ -332,10 +334,10 @@ open_compressed_archive ()
               break;
             }
         }
               break;
             }
         }

-      
+

       /* FD is not needed any more */
       rmtclose (archive);
       /* FD is not needed any more */
       rmtclose (archive);

-      
+

       hit_eof = false; /* It might have been set by find_next_block in
                           check_compressed_archive */
 
       hit_eof = false; /* It might have been set by find_next_block in
                           check_compressed_archive */
 


@@ -484,7 +486,7 @@ xclose (int fd)
 }
 
 static void
 }
 
 static void

-init_buffer ()
+init_buffer (void)

 {
   if (! record_buffer_aligned[record_index])
     record_buffer_aligned[record_index] =
 {
   if (! record_buffer_aligned[record_index])
     record_buffer_aligned[record_index] =


@@ -655,7 +657,7 @@ _open_archive (enum access_mode wanted_access)
 }
 
 /* Perform a write to flush the buffer.  */
 }
 
 /* Perform a write to flush the buffer.  */

-ssize_t
+static ssize_t

 _flush_write (void)
 {
   ssize_t status;
 _flush_write (void)
 {
   ssize_t status;


@@ -670,7 +672,7 @@ _flush_write (void)
     status = record_size;
   else
     status = sys_write_archive_buffer ();
     status = record_size;
   else
     status = sys_write_archive_buffer ();

-  
+

   return status;
 }
 
   return status;
 }
 


@@ -711,7 +713,7 @@ archive_read_error (void)
 }
 
 static bool
 }
 
 static bool

-archive_is_dev ()
+archive_is_dev (void)

 {
   struct stat st;
 
 {
   struct stat st;
 


@@ -854,16 +856,16 @@ seek_archive (off_t size)
   off_t start = current_block_ordinal ();
   off_t offset;
   off_t nrec, nblk;
   off_t start = current_block_ordinal ();
   off_t offset;
   off_t nrec, nblk;

-  off_t skipped = (blocking_factor - (current_block - record_start));
-
-  size -= skipped * BLOCKSIZE;
+  off_t skipped = (blocking_factor - (current_block - record_start))
+                  * BLOCKSIZE;

 
 

-  if (size < record_size)
+  if (size <= skipped)

     return 0;
     return 0;

-  /* FIXME: flush? */

 
   /* Compute number of records to skip */
 
   /* Compute number of records to skip */

-  nrec = size / record_size;
+  nrec = (size - skipped) / record_size;
+  if (nrec == 0)
+    return 0;

   offset = rmtlseek (archive, nrec * record_size, SEEK_CUR);
   if (offset < 0)
     return offset;
   offset = rmtlseek (archive, nrec * record_size, SEEK_CUR);
   if (offset < 0)
     return offset;


@@ -954,7 +956,7 @@ closeout_volume_number (void)
 
 \f
 static void
 
 \f
 static void

-increase_volume_number ()
+increase_volume_number (void)

 {
   global_volno++;
   if (global_volno < 0)
 {
   global_volno++;
   if (global_volno < 0)


@@ -962,13 +964,13 @@ increase_volume_number ()
   volno++;
 }
 
   volno++;
 }
 

-void
+static void

 change_tape_menu (FILE *read_file)
 {
   char *input_buffer = NULL;
   size_t size = 0;
   bool stop = false;
 change_tape_menu (FILE *read_file)
 {
   char *input_buffer = NULL;
   size_t size = 0;
   bool stop = false;

-  
+

   while (!stop)
     {
       fputc ('\007', stderr);
   while (!stop)
     {
       fputc ('\007', stderr);


@@ -1086,7 +1088,7 @@ new_volume (enum access_mode mode)
   assign_string (&continued_file_name, NULL);
   continued_file_size = continued_file_offset = 0;
   current_block = record_start;
   assign_string (&continued_file_name, NULL);
   continued_file_size = continued_file_offset = 0;
   current_block = record_start;

-  
+

   if (rmtclose (archive) != 0)
     close_error (*archive_name_cursor);
 
   if (rmtclose (archive) != 0)
     close_error (*archive_name_cursor);
 


@@ -1175,13 +1177,13 @@ read_header0 (struct tar_stat_info *info)
   return false;
 }
 
   return false;
 }
 

-bool
-try_new_volume ()
+static bool
+try_new_volume (void)

 {
   size_t status;
   union block *header;
   enum access_mode acc;
 {
   size_t status;
   union block *header;
   enum access_mode acc;

-  
+

   switch (subcommand_option)
     {
     case APPEND_SUBCOMMAND:
   switch (subcommand_option)
     {
     case APPEND_SUBCOMMAND:


@@ -1197,7 +1199,7 @@ try_new_volume ()
 
   if (!new_volume (acc))
     return true;
 
   if (!new_volume (acc))
     return true;

-  
+

   while ((status = rmtread (archive, record_start->buffer, record_size))
          == SAFE_READ_ERROR)
     archive_read_error ();
   while ((status = rmtread (archive, record_start->buffer, record_size))
          == SAFE_READ_ERROR)
     archive_read_error ();


@@ -1220,10 +1222,10 @@ try_new_volume ()
            ERROR ((0, 0, _("This does not look like a tar archive")));
            return false;
          }
            ERROR ((0, 0, _("This does not look like a tar archive")));
            return false;
          }

-       
+

         xheader_decode (&dummy); /* decodes values from the global header */
         tar_stat_destroy (&dummy);
         xheader_decode (&dummy); /* decodes values from the global header */
         tar_stat_destroy (&dummy);

-       
+

        /* The initial global header must be immediately followed by
           an extended PAX header for the first member in this volume.
           However, in some cases tar may split volumes in the middle
        /* The initial global header must be immediately followed by
           an extended PAX header for the first member in this volume.
           However, in some cases tar may split volumes in the middle


@@ -1235,7 +1237,7 @@ try_new_volume ()
           HEADER_FAILURE, which is ignored.
 
           See also tests/multiv07.at */
           HEADER_FAILURE, which is ignored.
 
           See also tests/multiv07.at */

-              
+

        switch (read_header (&header, &dummy, read_header_auto))
          {
          case HEADER_SUCCESS:
        switch (read_header (&header, &dummy, read_header_auto))
          {
          case HEADER_SUCCESS:


@@ -1325,7 +1327,7 @@ try_new_volume ()
                  STRINGIFY_BIGINT (real_s_totsize, totsizebuf),
                  STRINGIFY_BIGINT (real_s_sizeleft, s1buf),
                  STRINGIFY_BIGINT (continued_file_offset, s2buf)));
                  STRINGIFY_BIGINT (real_s_totsize, totsizebuf),
                  STRINGIFY_BIGINT (real_s_sizeleft, s1buf),
                  STRINGIFY_BIGINT (continued_file_offset, s2buf)));

-         
+

           return false;
         }
     }
           return false;
         }
     }


@@ -1346,7 +1348,7 @@ drop_volume_label_suffix (const char *label)
 
   if (len < 1)
     return NULL;
 
   if (len < 1)
     return NULL;

-  
+

   for (p = label + len - 1; p > label && isdigit ((unsigned char) *p); p--)
     ;
   if (p > label && p - (VOLUME_TEXT_LEN - 1) > label)
   for (p = label + len - 1; p > label && isdigit ((unsigned char) *p); p--)
     ;
   if (p > label && p - (VOLUME_TEXT_LEN - 1) > label)


@@ -1363,7 +1365,7 @@ drop_volume_label_suffix (const char *label)
 
   return NULL;
 }
 
   return NULL;
 }

-      
+

 /* Check LABEL against the volume label, seen as a globbing
    pattern.  Return true if the pattern matches.  In case of failure,
    retry matching a volume sequence number before giving up in
 /* Check LABEL against the volume label, seen as a globbing
    pattern.  Return true if the pattern matches.  In case of failure,
    retry matching a volume sequence number before giving up in


@@ -1372,7 +1374,7 @@ static bool
 check_label_pattern (const char *label)
 {
   char *string;
 check_label_pattern (const char *label)
 {
   char *string;

-  bool result;
+  bool result = false;

 
   if (fnmatch (volume_label_option, label, 0) == 0)
     return true;
 
   if (fnmatch (volume_label_option, label, 0) == 0)
     return true;


@@ -1397,7 +1399,7 @@ match_volume_label (void)
   if (!volume_label)
     {
       union block *label = find_next_block ();
   if (!volume_label)
     {
       union block *label = find_next_block ();

-  
+

       if (!label)
        FATAL_ERROR ((0, 0, _("Archive not labeled to match %s"),
                      quote (volume_label_option)));
       if (!label)
        FATAL_ERROR ((0, 0, _("Archive not labeled to match %s"),
                      quote (volume_label_option)));


@@ -1423,11 +1425,11 @@ match_volume_label (void)
          tar_stat_destroy (&st);
        }
     }
          tar_stat_destroy (&st);
        }
     }

-  
+

   if (!volume_label)
     FATAL_ERROR ((0, 0, _("Archive not labeled to match %s"),
                   quote (volume_label_option)));
   if (!volume_label)
     FATAL_ERROR ((0, 0, _("Archive not labeled to match %s"),
                   quote (volume_label_option)));

-  
+

   if (!check_label_pattern (volume_label))
     FATAL_ERROR ((0, 0, _("Volume %s does not match %s"),
                   quote_n (0, volume_label),
   if (!check_label_pattern (volume_label))
     FATAL_ERROR ((0, 0, _("Volume %s does not match %s"),
                   quote_n (0, volume_label),


@@ -1475,7 +1477,7 @@ add_volume_label (void)
 }
 
 static void
 }
 
 static void

-add_chunk_header ()
+add_chunk_header (void)

 {
   if (archive_format == POSIX_FORMAT)
     {
 {
   if (archive_format == POSIX_FORMAT)
     {


@@ -1566,7 +1568,7 @@ add_multi_volume_header (void)
 
 /* Synchronize multi-volume globals */
 static void
 
 /* Synchronize multi-volume globals */
 static void

-multi_volume_sync ()
+multi_volume_sync (void)

 {
   if (multi_volume_option)
     {
 {
   if (multi_volume_option)
     {


@@ -1597,7 +1599,7 @@ simple_flush_read (void)
   size_t status;                /* result from system call */
 
   checkpoint_run (false);
   size_t status;                /* result from system call */
 
   checkpoint_run (false);

-  
+

   /* Clear the count of errors.  This only applies to a single call to
      flush_read.  */
 
   /* Clear the count of errors.  This only applies to a single call to
      flush_read.  */
 


@@ -1656,7 +1658,7 @@ _gnu_flush_read (void)
   size_t status;                /* result from system call */
 
   checkpoint_run (false);
   size_t status;                /* result from system call */
 
   checkpoint_run (false);

-  
+

   /* Clear the count of errors.  This only applies to a single call to
      flush_read.  */
 
   /* Clear the count of errors.  This only applies to a single call to
      flush_read.  */
 


@@ -1725,14 +1727,14 @@ _gnu_flush_write (size_t buffer_level)
   size_t copy_size;
   size_t bufsize;
   tarlong wrt;
   size_t copy_size;
   size_t bufsize;
   tarlong wrt;

-  
+

   status = _flush_write ();
   if (status != record_size && !multi_volume_option)
     archive_write_error (status);
   else
     {
       if (status)
   status = _flush_write ();
   if (status != record_size && !multi_volume_option)
     archive_write_error (status);
   else
     {
       if (status)

-        records_written++; 
+        records_written++;

       bytes_written += status;
     }
 
       bytes_written += status;
     }
 


@@ -1747,7 +1749,7 @@ _gnu_flush_write (size_t buffer_level)
       ERROR ((0, 0, _("write did not end on a block boundary")));
       archive_write_error (status);
     }
       ERROR ((0, 0, _("write did not end on a block boundary")));
       archive_write_error (status);
     }

-  
+

   /* In multi-volume mode. */
   /* ENXIO is for the UNIX PC.  */
   if (status < 0 && errno != ENOSPC && errno != EIO && errno != ENXIO)
   /* In multi-volume mode. */
   /* ENXIO is for the UNIX PC.  */
   if (status < 0 && errno != ENOSPC && errno != EIO && errno != ENXIO)


@@ -1765,7 +1767,7 @@ _gnu_flush_write (size_t buffer_level)
 
   copy_ptr = record_start->buffer + status;
   copy_size = buffer_level - status;
 
   copy_ptr = record_start->buffer + status;
   copy_size = buffer_level - status;

-                   
+

   /* Switch to the next buffer */
   record_index = !record_index;
   init_buffer ();
   /* Switch to the next buffer */
   record_index = !record_index;
   init_buffer ();


@@ -1778,7 +1780,7 @@ _gnu_flush_write (size_t buffer_level)
 
   write_extended (true, &dummy, find_next_block ());
   tar_stat_destroy (&dummy);
 
   write_extended (true, &dummy, find_next_block ());
   tar_stat_destroy (&dummy);

-  
+

   if (real_s_name)
     add_chunk_header ();
   wrt = bytes_written;
   if (real_s_name)
     add_chunk_header ();
   wrt = bytes_written;


@@ -1839,6 +1841,7 @@ open_archive (enum access_mode wanted_access)
   switch (wanted_access)
     {
     case ACCESS_READ:
   switch (wanted_access)
     {
     case ACCESS_READ:

+    case ACCESS_UPDATE:

       if (volume_label_option)
         match_volume_label ();
       break;
       if (volume_label_option)
         match_volume_label ();
       break;


@@ -1848,9 +1851,6 @@ open_archive (enum access_mode wanted_access)
       if (volume_label_option)
         write_volume_label ();
       break;
       if (volume_label_option)
         write_volume_label ();
       break;

-
-    default:
-      break;

     }
   set_volume_start_time ();
 }
     }
   set_volume_start_time ();
 }