X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Fmakedevs.c;h=776bcaa8d9a7a82e4604a000893b288a222d4abf;hb=eea561871b45a2335ab6a09f14dad627ffcdc1cd;hp=0268fbb9dd67afe6e7402f98fc56d033a642330b;hpb=17329745fc31fb23e6647ddf4ed41c0a8a0f90c1;p=oweals%2Fbusybox.git

diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index 0268fbb9d..776bcaa8d 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -1,5 +1,13 @@
 /* vi: set sw=4 ts=4: */
+/*
+ * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com>
+ *
+ * makedevs
+ * Make ranges of device files quickly.
+ * known bugs: can't deal with alpha ranges
+ */
 
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -9,16 +17,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/sysmacros.h>     /* major() and minor() */
-#include "busybox.h"
 
 #ifdef CONFIG_FEATURE_MAKEDEVS_LEAF
-/*
- * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com>
- *
- * makedevs
- * Make ranges of device files quickly.
- * known bugs: can't deal with alpha ranges
- */
 int makedevs_main(int argc, char **argv)
 {
 	mode_t mode;
@@ -77,7 +77,7 @@ int makedevs_main(int argc, char **argv)
 
 /* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */
 
-extern int makedevs_main(int argc, char **argv)
+int makedevs_main(int argc, char **argv)
 {
 	FILE *table = stdin;
 	char *rootdir = NULL;
@@ -94,9 +94,7 @@ extern int makedevs_main(int argc, char **argv)
 		bb_error_msg_and_die("root directory not specified");
 	}
 
-	if (chdir(rootdir) != 0) {
-		bb_perror_msg_and_die("could not chdir to %s", rootdir);
-	}
+	bb_xchdir(rootdir);
 
 	umask(0);
 
@@ -234,9 +232,9 @@ loop:
 	}
 	fclose(table);
 
-	return 0;
+	return ret;
 }
 
 #else
-# error makdedevs configuration error, either leaf or table must be selected
+# error makedevs configuration error, either leaf or table must be selected
 #endif