X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fmountpoint.c;h=5647e4c5b289f96e4af31e880a05d1310433d3b6;hb=bfc3d82256c45fb1e6e04ca85fac8a65b34b72a1;hp=1248dc011867d09484c7acc584c1f0166cb1eb83;hpb=948a09d6f288144744ebe281bc18c4bf1a9fac58;p=oweals%2Fbusybox.git

diff --git a/miscutils/mountpoint.c b/miscutils/mountpoint.c
index 1248dc011..5647e4c5b 100644
--- a/miscutils/mountpoint.c
+++ b/miscutils/mountpoint.c
@@ -4,67 +4,63 @@
  *
  * Copyright (C) 2005 Bernhard Fischer
  *
- * Licensed under the GPL v2, see the file LICENSE in this tarball.
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  *
  * Based on sysvinit's mountpoint
  */
 
-#include <sys/stat.h>
-#include <errno.h> /* errno */
-#include <string.h> /* strerror */
-#include <getopt.h> /* optind */
-#include "busybox.h"
+#include "libbb.h"
 
+int mountpoint_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int mountpoint_main(int argc, char **argv)
 {
-	int opt = bb_getopt_ulflags(argc, argv, "qdx");
+	struct stat st;
+	char *arg;
+	int opt = getopt32(argv, "qdx");
 #define OPT_q (1)
 #define OPT_d (2)
 #define OPT_x (4)
 
 	if (optind != argc - 1)
 		bb_show_usage();
-	{
-		char *arg = argv[optind];
-		struct stat st;
 
-		if ( (opt & OPT_x && stat(arg, &st) == 0) || (lstat(arg, &st) == 0) ) {
-			if (opt & OPT_x) {
-				if (S_ISBLK(st.st_mode))
-				{
-					bb_printf("%u:%u\n", major(st.st_rdev),
-								minor(st.st_rdev));
-					return EXIT_SUCCESS;
-				} else {
-					if (opt & OPT_q)
-						putchar('\n');
-					else
-						bb_error_msg("%s: not a block device", arg);
-				}
-				return EXIT_FAILURE;
-			} else
-			if (S_ISDIR(st.st_mode)) {
-				dev_t st_dev = st.st_dev;
-				ino_t st_ino = st.st_ino;
-				char *p = bb_xasprintf("%s/..", arg);
+	arg = argv[optind];
 
-				if (stat(p, &st) == 0) {
-					short ret = (st_dev != st.st_dev) ||
-						(st_dev == st.st_dev && st_ino == st.st_ino);
-					if (opt & OPT_d)
-						bb_printf("%u:%u\n", major(st_dev), minor(st_dev));
-					else if (!(opt & OPT_q))
-						bb_printf("%s is %sa mountpoint\n", arg, ret?"":"not ");
-					return !ret;
-				}
+	if ( (opt & OPT_x && stat(arg, &st) == 0) || (lstat(arg, &st) == 0) ) {
+		if (opt & OPT_x) {
+			if (S_ISBLK(st.st_mode)) {
+				printf("%u:%u\n", major(st.st_rdev),
+							minor(st.st_rdev));
+				return EXIT_SUCCESS;
 			} else {
-				if (!(opt & OPT_q))
-					bb_error_msg("%s: not a directory", arg);
-				return EXIT_FAILURE;
+				if (opt & OPT_q)
+					bb_putchar('\n');
+				else
+					bb_error_msg("%s: not a block device", arg);
 			}
+			return EXIT_FAILURE;
+		} else
+		if (S_ISDIR(st.st_mode)) {
+			dev_t st_dev = st.st_dev;
+			ino_t st_ino = st.st_ino;
+			char *p = xasprintf("%s/..", arg);
+
+			if (stat(p, &st) == 0) {
+				int ret = (st_dev != st.st_dev) ||
+					(st_dev == st.st_dev && st_ino == st.st_ino);
+				if (opt & OPT_d)
+					printf("%u:%u\n", major(st_dev), minor(st_dev));
+				else if (!(opt & OPT_q))
+					printf("%s is %sa mountpoint\n", arg, ret?"":"not ");
+				return !ret;
+			}
+		} else {
+			if (!(opt & OPT_q))
+				bb_error_msg("%s: not a directory", arg);
+			return EXIT_FAILURE;
 		}
-		if (!(opt & OPT_q))
-			bb_perror_msg("%s", arg);
-		return EXIT_FAILURE;
 	}
+	if (!(opt & OPT_q))
+		bb_simple_perror_msg(arg);
+	return EXIT_FAILURE;
 }