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

losetup: support /dev/loop10 and higher. closes bug 1627

Browse Source 
function                                             old     new   delta
query_loop                                            91      95      +4
losetup_main                                         288     285      -3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-05-19 00:39:17 +02:00
parent 42c4b2e3b5
commit 92510141e2
2 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libbb/loop.c
View File

@ -56,7 +56,7 @@ char* FAST_FUNC query_loop(const char *device)
fd = open(device, O_RDONLY); fd = open(device, O_RDONLY);
if (fd >= 0) { if (fd >= 0) {
if (ioctl(fd, BB_LOOP_GET_STATUS, &loopinfo) == 0) { if (ioctl(fd, BB_LOOP_GET_STATUS, &loopinfo) == 0) {
dev = xasprintf("%lu %s", (long) loopinfo.lo_offset, dev = xasprintf("%"OFF_FMT"u %s", (off_t) loopinfo.lo_offset,
(char *)loopinfo.lo_file_name); (char *)loopinfo.lo_file_name);
} }
close(fd); close(fd);

59
util-linux/losetup.c
View File

@ -10,44 +10,48 @@
#include "libbb.h" #include "libbb.h"
int losetup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int losetup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int losetup_main(int argc, char **argv) int losetup_main(int argc UNUSED_PARAM, char **argv)
{ {
char dev[] = LOOP_NAME"0";
unsigned opt; unsigned opt;
int n;
char *opt_o; char *opt_o;
char *s;
unsigned long long offset = 0; unsigned long long offset = 0;
enum {
OPT_d = (1 << 0),
OPT_o = (1 << 1),
OPT_f = (1 << 2),
};
/* max 2 args, all opts are mutually exclusive */ /* max 2 args, all opts are mutually exclusive */
opt_complementary = "?2:d--of:o--df:f-do"; opt_complementary = "?2:d--of:o--df:f-do";
opt = getopt32(argv, "do:f", &opt_o); opt = getopt32(argv, "do:f", &opt_o);
argc -= optind;
argv += optind; argv += optind;
if (opt == 0x2) // -o if (opt == OPT_o)
offset = xatoull(opt_o); offset = xatoull(opt_o);
if (opt == 0x4 && argc) // -f does not take any argument if (opt == OPT_d) {
bb_show_usage(); /* -d BLOCKDEV */
if (!argv[0] || argv[1])
if (opt == 0x1) { // -d
/* detach takes exactly one argument */
if (argc != 1)
bb_show_usage(); bb_show_usage();
if (del_loop(argv[0])) if (del_loop(argv[0]))
bb_simple_perror_msg_and_die(argv[0]); bb_simple_perror_msg_and_die(argv[0]);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
if (argc == 2) { if (argv[0]) {
/* -o or no option */ char *s;
if (set_loop(&argv[0], argv[1], offset) < 0)
bb_simple_perror_msg_and_die(argv[0]);
return EXIT_SUCCESS;
}
if (argc == 1) { if (opt == OPT_f) /* -f should not have arguments */
/* -o or no option */ bb_show_usage();
if (argv[1]) {
/* [-o OFS] BLOCKDEV FILE */
if (set_loop(&argv[0], argv[1], offset) < 0)
bb_simple_perror_msg_and_die(argv[0]);
return EXIT_SUCCESS;
}
/* [-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]);
@ -57,23 +61,28 @@ int losetup_main(int argc, char **argv)
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
/* -o, -f or no option */ /* [-o OFS|-f] with no params */
n = 0;
while (1) { while (1) {
char *s;
char dev[sizeof(LOOP_NAME) + sizeof(int)*3];
sprintf(dev, LOOP_NAME"%u", n);
s = query_loop(dev); s = query_loop(dev);
n++;
if (!s) { if (!s) {
if (opt == 0x4) { if (n > 9 && errno && errno != ENXIO)
return EXIT_SUCCESS;
if (opt == OPT_f) {
puts(dev); puts(dev);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
} else { } else {
if (opt != 0x4) 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); free(s);
} }
if (++dev[sizeof(dev) - 2] > '9')
break;
} }
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }