diff options
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/fsck_minix.c | 33 | ||||
-rw-r--r-- | util-linux/mkfs_minix.c | 32 |
2 files changed, 30 insertions, 35 deletions
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 74281a71e..ea27c236c 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c | |||
@@ -288,25 +288,24 @@ static void leave(int status) | |||
288 | exit(status); | 288 | exit(status); |
289 | } | 289 | } |
290 | 290 | ||
291 | static void show_usage(void) | 291 | const char fsck_minix_usage[] = |
292 | { | 292 | "Usage: fsck.minix [-larvsmf] /dev/name\n" |
293 | fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", | ||
294 | BB_VER, BB_BT); | ||
295 | fprintf(stderr, "Usage: %s [-larvsmf] /dev/name\n", applet_name); | ||
296 | #ifndef BB_FEATURE_TRIVIAL_HELP | 293 | #ifndef BB_FEATURE_TRIVIAL_HELP |
297 | fprintf(stderr, | 294 | "\nPerforms a consistency check for MINIX filesystems.\n\n" |
298 | "\nPerforms a consistency check for MINIX filesystems.\n\n"); | 295 | "Options:\n" |
299 | fprintf(stderr, "Options:\n"); | 296 | "\t-l\tLists all filenames\n" |
300 | fprintf(stderr, "\t-l\tLists all filenames\n"); | 297 | "\t-r\tPerform interactive repairs\n" |
301 | fprintf(stderr, "\t-r\tPerform interactive repairs\n"); | 298 | "\t-a\tPerform automatic repairs\n" |
302 | fprintf(stderr, "\t-a\tPerform automatic repairs\n"); | 299 | "\t-v\tverbose\n" |
303 | fprintf(stderr, "\t-v\tverbose\n"); | 300 | "\t-s\tOutputs super-block information\n" |
304 | fprintf(stderr, "\t-s\tOutputs super-block information\n"); | 301 | "\t-m\tActivates MINIX-like \"mode not cleared\" warnings\n" |
305 | fprintf(stderr, | 302 | "\t-f\tForce file system check.\n\n" |
306 | "\t-m\tActivates MINIX-like \"mode not cleared\" warnings\n"); | ||
307 | fprintf(stderr, "\t-f\tForce file system check.\n\n"); | ||
308 | #endif | 303 | #endif |
309 | leave(16); | 304 | ; |
305 | |||
306 | static void show_usage(void) | ||
307 | { | ||
308 | usage(fsck_minix_usage); | ||
310 | } | 309 | } |
311 | 310 | ||
312 | static void die(const char *str) | 311 | static void die(const char *str) |
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index e4dedaf82..9ae4b569c 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c | |||
@@ -267,27 +267,23 @@ static volatile void die(char *str) | |||
267 | exit(8); | 267 | exit(8); |
268 | } | 268 | } |
269 | 269 | ||
270 | const char mkfs_minix_usage[] = | ||
271 | "mkfs.minix [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n" | ||
272 | #ifndef BB_FEATURE_TRIVIAL_HELP | ||
273 | "\nMake a MINIX filesystem.\n\n" | ||
274 | "Options:\n" | ||
275 | "\t-c\t\tCheck the device for bad blocks\n" | ||
276 | "\t-n [14|30]\tSpecify the maximum length of filenames\n" | ||
277 | "\t-i INODES\tSpecify the number of inodes for the filesystem\n" | ||
278 | "\t-l FILENAME\tRead the bad blocks list from FILENAME\n" | ||
279 | "\t-v\t\tMake a Minix version 2 filesystem\n\n" | ||
280 | #endif | ||
281 | ; | ||
282 | |||
270 | static volatile void show_usage() __attribute__ ((noreturn)); | 283 | static volatile void show_usage() __attribute__ ((noreturn)); |
271 | static volatile void show_usage() | 284 | static volatile void show_usage() |
272 | { | 285 | { |
273 | fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", | 286 | usage(mkfs_minix_usage); |
274 | BB_VER, BB_BT); | ||
275 | fprintf(stderr, | ||
276 | "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n", | ||
277 | applet_name); | ||
278 | #ifndef BB_FEATURE_TRIVIAL_HELP | ||
279 | fprintf(stderr, "\nMake a MINIX filesystem.\n\n"); | ||
280 | fprintf(stderr, "Options:\n"); | ||
281 | fprintf(stderr, "\t-c\t\tCheck the device for bad blocks\n"); | ||
282 | fprintf(stderr, | ||
283 | "\t-n [14|30]\tSpecify the maximum length of filenames\n"); | ||
284 | fprintf(stderr, | ||
285 | "\t-i INODES\tSpecify the number of inodes for the filesystem\n"); | ||
286 | fprintf(stderr, | ||
287 | "\t-l FILENAME\tRead the bad blocks list from FILENAME\n"); | ||
288 | fprintf(stderr, "\t-v\t\tMake a Minix version 2 filesystem\n\n"); | ||
289 | #endif | ||
290 | exit(16); | ||
291 | } | 287 | } |
292 | 288 | ||
293 | /* | 289 | /* |