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

losetup: use /dev/loopN or /dev/loop/N according to CONFIG_FEATURE_DEVFS=n/y

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-29 21:47:11 +00:00
parent a959588b80
commit 0b193a7871
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -442,6 +442,7 @@ extern int bb_default_error_retval;
#endif
# define VC_FORMAT "/dev/vc/%d"
# define LOOP_FORMAT "/dev/loop/%d"
# define LOOP_NAME "/dev/loop/"
# define FB_0 "/dev/fb/0"
#else
# define CURRENT_VC "/dev/tty0"
@ -461,6 +462,7 @@ extern int bb_default_error_retval;
#endif
# define VC_FORMAT "/dev/tty%d"
# define LOOP_FORMAT "/dev/loop%d"
# define LOOP_NAME "/dev/loop"
# define FB_0 "/dev/fb0"
#endif

4
util-linux/losetup.c
View File

@ -48,11 +48,11 @@ int losetup_main(int argc, char **argv)
printf("%s: %s\n", argv[0], s);
if (ENABLE_FEATURE_CLEAN_UP) free(s);
} else {
char dev[11] = "/dev/loop0";
char dev[sizeof(LOOP_NAME"0")] = LOOP_NAME"0";
char c;
for (c = '0'; c <= '9'; ++c) {
char *s;
dev[9] = c;
dev[sizeof(LOOP_NAME"0")-2] = c;
s = query_loop(dev);
if (s) {
printf("%s: %s\n", dev, s);