Fix devfs loop device support

diff --git a/include/libbb.h b/include/libbb.h
index 8dadfd9584048e1a79d2ddaba15001c9fd76bbae..cf593d65ce58386c8974fa41645b9a42df4da136 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -270,6 +270,7 @@ extern const char * const can_not_create_raw_socket;
 # define SC_1 "/dev/tts/1"
 # define VC_FORMAT "/dev/vc/%d"
 # define SC_FORMAT "/dev/tts/%d"
+# define LOOP_FORMAT "/dev/loop/%d"
 #else
 # define CURRENT_VC "/dev/tty0"
 # define VC_1 "/dev/tty1"
@@ -281,6 +282,7 @@ extern const char * const can_not_create_raw_socket;
 # define SC_1 "/dev/ttyS1"
 # define VC_FORMAT "/dev/tty%d"
 # define SC_FORMAT "/dev/ttyS%d"
+# define LOOP_FORMAT "/dev/loop%d"
 #endif
 
 /* The following devices are the same on devfs and non-devfs systems.  */

diff --git a/libbb/loop.c b/libbb/loop.c
index 36b13d6e6d468bf93c2d34e5d323b394a43a4e27..7e58b2f8510da5eb345aee23598c4ec0c2f0c1c1 100644 (file)
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -95,7 +95,7 @@ extern char *find_unused_loop_device(void)
        struct loop_info loopinfo;
 
        for (i = 0; i <= 7; i++) {
-               sprintf(dev, "/dev/loop%d", i);
+               sprintf(dev, LOOP_FORMAT, i);
                if (stat(dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
                        if ((fd = open(dev, O_RDONLY)) >= 0) {
                                if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) != 0) {