emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from tito, acked by Bernhard Fischer.

Browse Source
This commit is contained in:
Rob Landley 2006-03-20 02:20:18 +00:00
parent e2b428cbb1
commit c30f445b08
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util-linux/Config.in
View File

@ -354,9 +354,19 @@ config CONFIG_READPROFILE
help help
This allows you to parse /proc/profile for basic profiling. This allows you to parse /proc/profile for basic profiling.
config CONFIG_LINUX32
default n
depends on CONFIG_SETARCH
config CONFIG_LINUX64
default n
depends on CONFIG_SETARCH
config CONFIG_SETARCH config CONFIG_SETARCH
bool "setarch" bool "setarch"
default n default n
select CONFIG_LINUX32
select CONFIG_LINUX64
help help
The linux32 utility is used to create a 32bit environment for the The linux32 utility is used to create a 32bit environment for the
specified program (usually a shell). It only makes sense to have specified program (usually a shell). It only makes sense to have

11
util-linux/setarch.c
View File

@ -16,7 +16,7 @@
#include "busybox.h" #include "busybox.h"
int setarch_main(int argc, char **argv) int setarch_main(int ATTRIBUTE_UNUSED argc, char **argv)
{ {
int pers = -1; int pers = -1;
@ -26,9 +26,9 @@ int setarch_main(int argc, char **argv)
* argv[0] -> "personality" * argv[0] -> "personality"
*/ */
retry: retry:
if (!strcmp(argv[0], "linux64")) if (argv[0][5] == '6') /* linux64 */
pers = PER_LINUX; pers = PER_LINUX;
else if (!strcmp(argv[0], "linux32")) else if (argv[0][5] == '3') /* linux32 */
pers = PER_LINUX32; pers = PER_LINUX32;
else if (pers == -1 && argv[1] != NULL) { else if (pers == -1 && argv[1] != NULL) {
pers = PER_LINUX32; pers = PER_LINUX32;
@ -42,12 +42,11 @@ retry:
bb_show_usage(); bb_show_usage();
/* Try to set personality */ /* Try to set personality */
if (personality(pers) < 0) if (personality(pers) >= 0) {
goto failure;
/* Try to execute the program */ /* Try to execute the program */
execvp(argv[0], argv); execvp(argv[0], argv);
}
failure:
bb_perror_msg_and_die("%s", argv[0]); bb_perror_msg_and_die("%s", argv[0]);
} }