aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--applets/usage.h19
-rw-r--r--include/usage.h19
-rw-r--r--usage.h19
3 files changed, 30 insertions, 27 deletions
diff --git a/applets/usage.h b/applets/usage.h
index 7cfa4601b..92740b166 100644
--- a/applets/usage.h
+++ b/applets/usage.h
@@ -127,19 +127,21 @@
127 127
128 128
129#ifdef BB_FEATURE_HUMAN_READABLE 129#ifdef BB_FEATURE_HUMAN_READABLE
130 #define USAGE_HUMAN_READABLE(a,b) a 130 #define USAGE_HUMAN_READABLE(a) a
131 #define USAGE_NOT_HUMAN_READABLE(a)
131#else 132#else
132 #define USAGE_HUMAN_READABLE(a,b) b 133 #define USAGE_HUMAN_READABLE(a)
134 #define USAGE_NOT_HUMAN_READABLE(a) a
133#endif 135#endif
134#define df_trivial_usage \ 136#define df_trivial_usage \
135 "[-" USAGE_HUMAN_READABLE("hm", "") "k] [filesystem ...]" 137 "[-" USAGE_HUMAN_READABLE("hm") USAGE_NOT_HUMAN_READABLE("") "k] [filesystem ...]"
136#define df_full_usage \ 138#define df_full_usage \
137 "Print the filesystem space used and space available.\n\n" \ 139 "Print the filesystem space used and space available.\n\n" \
138 "Options:\n" \ 140 "Options:\n" \
139 USAGE_HUMAN_READABLE( \ 141 USAGE_HUMAN_READABLE( \
140 "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \ 142 "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
141 "\t-m\tprint sizes in megabytes\n" \ 143 "\t-m\tprint sizes in megabytes\n" \
142 "\t-k\tprint sizes in kilobytes(default)", \ 144 "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
143 "\n\t-k\tprint sizes in kilobytes(compatability)") 145 "\n\t-k\tprint sizes in kilobytes(compatability)")
144 146
145#define dirname_trivial_usage \ 147#define dirname_trivial_usage \
@@ -184,7 +186,7 @@
184 "\t-X\tVerbose extract" 186 "\t-X\tVerbose extract"
185 187
186#define du_trivial_usage \ 188#define du_trivial_usage \
187 "[-ls" USAGE_HUMAN_READABLE("hm", "") "k] [FILE]..." 189 "[-ls" USAGE_HUMAN_READABLE("hm") USAGE_NOT_HUMAN_READABLE("") "k] [FILE]..."
188#define du_full_usage \ 190#define du_full_usage \
189 "Summarizes disk space used for each FILE and/or directory.\n" \ 191 "Summarizes disk space used for each FILE and/or directory.\n" \
190 "Disk space is printed in units of 1024 bytes.\n\n" \ 192 "Disk space is printed in units of 1024 bytes.\n\n" \
@@ -194,8 +196,7 @@
194 USAGE_HUMAN_READABLE( \ 196 USAGE_HUMAN_READABLE( \
195 "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \ 197 "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
196 "\t-m\tprint sizes in megabytes\n" \ 198 "\t-m\tprint sizes in megabytes\n" \
197 "\t-k\tprint sizes in kilobytes(default)" \ 199 "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
198 , \
199 "\n\t-k\tprint sizes in kilobytes(compatability)") 200 "\n\t-k\tprint sizes in kilobytes(compatability)")
200 201
201#define dumpkmap_trivial_usage \ 202#define dumpkmap_trivial_usage \
@@ -524,7 +525,7 @@
524 #define USAGE_AUTOWIDTH(a) 525 #define USAGE_AUTOWIDTH(a)
525#endif 526#endif
526#define ls_trivial_usage \ 527#define ls_trivial_usage \
527 "[-1Aa" USAGE_LS_TIMESTAMPS("c") "Cd" USAGE_LS_TIMESTAMPS("e") USAGE_LS_FILETYPES("F") "iln" USAGE_LS_FILETYPES("p") USAGE_LS_FOLLOWLINKS("L") USAGE_LS_RECURSIVE("R") USAGE_LS_SORTFILES("rS") "s" USAGE_AUTOWIDTH("T") USAGE_LS_TIMESTAMPS("tu") USAGE_LS_SORTFILES("v") USAGE_AUTOWIDTH("w") "x" USAGE_LS_SORTFILES("X") USAGE_HUMAN_READABLE("h", "") "k] [filenames...]" 528 "[-1Aa" USAGE_LS_TIMESTAMPS("c") "Cd" USAGE_LS_TIMESTAMPS("e") USAGE_LS_FILETYPES("F") "iln" USAGE_LS_FILETYPES("p") USAGE_LS_FOLLOWLINKS("L") USAGE_LS_RECURSIVE("R") USAGE_LS_SORTFILES("rS") "s" USAGE_AUTOWIDTH("T") USAGE_LS_TIMESTAMPS("tu") USAGE_LS_SORTFILES("v") USAGE_AUTOWIDTH("w") "x" USAGE_LS_SORTFILES("X") USAGE_HUMAN_READABLE("h") USAGE_NOT_HUMAN_READABLE("") "k] [filenames...]"
528#define ls_full_usage \ 529#define ls_full_usage \
529 "List directory contents\n\n" \ 530 "List directory contents\n\n" \
530 "Options:\n" \ 531 "Options:\n" \
@@ -554,7 +555,7 @@
554 USAGE_LS_SORTFILES("\t-X\tsort the listing by extension\n") \ 555 USAGE_LS_SORTFILES("\t-X\tsort the listing by extension\n") \
555 USAGE_HUMAN_READABLE( \ 556 USAGE_HUMAN_READABLE( \
556 "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \ 557 "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
557 "\t-k\tprint sizes in kilobytes(default)" , \ 558 "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
558 "\t-k\tprint sizes in kilobytes(compatability)") 559 "\t-k\tprint sizes in kilobytes(compatability)")
559 560
560#define lsmod_trivial_usage \ 561#define lsmod_trivial_usage \
diff --git a/include/usage.h b/include/usage.h
index 7cfa4601b..92740b166 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -127,19 +127,21 @@
127 127
128 128
129#ifdef BB_FEATURE_HUMAN_READABLE 129#ifdef BB_FEATURE_HUMAN_READABLE
130 #define USAGE_HUMAN_READABLE(a,b) a 130 #define USAGE_HUMAN_READABLE(a) a
131 #define USAGE_NOT_HUMAN_READABLE(a)
131#else 132#else
132 #define USAGE_HUMAN_READABLE(a,b) b 133 #define USAGE_HUMAN_READABLE(a)
134 #define USAGE_NOT_HUMAN_READABLE(a) a
133#endif 135#endif
134#define df_trivial_usage \ 136#define df_trivial_usage \
135 "[-" USAGE_HUMAN_READABLE("hm", "") "k] [filesystem ...]" 137 "[-" USAGE_HUMAN_READABLE("hm") USAGE_NOT_HUMAN_READABLE("") "k] [filesystem ...]"
136#define df_full_usage \ 138#define df_full_usage \
137 "Print the filesystem space used and space available.\n\n" \ 139 "Print the filesystem space used and space available.\n\n" \
138 "Options:\n" \ 140 "Options:\n" \
139 USAGE_HUMAN_READABLE( \ 141 USAGE_HUMAN_READABLE( \
140 "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \ 142 "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
141 "\t-m\tprint sizes in megabytes\n" \ 143 "\t-m\tprint sizes in megabytes\n" \
142 "\t-k\tprint sizes in kilobytes(default)", \ 144 "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
143 "\n\t-k\tprint sizes in kilobytes(compatability)") 145 "\n\t-k\tprint sizes in kilobytes(compatability)")
144 146
145#define dirname_trivial_usage \ 147#define dirname_trivial_usage \
@@ -184,7 +186,7 @@
184 "\t-X\tVerbose extract" 186 "\t-X\tVerbose extract"
185 187
186#define du_trivial_usage \ 188#define du_trivial_usage \
187 "[-ls" USAGE_HUMAN_READABLE("hm", "") "k] [FILE]..." 189 "[-ls" USAGE_HUMAN_READABLE("hm") USAGE_NOT_HUMAN_READABLE("") "k] [FILE]..."
188#define du_full_usage \ 190#define du_full_usage \
189 "Summarizes disk space used for each FILE and/or directory.\n" \ 191 "Summarizes disk space used for each FILE and/or directory.\n" \
190 "Disk space is printed in units of 1024 bytes.\n\n" \ 192 "Disk space is printed in units of 1024 bytes.\n\n" \
@@ -194,8 +196,7 @@
194 USAGE_HUMAN_READABLE( \ 196 USAGE_HUMAN_READABLE( \
195 "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \ 197 "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
196 "\t-m\tprint sizes in megabytes\n" \ 198 "\t-m\tprint sizes in megabytes\n" \
197 "\t-k\tprint sizes in kilobytes(default)" \ 199 "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
198 , \
199 "\n\t-k\tprint sizes in kilobytes(compatability)") 200 "\n\t-k\tprint sizes in kilobytes(compatability)")
200 201
201#define dumpkmap_trivial_usage \ 202#define dumpkmap_trivial_usage \
@@ -524,7 +525,7 @@
524 #define USAGE_AUTOWIDTH(a) 525 #define USAGE_AUTOWIDTH(a)
525#endif 526#endif
526#define ls_trivial_usage \ 527#define ls_trivial_usage \
527 "[-1Aa" USAGE_LS_TIMESTAMPS("c") "Cd" USAGE_LS_TIMESTAMPS("e") USAGE_LS_FILETYPES("F") "iln" USAGE_LS_FILETYPES("p") USAGE_LS_FOLLOWLINKS("L") USAGE_LS_RECURSIVE("R") USAGE_LS_SORTFILES("rS") "s" USAGE_AUTOWIDTH("T") USAGE_LS_TIMESTAMPS("tu") USAGE_LS_SORTFILES("v") USAGE_AUTOWIDTH("w") "x" USAGE_LS_SORTFILES("X") USAGE_HUMAN_READABLE("h", "") "k] [filenames...]" 528 "[-1Aa" USAGE_LS_TIMESTAMPS("c") "Cd" USAGE_LS_TIMESTAMPS("e") USAGE_LS_FILETYPES("F") "iln" USAGE_LS_FILETYPES("p") USAGE_LS_FOLLOWLINKS("L") USAGE_LS_RECURSIVE("R") USAGE_LS_SORTFILES("rS") "s" USAGE_AUTOWIDTH("T") USAGE_LS_TIMESTAMPS("tu") USAGE_LS_SORTFILES("v") USAGE_AUTOWIDTH("w") "x" USAGE_LS_SORTFILES("X") USAGE_HUMAN_READABLE("h") USAGE_NOT_HUMAN_READABLE("") "k] [filenames...]"
528#define ls_full_usage \ 529#define ls_full_usage \
529 "List directory contents\n\n" \ 530 "List directory contents\n\n" \
530 "Options:\n" \ 531 "Options:\n" \
@@ -554,7 +555,7 @@
554 USAGE_LS_SORTFILES("\t-X\tsort the listing by extension\n") \ 555 USAGE_LS_SORTFILES("\t-X\tsort the listing by extension\n") \
555 USAGE_HUMAN_READABLE( \ 556 USAGE_HUMAN_READABLE( \
556 "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \ 557 "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
557 "\t-k\tprint sizes in kilobytes(default)" , \ 558 "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
558 "\t-k\tprint sizes in kilobytes(compatability)") 559 "\t-k\tprint sizes in kilobytes(compatability)")
559 560
560#define lsmod_trivial_usage \ 561#define lsmod_trivial_usage \
diff --git a/usage.h b/usage.h
index 7cfa4601b..92740b166 100644
--- a/usage.h
+++ b/usage.h
@@ -127,19 +127,21 @@
127 127
128 128
129#ifdef BB_FEATURE_HUMAN_READABLE 129#ifdef BB_FEATURE_HUMAN_READABLE
130 #define USAGE_HUMAN_READABLE(a,b) a 130 #define USAGE_HUMAN_READABLE(a) a
131 #define USAGE_NOT_HUMAN_READABLE(a)
131#else 132#else
132 #define USAGE_HUMAN_READABLE(a,b) b 133 #define USAGE_HUMAN_READABLE(a)
134 #define USAGE_NOT_HUMAN_READABLE(a) a
133#endif 135#endif
134#define df_trivial_usage \ 136#define df_trivial_usage \
135 "[-" USAGE_HUMAN_READABLE("hm", "") "k] [filesystem ...]" 137 "[-" USAGE_HUMAN_READABLE("hm") USAGE_NOT_HUMAN_READABLE("") "k] [filesystem ...]"
136#define df_full_usage \ 138#define df_full_usage \
137 "Print the filesystem space used and space available.\n\n" \ 139 "Print the filesystem space used and space available.\n\n" \
138 "Options:\n" \ 140 "Options:\n" \
139 USAGE_HUMAN_READABLE( \ 141 USAGE_HUMAN_READABLE( \
140 "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \ 142 "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
141 "\t-m\tprint sizes in megabytes\n" \ 143 "\t-m\tprint sizes in megabytes\n" \
142 "\t-k\tprint sizes in kilobytes(default)", \ 144 "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
143 "\n\t-k\tprint sizes in kilobytes(compatability)") 145 "\n\t-k\tprint sizes in kilobytes(compatability)")
144 146
145#define dirname_trivial_usage \ 147#define dirname_trivial_usage \
@@ -184,7 +186,7 @@
184 "\t-X\tVerbose extract" 186 "\t-X\tVerbose extract"
185 187
186#define du_trivial_usage \ 188#define du_trivial_usage \
187 "[-ls" USAGE_HUMAN_READABLE("hm", "") "k] [FILE]..." 189 "[-ls" USAGE_HUMAN_READABLE("hm") USAGE_NOT_HUMAN_READABLE("") "k] [FILE]..."
188#define du_full_usage \ 190#define du_full_usage \
189 "Summarizes disk space used for each FILE and/or directory.\n" \ 191 "Summarizes disk space used for each FILE and/or directory.\n" \
190 "Disk space is printed in units of 1024 bytes.\n\n" \ 192 "Disk space is printed in units of 1024 bytes.\n\n" \
@@ -194,8 +196,7 @@
194 USAGE_HUMAN_READABLE( \ 196 USAGE_HUMAN_READABLE( \
195 "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \ 197 "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
196 "\t-m\tprint sizes in megabytes\n" \ 198 "\t-m\tprint sizes in megabytes\n" \
197 "\t-k\tprint sizes in kilobytes(default)" \ 199 "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
198 , \
199 "\n\t-k\tprint sizes in kilobytes(compatability)") 200 "\n\t-k\tprint sizes in kilobytes(compatability)")
200 201
201#define dumpkmap_trivial_usage \ 202#define dumpkmap_trivial_usage \
@@ -524,7 +525,7 @@
524 #define USAGE_AUTOWIDTH(a) 525 #define USAGE_AUTOWIDTH(a)
525#endif 526#endif
526#define ls_trivial_usage \ 527#define ls_trivial_usage \
527 "[-1Aa" USAGE_LS_TIMESTAMPS("c") "Cd" USAGE_LS_TIMESTAMPS("e") USAGE_LS_FILETYPES("F") "iln" USAGE_LS_FILETYPES("p") USAGE_LS_FOLLOWLINKS("L") USAGE_LS_RECURSIVE("R") USAGE_LS_SORTFILES("rS") "s" USAGE_AUTOWIDTH("T") USAGE_LS_TIMESTAMPS("tu") USAGE_LS_SORTFILES("v") USAGE_AUTOWIDTH("w") "x" USAGE_LS_SORTFILES("X") USAGE_HUMAN_READABLE("h", "") "k] [filenames...]" 528 "[-1Aa" USAGE_LS_TIMESTAMPS("c") "Cd" USAGE_LS_TIMESTAMPS("e") USAGE_LS_FILETYPES("F") "iln" USAGE_LS_FILETYPES("p") USAGE_LS_FOLLOWLINKS("L") USAGE_LS_RECURSIVE("R") USAGE_LS_SORTFILES("rS") "s" USAGE_AUTOWIDTH("T") USAGE_LS_TIMESTAMPS("tu") USAGE_LS_SORTFILES("v") USAGE_AUTOWIDTH("w") "x" USAGE_LS_SORTFILES("X") USAGE_HUMAN_READABLE("h") USAGE_NOT_HUMAN_READABLE("") "k] [filenames...]"
528#define ls_full_usage \ 529#define ls_full_usage \
529 "List directory contents\n\n" \ 530 "List directory contents\n\n" \
530 "Options:\n" \ 531 "Options:\n" \
@@ -554,7 +555,7 @@
554 USAGE_LS_SORTFILES("\t-X\tsort the listing by extension\n") \ 555 USAGE_LS_SORTFILES("\t-X\tsort the listing by extension\n") \
555 USAGE_HUMAN_READABLE( \ 556 USAGE_HUMAN_READABLE( \
556 "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \ 557 "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
557 "\t-k\tprint sizes in kilobytes(default)" , \ 558 "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
558 "\t-k\tprint sizes in kilobytes(compatability)") 559 "\t-k\tprint sizes in kilobytes(compatability)")
559 560
560#define lsmod_trivial_usage \ 561#define lsmod_trivial_usage \
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-26 17:19:23 +0000