emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trying to losetup a device as a regular user shouldn't result in an endless

Browse Source 
loop, and the error messages should display correctly now.
This commit is contained in:
Rob Landley 2005-12-21 16:53:57 +00:00
parent beb665a376
commit 9085467970
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libbb/loop.c
View File

@ -89,7 +89,7 @@ int set_loop(char **device, const char *file, int offset)
char dev[20], *try; char dev[20], *try;
bb_loop_info loopinfo; bb_loop_info loopinfo;
struct stat statbuf; struct stat statbuf;
int i, dfd, ffd, mode, rc=1; int i, dfd, ffd, mode, rc=-1;
/* Open the file. Barf if this doesn't work. */ /* Open the file. Barf if this doesn't work. */
if((ffd = open(file, mode=O_RDWR))<0 && (ffd = open(file,mode=O_RDONLY))<0) if((ffd = open(file, mode=O_RDWR))<0 && (ffd = open(file,mode=O_RDONLY))<0)
@ -107,7 +107,7 @@ int set_loop(char **device, const char *file, int offset)
/* Open the sucker and check its loopiness. */ /* Open the sucker and check its loopiness. */
if((dfd=open(try, mode))<0 && errno==EROFS) if((dfd=open(try, mode))<0 && errno==EROFS)
dfd=open(try,mode=O_RDONLY); dfd=open(try,mode=O_RDONLY);
if(dfd<0) continue; if(dfd<0) goto try_again;
rc=ioctl(dfd, BB_LOOP_GET_STATUS, &loopinfo); rc=ioctl(dfd, BB_LOOP_GET_STATUS, &loopinfo);
@ -128,6 +128,7 @@ int set_loop(char **device, const char *file, int offset)
} else if(strcmp(file,loopinfo.lo_file_name) } else if(strcmp(file,loopinfo.lo_file_name)
|| offset!=loopinfo.lo_offset) rc=-1; || offset!=loopinfo.lo_offset) rc=-1;
close(dfd); close(dfd);
try_again:
if(*device) break; if(*device) break;
} }
close(ffd); close(ffd);