6307357ef
Denys Vlasenko
2011-02-02
Subject
move nofork_save_area from libbb.h to vfork_daemon_rexec.c
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h+0 -11
| @@ -911,19 +911,8 @@ pid_t wait_any_nohang(int *wstat) FAST_FUNC; | |
| int wait4pid(pid_t pid) FAST_FUNC; | |
| /* Same as wait4pid(spawn(argv)), but with NOFORK/NOEXEC if configured: */ | |
| int spawn_and_wait(char **argv) FAST_FUNC; | |
| - | struct nofork_save_area { |
| - | jmp_buf die_jmp; |
| - | const char *applet_name; |
| - | uint32_t option_mask32; |
| - | int die_sleep; |
| - | uint8_t xfunc_error_retval; |
| - | smallint saved; |
| - | }; |
| - | void save_nofork_data(struct nofork_save_area *save) FAST_FUNC; |
| - | void restore_nofork_data(struct nofork_save_area *save) FAST_FUNC; |
| /* Does NOT check that applet is NOFORK, just blindly runs it */ | |
| int run_nofork_applet(int applet_no, char **argv) FAST_FUNC; | |
| - | int run_nofork_applet_prime(struct nofork_save_area *old, int applet_no, char **argv) FAST_FUNC; |
| /* Helpers for daemonization. | |
| * | |
libbb/getopt32.c+1 -1
| @@ -531,7 +531,7 @@ getopt32(char **argv, const char *applet_opts, ...) | |
| /* In case getopt32 was already called: | |
| * reset the libc getopt() function, which keeps internal state. | |
| - | * run_nofork_applet_prime() does this, but we might end up here |
| + | * run_nofork_applet() does this, but we might end up here |
| * also via gunzip_main() -> gzip_main(). Play safe. | |
| */ | |
| #ifdef __GLIBC__ | |
libbb/vfork_daemon_rexec.c+19 -29
| @@ -68,17 +68,22 @@ pid_t FAST_FUNC xspawn(char **argv) | |
| } | |
| #if ENABLE_FEATURE_PREFER_APPLETS | |
| - | void FAST_FUNC save_nofork_data(struct nofork_save_area *save) |
| + | struct nofork_save_area { |
| + | jmp_buf die_jmp; |
| + | const char *applet_name; |
| + | uint32_t option_mask32; |
| + | int die_sleep; |
| + | uint8_t xfunc_error_retval; |
| + | }; |
| + | static void save_nofork_data(struct nofork_save_area *save) |
| { | |
| memcpy(&save->die_jmp, &die_jmp, sizeof(die_jmp)); | |
| save->applet_name = applet_name; | |
| save->xfunc_error_retval = xfunc_error_retval; | |
| save->option_mask32 = option_mask32; | |
| save->die_sleep = die_sleep; | |
| - | save->saved = 1; |
| } | |
| - | |
| - | void FAST_FUNC restore_nofork_data(struct nofork_save_area *save) |
| + | static void restore_nofork_data(struct nofork_save_area *save) |
| { | |
| memcpy(&die_jmp, &save->die_jmp, sizeof(die_jmp)); | |
| applet_name = save->applet_name; | |
| @@ -87,19 +92,17 @@ void FAST_FUNC restore_nofork_data(struct nofork_save_area *save) | |
| die_sleep = save->die_sleep; | |
| } | |
| - | int FAST_FUNC run_nofork_applet_prime(struct nofork_save_area *old, int applet_no, char **argv) |
| + | int FAST_FUNC run_nofork_applet(int applet_no, char **argv) |
| { | |
| int rc, argc; | |
| + | struct nofork_save_area old; |
| + | |
| + | save_nofork_data(&old); |
| applet_name = APPLET_NAME(applet_no); | |
| xfunc_error_retval = EXIT_FAILURE; | |
| - | /* Special flag for xfunc_die(). If xfunc will "die" |
| - | * in NOFORK applet, xfunc_die() sees negative |
| - | * die_sleep and longjmp here instead. */ |
| - | die_sleep = -1; |
| - | |
| /* In case getopt() or getopt32() was already called: | |
| * reset the libc getopt() function, which keeps internal state. | |
| * | |
| @@ -129,6 +132,11 @@ int FAST_FUNC run_nofork_applet_prime(struct nofork_save_area *old, int applet_n | |
| while (argv[argc]) | |
| argc++; | |
| + | /* Special flag for xfunc_die(). If xfunc will "die" |
| + | * in NOFORK applet, xfunc_die() sees negative |
| + | * die_sleep and longjmp here instead. */ |
| + | die_sleep = -1; |
| + | |
| rc = setjmp(die_jmp); | |
| if (!rc) { | |
| /* Some callers (xargs) | |
| @@ -137,15 +145,6 @@ int FAST_FUNC run_nofork_applet_prime(struct nofork_save_area *old, int applet_n | |
| memcpy(tmp_argv, argv, (argc+1) * sizeof(tmp_argv[0])); | |
| /* Finally we can call NOFORK applet's main() */ | |
| rc = applet_main[applet_no](argc, tmp_argv); | |
| - | |
| - | /* The whole reason behind nofork_save_area is that <applet>_main |
| - | * may exit non-locally! For example, in hush Ctrl-Z tries |
| - | * (modulo bugs) to dynamically create a child (backgrounded task) |
| - | * if it detects that Ctrl-Z was pressed when a NOFORK was running. |
| - | * Testcase: interactive "rm -i". |
| - | * Don't fool yourself into thinking "and <applet>_main() returns |
| - | * quickly here" and removing "useless" nofork_save_area code. */ |
| - | |
| } else { /* xfunc died in NOFORK applet */ | |
| /* in case they meant to return 0... */ | |
| if (rc == -2222) | |
| @@ -153,7 +152,7 @@ int FAST_FUNC run_nofork_applet_prime(struct nofork_save_area *old, int applet_n | |
| } | |
| /* Restoring some globals */ | |
| - | restore_nofork_data(old); |
| + | restore_nofork_data(&old); |
| /* Other globals can be simply reset to defaults */ | |
| #ifdef __GLIBC__ | |
| @@ -164,15 +163,6 @@ int FAST_FUNC run_nofork_applet_prime(struct nofork_save_area *old, int applet_n | |
| return rc & 0xff; /* don't confuse people with "exitcodes" >255 */ | |
| } | |
| - | |
| - | int FAST_FUNC run_nofork_applet(int applet_no, char **argv) |
| - | { |
| - | struct nofork_save_area old; |
| - | |
| - | /* Saving globals */ |
| - | save_nofork_data(&old); |
| - | return run_nofork_applet_prime(&old, applet_no, argv); |
| - | } |
| #endif /* FEATURE_PREFER_APPLETS */ | |
| int FAST_FUNC spawn_and_wait(char **argv) | |