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

#ifdef out re_execed on MMU machines

Browse Source
This commit is contained in:
Denis Vlasenko 2007-03-24 16:13:33 +00:00
parent 7695328575
commit 8a503be840
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applets/busybox.c
View File

@ -7,7 +7,9 @@
#include "busybox.h" #include "busybox.h"
const char *applet_name ATTRIBUTE_EXTERNALLY_VISIBLE; const char *applet_name ATTRIBUTE_EXTERNALLY_VISIBLE;
#ifdef BB_NOMMU
smallint re_execed; smallint re_execed;
#endif
#ifdef CONFIG_FEATURE_INSTALLER #ifdef CONFIG_FEATURE_INSTALLER
/* /*
@ -60,11 +62,13 @@ int main(int argc, char **argv)
{ {
const char *s; const char *s;
#ifdef BB_NOMMU
/* NOMMU re-exec trick sets high-order bit in first byte of name */ /* NOMMU re-exec trick sets high-order bit in first byte of name */
if (argv[0][0] & 0x80) { if (argv[0][0] & 0x80) {
re_execed = 1; re_execed = 1;
argv[0][0] &= 0x7f; argv[0][0] &= 0x7f;
} }
#endif
applet_name = argv[0]; applet_name = argv[0];
if (*applet_name == '-') if (*applet_name == '-')

2
include/libbb.h
View File

@ -617,6 +617,7 @@ extern void print_login_issue(const char *issue_file, const char *tty);
extern void print_login_prompt(void); extern void print_login_prompt(void);
#ifdef BB_NOMMU #ifdef BB_NOMMU
extern void vfork_daemon_rexec(int nochdir, int noclose, char **argv); extern void vfork_daemon_rexec(int nochdir, int noclose, char **argv);
extern smallint re_execed;
#endif #endif
extern int get_terminal_width_height(const int fd, int *width, int *height); extern int get_terminal_width_height(const int fd, int *width, int *height);
@ -761,7 +762,6 @@ enum { /* DO NOT CHANGE THESE VALUES! cp.c, mv.c, install.c depend on them. */
}; };
#define FILEUTILS_CP_OPTSTR "pdRfils" USE_SELINUX("c") #define FILEUTILS_CP_OPTSTR "pdRfils" USE_SELINUX("c")
extern smallint re_execed;
extern const char *applet_name; extern const char *applet_name;
extern const char BB_BANNER[]; extern const char BB_BANNER[];