in main(), exit if initscr() fails

git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_0_branch/nano@4198 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index fecd409212f7c808928f6cd90f18af3ca26a96ba..de7fa5b71758147f1f8100c43d428bb3842f40f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -90,6 +90,8 @@ CVS code -
          (DLR, found by Paul Goins)
        - Make sure the mark is always properly positioned after
          uncutting text with the mark on. (DLR)
+  main()
+       - Exit if initscr() fails. (DLR)
 - prompt.c:
   do_yesno_prompt()
        - Remove redundant check for NO_HELP's being FALSE. (DLR)

diff --git a/src/nano.c b/src/nano.c
index 6acbadae4f1acae41a7423b6f5732001455678fb..045157cec14d8fa9af7232be42fdd260d853788e 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -2036,7 +2036,7 @@ int main(int argc, char **argv)
            free(backup_dir);
            backup_dir = backup_dir_cpy;
        }
-#endif 
+#endif
 #ifndef DISABLE_JUSTIFY
        if (quotestr_cpy != NULL) {
            free(quotestr);
@@ -2162,8 +2162,9 @@ int main(int argc, char **argv)
     /* Back up the old terminal settings so that they can be restored. */
     tcgetattr(0, &oldterm);
 
-    /* Initialize curses mode. */
-    initscr();
+    /* Initialize curses mode.  If this fails, get out. */
+    if (initscr() == NULL)
+       exit(1);
 
     /* Set up the terminal state. */
     terminal_init();