mirrors/tar
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/tar.git synced 2026-04-26 19:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve previous changes.

Browse Source 
* acinclude.m4: Fix typos.
* gnulib.modules: Add xvasprintf.
* src/common.h: Include xvasprintf.h.
* src/tar.c (options): Remove docstrings for --gzip, --bzip2,
--compress, --lzop, --lzma and --xz.
(tar_help_filter): Generate these using actual values of
*_PROGRAM constants.
(format_default_settings): Use xasprintf.
(parse_opt): Use *_PROGRAM defines instead of hardcoded
program names.
This commit is contained in:
Sergey Poznyakoff
2009-10-10 19:49:38 +03:00
parent a7e9b6a17b
commit 84a55f12e5
4 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acinclude.m4
View File

@@ -17,10 +17,10 @@ dnl with GNU tar. If not, see <http://www.gnu.org/licenses/>.
AC_DEFUN([TAR_COMPR_PROGRAM],[
m4_pushdef([tar_compr_define],translit($1,[a-z+-],[A-ZX_])[_PROGRAM])
m4_pushdef([tar_compr_var],[tar_cv_compressor_]translit($1,[+-],[x_]))
AC_ARG_WITH([--with-]$1,
AC_ARG_WITH($1,
AC_HELP_STRING([--with-]$1[=PROG],
[use PROG as ]$1[ compressor program]),
[tar_compr_var=${withvar}],
[tar_compr_var=${withval}],
[tar_compr_var=m4_if($2,,$1,$2)])
AC_DEFINE_UNQUOTED(tar_compr_define, "$tar_compr_var",
[Define to the program name of ]$1[ compressor program])])

2
gnulib.modules
View File

@@ -5,7 +5,6 @@ alloca
argmatch
argp
argp-version-etc
asprintf
backupfile
canonicalize
closeout
@@ -62,3 +61,4 @@ xalloc
xalloc-die
xgetcwd
xstrtoumax
xvasprintf

1
src/common.h
View File

@@ -61,6 +61,7 @@
#define obstack_chunk_free free
#include <obstack.h>
#include <progname.h>
#include <xvasprintf.h>
#include <paxlib.h>

97
src/tar.c
View File

@@ -614,23 +614,18 @@ static struct argp_option options[] = {
{"no-auto-compress", NO_AUTO_COMPRESS_OPTION, 0, 0,
N_("do not use archive suffix to determine the compression program"),
GRID+1 },
{"bzip2", 'j', 0, 0,
N_("filter the archive through bzip2"), GRID+1 },
{"gzip", 'z', 0, 0,
N_("filter the archive through gzip"), GRID+1 },
{"gunzip", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
{"ungzip", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
{"compress", 'Z', 0, 0,
N_("filter the archive through compress"), GRID+1 },
{"uncompress", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
{"lzma", LZMA_OPTION, 0, 0,
N_("filter the archive through lzma"), GRID+1 },
{"lzop", LZOP_OPTION, 0, 0,
N_("filter the archive through lzop"), GRID+8 },
{"xz", 'J', 0, 0,
N_("filter the archive through xz"), GRID+8 },
{"use-compress-program", 'I', N_("PROG"), 0,
N_("filter through PROG (must accept -d)"), GRID+1 },
/* Note: docstrings for the options below are generated by tar_help_filter */
{"bzip2", 'j', 0, 0, NULL, GRID+1 },
{"gzip", 'z', 0, 0, NULL, GRID+1 },
{"gunzip", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
{"ungzip", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
{"compress", 'Z', 0, 0, NULL, GRID+1 },
{"uncompress", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
{"lzma", LZMA_OPTION, 0, 0, NULL, GRID+1 },
{"lzop", LZOP_OPTION, 0, 0, NULL, GRID+1 },
{"xz", 'J', 0, 0, NULL, GRID+1 },
#undef GRID
#define GRID 100
@@ -903,9 +898,7 @@ add_exclude_array (char const * const * fv)
static char *
format_default_settings (void)
{
char *s;
asprintf (&s,
return xasprintf (
"--format=%s -f%s -b%d --quoting-style=%s --rmt-command=%s"
#ifdef REMOTE_SHELL
" --rsh-command=%s"
@@ -919,7 +912,6 @@ format_default_settings (void)
REMOTE_SHELL
#endif
);
return s;
}
@@ -1260,22 +1252,47 @@ tar_help_filter (int key, const char *text, void *input)
struct obstack stk;
char *s;
if (key != ARGP_KEY_HELP_EXTRA)
return (char*) text;
switch (key)
{
default:
s = (char*) text;
break;
case 'j':
s = xasprintf (_("filter the archive through %s"), BZIP2_PROGRAM);
break;
case 'z':
s = xasprintf (_("filter the archive through %s"), GZIP_PROGRAM);
break;
case 'Z':
s = xasprintf (_("filter the archive through %s"), COMPRESS_PROGRAM);
break;
obstack_init (&stk);
s = _("Valid arguments for the --quoting-style option are:");
obstack_grow (&stk, s, strlen (s));
obstack_grow (&stk, "\n\n", 2);
tar_list_quoting_styles (&stk, " ");
s = _("\n*This* tar defaults to:\n");
obstack_grow (&stk, s, strlen (s));
s = format_default_settings ();
obstack_grow (&stk, s, strlen (s));
obstack_1grow (&stk, '\n');
obstack_1grow (&stk, 0);
s = xstrdup (obstack_finish (&stk));
obstack_free (&stk, NULL);
case LZMA_OPTION:
s = xasprintf (_("filter the archive through %s"), LZMA_PROGRAM);
break;
case 'J':
s = xasprintf (_("filter the archive through %s"), XZ_PROGRAM);
break;
case ARGP_KEY_HELP_EXTRA:
obstack_init (&stk);
s = _("Valid arguments for the --quoting-style option are:");
obstack_grow (&stk, s, strlen (s));
obstack_grow (&stk, "\n\n", 2);
tar_list_quoting_styles (&stk, " ");
s = _("\n*This* tar defaults to:\n");
obstack_grow (&stk, s, strlen (s));
s = format_default_settings ();
obstack_grow (&stk, s, strlen (s));
obstack_1grow (&stk, '\n');
obstack_1grow (&stk, 0);
s = xstrdup (obstack_finish (&stk));
obstack_free (&stk, NULL);
}
return s;
}
@@ -1441,11 +1458,11 @@ parse_opt (int key, char *arg, struct argp_state *state)
break;
case 'j':
set_use_compress_program_option ("bzip2");
set_use_compress_program_option (BZIP2_PROGRAM);
break;
case 'J':
set_use_compress_program_option ("xz");
set_use_compress_program_option (XZ_PROGRAM);
break;
case 'k':
@@ -1489,11 +1506,11 @@ parse_opt (int key, char *arg, struct argp_state *state)
break;
case LZMA_OPTION:
set_use_compress_program_option ("lzma");
set_use_compress_program_option (LZMA_PROGRAM);
break;
case LZOP_OPTION:
set_use_compress_program_option ("lzop");
set_use_compress_program_option (LZOP_PROGRAM);
break;
case 'm':
@@ -1651,11 +1668,11 @@ parse_opt (int key, char *arg, struct argp_state *state)
break;
case 'z':
set_use_compress_program_option ("gzip");
set_use_compress_program_option (GZIP_PROGRAM);
break;
case 'Z':
set_use_compress_program_option ("compress");
set_use_compress_program_option (COMPRESS_PROGRAM);
break;
case ANCHORED_OPTION: