diff options
| author | Eric Andersen <andersen@codepoet.org> | 2000-08-02 16:42:58 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2000-08-02 16:42:58 +0000 |
| commit | d5fa3e3e9a8a1548b2e405ca9684bebbf946fd4f (patch) | |
| tree | f1552eda438dc59df253e2b1c85bc6b23648e96e /applets | |
| parent | 080d51bf455201ea4f815371c556effca6298dc2 (diff) | |
| download | busybox-w32-d5fa3e3e9a8a1548b2e405ca9684bebbf946fd4f.tar.gz busybox-w32-d5fa3e3e9a8a1548b2e405ca9684bebbf946fd4f.tar.bz2 busybox-w32-d5fa3e3e9a8a1548b2e405ca9684bebbf946fd4f.zip | |
Update to the tail rewrite by "Allen Soard" <esp-software@mail.hypermart.net>
-Erik
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/usage.c | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/applets/usage.c b/applets/usage.c index 3f367f9b1..1e2eb64cc 100644 --- a/applets/usage.c +++ b/applets/usage.c | |||
| @@ -1017,7 +1017,6 @@ const char syslogd_usage[] = | |||
| 1017 | #endif | 1017 | #endif |
| 1018 | 1018 | ||
| 1019 | #if defined BB_TAIL | 1019 | #if defined BB_TAIL |
| 1020 | #if defined BB_FEATURE_SIMPLE_TAIL | ||
| 1021 | const char tail_usage[] = | 1020 | const char tail_usage[] = |
| 1022 | "tail [OPTION] [FILE]...\n" | 1021 | "tail [OPTION] [FILE]...\n" |
| 1023 | #ifndef BB_FEATURE_TRIVIAL_HELP | 1022 | #ifndef BB_FEATURE_TRIVIAL_HELP |
| @@ -1025,32 +1024,25 @@ const char tail_usage[] = | |||
| 1025 | "With more than one FILE, precede each with a header giving the\n" | 1024 | "With more than one FILE, precede each with a header giving the\n" |
| 1026 | "file name. With no FILE, or when FILE is -, read standard input.\n\n" | 1025 | "file name. With no FILE, or when FILE is -, read standard input.\n\n" |
| 1027 | "Options:\n" | 1026 | "Options:\n" |
| 1028 | "\t-n NUM\t\tPrint last NUM lines instead of first 10\n" | 1027 | #ifndef BB_FEATURE_SIMPLE_TAIL |
| 1029 | 1028 | "\t-c=N[kbm]\toutput the last N bytes\n" | |
| 1030 | "\t-f\t\tOutput data as the file grows. This version\n" | ||
| 1031 | "\t\t\tof 'tail -f' supports only one file at a time.\n" | ||
| 1032 | #endif | 1029 | #endif |
| 1033 | ; | 1030 | "\t-n NUM\t\tPrint last NUM lines instead of first 10\n" |
| 1034 | #else /* ! defined BB_FEATURE_SIMPLE_TAIL */ | 1031 | "\t\t\tAlso can be -NUM or +NUM.\n" |
| 1035 | const char tail_usage[] = | 1032 | "\t-f\t\tOutput data as the file grows.\n" |
| 1036 | "tail [OPTION]... [FILE]...\n" | 1033 | #ifndef BB_FEATURE_SIMPLE_TAIL |
| 1037 | #ifndef BB_FEATURE_TRIVIAL_HELP | 1034 | "\t-q\t\tnever output headers giving file names\n" |
| 1038 | "\nPrint last 10 lines of each FILE to standard output.\n" | 1035 | "\t-s SEC\t\tWait SEC seconds between reads with -f\n" |
| 1039 | "With more than one FILE, precede each with a header giving the file name.\n" | 1036 | "\t-v\t\talways output headers giving file names\n\n" |
| 1040 | "With no FILE, or when FILE is -, read standard input.\n" | ||
| 1041 | "\n" | ||
| 1042 | " -c=N[kbm] output the last N bytes\n" | ||
| 1043 | " -f output appended data as the file grows\n" | ||
| 1044 | " -n=N output the last N lines, instead of last 10\n" | ||
| 1045 | " -q never output headers giving file names\n" | ||
| 1046 | " -v always output headers giving file names\n" | ||
| 1047 | "\n" | ||
| 1048 | "If the first character of N (bytes or lines) is a `+', output begins with \n" | 1037 | "If the first character of N (bytes or lines) is a `+', output begins with \n" |
| 1049 | "the Nth item from the start of each file, otherwise, print the last N items\n" | 1038 | "the Nth item from the start of each file, otherwise, print the last N items\n" |
| 1050 | "in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2).\n" | 1039 | "in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2).\n" |
| 1040 | //#else | ||
| 1041 | // "\nIf the first character of N (bytes or lines) is a `+', output begins with \n" | ||
| 1042 | // "the Nth item from the start of each file.\n" | ||
| 1051 | #endif | 1043 | #endif |
| 1052 | ; | ||
| 1053 | #endif | 1044 | #endif |
| 1045 | ; | ||
| 1054 | #endif | 1046 | #endif |
| 1055 | 1047 | ||
| 1056 | #if defined BB_TAR | 1048 | #if defined BB_TAR |
| @@ -1061,9 +1053,9 @@ const char tar_usage[] = | |||
| 1061 | "tar -[xtvO] " | 1053 | "tar -[xtvO] " |
| 1062 | #endif | 1054 | #endif |
| 1063 | #if defined BB_FEATURE_TAR_EXCLUDE | 1055 | #if defined BB_FEATURE_TAR_EXCLUDE |
| 1064 | "[--exclude File] " | 1056 | "[-X File(s)] " |
| 1065 | #endif | 1057 | #endif |
| 1066 | "[-f tarFile] [FILE] ...\n" | 1058 | "[-f tarFile] [FILE(s)] ...\n" |
| 1067 | #ifndef BB_FEATURE_TRIVIAL_HELP | 1059 | #ifndef BB_FEATURE_TRIVIAL_HELP |
| 1068 | "\nCreate, extract, or list files from a tar file. Note that\n" | 1060 | "\nCreate, extract, or list files from a tar file. Note that\n" |
| 1069 | "this version of tar treats hard links as separate files.\n\n" | 1061 | "this version of tar treats hard links as separate files.\n\n" |
| @@ -1077,7 +1069,7 @@ const char tar_usage[] = | |||
| 1077 | "\tf\t\tname of tarfile or \"-\" for stdin\n" | 1069 | "\tf\t\tname of tarfile or \"-\" for stdin\n" |
| 1078 | "\tO\t\textract to stdout\n" | 1070 | "\tO\t\textract to stdout\n" |
| 1079 | #if defined BB_FEATURE_TAR_EXCLUDE | 1071 | #if defined BB_FEATURE_TAR_EXCLUDE |
| 1080 | "\t--exclude\tfile to exclude\n" | 1072 | "\tX\t\tfile(s) to exclude\n" |
| 1081 | #endif | 1073 | #endif |
| 1082 | "\nInformative output:\n" | 1074 | "\nInformative output:\n" |
| 1083 | "\tv\t\tverbosely list files processed\n" | 1075 | "\tv\t\tverbosely list files processed\n" |