util: introduce save_argc_argv() helper
This commit is contained in:
parent
c82cfae00b
commit
36fea15565
|
@ -46,6 +46,11 @@ static inline const char* enable_disable(bool b) {
|
|||
extern int saved_argc;
|
||||
extern char **saved_argv;
|
||||
|
||||
static inline void save_argc_argv(int argc, char **argv) {
|
||||
saved_argc = argc;
|
||||
saved_argv = argv;
|
||||
}
|
||||
|
||||
bool kexec_loaded(void);
|
||||
|
||||
int prot_from_flags(int flags) _const_;
|
||||
|
|
|
@ -2380,8 +2380,7 @@ int main(int argc, char *argv[]) {
|
|||
(void) prctl(PR_SET_NAME, systemd);
|
||||
|
||||
/* Save the original command line */
|
||||
saved_argv = argv;
|
||||
saved_argc = argc;
|
||||
save_argc_argv(argc, argv);
|
||||
|
||||
/* Make sure that if the user says "syslog" we actually log to the journal. */
|
||||
log_set_upgrade_syslog_to_journal(true);
|
||||
|
|
|
@ -4668,8 +4668,7 @@ static int run(int argc, char *argv[]) {
|
|||
log_open();
|
||||
|
||||
/* Make sure rename_process() in the stub init process can work */
|
||||
saved_argv = argv;
|
||||
saved_argc = argc;
|
||||
save_argc_argv(argc, argv);
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -603,8 +603,7 @@ static void test_ioprio_class_from_to_string(void) {
|
|||
int main(int argc, char *argv[]) {
|
||||
test_setup_logging(LOG_DEBUG);
|
||||
|
||||
saved_argc = argc;
|
||||
saved_argv = argv;
|
||||
save_argc_argv(argc, argv);
|
||||
|
||||
if (argc > 1) {
|
||||
pid_t pid = 0;
|
||||
|
|
Loading…
Reference in a new issue