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

losetup: support -f (Loic Grenie <loic.grenie@gmail.com>)

Browse Source 
function                                             old     new   delta
losetup_main                                         238     278     +40
packed_usage                                       23021   23027      +6
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 46/0)               Total: 46 bytes
This commit is contained in:
Denis Vlasenko 2007-09-26 17:54:18 +00:00
parent 137fbe495d
commit 7ae209c019
2 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/usage.h
View File

@ -1868,19 +1868,21 @@
" -f Output data as the log grows" " -f Output data as the log grows"
#define losetup_trivial_usage \ #define losetup_trivial_usage \
"[-o OFFSET] [-d] LOOPDEVICE [FILE]]" "[-o OFS] LOOPDEV FILE - associate loop devices\n" \
" losetup -d LOOPDEV - disassociate\n" \
" losetup [-f] - show"
#define losetup_full_usage \ #define losetup_full_usage \
"(Dis)associate LOOPDEVICE with FILE, or display current associations" \ "Options:\n" \
"\n\nOptions:\n" \ " -o OFS Start OFS bytes into FILE\n" \
" -d Disassociate LOOPDEVICE\n" \ " -f Show first free loop device"
" -o OFFSET Start OFFSET bytes into FILE"
#define losetup_notes_usage \ #define losetup_notes_usage \
"No arguments will display all current associations.\n" \ "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" \
"Two arguments (losetup /dev/loop1 file.img) create a new association,\n" \ "Two arguments (losetup /dev/loop1 file.img) create a new association,\n" \
"with an optional offset (-o 12345). Encryption is not yet supported.\n\n" "with an optional offset (-o 12345). Encryption is not yet supported.\n" \
"losetup -f will show the first loop free loop device\n\n"
#define ls_trivial_usage \ #define ls_trivial_usage \
"[-1Aa" USE_FEATURE_LS_TIMESTAMPS("c") "Cd" \ "[-1Aa" USE_FEATURE_LS_TIMESTAMPS("c") "Cd" \

60
util-linux/losetup.c
View File

@ -14,54 +14,68 @@
int losetup_main(int argc, char **argv); int losetup_main(int argc, char **argv);
int losetup_main(int argc, char **argv) int losetup_main(int argc, char **argv)
{ {
char dev[] = LOOP_NAME"0";
unsigned opt; unsigned opt;
char *opt_o; char *opt_o;
char *s;
unsigned long long offset = 0; unsigned long long offset = 0;
opt = getopt32(argv, "do:", &opt_o); /* max 2 args, all opts are mutially exclusive */
opt_complementary = "?2:d--of:o--df:f-do";
opt = getopt32(argv, "do:f", &opt_o);
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (opt == 0x3) // -d + -o (illegal) if (opt == 0x2) // -o
offset = xatoull(opt_o);
if (opt == 0x4 && argc) // -f does not take any argument
bb_show_usage(); bb_show_usage();
if (opt == 0x1) { // -d if (opt == 0x1) { // -d
/* detach takes exactly one argument */ /* detach takes exactly one argument */
if (argc != 1) if (argc != 1)
bb_show_usage(); bb_show_usage();
if (!del_loop(argv[0])) if (del_loop(argv[0]))
return EXIT_SUCCESS; bb_perror_nomsg_and_die();
bb_perror_nomsg_and_die(); return EXIT_SUCCESS;
} }
if (opt == 0x2) // -o
offset = xatoull(opt_o);
/* -o or no option */
if (argc == 2) { if (argc == 2) {
/* -o or no option */
if (set_loop(&argv[0], argv[1], offset) < 0) if (set_loop(&argv[0], argv[1], offset) < 0)
bb_perror_nomsg_and_die(); bb_perror_nomsg_and_die();
} else if (argc == 1) { return EXIT_SUCCESS;
char *s = query_loop(argv[0]); }
if (argc == 1) {
/* -o or no option */
s = query_loop(argv[0]);
if (!s) if (!s)
bb_perror_nomsg_and_die(); bb_perror_nomsg_and_die();
printf("%s: %s\n", argv[0], s); printf("%s: %s\n", argv[0], s);
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
free(s); free(s);
} else { return EXIT_SUCCESS;
char dev[sizeof(LOOP_NAME"0")] = LOOP_NAME"0"; }
char c;
for (c = '0'; c <= '9'; ++c) { /* -o, -f or no option */
char *s; while (1) {
dev[sizeof(LOOP_NAME"0")-2] = c; s = query_loop(dev);
s = query_loop(dev); if (!s) {
if (s) { if (opt == 0x4) {
printf("%s: %s\n", dev, s); printf("%s\n", dev);
if (ENABLE_FEATURE_CLEAN_UP) return EXIT_SUCCESS;
free(s);
} }
} else {
if (opt != 0x4)
printf("%s: %s\n", dev, s);
if (ENABLE_FEATURE_CLEAN_UP)
free(s);
} }
if (++dev[sizeof(dev) - 2] > '9')
break;
} }
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }