X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuffer.c;h=97084ab5caa0d76a43abd053e5a11d9368996226;hb=88cb5008a6133cfbc129408273aa69266f2502a0;hp=ef4bbac6a7f6ec3a5cac1f24d59a24bb3806c507;hpb=9764a6b1d3b91b654728c04a645f20c605970562;p=chaz%2Ftar
diff --git a/src/buffer.c b/src/buffer.c
index ef4bbac..97084ab 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,24 +1,24 @@
/* Buffer management for tar.
- Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
- 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+ Copyright 1988, 1992-1994, 1996-1997, 1999-2010, 2013 Free Software
Foundation, Inc.
- Written by John Gilmore, on 1985-08-25.
+ This file is part of GNU tar.
- 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 3, or (at your option) any later
- version.
+ GNU tar 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 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- Public License for more details.
+ GNU tar is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- 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.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+ Written by John Gilmore, on 1985-08-25. */
#include
#include
@@ -41,7 +41,7 @@
static tarlong prev_written; /* bytes written on previous volumes */
static tarlong bytes_written; /* bytes written on this volume */
static void *record_buffer[2]; /* allocated memory */
-union block *record_buffer_aligned[2];
+static union block *record_buffer_aligned[2];
static int record_index;
/* FIXME: The following variables should ideally be static to this
@@ -83,8 +83,8 @@ extern bool time_to_start_writing;
bool write_archive_to_stdout;
-void (*flush_write_ptr) (size_t);
-void (*flush_read_ptr) (void);
+static void (*flush_write_ptr) (size_t);
+static void (*flush_read_ptr) (void);
char *volume_label;
@@ -103,7 +103,7 @@ bool write_archive_to_stdout;
/* Multi-volume tracking support */
-/* When creating a multi-volume archive, each `bufmap' represents
+/* When creating a multi-volume archive, each 'bufmap' represents
a member stored (perhaps partly) in the current record buffer.
After flushing the record to the output media, all bufmaps that
represent fully written members are removed from the list, then
@@ -193,7 +193,7 @@ bufmap_reset (struct bufmap *map, ssize_t fixup)
static struct tar_stat_info dummy;
void
-buffer_write_global_xheader ()
+buffer_write_global_xheader (void)
{
xheader_write_global (&dummy.xhdr);
}
@@ -205,7 +205,7 @@ mv_begin_read (struct tar_stat_info *st)
}
void
-mv_end ()
+mv_end (void)
{
if (multi_volume_option)
bufmap_free (NULL);
@@ -230,10 +230,10 @@ clear_read_error_count (void)
/* Time-related functions */
-double duration;
+static double duration;
void
-set_start_time ()
+set_start_time (void)
{
gettime (&start_time);
volume_start_time = start_time;
@@ -248,7 +248,7 @@ set_volume_start_time (void)
}
void
-compute_duration ()
+compute_duration (void)
{
struct timespec now;
gettime (&now);
@@ -261,8 +261,8 @@ compute_duration ()
/* Compression detection */
enum compress_type {
- ct_tar, /* Plain tar file */
ct_none, /* Unknown compression type */
+ ct_tar, /* Plain tar file */
ct_compress,
ct_gzip,
ct_bzip2,
@@ -272,31 +272,102 @@ enum compress_type {
ct_xz
};
+static enum compress_type archive_compression_type = ct_none;
+
struct zip_magic
{
enum compress_type type;
size_t length;
char const *magic;
+};
+
+struct zip_program
+{
+ enum compress_type type;
char const *program;
char const *option;
};
static struct zip_magic const magic[] = {
- { ct_tar },
- { ct_none, },
- { 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_xz, 6, "\xFD" "7zXZ", XZ_PROGRAM, "-J" },
+ { ct_none, 0, 0 },
+ { ct_tar, 0, 0 },
+ { ct_compress, 2, "\037\235" },
+ { ct_gzip, 2, "\037\213" },
+ { ct_bzip2, 3, "BZh" },
+ { ct_lzip, 4, "LZIP" },
+ { ct_lzma, 6, "\xFFLZMA" },
+ { ct_lzop, 4, "\211LZO" },
+ { ct_xz, 6, "\xFD" "7zXZ" },
};
#define NMAGIC (sizeof(magic)/sizeof(magic[0]))
-#define compress_option(t) magic[t].option
-#define compress_program(t) magic[t].program
+static struct zip_program zip_program[] = {
+ { ct_compress, COMPRESS_PROGRAM, "-Z" },
+ { ct_compress, GZIP_PROGRAM, "-z" },
+ { ct_gzip, GZIP_PROGRAM, "-z" },
+ { ct_bzip2, BZIP2_PROGRAM, "-j" },
+ { ct_bzip2, "lbzip2", "-j" },
+ { ct_lzip, LZIP_PROGRAM, "--lzip" },
+ { ct_lzma, LZMA_PROGRAM, "--lzma" },
+ { ct_lzma, XZ_PROGRAM, "-J" },
+ { ct_lzop, LZOP_PROGRAM, "--lzop" },
+ { ct_xz, XZ_PROGRAM, "-J" },
+ { ct_none }
+};
+
+static struct zip_program const *
+find_zip_program (enum compress_type type, int *pstate)
+{
+ int i;
+
+ for (i = *pstate; zip_program[i].type != ct_none; i++)
+ {
+ if (zip_program[i].type == type)
+ {
+ *pstate = i + 1;
+ return zip_program + i;
+ }
+ }
+ *pstate = i;
+ return NULL;
+}
+
+const char *
+first_decompress_program (int *pstate)
+{
+ struct zip_program const *zp;
+
+ if (use_compress_program_option)
+ return use_compress_program_option;
+
+ if (archive_compression_type == ct_none)
+ return NULL;
+
+ *pstate = 0;
+ zp = find_zip_program (archive_compression_type, pstate);
+ return zp ? zp->program : NULL;
+}
+
+const char *
+next_decompress_program (int *pstate)
+{
+ struct zip_program const *zp;
+
+ if (use_compress_program_option)
+ return NULL;
+ zp = find_zip_program (archive_compression_type, pstate);
+ return zp ? zp->program : NULL;
+}
+
+static const char *
+compress_option (enum compress_type type)
+{
+ struct zip_program const *zp;
+ int i = 0;
+ zp = find_zip_program (type, &i);
+ return zp ? zp->option : NULL;
+}
/* Check if the file ARCHIVE is a compressed archive. */
static enum compress_type
@@ -395,7 +466,7 @@ open_compressed_archive (void)
break;
default:
- use_compress_program_option = compress_program (type);
+ archive_compression_type = type;
break;
}
}
@@ -438,7 +509,7 @@ print_stats (FILE *fp, const char *text, tarlong numbytes)
}
void
-print_total_stats ()
+print_total_stats (void)
{
switch (subcommand_option)
{
@@ -651,9 +722,6 @@ _open_archive (enum access_mode wanted_access)
break;
}
}
- else if (verify_option)
- archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
- MODE_RW, rsh_command_option);
else
switch (wanted_access)
{
@@ -669,8 +737,12 @@ _open_archive (enum access_mode wanted_access)
maybe_backup_file (archive_name_array[0], 1);
backed_up_flag = 1;
}
- archive = rmtcreat (archive_name_array[0], MODE_RW,
- rsh_command_option);
+ if (verify_option)
+ archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
+ MODE_RW, rsh_command_option);
+ else
+ archive = rmtcreat (archive_name_array[0], MODE_RW,
+ rsh_command_option);
break;
case ACCESS_UPDATE:
@@ -1857,13 +1929,13 @@ gnu_flush_write (size_t buffer_level)
}
void
-flush_read ()
+flush_read (void)
{
flush_read_ptr ();
}
void
-flush_write ()
+flush_write (void)
{
flush_write_ptr (record_size);
}