diff options
Diffstat (limited to 'libbb/loop.c')
-rw-r--r-- | libbb/loop.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libbb/loop.c b/libbb/loop.c index b798932fa..b3a520848 100644 --- a/libbb/loop.c +++ b/libbb/loop.c | |||
@@ -84,7 +84,7 @@ int FAST_FUNC del_loop(const char *device) | |||
84 | search will re-use an existing loop device already bound to that | 84 | search will re-use an existing loop device already bound to that |
85 | file/offset if it finds one. | 85 | file/offset if it finds one. |
86 | */ | 86 | */ |
87 | int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offset) | 87 | int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offset, int ro) |
88 | { | 88 | { |
89 | char dev[LOOP_NAMESIZE]; | 89 | char dev[LOOP_NAMESIZE]; |
90 | char *try; | 90 | char *try; |
@@ -93,11 +93,13 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse | |||
93 | int i, dfd, ffd, mode, rc = -1; | 93 | int i, dfd, ffd, mode, rc = -1; |
94 | 94 | ||
95 | /* Open the file. Barf if this doesn't work. */ | 95 | /* Open the file. Barf if this doesn't work. */ |
96 | mode = O_RDWR; | 96 | mode = ro ? O_RDONLY : O_RDWR; |
97 | ffd = open(file, mode); | 97 | ffd = open(file, mode); |
98 | if (ffd < 0) { | 98 | if (ffd < 0) { |
99 | mode = O_RDONLY; | 99 | if (mode != O_RDONLY) { |
100 | ffd = open(file, mode); | 100 | mode = O_RDONLY; |
101 | ffd = open(file, mode); | ||
102 | } | ||
101 | if (ffd < 0) | 103 | if (ffd < 0) |
102 | return -errno; | 104 | return -errno; |
103 | } | 105 | } |