wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-11 17:02:42 +07:00
Code Issues Packages Projects Releases Wiki Activity

initctl: minor refactor, simplify edit command

Browse Source 
- Gamble a bit by redirecting stderr to /dev/null instead of command -v
- Drop vi from VISUAL/EDITOR expansion alternatives, tested later anyway

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2021-02-26 11:45:04 +01:00
parent 7439fa0c2a
commit 6cf8c7ade4
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serv.c
+14 -5
View File
@@ -202,6 +202,13 @@ int serv_touch(char *arg)
int serv_edit(char *arg)
{
char *editor[] = {
"sensible-editor",
"editor",
"${VISUAL:-${EDITOR}}",
"mg",
"vi"
};
char corr[40];
char path[256];
@@ -221,11 +228,13 @@ int serv_edit(char *arg)
if (!fexist(path))
return serv_list(NULL);
return !systemf("[ -x \"$(command -v sensible-editor)\" ] && sensible-editor %s", path) || \
!systemf("[ -x \"$(command -v editor)\" ] && editor %s", path) || \
!systemf("${VISUAL:-${EDITOR:-$(command -v vi)}} %s", path) || \
!systemf("[ -x \"$(command -v mg)\" ] && mg %s", path) || \
!systemf("[ -x \"$(command -v vi)\" ] && vi %s", path);
for (size_t i = 0; i < NELEMS(editor); i++) {
if (systemf("%s %s 2>/dev/null", editor[i], path))
continue;
return 0;
}
return 1;
}
/**