diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2015-06-29 14:24:41 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2015-06-29 14:24:41 +0000 |
| commit | 54c8a7c60d658a05ccbe709720a9a1d9dcd33c6b (patch) | |
| tree | e3792ba8c8563ae56d6d51a59f939273327d8da2 | |
| parent | 685562ac3e0938d0004f262206d33b2fffcf02ce (diff) | |
Shuffle code in kbfunc_ssh so that a missing known_hosts file still
allows a (now blank) menu to appear, as opposed to nothing at all.
Behavior reported by Alex Greif.
| -rw-r--r-- | app/cwm/kbfunc.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/app/cwm/kbfunc.c b/app/cwm/kbfunc.c index 7c9bb220a..714d37f6c 100644 --- a/app/cwm/kbfunc.c +++ b/app/cwm/kbfunc.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: kbfunc.c,v 1.108 2015/06/26 17:17:46 okan Exp $ + * $OpenBSD: kbfunc.c,v 1.109 2015/06/29 14:24:40 okan Exp $ */ #include <sys/types.h> @@ -329,18 +329,17 @@ kbfunc_ssh(struct client_ctx *cc, union arg *arg) int l; size_t len; - if ((fp = fopen(Conf.known_hosts, "r")) == NULL) { - warn("kbfunc_ssh: %s", Conf.known_hosts); - return; - } - TAILQ_FOREACH(cmd, &Conf.cmdq, entry) { if (strcmp(cmd->name, "term") == 0) break; } - TAILQ_INIT(&menuq); + if ((fp = fopen(Conf.known_hosts, "r")) == NULL) { + warn("kbfunc_ssh: %s", Conf.known_hosts); + goto menu; + } + lbuf = NULL; while ((buf = fgetln(fp, &len))) { if (buf[len - 1] == '\n') @@ -366,7 +365,7 @@ kbfunc_ssh(struct client_ctx *cc, union arg *arg) } free(lbuf); (void)fclose(fp); - +menu: if ((mi = menu_filter(sc, &menuq, "ssh", NULL, CWM_MENU_DUMMY, search_match_exec, NULL)) != NULL) { if (mi->text[0] == '\0') |