thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert "mountpoint: refactor exit path"

Browse source 
This change is unnecessary, we can use libmount stuff for everything.

This reverts commit b16b56ec55.
This commit is contained in:
Karel Zak 2011-10-11 11:14:31 +02:00
parent b16b56ec55
commit b031befc25
1 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
sys-utils/mountpoint.c
View file

@ -116,7 +116,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int c, fs_devno = 0, dev_devno = 0, rc = EXIT_FAILURE; int c, fs_devno = 0, dev_devno = 0, rc = 0;
char *spec; char *spec;
struct stat st; struct stat st;
@ -162,36 +162,30 @@ int main(int argc, char **argv)
if (stat(spec, &st)) { if (stat(spec, &st)) {
if (!quiet) if (!quiet)
warn("%s", spec); err(EXIT_FAILURE, "%s", spec);
goto finish; return EXIT_FAILURE;
} }
if (dev_devno)
if (dev_devno) { rc = print_devno(spec, &st);
if (print_devno(spec, &st) == 0) else {
rc = EXIT_SUCCESS;
} else {
dev_t src; dev_t src;
if (!S_ISDIR(st.st_mode)) { if (!S_ISDIR(st.st_mode)) {
if (!quiet) if (!quiet)
warnx(_("%s: not a directory"), spec); errx(EXIT_FAILURE, _("%s: not a directory"), spec);
goto finish; return EXIT_FAILURE;
} }
src = dir_to_device(spec); src = dir_to_device(spec);
if (!src) { if (!src) {
if (!quiet) if (!quiet)
printf(_("%s is not a mountpoint\n"), spec); printf(_("%s is not a mountpoint\n"), spec);
goto finish; return EXIT_FAILURE;
} }
rc = EXIT_SUCCESS;
if (fs_devno) if (fs_devno)
printf("%u:%u\n", major(src), minor(src)); printf("%u:%u\n", major(src), minor(src));
else if (!quiet) else if (!quiet)
printf(_("%s is a mountpoint\n"), spec); printf(_("%s is a mountpoint\n"), spec);
} }
finish: return rc ? EXIT_FAILURE : EXIT_SUCCESS;
return rc;
} }