ncurses 5.7 - patch 20101225

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

diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c
index e747effcae6df501bf46ea7517642fb847abb819..8725b2edb7ebcd73a974d0c452f55a20077dcc56 100644 (file)
--- a/ncurses/tinfo/comp_scan.c
+++ b/ncurses/tinfo/comp_scan.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -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.84 2009/05/09 16:37:42 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;
                    }
@@ -424,7 +427,7 @@ _nc_get_token(bool silent)
            && !strchr(terminfo_punct, (char) ch)) {
            if (!silent)
                _nc_warning("Illegal character (expected alphanumeric or %s) - '%s'",
-                           terminfo_punct, unctrl((chtype) ch));
+                           terminfo_punct, unctrl(UChar(ch)));
            _nc_panic_mode(separator);
            goto start_token;
        }
@@ -480,7 +483,6 @@ _nc_get_token(bool silent)
                if (OkToAdd()) {
                    AddCh(ch);
                } else {
-                   ch = EOF;
                    break;
                }
            }
@@ -589,7 +591,7 @@ _nc_get_token(bool silent)
            case '@':
                if ((ch = next_char()) != separator && !silent)
                    _nc_warning("Missing separator after `%s', have %s",
-                               tok_buf, unctrl((chtype) ch));
+                               tok_buf, unctrl(UChar(ch)));
                _nc_curr_token.tk_name = tok_buf;
                type = CANCEL;
                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;
 
@@ -630,8 +632,7 @@ _nc_get_token(bool silent)
                /* just to get rid of the compiler warning */
                type = UNDEF;
                if (!silent)
-                   _nc_warning("Illegal character - '%s'",
-                               unctrl((chtype) ch));
+                   _nc_warning("Illegal character - '%s'", unctrl(UChar(ch)));
            }
        }                       /* end else (first_column == FALSE) */
     }                          /* end else (ch != EOF) */
@@ -724,48 +725,47 @@ _nc_trans_string(char *ptr, char *last)
     int count = 0;
     int number = 0;
     int i, c;
-    chtype ch, last_ch = '\0';
+    int last_ch = '\0';
     bool ignored = FALSE;
     bool long_warning = FALSE;
 
-    while ((ch = c = next_char()) != (chtype) separator && c != EOF) {
+    while ((c = next_char()) != separator && c != EOF) {
        if (ptr >= (last - 1)) {
            if (c != EOF) {
                while ((c = next_char()) != separator && c != EOF) {
                    ;
                }
-               ch = c;
            }
            break;
        }
        if ((_nc_syntax == SYN_TERMCAP) && c == '\n')
            break;
-       if (ch == '^' && last_ch != '%') {
-           ch = c = next_char();
+       if (c == '^' && last_ch != '%') {
+           c = next_char();
            if (c == EOF)
                _nc_err_abort(MSG_NO_INPUTS);
 
-           if (!(is7bits(ch) && isprint(ch))) {
-               _nc_warning("Illegal ^ character - '%s'", unctrl(ch));
+           if (!(is7bits(c) && isprint(c))) {
+               _nc_warning("Illegal ^ character - '%s'", unctrl(UChar(c)));
            }
-           if (ch == '?') {
+           if (c == '?') {
                *(ptr++) = '\177';
                if (_nc_tracing)
                    _nc_warning("Allow ^? as synonym for \\177");
            } else {
-               if ((ch &= 037) == 0)
-                   ch = 128;
-               *(ptr++) = (char) (ch);
+               if ((c &= 037) == 0)
+                   c = 128;
+               *(ptr++) = (char) (c);
            }
-       } else if (ch == '\\') {
-           ch = c = next_char();
+       } else if (c == '\\') {
+           c = next_char();
            if (c == EOF)
                _nc_err_abort(MSG_NO_INPUTS);
 
-           if (ch >= '0' && ch <= '7') {
-               number = ch - '0';
+           if (c >= '0' && c <= '7') {
+               number = c - '0';
                for (i = 0; i < 2; i++) {
-                   ch = c = next_char();
+                   c = next_char();
                    if (c == EOF)
                        _nc_err_abort(MSG_NO_INPUTS);
 
@@ -842,31 +842,31 @@ _nc_trans_string(char *ptr, char *last)
 
                default:
                    _nc_warning("Illegal character '%s' in \\ sequence",
-                               unctrl(ch));
+                               unctrl(UChar(c)));
                    /* FALLTHRU */
                case '|':
-                   *(ptr++) = (char) ch;
-               }               /* endswitch (ch) */
-           }                   /* endelse (ch < '0' ||  ch > '7') */
+                   *(ptr++) = (char) c;
+               }               /* endswitch (c) */
+           }                   /* endelse (c < '0' ||  c > '7') */
        }
-       /* end else if (ch == '\\') */
-       else if (ch == '\n' && (_nc_syntax == SYN_TERMINFO)) {
+       /* end else if (c == '\\') */
+       else if (c == '\n' && (_nc_syntax == SYN_TERMINFO)) {
            /*
             * Newlines embedded in a terminfo string are ignored, provided
             * that the next line begins with whitespace.
             */
            ignored = TRUE;
        } else {
-           *(ptr++) = (char) ch;
+           *(ptr++) = (char) c;
        }
 
        if (!ignored) {
            if (_nc_curr_col <= 1) {
-               push_back((char) ch);
-               ch = '\n';
+               push_back((char) c);
+               c = '\n';
                break;
            }
-           last_ch = ch;
+           last_ch = c;
            count++;
        }
        ignored = FALSE;
@@ -879,7 +879,7 @@ _nc_trans_string(char *ptr, char *last)
 
     *ptr = '\0';
 
-    return (ch);
+    return (c);
 }
 
 /*