/* A tar (tape archiver) program.
Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000,
- 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Written by John Gilmore, starting 1985-08-25.
#include <rmt.h>
#include <prepargs.h>
#include <quotearg.h>
+#include <version-etc.h>
#include <xstrtol.h>
#include <stdopen.h>
case CAT_SUBCOMMAND:
return "-A";
-
+
case CREATE_SUBCOMMAND:
return "-c";
-
+
case DELETE_SUBCOMMAND:
return "-D";
case DIFF_SUBCOMMAND:
return "-d";
-
+
case EXTRACT_SUBCOMMAND:
return "-x";
}
}
+void
+tar_list_quoting_styles (FILE *fp, char *prefix)
+{
+ int i;
+
+ for (i = 0; quoting_style_args[i]; i++)
+ fprintf (fp, "%s%s\n", prefix, quoting_style_args[i]);
+}
+
+void
+tar_set_quoting_style (char *arg)
+{
+ int i;
+
+ for (i = 0; quoting_style_args[i]; i++)
+ if (strcmp (arg, quoting_style_args[i]) == 0)
+ {
+ set_quoting_style (NULL, i);
+ return;
+ }
+ FATAL_ERROR ((0, 0,
+ _("Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list."), arg));
+}
+
\f
/* Options. */
IGNORE_FAILED_READ_OPTION,
INDEX_FILE_OPTION,
KEEP_NEWER_FILES_OPTION,
- LICENSE_OPTION,
MODE_OPTION,
NEWER_MTIME_OPTION,
NO_ANCHORED_OPTION,
NO_IGNORE_CASE_OPTION,
NO_IGNORE_COMMAND_ERROR_OPTION,
NO_OVERWRITE_DIR_OPTION,
+ NO_QUOTE_CHARS_OPTION,
NO_RECURSION_OPTION,
NO_SAME_OWNER_OPTION,
NO_SAME_PERMISSIONS_OPTION,
PAX_OPTION,
POSIX_OPTION,
PRESERVE_OPTION,
+ QUOTE_CHARS_OPTION,
+ QUOTING_STYLE_OPTION,
RECORD_SIZE_OPTION,
RECURSION_OPTION,
RECURSIVE_UNLINK_OPTION,
N_("Test archive volume label and exit"), GRID+1 },
#undef GRID
-#define GRID 20
+#define GRID 20
{NULL, 0, NULL, 0,
N_("Operation modifiers:"), GRID },
N_("archive is seekable"), GRID+1 },
#undef GRID
-#define GRID 30
+#define GRID 30
{NULL, 0, NULL, 0,
N_("Overwrite control:\n"), GRID+1 },
N_("preserve metadata of existing directories"), GRID+1 },
#undef GRID
-#define GRID 40
+#define GRID 40
{NULL, 0, NULL, 0,
N_("Select output stream:"), GRID },
N_("treat non-zero exit codes of children as error"), GRID+1 },
#undef GRID
-#define GRID 50
+#define GRID 50
{NULL, 0, NULL, 0,
N_("Handling of file attributes:"), GRID },
N_("Cancel the effect of --delay-directory-restore option."), GRID+1 },
#undef GRID
-#define GRID 60
+#define GRID 60
{NULL, 0, NULL, 0,
N_("Device selection and switching:\n"), GRID+1 },
N_("use/update the volume number in FILE"), GRID+1 },
#undef GRID
-#define GRID 70
+#define GRID 70
{NULL, 0, NULL, 0,
N_("Device blocking:"), GRID+1 },
N_("reblock as we read (for 4.2BSD pipes)"), GRID+1 },
#undef GRID
-#define GRID 80
+#define GRID 80
{NULL, 0, NULL, 0,
N_("Archive format selection:"), GRID },
N_("filter through PROG (must accept -d)"), GRID+8 },
#undef GRID
-#define GRID 90
+#define GRID 90
{NULL, 0, NULL, 0,
N_("Local file selection:"), GRID },
N_("exclude pattern wildcards match `/' (default)"), GRID+1 },
#undef GRID
-#define GRID 100
+#define GRID 100
{NULL, 0, NULL, 0,
N_("Informative output:"), GRID },
{"show-stored-names", SHOW_STORED_NAMES_OPTION, 0, 0,
N_("When creating archive in verbose mode, list member names as stored in the archive"),
GRID+1 },
+ {"quoting-style", QUOTING_STYLE_OPTION, N_("STYLE"), 0,
+ N_("Set name quoting style. See below for valid STYLE values."), GRID+1 },
+ {"quote-chars", QUOTE_CHARS_OPTION, N_("STRING"), 0,
+ N_("Additionally quote characters from STRING"), GRID+1 },
+ {"no-quote-chars", NO_QUOTE_CHARS_OPTION, N_("STRING"), 0,
+ N_("Disable quoting for characters from STRING"), GRID+1 },
#undef GRID
-#define GRID 110
+#define GRID 110
{NULL, 0, NULL, 0,
N_("Compatibility options:"), GRID },
N_("when creating, same as --old-archive. When extracting, same as --no-same-owner"), GRID+1 },
#undef GRID
-#define GRID 120
+#define GRID 120
{NULL, 0, NULL, 0,
N_("Other options:"), GRID },
- {"restrict", RESTRICT_OPTION, 0, 0,
+ {"restrict", RESTRICT_OPTION, 0, 0,
N_("Restrict use of some potentially harmful options"), -1 },
-
+
{"help", '?', 0, 0, N_("Give this help list"), -1},
{"usage", USAGE_OPTION, 0, 0, N_("Give a short usage message"), -1},
- {"license", LICENSE_OPTION, 0, 0, N_("Print license and exit"), -1},
{"version", VERSION_OPTION, 0, 0, N_("Print program version"), -1},
/* FIXME -V (--label) conflicts with the default short option for
--version */
{"HANG", HANG_OPTION, "SECS", OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
N_("Hang for SECS seconds (default 3600)"), 0},
#undef GRID
-
+
{0, 0, 0, 0, 0, 0}
};
show_default_settings (FILE *stream)
{
fprintf (stream,
- "--format=%s -f%s -b%d --rmt-command=%s",
+ "--format=%s -f%s -b%d --quoting-style=%s --rmt-command=%s",
archive_format_string (DEFAULT_ARCHIVE_FORMAT),
DEFAULT_ARCHIVE, DEFAULT_BLOCKING,
+ quoting_style_args[DEFAULT_QUOTING_STYLE],
DEFAULT_RMT_COMMAND);
#ifdef REMOTE_SHELL
fprintf (stream, " --rsh-command=%s", REMOTE_SHELL);
use_compress_program_option = string;
}
-void
-license ()
-{
- printf ("tar (%s) %s\n%s\n", PACKAGE_NAME, PACKAGE_VERSION,
- "Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1999, \n\
-2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.\n");
- puts (_("Based on the work of John Gilmore and Jay Fenlason. See AUTHORS\n\
-for complete list of authors.\n"));
- printf (_(" GNU tar is free software; you can redistribute it and/or modify\n"
- " it under the terms of the GNU General Public License as published by\n"
- " the Free Software Foundation; either version 2 of the License, or\n"
- " (at your option) any later version.\n"
- "\n"
- " GNU tar is distributed in the hope that it will be useful,\n"
- " but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
- " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
- " GNU General Public License for more details.\n"
- "\n"
- " You should have received a copy of the GNU General Public License\n"
- " along with GNU tar; if not, write to the Free Software Foundation,\n"
- " Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\n\n"));
- exit (0);
-}
-
static volatile int _argp_hang;
enum read_file_list_state /* Result of reading file name from the list file */
case NO_DELAY_DIRECTORY_RESTORE_OPTION:
delay_directory_restore_option = false;
break;
-
+
case DELETE_OPTION:
set_subcommand_option (DELETE_SUBCOMMAND);
break;
old_files_option = NO_OVERWRITE_DIR_OLD_FILES;
break;
+ case NO_QUOTE_CHARS_OPTION:
+ for (;*arg; arg++)
+ set_char_quoting (NULL, *arg, 0);
+ break;
+
case NO_WILDCARDS_OPTION:
args->exclude_options &= ~ EXCLUDE_WILDCARDS;
break;
}
break;
+ case QUOTE_CHARS_OPTION:
+ for (;*arg; arg++)
+ set_char_quoting (NULL, *arg, 1);
+ break;
+
+ case QUOTING_STYLE_OPTION:
+ tar_set_quoting_style (arg);
+ break;
+
case PAX_OPTION:
args->pax_option++;
xheader_set_option (arg);
case RESTRICT_OPTION:
restrict_option = true;
break;
-
+
case RMT_COMMAND_OPTION:
rmt_command = arg;
break;
state->flags |= ARGP_NO_EXIT;
argp_state_help (state, state->out_stream,
ARGP_HELP_STD_HELP & ~ARGP_HELP_BUG_ADDR);
+ fprintf (state->out_stream, "\n%s\n\n",
+ _("Valid arguments for --quoting-style options are:"));
+ tar_list_quoting_styles (state->out_stream, " ");
+
fprintf (state->out_stream, _("\n*This* tar defaults to:\n"));
show_default_settings (state->out_stream);
fprintf (state->out_stream, "\n");
break;
case VERSION_OPTION:
- fprintf (state->out_stream, "%s\n", argp_program_version);
+ version_etc (state->out_stream, "tar", PACKAGE_NAME, VERSION,
+ "John Gilmore", "Jay Fenlason", (char *) NULL);
exit (0);
- case LICENSE_OPTION:
- license ();
- break;
-
case HANG_OPTION:
_argp_hang = atoi (arg ? arg : "3600");
while (_argp_hang-- > 0)
&& !tape_length_option)
USAGE_ERROR ((0, 0,
_("creating multi-volume archives in posix format requires using --tape-length (-L) option")));
-
+
if (occurrence_option)
{
if (!args.input_files)
if (multi_volume_option)
USAGE_ERROR ((0, 0, _("Cannot use multi-volume compressed archives")));
if (subcommand_option == UPDATE_SUBCOMMAND
- || subcommand_option == APPEND_SUBCOMMAND)
+ || subcommand_option == APPEND_SUBCOMMAND
+ || subcommand_option == DELETE_SUBCOMMAND)
USAGE_ERROR ((0, 0, _("Cannot update compressed archives")));
if (subcommand_option == CAT_SUBCOMMAND)
USAGE_ERROR ((0, 0, _("Cannot concatenate compressed archives")));
exit_status = TAREXIT_SUCCESS;
filename_terminator = '\n';
- set_quoting_style (0, escape_quoting_style);
+ set_quoting_style (0, DEFAULT_QUOTING_STYLE);
/* Make sure we have first three descriptors available */
stdopen ();
projects / chaz / tar / blobdiff