SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemctl: fix edit when EDITOR contains arguments

Browse Source 
Correctly support cases when the EDITOR environment variable and friends
also contain arguments. For example, to run emacs in terminal only, one
can say:

EDITOR="emacs -nw" systemctl edit myservice
This commit is contained in:
Jan Synacek
2015-06-18 13:46:08 +02:00
parent a028d19ba5
commit 9ef5d8f2cb
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemctl/systemctl.c
+25 -12
View File
@@ -5855,23 +5855,15 @@ static int run_editor(char **paths) {
if (pid == 0) { if (pid == 0) {
const char **args; const char **args;
char *editor; char *editor, **editor_args = NULL;
char **tmp_path, **original_path, *p; char **tmp_path, **original_path, *p;
unsigned i = 1; unsigned n_editor_args = 0, i = 1;
size_t argc; size_t argc;
(void) reset_all_signal_handlers(); (void) reset_all_signal_handlers();
(void) reset_signal_mask(); (void) reset_signal_mask();
argc = strv_length(paths)/2 + 1; argc = strv_length(paths)/2 + 1;
args = newa(const char*, argc + 1);
args[0] = NULL;
STRV_FOREACH_PAIR(original_path, tmp_path, paths) {
args[i] = *tmp_path;
i++;
}
args[argc] = NULL;
/* SYSTEMD_EDITOR takes precedence over EDITOR which takes precedence over VISUAL /* SYSTEMD_EDITOR takes precedence over EDITOR which takes precedence over VISUAL
* If neither SYSTEMD_EDITOR nor EDITOR nor VISUAL are present, * If neither SYSTEMD_EDITOR nor EDITOR nor VISUAL are present,
@@ -5884,9 +5876,30 @@ static int run_editor(char **paths) {
editor = getenv("VISUAL"); editor = getenv("VISUAL");
if (!isempty(editor)) { if (!isempty(editor)) {
args[0] = editor; editor_args = strv_split(editor, WHITESPACE);
execvp(editor, (char* const*) args); if (!editor_args) {
(void) log_oom();
_exit(EXIT_FAILURE);
}
n_editor_args = strv_length(editor_args);
argc += n_editor_args - 1;
} }
args = newa(const char*, argc + 1);
if (n_editor_args > 0) {
args[0] = editor_args[0];
for (; i < n_editor_args; i++)
args[i] = editor_args[i];
}
STRV_FOREACH_PAIR(original_path, tmp_path, paths) {
args[i] = *tmp_path;
i++;
}
args[i] = NULL;
if (n_editor_args > 0)
execvp(args[0], (char* const*) args);
FOREACH_STRING(p, "editor", "nano", "vim", "vi") { FOREACH_STRING(p, "editor", "nano", "vim", "vi") {
args[0] = p; args[0] = p;