diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-28 00:46:49 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-28 00:46:49 +0000 |
commit | 7df69b887ad07c051b53a0217bc649c4bed20ed4 (patch) | |
tree | d311e602aac3008c69631a85203f47d9d7a8dbf7 | |
parent | c2f5b022933dfcf87e4bda1e69d534f0fec918ca (diff) | |
download | busybox-w32-7df69b887ad07c051b53a0217bc649c4bed20ed4.tar.gz busybox-w32-7df69b887ad07c051b53a0217bc649c4bed20ed4.tar.bz2 busybox-w32-7df69b887ad07c051b53a0217bc649c4bed20ed4.zip |
usage: fix few help texts, fix breakage: '\<tab>'
sequence utterly confused cpp :)
-rw-r--r-- | include/usage.h | 101 |
1 files changed, 51 insertions, 50 deletions
diff --git a/include/usage.h b/include/usage.h index 7cabd8751..5a1715a9d 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -337,7 +337,7 @@ | |||
337 | "Compares FILE1 vs stdin if FILE2 is not specified.\n\n" \ | 337 | "Compares FILE1 vs stdin if FILE2 is not specified.\n\n" \ |
338 | "Options:\n" \ | 338 | "Options:\n" \ |
339 | " -l Write the byte numbers (decimal) and values (octal)\n" \ | 339 | " -l Write the byte numbers (decimal) and values (octal)\n" \ |
340 | " for all differing bytes\n" \ | 340 | " for all differing bytes\n" \ |
341 | " -s quiet mode - do not print" | 341 | " -s quiet mode - do not print" |
342 | 342 | ||
343 | #define comm_trivial_usage \ | 343 | #define comm_trivial_usage \ |
@@ -379,13 +379,13 @@ | |||
379 | #define cpio_full_usage \ | 379 | #define cpio_full_usage \ |
380 | "Extract or list files from a cpio archive\n" \ | 380 | "Extract or list files from a cpio archive\n" \ |
381 | "Main operation mode:\n" \ | 381 | "Main operation mode:\n" \ |
382 | " d make leading directories\n" \ | 382 | " d make leading directories\n" \ |
383 | " i extract\n" \ | 383 | " i extract\n" \ |
384 | " m preserve mtime\n" \ | 384 | " m preserve mtime\n" \ |
385 | " t list\n" \ | 385 | " t list\n" \ |
386 | " v verbose\n" \ | 386 | " v verbose\n" \ |
387 | " u unconditional overwrite\n" \ | 387 | " u unconditional overwrite\n" \ |
388 | " F input from file" | 388 | " F input from file" |
389 | 389 | ||
390 | #define crond_trivial_usage \ | 390 | #define crond_trivial_usage \ |
391 | "-d[#] -c <crondir> -f -b" | 391 | "-d[#] -c <crondir> -f -b" |
@@ -416,12 +416,12 @@ | |||
416 | #define cut_full_usage \ | 416 | #define cut_full_usage \ |
417 | "Prints selected fields from each input FILE to standard output.\n\n" \ | 417 | "Prints selected fields from each input FILE to standard output.\n\n" \ |
418 | "Options:\n" \ | 418 | "Options:\n" \ |
419 | " -b LIST Output only bytes from LIST\n" \ | 419 | " -b LIST Output only bytes from LIST\n" \ |
420 | " -c LIST Output only characters from LIST\n" \ | 420 | " -c LIST Output only characters from LIST\n" \ |
421 | " -d CHAR Use CHAR instead of tab as the field delimiter\n" \ | 421 | " -d CHAR Use CHAR instead of tab as the field delimiter\n" \ |
422 | " -s Output only the lines containing delimiter\n" \ | 422 | " -s Output only the lines containing delimiter\n" \ |
423 | " -f N Print only these fields\n" \ | 423 | " -f N Print only these fields\n" \ |
424 | " -n Ignored" | 424 | " -n Ignored" |
425 | #define cut_example_usage \ | 425 | #define cut_example_usage \ |
426 | "$ echo \"Hello world\" | cut -f 1 -d ' '\n" \ | 426 | "$ echo \"Hello world\" | cut -f 1 -d ' '\n" \ |
427 | "Hello\n" \ | 427 | "Hello\n" \ |
@@ -481,16 +481,17 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
481 | " if=FILE read from FILE instead of stdin\n" \ | 481 | " if=FILE read from FILE instead of stdin\n" \ |
482 | " of=FILE write to FILE instead of stdout\n" \ | 482 | " of=FILE write to FILE instead of stdout\n" \ |
483 | " bs=N read and write N bytes at a time\n" \ | 483 | " bs=N read and write N bytes at a time\n" \ |
484 | USE_FEATURE_DD_IBS_OBS(" ibs=N read N bytes at a time\n") \ | 484 | USE_FEATURE_DD_IBS_OBS( \ |
485 | USE_FEATURE_DD_IBS_OBS(" obs=N write N bytes at a time\n") \ | 485 | " ibs=N read N bytes at a time\n") \ |
486 | USE_FEATURE_DD_IBS_OBS( \ | ||
487 | " obs=N write N bytes at a time\n") \ | ||
486 | " count=N copy only N input blocks\n" \ | 488 | " count=N copy only N input blocks\n" \ |
487 | " skip=N skip N input blocks\n" \ | 489 | " skip=N skip N input blocks\n" \ |
488 | " seek=N skip N output blocks\n" \ | 490 | " seek=N skip N output blocks\n" \ |
489 | USE_FEATURE_DD_IBS_OBS( \ | 491 | USE_FEATURE_DD_IBS_OBS( \ |
490 | " conv=notrunc don't truncate output file\n" \ | 492 | " conv=notrunc don't truncate output file\n" \ |
491 | " conv=noerror continue after read errors\n" \ | 493 | " conv=noerror continue after read errors\n" \ |
492 | " conv=sync pad blocks with zeros\n" \ | 494 | " conv=sync pad blocks with zeros\n") \ |
493 | ) \ | ||
494 | "\n" \ | 495 | "\n" \ |
495 | "Numbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),\n" \ | 496 | "Numbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),\n" \ |
496 | "MD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)" | 497 | "MD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)" |
@@ -534,10 +535,9 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
534 | "Print the filesystem space used and space available.\n\n" \ | 535 | "Print the filesystem space used and space available.\n\n" \ |
535 | "Options:\n" \ | 536 | "Options:\n" \ |
536 | USE_FEATURE_HUMAN_READABLE( \ | 537 | USE_FEATURE_HUMAN_READABLE( \ |
537 | "\n -h print sizes in human readable format (e.g., 1K 243M 2G )\n" \ | 538 | "\n -h print sizes in human readable format (e.g., 1K 243M 2G )\n" \ |
538 | " -m print sizes in megabytes\n" \ | 539 | " -m print sizes in megabytes\n" \ |
539 | " -k print sizes in kilobytes(default)" \ | 540 | " -k print sizes in kilobytes(default)") \ |
540 | ) \ | ||
541 | SKIP_FEATURE_HUMAN_READABLE("\n -k ignored") | 541 | SKIP_FEATURE_HUMAN_READABLE("\n -k ignored") |
542 | #define df_example_usage \ | 542 | #define df_example_usage \ |
543 | "$ df\n" \ | 543 | "$ df\n" \ |
@@ -663,8 +663,8 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
663 | " -s display only a total for each argument\n" \ | 663 | " -s display only a total for each argument\n" \ |
664 | " -x skip directories on different filesystems\n" \ | 664 | " -x skip directories on different filesystems\n" \ |
665 | USE_FEATURE_HUMAN_READABLE( \ | 665 | USE_FEATURE_HUMAN_READABLE( \ |
666 | " -h print sizes in human readable format (e.g., 1K 243M 2G )\n" \ | 666 | " -h print sizes in human readable format (e.g., 1K 243M 2G )\n" \ |
667 | " -m print sizes in megabytes\n" \ | 667 | " -m print sizes in megabytes\n" \ |
668 | ) \ | 668 | ) \ |
669 | " -k print sizes in kilobytes" \ | 669 | " -k print sizes in kilobytes" \ |
670 | USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("(default)") | 670 | USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("(default)") |
@@ -724,7 +724,7 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
724 | USE_FEATURE_FANCY_ECHO( \ | 724 | USE_FEATURE_FANCY_ECHO( \ |
725 | "Options:\n" \ | 725 | "Options:\n" \ |
726 | " -n suppress trailing newline\n" \ | 726 | " -n suppress trailing newline\n" \ |
727 | " -e interpret backslash-escaped characters (i.e., \ =tab)\n" \ | 727 | " -e interpret backslash-escaped characters (i.e., \\t=tab)\n" \ |
728 | " -E disable interpretation of backslash-escaped characters" \ | 728 | " -E disable interpretation of backslash-escaped characters" \ |
729 | ) | 729 | ) |
730 | #define echo_example_usage \ | 730 | #define echo_example_usage \ |
@@ -1275,7 +1275,7 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
1275 | " -a de/configure all interfaces automatically\n" \ | 1275 | " -a de/configure all interfaces automatically\n" \ |
1276 | " -i FILE use FILE for interface definitions\n" \ | 1276 | " -i FILE use FILE for interface definitions\n" \ |
1277 | " -n print out what would happen, but don't do it\n" \ | 1277 | " -n print out what would happen, but don't do it\n" \ |
1278 | " (note that this option doesn't disable mappings)\n" \ | 1278 | " (note that this option doesn't disable mappings)\n" \ |
1279 | " -v print out what would happen before doing it\n" \ | 1279 | " -v print out what would happen before doing it\n" \ |
1280 | " -m don't run any mappings\n" \ | 1280 | " -m don't run any mappings\n" \ |
1281 | " -f force de/configuration" | 1281 | " -f force de/configuration" |
@@ -1860,14 +1860,14 @@ USE_FEATURE_MDEV_CONFIG( \ | |||
1860 | " hd[a-z][0-9]* 0:3 660\n\n" \ | 1860 | " hd[a-z][0-9]* 0:3 660\n\n" \ |
1861 | "That's device name (with regex match), uid:gid, and permissions.\n\n" \ | 1861 | "That's device name (with regex match), uid:gid, and permissions.\n\n" \ |
1862 | USE_FEATURE_MDEV_EXEC( \ | 1862 | USE_FEATURE_MDEV_EXEC( \ |
1863 | "Optionally, that can be followed (on the same line) by a special character\n" \ | 1863 | "Optionally, that can be followed (on the same line) by a special character\n" \ |
1864 | "and a command line to run after creating/before deleting the corresponding\n" \ | 1864 | "and a command line to run after creating/before deleting the corresponding\n" \ |
1865 | "device(s). The environment variable $MDEV indicates the active device node\n" \ | 1865 | "device(s). The environment variable $MDEV indicates the active device node\n" \ |
1866 | "(which is useful if it's a regex match). For example:\n\n" \ | 1866 | "(which is useful if it's a regex match). For example:\n\n" \ |
1867 | " hdc root:cdrom 660 *ln -s $MDEV cdrom\n\n" \ | 1867 | " hdc root:cdrom 660 *ln -s $MDEV cdrom\n\n" \ |
1868 | "The special characters are @ (run after creating), $ (run before deleting),\n" \ | 1868 | "The special characters are @ (run after creating), $ (run before deleting),\n" \ |
1869 | "and * (run both after creating and before deleting). The commands run in\n" \ | 1869 | "and * (run both after creating and before deleting). The commands run in\n" \ |
1870 | "the /dev directory, and use system() which calls /bin/sh.\n\n" \ | 1870 | "the /dev directory, and use system() which calls /bin/sh.\n\n" \ |
1871 | ) \ | 1871 | ) \ |
1872 | "Config file parsing stops on the first matching line. If no config\n"\ | 1872 | "Config file parsing stops on the first matching line. If no config\n"\ |
1873 | "entry is matched, devices are created with default 0:0 660. (Make\n"\ | 1873 | "entry is matched, devices are created with default 0:0 660. (Make\n"\ |
@@ -1966,7 +1966,8 @@ USE_FEATURE_MDEV_CONFIG( \ | |||
1966 | "Options:\n" \ | 1966 | "Options:\n" \ |
1967 | " -c Check for read-ability\n" \ | 1967 | " -c Check for read-ability\n" \ |
1968 | " -v0 Make version 0 swap [max 128 Megs]\n" \ | 1968 | " -v0 Make version 0 swap [max 128 Megs]\n" \ |
1969 | " -v1 Make version 1 swap [big!] (default for kernels >\n 2.1.117)\n" \ | 1969 | " -v1 Make version 1 swap [big!] (default for kernels >\n" \ |
1970 | " 2.1.117)\n" \ | ||
1970 | " block-count Number of block to use (default is entire partition)" | 1971 | " block-count Number of block to use (default is entire partition)" |
1971 | 1972 | ||
1972 | #define mktemp_trivial_usage \ | 1973 | #define mktemp_trivial_usage \ |
@@ -3046,12 +3047,12 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \ | |||
3046 | "Telnet is used to establish interactive communication with another\n" \ | 3047 | "Telnet is used to establish interactive communication with another\n" \ |
3047 | "computer over a network using the TELNET protocol.\n\n" \ | 3048 | "computer over a network using the TELNET protocol.\n\n" \ |
3048 | "Options:\n" \ | 3049 | "Options:\n" \ |
3049 | " -a Attempt an automatic login with the USER variable\n" \ | 3050 | " -a Attempt an automatic login with the USER variable\n" \ |
3050 | " -l USER Attempt an automatic login with the USER argument\n" \ | 3051 | " -l USER Attempt an automatic login with the USER argument\n" \ |
3051 | " HOST The official name, alias or the IP address of the\n" \ | 3052 | " HOST The official name, alias or the IP address of the\n" \ |
3052 | " remote host.\n" \ | 3053 | " remote host.\n" \ |
3053 | " PORT The remote port number to connect to. If it is not\n" \ | 3054 | " PORT The remote port number to connect to. If it is not\n" \ |
3054 | " specified, the default telnet (23) port is used." | 3055 | " specified, the default telnet (23) port is used." |
3055 | #else | 3056 | #else |
3056 | #define telnet_trivial_usage \ | 3057 | #define telnet_trivial_usage \ |
3057 | "HOST [PORT]" | 3058 | "HOST [PORT]" |
@@ -3173,15 +3174,15 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \ | |||
3173 | " -v Verbose output\n" \ | 3174 | " -v Verbose output\n" \ |
3174 | " -m max_ttl Set the max time-to-live (max number of hops)\n" \ | 3175 | " -m max_ttl Set the max time-to-live (max number of hops)\n" \ |
3175 | " -p port# Set the base UDP port number used in probes\n" \ | 3176 | " -p port# Set the base UDP port number used in probes\n" \ |
3176 | " (default is 33434)\n" \ | 3177 | " (default is 33434)\n" \ |
3177 | " -q nqueries Set the number of probes per 'ttl' to nqueries\n" \ | 3178 | " -q nqueries Set the number of probes per 'ttl' to nqueries\n" \ |
3178 | " (default is 3)\n" \ | 3179 | " (default is 3)\n" \ |
3179 | " -s src_addr Use the following IP address as the source address\n" \ | 3180 | " -s src_addr Use the following IP address as the source address\n" \ |
3180 | " -t tos Set the type-of-service in probe packets to the following value\n" \ | 3181 | " -t tos Set the type-of-service in probe packets to the following value\n" \ |
3181 | " (default 0)\n" \ | 3182 | " (default 0)\n" \ |
3182 | " -w wait Set the time (in seconds) to wait for a response to a probe\n" \ | 3183 | " -w wait Set the time (in seconds) to wait for a response to a probe\n" \ |
3183 | " (default 3 sec)\n" \ | 3184 | " (default 3 sec)\n" \ |
3184 | " -g Specify a loose source route gateway (8 maximum)" | 3185 | " -g Specify a loose source route gateway (8 maximum)" |
3185 | 3186 | ||
3186 | 3187 | ||
3187 | #define true_trivial_usage \ | 3188 | #define true_trivial_usage \ |