mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

cwm_argv doesn't need to be global any longer

Browse Source
This commit is contained in:
okan 2014-01-22 22:26:05 +00:00
parent 5121ea5e10
commit 978a5767ec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calmwm.c
View File

@ -35,7 +35,6 @@
#include "calmwm.h" #include "calmwm.h"
char **cwm_argv;
Display *X_Dpy; Display *X_Dpy;
Time Last_Event_Time = CurrentTime; Time Last_Event_Time = CurrentTime;
Atom cwmh[CWMH_NITEMS]; Atom cwmh[CWMH_NITEMS];
@ -52,7 +51,7 @@ volatile sig_atomic_t cwm_status;
static void sigchld_cb(int); static void sigchld_cb(int);
static int x_errorhandler(Display *, XErrorEvent *); static int x_errorhandler(Display *, XErrorEvent *);
static void x_init(const char *); static void x_init(const char *);
static void x_restart(void); static void x_restart(char **);
static void x_teardown(void); static void x_teardown(void);
static int x_wmerrorhandler(Display *, XErrorEvent *); static int x_wmerrorhandler(Display *, XErrorEvent *);
@ -61,6 +60,7 @@ main(int argc, char **argv)
{ {
const char *conf_file = NULL; const char *conf_file = NULL;
char *conf_path, *display_name = NULL; char *conf_path, *display_name = NULL;
char **cwm_argv;
int ch; int ch;
struct passwd *pw; struct passwd *pw;
@ -118,7 +118,7 @@ main(int argc, char **argv)
xev_process(); xev_process();
x_teardown(); x_teardown();
if (cwm_status == CWM_RESTART) if (cwm_status == CWM_RESTART)
x_restart(); x_restart(cwm_argv);
return (0); return (0);
} }
@ -147,10 +147,10 @@ x_init(const char *dpyname)
} }
static void static void
x_restart(void) x_restart(char **args)
{ {
(void)setsid(); (void)setsid();
(void)execvp(cwm_argv[0], cwm_argv); (void)execvp(args[0], args);
} }
static void static void