diff options
author | okan <okan> | 2015-03-29 00:21:05 +0000 |
---|---|---|
committer | okan <okan> | 2015-03-29 00:21:05 +0000 |
commit | bc21e4aa37b36b486f7f6ddcb6050e2be93590c1 (patch) | |
tree | da1b2c2fff822dbb33ab2c7b2692cb7599796d03 /menu.c | |
parent | 668da8493abd2abb6242a0a707e4d745c01b1031 (diff) | |
parent | 557cd382dcd973fd96605c3359e3d6dfa45a4fd9 (diff) | |
download | cwm-bc21e4aa37b36b486f7f6ddcb6050e2be93590c1.tar.gz cwm-bc21e4aa37b36b486f7f6ddcb6050e2be93590c1.tar.xz cwm-bc21e4aa37b36b486f7f6ddcb6050e2be93590c1.zip |
cvsimport
Diffstat (limited to 'menu.c')
-rw-r--r-- | menu.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/menu.c b/menu.c index 2faa734..2d8853c 100644 --- a/menu.c +++ b/menu.c @@ -189,9 +189,7 @@ menu_complete_path(struct menu_ctx *mc) { struct menu *mi, *mr; struct menu_q menuq; - char *path = NULL; - path = xcalloc(1, sizeof(mr->text)); mr = xcalloc(1, sizeof(*mr)); TAILQ_INIT(&menuq); @@ -200,17 +198,15 @@ menu_complete_path(struct menu_ctx *mc) CWM_MENU_DUMMY, search_match_path_any, NULL)) != NULL) { mr->abort = mi->abort; mr->dummy = mi->dummy; - strlcpy(path, mi->text, sizeof(mi->text)); + if (mi->text[0] != '\0') + snprintf(mr->text, sizeof(mr->text), "%s \"%s\"", + mc->searchstr, mi->text); + else if (!mr->abort) + strlcpy(mr->text, mc->searchstr, sizeof(mr->text)); } menuq_clear(&menuq); - if (path[0] != '\0') - snprintf(mr->text, sizeof(mr->text), "%s \"%s\"", - mc->searchstr, path); - else if (!mr->abort) - strlcpy(mr->text, mc->searchstr, sizeof(mr->text)); - free(path); return(mr); } |