X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=60cd306d7ffdbb132dd17135276d0e6a191d3360;hb=e7db56c0ef5db2000c79fc87c96d669c51c6b2e9;hp=a112abf9a950eda544cf50387640f62e06e79d55;hpb=5842962ed6b5cfabccb93749639bffa85e04ae67;p=chaz%2Ftar

diff --git a/src/tar.c b/src/tar.c
index a112abf..60cd306 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -343,10 +343,10 @@ static struct argp_option options[] = {
   {"numeric-owner", NUMERIC_OWNER_OPTION, 0, 0,
    N_("always use numbers for user/group names"), 31 },
   {"preserve-permissions", 'p', 0, 0,
-   N_("extract permissions information"), 31 },
+   N_("extract information about file permissions (default for superuser)"), 31 },
   {"same-permissions", 0, 0, OPTION_ALIAS, NULL, 31 },
   {"no-same-permissions", NO_SAME_PERMISSIONS_OPTION, 0, 0,
-   N_("do not extract permissions information"), 31 },
+   N_("apply the user's umask when extracting permissions from the archive (default for ordinary users)"), 31 },
   {"preserve-order", 's', 0, 0,
    N_("sort names to extract to match archive"), 31 },
   {"same-order", 0, 0, OPTION_ALIAS, NULL, 31 },
@@ -617,9 +617,9 @@ parse_opt(int key, char *arg, struct argp_state *state)
   
   switch (key)
     {
-      case 1:
+      case ARGP_KEY_ARG:
 	/* File name or non-parsed option, because of ARGP_IN_ORDER */
-	name_add (optarg);
+	name_add (arg);
 	args->input_files++;
 	break;
 
@@ -1622,9 +1622,7 @@ main (int argc, char **argv)
   set_start_time ();
   program_name = argv[0];
 
-#ifdef HAVE_SETLOCALE
   setlocale (LC_ALL, "");
-#endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);