=================================================================== RCS file: /cvs/mandoc/Attic/manpage.c,v retrieving revision 1.11 retrieving revision 1.13 diff -u -p -r1.11 -r1.13 --- mandoc/Attic/manpage.c 2015/03/27 17:37:25 1.11 +++ mandoc/Attic/manpage.c 2015/11/07 17:58:55 1.13 @@ -1,4 +1,4 @@ -/* $Id: manpage.c,v 1.11 2015/03/27 17:37:25 schwarze Exp $ */ +/* $Id: manpage.c,v 1.13 2015/11/07 17:58:55 schwarze Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons * Copyright (c) 2013 Ingo Schwarze @@ -37,10 +37,11 @@ int main(int argc, char *argv[]) { int ch, term; - size_t i, sz, len; + size_t i, sz, linesz; + ssize_t len; struct mansearch search; struct manpage *res; - char *conf_file, *defpaths, *auxpaths, *cp; + char *conf_file, *defpaths, *auxpaths, *line; char buf[PATH_MAX]; const char *cmd; struct manconf conf; @@ -99,12 +100,12 @@ main(int argc, char *argv[]) if (0 == sz) { free(res); - return(EXIT_FAILURE); + return EXIT_FAILURE; } else if (1 == sz && term) { i = 1; goto show; } else if (NULL == res) - return(EXIT_FAILURE); + return EXIT_FAILURE; for (i = 0; i < sz; i++) { printf("%6zu %s: %s\n", @@ -117,25 +118,29 @@ main(int argc, char *argv[]) for (i = 0; i < sz; i++) free(res[i].file); free(res); - return(EXIT_SUCCESS); + return EXIT_SUCCESS; } i = 1; printf("Enter a choice [1]: "); fflush(stdout); - if (NULL != (cp = fgetln(stdin, &len))) - if ('\n' == cp[--len] && len > 0) { - cp[len] = '\0'; - if ((i = atoi(cp)) < 1 || i > sz) + line = NULL; + linesz = 0; + if ((len = getline(&line, &linesz, stdin)) != -1) { + if ('\n' == line[--len] && len > 0) { + line[len] = '\0'; + if ((i = atoi(line)) < 1 || i > sz) i = 0; } + } + free(line); if (0 == i) { for (i = 0; i < sz; i++) free(res[i].file); free(res); - return(EXIT_SUCCESS); + return EXIT_SUCCESS; } show: cmd = res[i - 1].form ? "mandoc" : "cat"; @@ -154,7 +159,7 @@ usage: "[-s section] " "expr ...\n", progname); - return(EXIT_FAILURE); + return EXIT_FAILURE; } static void