Clarify default values for --same-owner and --no-same-owner

Most other options which have different defaults for superuser and
ordinary users already say as much. Fix these to match.

diff --git a/debian/changelog b/debian/changelog
index 393a9e1a6567306073bf74a8077f9b9eeaecccec..737dcbaf2fc4eea17b99de5f1ccffbe1a8133a9d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tar (1.22-3) UNRELEASED; urgency=low
+
+  * Clarify default values for --same-owner and --no-same-owner
+
+ -- Carl Worth <cworth@cworth.org>  Tue, 04 Aug 2009 17:13:55 -0700
+
 tar (1.22-2) unstable; urgency=low
 
   * Add Carl Worth as an uploader.

diff --git a/src/tar.c b/src/tar.c
index e10b80431c1c60ba5f7fa2ee04b9e0f07310970a..309f9d7363ff4a3b33c212d85b395f0c3a472155 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -481,9 +481,9 @@ static struct argp_option options[] = {
   {"touch", 'm', 0, 0,
    N_("don't extract file modified time"), GRID+1 },
   {"same-owner", SAME_OWNER_OPTION, 0, 0,
-   N_("try extracting files with the same ownership"), GRID+1 },
+   N_("try extracting files with the same ownership as exists in the archive (default for superuser)"), GRID+1 },
   {"no-same-owner", NO_SAME_OWNER_OPTION, 0, 0,
-   N_("extract files as yourself"), GRID+1 },
+   N_("extract files as yourself (default for ordinary users)"), GRID+1 },
   {"numeric-owner", NUMERIC_OWNER_OPTION, 0, 0,
    N_("always use numbers for user/group names"), GRID+1 },
   {"preserve-permissions", 'p', 0, 0,