Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/loop.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/libbb/loop.c (modified) (3 diffs)

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

@@ -85 +85 @@
    file/offset if it finds one.
  */
-int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offset)
+int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offset, int ro)
 {
     char dev[LOOP_NAMESIZE];
@@ -94 +94 @@
 
     /* Open the file.  Barf if this doesn't work.  */
-    mode = O_RDWR;
+    mode = ro ? O_RDONLY : O_RDWR;
     ffd = open(file, mode);
     if (ffd < 0) {
-        mode = O_RDONLY;
-        ffd = open(file, mode);
+        if (mode != O_RDONLY) {
+            mode = O_RDONLY;
+            ffd = open(file, mode);
+        }
         if (ffd < 0)
             return -errno;
@@ -149 +151 @@
 
         /* 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.)
+         * (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