gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-04 04:44:16 +01:00
Code Issues Projects Releases Wiki Activity

util: simplify the code for 'find_terminal_emulator' (Coverity #50076)

Browse Source 
As pointed by Coverity, the code was making an explicit use of a null
pointer, which is certainly not what was initially expected. The code was
simplified to fix the case and to make it easier to understand and
maintain.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-06-16 20:15:16 +02:00
committed by Carlos R. Mafra
parent 382337c980
commit b9eb99ca73
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
util/wmmenugen_misc.c
View File

@@ -39,16 +39,12 @@ static char *terminals[] = {
*/ */
char *find_terminal_emulator(void) char *find_terminal_emulator(void)
{ {
char *path, *t, *ret; char *path, *t;
int i; int i;
path = t = ret = NULL;
t = getenv("WMMENU_TERMINAL"); t = getenv("WMMENU_TERMINAL");
if (t) { if (t)
ret = wstrdup(t); return wstrdup(t);
return ret;
}
path = getenv("PATH"); path = getenv("PATH");
if (!path) if (!path)
@@ -56,18 +52,13 @@ char *find_terminal_emulator(void)
for (i = 0; terminals[i]; i++) { for (i = 0; terminals[i]; i++) {
t = wfindfile(path, terminals[i]); t = wfindfile(path, terminals[i]);
if (t) if (t) {
break; wfree(t);
return wstrdup(terminals[i]);
}
} }
if (t) return NULL;
ret = wstrdup(basename(t));
else
ret = wstrdup(t);
wfree(t);
return ret;
} }
/* tokenize `what' (LC_MESSAGES or LANG if `what' is NULL) in the form of /* tokenize `what' (LC_MESSAGES or LANG if `what' is NULL) in the form of