X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuffer.c;h=75b4487a8ef2ef5c3064749b71b042ce8e23ca60;hb=5bfb6c5f9d105850ca9628dae7ef8d4d27687f70;hp=cea5f253f438e62bdaa65e03565a8e67f9f4ff4d;hpb=7c0b81cbb9790ab9402e983a4d677a8ebde010d5;p=chaz%2Ftar diff --git a/src/buffer.c b/src/buffer.c index cea5f25..75b4487 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -205,7 +204,8 @@ enum compress_type { ct_none, ct_compress, ct_gzip, - ct_bzip2 + ct_bzip2, + ct_lzma }; struct zip_magic @@ -222,6 +222,7 @@ static struct zip_magic const magic[] = { { ct_compress, 2, "\037\235", "compress", "-Z" }, { ct_gzip, 2, "\037\213", "gzip", "-z" }, { ct_bzip2, 3, "BZh", "bzip2", "-j" }, + { ct_lzma, 6, "\xFFLZMA", "lzma", "-a" }, /* FIXME: ???? */ }; #define NMAGIC (sizeof(magic)/sizeof(magic[0])) @@ -591,7 +592,7 @@ _open_archive (enum access_mode wanted_access) } static void -do_checkpoint (bool write) +do_checkpoint (bool do_write) { if (checkpoint_option && !(++checkpoint % checkpoint_option)) { @@ -603,7 +604,7 @@ do_checkpoint (bool write) break; case checkpoint_text: - if (write) + if (do_write) /* TRANSLATORS: This is a ``checkpoint of write operation'', *not* ``Writing a checkpoint''. E.g. in Spanish ``Punto de comprobaci@'on de escritura'', @@ -1137,22 +1138,22 @@ try_new_volume () { size_t status; union block *header; - int access; + enum access_mode acc; switch (subcommand_option) { case APPEND_SUBCOMMAND: case CAT_SUBCOMMAND: case UPDATE_SUBCOMMAND: - access = ACCESS_UPDATE; + acc = ACCESS_UPDATE; break; default: - access = ACCESS_READ; + acc = ACCESS_READ; break; } - if (!new_volume (access)) + if (!new_volume (acc)) return true; while ((status = rmtread (archive, record_start->buffer, record_size))