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

losetup: fix util-linux compatibility

Browse Source 
Added -a support. Also made sure -f works as follows:

losetup [-r] [-o offset] {-f|loopdev} file

Removed support for 'losetup -r' with no arguments.

Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mandeep Singh Baines 2013-03-04 16:33:12 -08:00 committed by Mike Frysinger
parent 1b49c25e0a
commit 7991d45446
1 changed files with 66 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
util-linux/losetup.c
View File

@ -8,16 +8,16 @@
*/ */
//usage:#define losetup_trivial_usage //usage:#define losetup_trivial_usage
//usage: "[-r] [-o OFS] LOOPDEV FILE - associate loop devices\n" //usage: "[-r] [-o OFS] {-f|LOOPDEV} FILE - associate loop devices\n"
//usage: " losetup -d LOOPDEV - disassociate\n" //usage: " losetup -d LOOPDEV - disassociate\n"
//usage: " losetup [-f] - show" //usage: " losetup -a - show status of all\n"
//usage: " losetup -f - show next available"
//usage:#define losetup_full_usage "\n\n" //usage:#define losetup_full_usage "\n\n"
//usage: " -o OFS Start OFS bytes into FILE" //usage: " -o OFS Start OFS bytes into FILE"
//usage: "\n -r Read-only" //usage: "\n -r Read-only"
//usage: "\n -f Show first free loop device" //usage: "\n -f Show/find first free loop device"
//usage: //usage:
//usage:#define losetup_notes_usage //usage:#define losetup_notes_usage
//usage: "No arguments will display all current associations.\n"
//usage: "One argument (losetup /dev/loop1) will display the current association\n" //usage: "One argument (losetup /dev/loop1) will display the current association\n"
//usage: "(if any), or disassociate it (with -d). The display shows the offset\n" //usage: "(if any), or disassociate it (with -d). The display shows the offset\n"
//usage: "and filename of the file the loop device is currently bound to.\n\n" //usage: "and filename of the file the loop device is currently bound to.\n\n"
@ -31,46 +31,24 @@ int losetup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int losetup_main(int argc UNUSED_PARAM, char **argv) int losetup_main(int argc UNUSED_PARAM, char **argv)
{ {
unsigned opt; unsigned opt;
int n;
char *opt_o; char *opt_o;
unsigned long long offset = 0; char dev[LOOP_NAMESIZE];
enum { enum {
OPT_d = (1 << 0), OPT_d = (1 << 0),
OPT_o = (1 << 1), OPT_o = (1 << 1),
OPT_f = (1 << 2), OPT_f = (1 << 2),
OPT_r = (1 << 3), /* must be last */ OPT_a = (1 << 3),
OPT_r = (1 << 4), /* must be last */
}; };
/* max 2 args, -d,-o,-f opts are mutually exclusive */ opt_complementary = "?2:d--ofar:a--ofr";
opt_complementary = "?2:d--of:o--df:f--do"; opt = getopt32(argv, "do:far", &opt_o);
opt = getopt32(argv, "do:fr", &opt_o);
argv += optind; argv += optind;
if (opt == OPT_o) /* LOOPDEV */
offset = xatoull(opt_o); if (!opt && argv[0] && !argv[1]) {
if (opt == OPT_d) {
/* -d BLOCKDEV */
if (!argv[0] || argv[1])
bb_show_usage();
if (del_loop(argv[0]))
bb_simple_perror_msg_and_die(argv[0]);
return EXIT_SUCCESS;
}
if (argv[0]) {
char *s; char *s;
if (opt == OPT_f) /* -f should not have arguments */
bb_show_usage();
if (argv[1]) {
/* [-r] [-o OFS] BLOCKDEV FILE */
if (set_loop(&argv[0], argv[1], offset, (opt / OPT_r)) < 0)
bb_simple_perror_msg_and_die(argv[0]);
return EXIT_SUCCESS;
}
/* [-r] [-o OFS] BLOCKDEV */
s = query_loop(argv[0]); s = query_loop(argv[0]);
if (!s) if (!s)
bb_simple_perror_msg_and_die(argv[0]); bb_simple_perror_msg_and_die(argv[0]);
@ -80,28 +58,64 @@ int losetup_main(int argc UNUSED_PARAM, char **argv)
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
/* [-r] [-o OFS|-f] with no params */ /* -d LOOPDEV */
n = 0; if (opt == OPT_d) {
while (1) { if (del_loop(argv[0]))
char *s; bb_simple_perror_msg_and_die(argv[0]);
char dev[LOOP_NAMESIZE]; return EXIT_SUCCESS;
}
sprintf(dev, LOOP_FORMAT, n); /* -a */
s = query_loop(dev); if (opt == OPT_a) {
n++; int n;
if (!s) { for (n = 0; n < 10; n++) {
if (n > 9 && errno && errno != ENXIO) char *s;
return EXIT_SUCCESS;
if (opt == OPT_f) { sprintf(dev, LOOP_FORMAT, n);
puts(dev); s = query_loop(dev);
return EXIT_SUCCESS; if (s) {
}
} else {
if (opt != OPT_f)
printf("%s: %s\n", dev, s); printf("%s: %s\n", dev, s);
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
free(s);
}
}
return EXIT_SUCCESS;
}
/* contains -f */
if (opt & OPT_f) {
char *s;
int n = 0;
do {
sprintf(dev, LOOP_FORMAT, n);
s = query_loop(dev);
if (s && ENABLE_FEATURE_CLEAN_UP)
free(s); free(s);
} while (s);
if ((opt == OPT_f) && !argv[0]) {
puts(dev);
return EXIT_SUCCESS;
} }
} }
return EXIT_SUCCESS;
/* [-r] [-o OFS] {-f|LOOPDEV} FILE */
if (argv[0] && ((opt & OPT_f) || argv[1])) {
unsigned long long offset = 0;
char *d = dev;
if (opt == OPT_o)
offset = xatoull(opt_o);
if (opt != OPT_f)
d = *(argv++);
if (argv[0]) {
if (set_loop(&d, argv[0], offset, (opt / OPT_r)) < 0)
bb_simple_perror_msg_and_die(argv[0]);
return EXIT_SUCCESS;
}
}
bb_show_usage();
return EXIT_FAILURE;
} }