nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hwangcc23-debuglog-on-persist' into next 

fixes #1929
This commit is contained in:
Michael Stapelberg 2015-09-21 10:10:45 +02:00
parent eb4a174788 77d962f520
commit b0c72abcdb
1 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/util.c
View File

@ -169,24 +169,35 @@ bool path_exists(const char *path) {
} }
/* /*
* Goes through the list of arguments (for exec()) and checks if the given argument * Goes through the list of arguments (for exec()) and add/replace the given option,
* is present. If not, it copies the arguments (because we cannot realloc it) and * including the option name, its argument, and the option character.
* appends the given argument.
*
*/ */
static char **append_argument(char **original, char *argument) { static char **add_argument(char **original, char *opt_char, char *opt_arg, char *opt_name) {
int num_args; int num_args;
for (num_args = 0; original[num_args] != NULL; num_args++) { for (num_args = 0; original[num_args] != NULL; num_args++)
DLOG("original argument: \"%s\"\n", original[num_args]); ;
/* If the argument is already present we return the original pointer */ char **result = scalloc(num_args + 3, sizeof(char *));
if (strcmp(original[num_args], argument) == 0)
return original; /* copy the arguments, but skip the ones we'll replace */
int write_index = 0;
bool skip_next = false;
for (int i = 0; i < num_args; ++i) {
if (skip_next) {
skip_next = false;
continue;
} }
/* Copy the original array */ if (!strcmp(original[i], opt_char) ||
char **result = smalloc((num_args + 2) * sizeof(char *)); (opt_name && !strcmp(original[i], opt_name))) {
memcpy(result, original, num_args * sizeof(char *)); if (opt_arg)
result[num_args] = argument; skip_next = true;
result[num_args + 1] = NULL; continue;
}
result[write_index++] = original[i];
}
/* add the arguments we'll replace */
result[write_index++] = opt_char;
result[write_index] = opt_arg;
return result; return result;
} }
@ -267,39 +278,21 @@ void i3_restart(bool forget_layout) {
ipc_shutdown(); ipc_shutdown();
LOG("restarting \"%s\"...\n", start_argv[0]); LOG("restarting \"%s\"...\n", start_argv[0]);
/* make sure -a is in the argument list or append it */ /* make sure -a is in the argument list or add it */
start_argv = append_argument(start_argv, "-a"); start_argv = add_argument(start_argv, "-a", NULL, NULL);
/* make debuglog-on persist */
if (get_debug_logging()) {
start_argv = add_argument(start_argv, "-d", "all", NULL);
}
/* replace -r <file> so that the layout is restored */ /* replace -r <file> so that the layout is restored */
if (restart_filename != NULL) { if (restart_filename != NULL) {
/* create the new argv */ start_argv = add_argument(start_argv, "--restart", restart_filename, "-r");
int num_args;
for (num_args = 0; start_argv[num_args] != NULL; num_args++)
;
char **new_argv = scalloc(num_args + 3, sizeof(char *));
/* copy the arguments, but skip the ones we'll replace */
int write_index = 0;
bool skip_next = false;
for (int i = 0; i < num_args; ++i) {
if (skip_next)
skip_next = false;
else if (!strcmp(start_argv[i], "-r") ||
!strcmp(start_argv[i], "--restart"))
skip_next = true;
else
new_argv[write_index++] = start_argv[i];
}
/* add the arguments we'll replace */
new_argv[write_index++] = "--restart";
new_argv[write_index] = restart_filename;
/* swap the argvs */
start_argv = new_argv;
} }
execvp(start_argv[0], start_argv); execvp(start_argv[0], start_argv);
/* not reached */ /* not reached */
} }