From 123588200d4e7c3d34bc15ec41223482e8b9b3ff Mon Sep 17 00:00:00 2001 From: "Steffen \"Daode\" Nurpmeso" Date: Thu, 11 Oct 2012 19:41:55 +0200 Subject: [PATCH] yorn(): do not continue in NULL case, please! --- tty.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tty.c b/tty.c index b8a97ad9..4beba181 100644 --- a/tty.c +++ b/tty.c @@ -420,10 +420,9 @@ yorn(char *msg) char *cp; if (value("interactive") == NULL) - return 1; - do - cp = readtty(msg, NULL); - while (cp == NULL || - (*cp != 'y' && *cp != 'Y' && *cp != 'n' && *cp != 'N')); - return *cp == 'y' || *cp == 'Y'; + return (1); + do if ((cp = readtty(msg, NULL)) == NULL) + return (0); + while (*cp != 'y' && *cp != 'Y' && *cp != 'n' && *cp != 'N'); + return (*cp == 'y' || *cp == 'Y'); } -- 2.11.4.GIT