Просмотр исходного кода

* When restarting, also pass along -s

svn: 2153
Bryan Drewery 21 лет назад
Родитель
Сommit
0397a51793
3 измененных файлов с 4 добавлено и 3 удалено
  1. 1 1
      src/main.c
  2. 2 1
      src/main.h
  3. 1 1
      src/misc.c

+ 1 - 1
src/main.c

@@ -99,7 +99,7 @@ int do_confedit = 0;		/* show conf menu if -C */
 static char do_killbot[21] = "";
 static char do_killbot[21] = "";
 static int kill_sig;
 static int kill_sig;
 static char *update_bin = NULL;
 static char *update_bin = NULL;
-static bool checktrace = 1;		/* Check for trace when starting up? */
+bool checktrace = 1;		/* Check for trace when starting up? */
 char *socksfile = NULL;
 char *socksfile = NULL;
 
 
 static char *getfullbinname(const char *argv_zero)
 static char *getfullbinname(const char *argv_zero)

+ 2 - 1
src/main.h

@@ -15,7 +15,8 @@ enum {
 
 
 extern int		role, default_flags, default_uflags, do_confedit,
 extern int		role, default_flags, default_uflags, do_confedit,
 			updating, do_restart;
 			updating, do_restart;
-extern bool		use_stderr, backgrd, used_B, term_z, loading, have_take, restart_was_update;
+extern bool		use_stderr, backgrd, used_B, term_z, loading, have_take, restart_was_update,
+                        checktrace;
 extern char		tempdir[], *binname, owner[], version[], ver[], quit_msg[], *socksfile;
 extern char		tempdir[], *binname, owner[], version[], ver[], quit_msg[], *socksfile;
 extern time_t		online_since, now, restart_time;
 extern time_t		online_since, now, restart_time;
 extern uid_t		myuid;
 extern uid_t		myuid;

+ 1 - 1
src/misc.c

@@ -679,7 +679,7 @@ restart(int idx)
   char *argv[5] = { NULL, NULL, NULL, NULL, NULL };
   char *argv[5] = { NULL, NULL, NULL, NULL, NULL };
   char shit[5] = "";
   char shit[5] = "";
 
 
-  simple_sprintf(shit, "-%s%s%s", !backgrd ? "n" : "", term_z ? "t" : "", sdebug ? "D" : "");
+  simple_sprintf(shit, "-%s%s%s%s", !checktrace ? "s" : "", !backgrd ? "n" : "", term_z ? "t" : "", sdebug ? "D" : "");
 
 
   argv[0] = strdup(binname);
   argv[0] = strdup(binname);
   argv[1] = strdup(shit);
   argv[1] = strdup(shit);