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

diff --git a/include/libbb.h b/include/libbb.h
index 05927f1de629b39b4f231dbeacb50ac5de4d9b92..67cf4939c1bc7e6bf0075973159b977fadbb49c9 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -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
 

diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index 6b9a810f283bc338b1f70178db36c9a34b41ca6d..54a160119cc2cc705334cf220752d8930cf247d7 100644 (file)
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -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);