X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=f65b64da603862d33f3c5be86f764bbf403a7c0d;hb=62599b528521f9a87f259b0448ada4e33a2d547a;hp=d466d1e9be44f4196e07a84c1b1f23ed2ac756cd;hpb=cd02b0855c64b6d44803f0f5c1ade06634ed0b1e;p=chaz%2Ftar

diff --git a/src/tar.c b/src/tar.c
index d466d1e..f65b64d 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -310,7 +310,7 @@ static struct argp_option options[] = {
   {"occurrence", OCCURRENCE_OPTION, N_("NUMBER"), OPTION_ARG_OPTIONAL,
    N_("process only the NUMBERth occurrence of each file in the archive. This option is valid only in conjunction with one of the subcommands --delete, --diff, --extract or --list and when a list of files is given either on the command line or via -T option. NUMBER defaults to 1."), 21 },
   {"seek", 'n', NULL, 0,
-   N_("Archive is seekable"), 21 },
+   N_("archive is seekable"), 21 },
 
   {NULL, 0, NULL, 0,
    N_("Overwrite control:"), 30},
@@ -381,7 +381,7 @@ static struct argp_option options[] = {
   {"file", 'f', N_("ARCHIVE"), 0,
    N_("use archive file or device ARCHIVE"), 61 },
   {"force-local", FORCE_LOCAL_OPTION, 0, 0,
-   N_("archive file is local even if has a colon"), 61 },
+   N_("archive file is local even if it has a colon"), 61 },
   {"rmt-command", RMT_COMMAND_OPTION, N_("COMMAND"), 0,
    N_("use given rmt COMMAND instead of rmt"), 61 }, 
   {"rsh-command", RSH_COMMAND_OPTION, N_("COMMAND"), 0,
@@ -418,7 +418,7 @@ static struct argp_option options[] = {
   {"blocking-factor", 'b', N_("BLOCKS"), 0,
    N_("BLOCKS x 512 bytes per record"), 71 },
   {"record-size", RECORD_SIZE_OPTION, N_("NUMBER"), 0,
-   N_("SIZE bytes per record, multiple of 512"), 71 },
+   N_("NUMBER of bytes per record, multiple of 512"), 71 },
   {"ignore-zeros", 'i', 0, 0,
    N_("ignore zeroed blocks in archive (means EOF)"), 71 },
   {"read-full-records", 'B', 0, 0,
@@ -440,7 +440,7 @@ static struct argp_option options[] = {
    N_("POSIX 1003.1-1988 (ustar) format"), 83 },
   {"  pax", 0, NULL, OPTION_DOC|OPTION_NO_TRANS,
    N_("POSIX 1003.1-2001 (pax) format"), 83 },
-  {"  posix", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, N_("Same as pax"), 83 },
+  {"  posix", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, N_("same as pax"), 83 },
   
   {"old-archive", OLD_ARCHIVE_OPTION, 0, 0, /* FIXME */
    N_("same as --format=v7"), 88 },
@@ -450,7 +450,7 @@ static struct argp_option options[] = {
   {"pax-option", PAX_OPTION, N_("keyword[[:]=value][,keyword[[:]=value], ...]"), 0,
    N_("control pax keywords"), 88 },
   {"label", 'V', N_("TEXT"), 0,
-   N_("create archive with volume name NAME. At list/extract time, use TEXT as a globbing pattern"), 88 },
+   N_("create archive with volume name TEXT. At list/extract time, use TEXT as a globbing pattern for volume name"), 88 },
   {"bzip2", 'j', 0, 0,
    N_("filter the archive through bzip2"), 88 },
   {"gzip", 'z', 0, 0,
@@ -467,17 +467,17 @@ static struct argp_option options[] = {
    N_("Local file selection:"), 90 },
 
   {"add-file", ARGP_KEY_ARG, N_("FILE"), 0,
-   N_("add given file to the archive (useful if FILE name starts with a dash)"), 91},
+   N_("add given FILE to the archive (useful if its name starts with a dash)"), 91},
   {"directory", 'C', N_("DIR"), 0,
    N_("change to directory DIR"), 91 },
-  {"files-from", 'T', N_("FILE-OF-NAMES"), 0,
-   N_("get names to extract or create from file NAME"), 91 },
+  {"files-from", 'T', N_("FILE"), 0,
+   N_("get names to extract or create from FILE"), 91 },
   {"null", NULL_OPTION, 0, 0,
    N_("-T reads null-terminated names, disable -C"), 91 },
   {"unquote", UNQUOTE_OPTION, 0, 0,
-   N_("Unquote filenames read with -T (default)"), 91 },
+   N_("unquote filenames read with -T (default)"), 91 },
   {"no-unquote", NO_UNQUOTE_OPTION, 0, 0,
-   N_("Do not unquote filenames read with -T"), 91 },
+   N_("do not unquote filenames read with -T"), 91 },
   {"exclude", EXCLUDE_OPTION, N_("PATTERN"), 0,
    N_("exclude files, given as a PATTERN"), 91 },
   {"exclude-from", 'X', N_("FILE"), 0,
@@ -489,13 +489,13 @@ static struct argp_option options[] = {
   {"anchored", ANCHORED_OPTION, 0, 0,
    N_("exclude patterns match file name start"), 91 },
   {"no-anchored", NO_ANCHORED_OPTION, 0, 0,
-   N_("exclude patterns match after any / (default)"), 91 },
+   N_("exclude patterns match after any `/' (default)"), 91 },
   {"no-ignore-case", NO_IGNORE_CASE_OPTION, 0, 0,
    N_("exclusion is case sensitive (default)"), 91 },
   {"no-wildcards", NO_WILDCARDS_OPTION, 0, 0,
    N_("exclude patterns are plain strings"), 91 },
   {"no-wildcards-match-slash", NO_WILDCARDS_MATCH_SLASH_OPTION, 0, 0,
-   N_("exclude pattern wildcards do not match '/'"), 91 },
+   N_("exclude pattern wildcards do not match `/'"), 91 },
   {"no-recursion", NO_RECURSION_OPTION, 0, 0,
    N_("avoid descending automatically in directories"), 91 },
   {"one-file-system", ONE_FILE_SYSTEM_OPTION, 0, 0,
@@ -506,7 +506,7 @@ static struct argp_option options[] = {
   {"absolute-names", 'P', 0, 0,
    N_("don't strip leading `/'s from file names"), 91 },
   {"dereference", 'h', 0, 0,
-   N_("dump instead the files symlinks point to"), 91 },
+   N_("follow symlinks; archive and dump the files they point to"), 91 },
   {"starting-file", 'K', N_("MEMBER-NAME"), 0,
    N_("begin at member MEMBER-NAME in the archive"), 91 },
   {"strip-components", STRIP_COMPONENTS_OPTION, N_("NUMBER"), 0,
@@ -520,11 +520,11 @@ static struct argp_option options[] = {
   {"backup", BACKUP_OPTION, N_("CONTROL"), OPTION_ARG_OPTIONAL,
    N_("backup before removal, choose version CONTROL"), 91 },
   {"suffix", SUFFIX_OPTION, N_("STRING"), 0,
-   N_("backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX"), 91 },
+   N_("backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX)"), 91 },
   {"wildcards", WILDCARDS_OPTION, 0, 0,
    N_("exclude patterns use wildcards (default)"), 91 },
   {"wildcards-match-slash", WILDCARDS_MATCH_SLASH_OPTION, 0, 0,
-   N_("exclude pattern wildcards match '/' (default)"), 91 },
+   N_("exclude pattern wildcards match `/' (default)"), 91 },
 
   {NULL, 0, NULL, 0,
    N_("Informative output:"), 100 },
@@ -932,7 +932,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 	  if (deref_stat (dereference_option, arg, &st) != 0)
 	    {
 	      stat_error (arg);
-	      USAGE_ERROR ((0, 0, _("Date file not found")));
+	      USAGE_ERROR ((0, 0, _("Date sample file not found")));
 	    }
 	  newer_mtime_option.tv_sec = st.st_mtime;
 	  newer_mtime_option.tv_nsec = TIMESPEC_NS (st.st_mtim);
@@ -1352,7 +1352,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 	char *cursor;
 
 	if (arg[1])
-	  argp_error (state, _("Malformed density argument: '%s'"), arg);
+	  argp_error (state, _("Malformed density argument: %s"), quote (arg));
 	
 	strcpy (buf, DEVICE_PREFIX);
 	cursor = buf + strlen (buf);
@@ -1388,7 +1388,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 	    break;
 
 	  default:
-	    argp_error (state, _("Unknown density: '%c'"), arg[0]);
+	    argp_error (state, _("Unknown density: `%c'"), arg[0]);
 	  }
 	sprintf (cursor, "%d", device);
 	
@@ -1401,7 +1401,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 	      xrealloc (archive_name_array,
 			sizeof (const char *) * allocated_archive_names);
 	  }
-	archive_name_array[archive_names++] = strdup (buf);
+	archive_name_array[archive_names++] = xstrdup (buf);
       }
       break;