emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

losetup: with no arguments lists all /dev/loopN. Corrected help text.

Browse Source 
(patch by Vladimir Dronnikov <dronnikov@gmail.ru>)
This commit is contained in:
Denis Vlasenko 2006-09-27 14:51:27 +00:00
parent 0bb628f4f3
commit 956a569360
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/usage.h
View File

@ -1623,13 +1623,14 @@ USE_FEATURE_DATE_ISOFMT( \
"\t-f\t\toutput data as the log grows" "\t-f\t\toutput data as the log grows"
#define losetup_trivial_usage \ #define losetup_trivial_usage \
"[-od] LOOPDEVICE [FILE]" "[-o OFFSET] [-d] LOOPDEVICE [FILE]]"
#define losetup_full_usage \ #define losetup_full_usage \
"Associate LOOPDEVICE with FILE, or display current association.\n\n" \ "(Dis)associate LOOPDEVICE with FILE, or display current associations.\n\n" \
"Options:\n" \ "Options:\n" \
"\t-d\t\tDisassociate LOOPDEVICE\n" \ "\t-d\t\tDisassociate LOOPDEVICE\n" \
"\t-o OFFSET\tStart OFFSET bytes into FILE" "\t-o OFFSET\tStart OFFSET bytes into FILE"
#define losetup_notes_usage \ #define losetup_notes_usage \
"No arguments will display all current associations.\n" \
"One argument (losetup /dev/loop1) will display the current association\n" \ "One argument (losetup /dev/loop1) will display the current association\n" \
"(if any), or disassociate it (with -d). The display shows the offset\n" \ "(if any), or disassociate it (with -d). The display shows the offset\n" \
"and filename of the file the loop device is currently bound to.\n\n" \ "and filename of the file the loop device is currently bound to.\n\n" \

18
util-linux/losetup.c
View File

@ -22,7 +22,8 @@ int losetup_main(int argc, char **argv)
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (opt == 0x3) bb_show_usage(); // -d and -o (illegal) if (opt == 0x3) // -d + -o (illegal)
bb_show_usage();
if (opt == 0x1) { // -d if (opt == 0x1) { // -d
/* detach takes exactly one argument */ /* detach takes exactly one argument */
@ -46,7 +47,18 @@ int losetup_main(int argc, char **argv)
if (!s) bb_perror_nomsg_and_die(); if (!s) bb_perror_nomsg_and_die();
printf("%s: %s\n", argv[0], s); printf("%s: %s\n", argv[0], s);
if (ENABLE_FEATURE_CLEAN_UP) free(s); if (ENABLE_FEATURE_CLEAN_UP) free(s);
} else } else {
bb_show_usage(); char dev[11] = "/dev/loop0";
char c;
for (c = '0'; c <= '9'; ++c) {
char *s;
dev[9] = c;
s = query_loop(dev);
if (s) {
printf("%s: %s\n", dev, s);
if (ENABLE_FEATURE_CLEAN_UP) free(s);
}
}
}
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }