libbb/bb_strtonum: always set end ptr, even on error return

[platform/upstream/busybox.git] / libbb / loop.c

diff --git a/libbb/loop.c b/libbb/loop.c
index b798932..b3a5208 100644 (file)
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -84,7 +84,7 @@ int FAST_FUNC del_loop(const char *device)
    search will re-use an existing loop device already bound to that
    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];
        char *try;
@@ -93,11 +93,13 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
        int i, dfd, ffd, mode, rc = -1;
 
        /* 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;
        }