projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mdev: fix subsystem passing (new kernels broke it again) - bugs 639, 721.
[oweals/busybox.git]
/
util-linux
/
pivot_root.c
diff --git
a/util-linux/pivot_root.c
b/util-linux/pivot_root.c
index ba26b9c58b1794dd7395863db0c003f596dad00e..28af00cc1530c723ec0e7fd15a5740182fdfb00f 100644
(file)
--- a/
util-linux/pivot_root.c
+++ b/
util-linux/pivot_root.c
@@
-4,32
+4,24
@@
*
* busyboxed by Evin Robertson
* pivot_root syscall stubbed by Erik Andersen, so it will compile
*
* busyboxed by Evin Robertson
* pivot_root syscall stubbed by Erik Andersen, so it will compile
- * regardless of the kernel being used.
+ * regardless of the kernel being used.
+ *
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
*/
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include "busybox.h"
+#include "libbb.h"
extern int pivot_root(const char * new_root,const char * put_old);
extern int pivot_root(const char * new_root,const char * put_old);
+int pivot_root_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int pivot_root_main(int argc, char **argv)
{
int pivot_root_main(int argc, char **argv)
{
- if (argc != 3)
- show_usage();
-
- if (pivot_root(argv[1],argv[2]) < 0)
- perror_msg_and_die("pivot_root");
+ if (argc != 3)
+ bb_show_usage();
- return EXIT_SUCCESS;
+ if (pivot_root(argv[1], argv[2]) < 0) {
+ /* prints "pivot_root: <strerror text>" */
+ bb_perror_nomsg_and_die();
+ }
+ return EXIT_SUCCESS;
}
}
-
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/