shared/kbd-util: simplify suffix stripping

It only came to me now that this can be prettified.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2021-03-04 11:52:25 +01:00
parent 9ef70c06c6
commit 73d0806abb
+5 -10
View File
@@ -22,7 +22,6 @@ static int nftw_cb(
struct FTW *ftwbuf) {
_cleanup_free_ char *p = NULL;
char *e;
int r;
/* If keymap_name is non-null, return true if keymap keymap_name is found.
@@ -31,22 +30,18 @@ static int nftw_cb(
if (tflag != FTW_F)
return 0;
if (!endswith(fpath, ".map") &&
!endswith(fpath, ".map.gz"))
fpath = basename(fpath);
const char *e = endswith(fpath, ".map") ?: endswith(fpath, ".map.gz");
if (!e)
return 0;
p = strdup(basename(fpath));
p = strndup(fpath, e - fpath);
if (!p) {
errno = ENOMEM;
return -1;
}
e = endswith(p, ".map");
if (!e)
e = endswith(p, ".map.gz");
if (e)
*e = 0;
if (keymap_name)
return streq(p, keymap_name);