ncurses 5.9 - patch 20110507

[ncurses.git] / ncurses / tinfo / comp_scan.c

diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c
index ea96a80497b387d799381fd652115060b2f5f475..8725b2edb7ebcd73a974d0c452f55a20077dcc56 100644 (file)
--- a/ncurses/tinfo/comp_scan.c
+++ b/ncurses/tinfo/comp_scan.c
@@ -48,10 +48,9 @@
 #include <curses.priv.h>
 
 #include <ctype.h>
-#include <term_entry.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_scan.c,v 1.85 2010/01/16 17:02:17 tom Exp $")
+MODULE_ID("$Id: comp_scan.c,v 1.89 2010/12/25 23:06:37 tom Exp $")
 
 /*
  * Maximum length of string capability we'll accept before raising an error.
@@ -204,6 +203,10 @@ next_char(void)
                if (fgets(result + used, (int) (allocated - used), yyin) != 0) {
                    bufstart = result;
                    if (used == 0) {
+                       if (_nc_curr_line == 0
+                           && IS_TIC_MAGIC(result)) {
+                           _nc_err_abort("This is a compiled terminal description, not a source");
+                       }
                        _nc_curr_line++;
                        _nc_curr_col = 0;
                    }
@@ -480,7 +483,6 @@ _nc_get_token(bool silent)
                if (OkToAdd()) {
                    AddCh(ch);
                } else {
-                   ch = EOF;
                    break;
                }
            }
@@ -610,7 +612,7 @@ _nc_get_token(bool silent)
                        _nc_warning("Missing separator");
                }
                _nc_curr_token.tk_name = tok_buf;
-               _nc_curr_token.tk_valnumber = number;
+               _nc_curr_token.tk_valnumber = (int) number;
                type = NUMBER;
                break;