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

* added (and documented) "-n" option for head -

Browse Source 
contributed Friedrich Vedder <fwv@myrtle.lahn.de>
* Cleanup for a number of usage messages -- also
    contributed Friedrich Vedder <fwv@myrtle.lahn.de>
 -Erik
This commit is contained in:
Erik Andersen
2000-01-23 18:19:02 +00:00
parent 9bc7e89fc1
commit 5509af7073
21 changed files with 110 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
util-linux/mount.c
View File

@ -428,44 +428,42 @@ static int set_loop(const char *device, const char *file, int offset, int *loopr
loopinfo.lo_encrypt_key_size = 0;
if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
perror("ioctl: LOOP_SET_FD");
exit(1);
close(fd);
close(ffd);
return 1;
}
if (ioctl(fd, LOOP_SET_STATUS, &loopinfo) < 0) {
(void) ioctl(fd, LOOP_CLR_FD, 0);
perror("ioctl: LOOP_SET_STATUS");
exit(1);
close(fd);
close(ffd);
return 1;
}
close(fd);
close(ffd);
return 0;
}
static char *find_unused_loop_device (void)
char *find_unused_loop_device (void)
{
char dev[20];
int i, fd, somedev = 0, someloop = 0;
struct stat statbuf;
struct loop_info loopinfo;
char dev[20];
int i, fd;
struct stat statbuf;
struct loop_info loopinfo;
for(i = 0; i < 256; i++) {
sprintf(dev, "/dev/loop%d", i);
if (stat (dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
somedev++;
fd = open (dev, O_RDONLY);
if (fd >= 0) {
if(ioctl (fd, LOOP_GET_STATUS, &loopinfo) == 0)
someloop++; /* in use */
else if (errno == ENXIO) {
close (fd);
return strdup(dev); /* probably free */
}
close (fd);
}
continue;
}
if (i >= 7)
break;
}
return NULL;
for(i = 0; i <= 7; i++) {
sprintf(dev, "/dev/loop%d", i);
if (stat (dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
if ((fd = open (dev, O_RDONLY)) >= 0) {
if(ioctl (fd, LOOP_GET_STATUS, &loopinfo) == -1 &&
errno == ENXIO) { /* probably free */
close (fd);
return strdup(dev);
}
close (fd);
}
}
}
return NULL;
}
#endif /* BB_FEATURE_MOUNT_LOOP */

2
util-linux/umount.c
View File

@ -37,7 +37,7 @@ static int del_loop(const char *device);
#endif
static const char umount_usage[] =
"Usage: umount [flags] filesystem|directory\n\n"
"umount [flags] filesystem|directory\n\n"
"Flags:\n"
"\t-a:\tUnmount all file systems"
#ifdef BB_MTAB