Merge in two patches from Dave Cinege:

    the first is a cleanup of tar --exclude
    the second changes mount so mtab works more as it should, and
    also allows mount to use the traditional short form (i.e.
    'mount / -o remount,rw' now works.

While inside tar, I changed it to use getopt...
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@937 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 2 insertions, 2 deletions

diff --git a/applets/usage.c b/applets/usage.c
index 1e2eb64cc..6c3f59797 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -1053,7 +1053,7 @@ const char tar_usage[] =
         "tar -[xtvO] "
 #endif
 #if defined BB_FEATURE_TAR_EXCLUDE
-        "[-X File(s)] "
+        "[--exclude File] "
 #endif
         "[-f tarFile] [FILE(s)] ...\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
@@ -1069,7 +1069,7 @@ const char tar_usage[] =
         "\tf\t\tname of tarfile or \"-\" for stdin\n"
         "\tO\t\textract to stdout\n"
 #if defined BB_FEATURE_TAR_EXCLUDE
-        "\tX\t\tfile(s) to exclude\n"
+        "\texclude\t\tfile to exclude\n"
 #endif
         "\nInformative output:\n"
         "\tv\t\tverbosely list files processed\n"