commit 013bcdee35b54fd7be928e8b57e9c659d325fff3
parent 4abc9f0b4601b530cf3d5aaefa1f745eb958680c
Author: sin <sin@2f30.org>
Date: Thu, 26 Nov 2015 15:54:54 +0000
Don't use printerr() before curses has been initialized
Diffstat:
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/noice.c b/noice.c
@@ -885,8 +885,10 @@ main(int argc, char *argv[])
char *ifilter;
/* Confirm we are in a terminal */
- if (!isatty(STDIN_FILENO))
- printerr(1, "isatty");
+ if (!isatty(0) || !isatty(1)) {
+ fprintf(stderr, "stdin or stdout is not a tty\n");
+ exit(1);
+ }
if (getuid() == 0)
ifilter = ".";
@@ -904,8 +906,10 @@ main(int argc, char *argv[])
signal(SIGINT, SIG_IGN);
/* Test initial path */
- if (canopendir(ipath) == 0)
- printerr(1, ipath);
+ if (canopendir(ipath) == 0) {
+ fprintf(stderr, "%s: %s\n", ipath, strerror(errno));
+ exit(1);
+ }
/* Set locale before curses setup */
setlocale(LC_ALL, "");
@@ -916,5 +920,5 @@ main(int argc, char *argv[])
exitcurses();
- return 0;
+ exit(0);
}