Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/loop.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/loop.c (modified) (4 diffs)

branches/3.3/mindi-busybox/libbb/loop.c

@@ -95 +95 @@
     /* Open the file.  Barf if this doesn't work.  */
     mode = ro ? O_RDONLY : O_RDWR;
+ open_ffd:
     ffd = open(file, mode);
     if (ffd < 0) {
         if (mode != O_RDONLY) {
             mode = O_RDONLY;
-            ffd = open(file, mode);
+            goto open_ffd;
         }
-        if (ffd < 0)
-            return -errno;
+        return -errno;
     }
 
     /* Find a loop device.  */
     try = *device ? *device : dev;
-    /* 1048575 is a max possible minor number in Linux circa 2010 */
+    /* 1048575 (0xfffff) is a max possible minor number in Linux circa 2010 */
     for (i = 0; rc && i < 1048576; i++) {
         sprintf(dev, LOOP_FORMAT, i);
@@ -122 +122 @@
             }
             /* Ran out of block devices, return failure.  */
-            rc = -ENOENT;
+            rc = -1;
             break;
         }
@@ -132 +132 @@
             dfd = open(try, mode);
         }
-        if (dfd < 0)
+        if (dfd < 0) {
+            if (errno == ENXIO) {
+                /* Happens if loop module is not loaded */
+                rc = -1;
+                break;
+            }
             goto try_again;
+        }
 
         rc = ioctl(dfd, BB_LOOP_GET_STATUS, &loopinfo);
@@ -149 +155 @@
                     ioctl(dfd, LOOP_CLR_FD, 0);
             }
-
-        /* If this block device already set up right, re-use it.
-         * (Yes this is racy, but associating two loop devices with the same
-         * file isn't pretty either.  In general, mounting the same file twice
-         * without using losetup manually is problematic.)
-         */
-        } else
-        if (strcmp(file, (char *)loopinfo.lo_file_name) != 0
-         || offset != loopinfo.lo_offset
-        ) {
+        } else {
             rc = -1;
         }