svn commit: trunk/busybox/libbb

[landley at busybox.net]

Author: landley
Date: 2005-12-21 08:53:57 -0800 (Wed, 21 Dec 2005)
New Revision: 12970

Log:
Trying to losetup a device as a regular user shouldn't result in an endless
loop, and the error messages should display correctly now.


Modified:
   trunk/busybox/libbb/loop.c


Changeset:
Modified: trunk/busybox/libbb/loop.c
===================================================================
--- trunk/busybox/libbb/loop.c	2005-12-21 16:33:41 UTC (rev 12969)
+++ trunk/busybox/libbb/loop.c	2005-12-21 16:53:57 UTC (rev 12970)
@@ -89,7 +89,7 @@
 	char dev[20], *try;
 	bb_loop_info loopinfo;
 	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.  */
 	if((ffd = open(file, mode=O_RDWR))<0 && (ffd = open(file,mode=O_RDONLY))<0)
@@ -107,7 +107,7 @@
 		/* Open the sucker and check its loopiness.  */
 		if((dfd=open(try, mode))<0 && errno==EROFS)
 			dfd=open(try,mode=O_RDONLY);
-		if(dfd<0) continue;
+		if(dfd<0) goto try_again;
 
 		rc=ioctl(dfd, BB_LOOP_GET_STATUS, &loopinfo);
 
@@ -128,6 +128,7 @@
 		} else if(strcmp(file,loopinfo.lo_file_name)
 					|| offset!=loopinfo.lo_offset) rc=-1;
 		close(dfd);
+try_again:
 		if(*device) break;
 	}
 	close(ffd);