mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(doc0, doc1, initialize_argp_doc): Removed. Rely on the new argp method instead

Browse Source
This commit is contained in:
Sergey Poznyakoff
2006-09-27 09:03:13 +00:00
parent 3ad3ca8734
commit a76ab340dd
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/tar.c
View File

@@ -320,17 +320,16 @@ enum
const char *argp_program_version = "tar (" PACKAGE_NAME ") " VERSION;
const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
static char const doc0[] = N_("\
static char const doc[] = N_("\
GNU `tar' saves many files together into a single tape or disk archive, \
and can restore individual files from the archive.\n\
\n\
Examples:\n\
tar -cf archive.tar foo bar # Create archive.tar from files foo and bar.\n\
tar -tvf archive.tar # List all files in archive.tar verbosely.\n\
tar -xf archive.tar # Extract all files from archive.tar.\n\
");
static char const doc1[] = N_("\
The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\
tar -xf archive.tar # Extract all files from archive.tar.\n")
"\v"
N_("The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\
The version control may be set with --backup or VERSION_CONTROL, values are:\n\n\
none, off never make backups\n\
t, numbered make numbered backups\n\
@@ -1862,27 +1861,12 @@ static struct argp argp = {
options,
parse_opt,
N_("[FILE]..."),
NULL,
doc,
NULL,
NULL,
NULL
};
/* Initialize the argp documentation. gettext 0.15 dislikes doc
strings containing '\v', so insert '\v' after translation. */
static void
initialize_argp_doc (void)
{
char const *xdoc0 = _(doc0); size_t xlen0 = strlen (xdoc0);
char const *xdoc1 = _(doc1); size_t xlen1 = strlen (xdoc1);
char *doc = xmalloc (xlen0 + 1 + xlen1 + 1);
memcpy (doc, xdoc0, xlen0);
doc[xlen0] = '\v';
memcpy (doc + xlen0 + 1, doc1, xlen1 + 1);;
argp.doc = doc;
}
void
usage (int status)
{
@@ -1939,8 +1923,6 @@ decode_options (int argc, char **argv)
owner_option = -1;
group_option = -1;
initialize_argp_doc ();
/* Convert old-style tar call by exploding option element and rearranging
options accordingly. */