aboutsummaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-08-02 18:48:26 +0000
committerEric Andersen <andersen@codepoet.org>2000-08-02 18:48:26 +0000
commitfdd51033480e6d93af274bfd0df25b14aaea6c3b (patch)
tree06e7faef9293569687b853590742c91e1e36d940 /applets
parent5ae166813f8a6db9784e75c9b3843e1e30a7465f (diff)
downloadbusybox-w32-fdd51033480e6d93af274bfd0df25b14aaea6c3b.tar.gz
busybox-w32-fdd51033480e6d93af274bfd0df25b14aaea6c3b.tar.bz2
busybox-w32-fdd51033480e6d93af274bfd0df25b14aaea6c3b.zip
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
Diffstat (limited to 'applets')
-rw-r--r--applets/usage.c4
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[] =
1053 "tar -[xtvO] " 1053 "tar -[xtvO] "
1054#endif 1054#endif
1055#if defined BB_FEATURE_TAR_EXCLUDE 1055#if defined BB_FEATURE_TAR_EXCLUDE
1056 "[-X File(s)] " 1056 "[--exclude File] "
1057#endif 1057#endif
1058 "[-f tarFile] [FILE(s)] ...\n" 1058 "[-f tarFile] [FILE(s)] ...\n"
1059#ifndef BB_FEATURE_TRIVIAL_HELP 1059#ifndef BB_FEATURE_TRIVIAL_HELP
@@ -1069,7 +1069,7 @@ const char tar_usage[] =
1069 "\tf\t\tname of tarfile or \"-\" for stdin\n" 1069 "\tf\t\tname of tarfile or \"-\" for stdin\n"
1070 "\tO\t\textract to stdout\n" 1070 "\tO\t\textract to stdout\n"
1071#if defined BB_FEATURE_TAR_EXCLUDE 1071#if defined BB_FEATURE_TAR_EXCLUDE
1072 "\tX\t\tfile(s) to exclude\n" 1072 "\texclude\t\tfile to exclude\n"
1073#endif 1073#endif
1074 "\nInformative output:\n" 1074 "\nInformative output:\n"
1075 "\tv\t\tverbosely list files processed\n" 1075 "\tv\t\tverbosely list files processed\n"