diff options
Diffstat (limited to 'lib/yesno.c')
| -rw-r--r-- | lib/yesno.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/lib/yesno.c b/lib/yesno.c index 2400628..81f77d1 100644 --- a/lib/yesno.c +++ b/lib/yesno.c @@ -1,12 +1,11 @@ /* yesno.c -- read a yes/no response from stdin - Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005, 2006 Free - Software Foundation, Inc. + Copyright (C) 1990, 1998, 2001, 2003-2016 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> @@ -24,13 +22,11 @@ #include <stdlib.h> #include <stdio.h> -#if ENABLE_NLS -# include "getline.h" -#endif - -/* Return true if we read an affirmative line from standard input. */ +/* Return true if we read an affirmative line from standard input. -extern int rpmatch (char const *response); + Since this function uses stdin, it is suggested that the caller not + use STDIN_FILENO directly, and also that the line + atexit(close_stdin) be added to main(). */ bool yesno (void) @@ -46,7 +42,10 @@ yesno (void) yes = false; else { - response[response_len - 1] = '\0'; + /* Remove EOL if present as that's not part of the matched response, + and not matched by $ for example. */ + if (response[response_len - 1] == '\n') + response[response_len - 1] = '\0'; yes = (0 < rpmatch (response)); } |