midfavila/ubase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Factor out umount -a into a separate function

Browse Source
This commit is contained in:
sin 2014-03-15 18:37:16 +00:00
parent e5b9f69626
commit 98f7fcad94
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
umount.c
View File

@ -6,6 +6,8 @@
#include <sys/mount.h> #include <sys/mount.h>
#include "util.h" #include "util.h"
static int umountall(int);
static void static void
usage(void) usage(void)
{ {
@ -21,8 +23,6 @@ main(int argc, char *argv[])
int aflag = 0; int aflag = 0;
int flags = 0; int flags = 0;
int ret = EXIT_SUCCESS; int ret = EXIT_SUCCESS;
FILE *fp;
struct mntent *me;
ARGBEGIN { ARGBEGIN {
case 'a': case 'a':
@ -43,21 +43,8 @@ main(int argc, char *argv[])
if (argc < 1 && aflag == 0) if (argc < 1 && aflag == 0)
usage(); usage();
if (aflag == 1) { if (aflag == 1)
fp = setmntent("/etc/mtab", "r"); return umountall(flags);
if (!fp)
eprintf("setmntent %s:", "/etc/mtab");
while ((me = getmntent(fp))) {
if (strcmp(me->mnt_type, "proc") == 0)
continue;
if (umount2(me->mnt_dir, flags) < 0) {
weprintf("umount2 %s:", me->mnt_dir);
ret = EXIT_FAILURE;
}
}
endmntent(fp);
return ret;
}
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
if (umount2(argv[i], flags) < 0) { if (umount2(argv[i], flags) < 0) {
@ -67,3 +54,25 @@ main(int argc, char *argv[])
} }
return ret; return ret;
} }
static int
umountall(int flags)
{
FILE *fp;
struct mntent *me;
int ret;
fp = setmntent("/etc/mtab", "r");
if (!fp)
eprintf("setmntent %s:", "/etc/mtab");
while ((me = getmntent(fp))) {
if (strcmp(me->mnt_type, "proc") == 0)
continue;
if (umount2(me->mnt_dir, flags) < 0) {
weprintf("umount2 %s:", me->mnt_dir);
ret = EXIT_FAILURE;
}
}
endmntent(fp);
return ret;
}