projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hush: rename o_quoted to has_quoted_part; small code shrink
[oweals/busybox.git]
/
util-linux
/
setarch.c
diff --git
a/util-linux/setarch.c
b/util-linux/setarch.c
index 3543eb6a203beabdad7ee6b26ffd1f4f3488cb88..7d5dc247c48fd242cfb12cb97cf31e2e1c3634bc 100644
(file)
--- a/
util-linux/setarch.c
+++ b/
util-linux/setarch.c
@@
-1,54
+1,48
@@
/* vi: set sw=4 ts=4: */
/*
/* vi: set sw=4 ts=4: */
/*
- *
L
inux32/linux64 allows for changing uname emulation.
+ *
l
inux32/linux64 allows for changing uname emulation.
*
* Copyright 2002 Andi Kleen, SuSE Labs.
*
* Copyright 2002 Andi Kleen, SuSE Labs.
- * This file is subject to the GNU General Public License v2
*
*
- * Licensed under GPL
v2 or later, see file License for details
.
+ * Licensed under GPL
v2 or later, see file LICENSE in this source tree
.
*/
*/
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
#include <sys/personality.h>
#include <sys/personality.h>
-#include "
busybox
.h"
+#include "
libbb
.h"
-int setarch_main(int argc, char **argv)
+int setarch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int setarch_main(int argc UNUSED_PARAM, char **argv)
{
{
- int pers
= -1
;
+ int pers;
/* Figure out what personality we are supposed to switch to ...
* we can be invoked as either:
/* Figure out what personality we are supposed to switch to ...
* we can be invoked as either:
- * argv[0],argv[1]
->
"setarch","personality"
- * argv[0]
->
"personality"
+ * argv[0],argv[1]
==
"setarch","personality"
+ * argv[0]
==
"personality"
*/
*/
-retry:
- if (!strcmp(argv[0], "linux64"))
+ if (ENABLE_SETARCH && applet_name[0] == 's'
+ && argv[1] && strncpy(argv[1], "linux", 5)
+ ) {
+ applet_name = argv[1];
+ argv++;
+ }
+ if (applet_name[5] == '6') /* linux64 */
pers = PER_LINUX;
pers = PER_LINUX;
- else if (!strcmp(argv[0], "linux32"))
- pers = PER_LINUX32;
- else if (pers == -1 && argv[1] != NULL) {
+ else if (applet_name[5] == '3') /* linux32 */
pers = PER_LINUX32;
pers = PER_LINUX32;
- ++argv;
- goto retry;
- }
+ else
+ bb_show_usage();
- /* make user actually gave us something to do */
- ++argv;
+ argv++;
if (argv[0] == NULL)
bb_show_usage();
/* Try to set personality */
if (argv[0] == NULL)
bb_show_usage();
/* Try to set personality */
- if (personality(pers) < 0)
- goto failure;
-
- /* Try to execute the program */
- execvp(argv[0], argv);
+ if (personality(pers) >= 0) {
+ /* Try to execute the program */
+ BB_EXECVP(argv[0], argv);
+ }
-failure:
- bb_perror_msg_and_die(argv[0]);
+ bb_simple_perror_msg_and_die(argv[0]);
}
}