summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2011-09-12 02:13:47 +0200
committerDenys Vlasenko2011-09-12 08:30:16 +0200
commit13e709c53f700a18a660feebdf72c613a233bf48 (patch)
tree248b913b7bb6629b751bbd5a79a7e3c6b55dd1af /libbb
parentdd1061b6a79b0161597799e825bfefc27993ace5 (diff)
downloadbusybox-13e709c53f700a18a660feebdf72c613a233bf48.zip
busybox-13e709c53f700a18a660feebdf72c613a233bf48.tar.gz
losetup: implement -r option. Closes 4033.
function old new delta packed_usage 28595 28633 +38 losetup_main 285 290 +5 singlemount 906 908 +2 set_loop 674 672 -2 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/loop.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libbb/loop.c b/libbb/loop.c
index b798932..b3a5208 100644
--- 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;
}