ncurses 5.9 - patch 20120407

[ncurses.git] / progs / tic.c

diff --git a/progs/tic.c b/progs/tic.c
index aa38840e7d9030a82f55070f5f7534b4b0be8c28..4881d655322b7e4674111430e854a253b4ada21e 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -46,7 +46,9 @@
 #include <hashed_db.h>
 #include <transform.h>
 
 #include <hashed_db.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.160 2012/02/05 01:39:39 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.165 2012/03/24 22:07:10 tom Exp $")
+
+#define STDIN_NAME "<stdin>"

 
 const char *_nc_progname = "tic";
 
 
 const char *_nc_progname = "tic";
 


@@ -222,7 +224,7 @@ write_it(ENTRY * ep)
            }
            *d = 0;
            if (strlen(result) < strlen(s))
            }
            *d = 0;
            if (strlen(result) < strlen(s))

-               strcpy(s, result);
+               _nc_STRCPY(s, result, strlen(s) + 1);

        }
     }
 
        }
     }
 


@@ -314,7 +316,7 @@ put_translate(int c)
            if ((up = strchr(namebuf, '#')) != 0
                || (up = strchr(namebuf, '=')) != 0
                || ((up = strchr(namebuf, '@')) != 0 && up[1] == '>')) {
            if ((up = strchr(namebuf, '#')) != 0
                || (up = strchr(namebuf, '=')) != 0
                || ((up = strchr(namebuf, '@')) != 0 && up[1] == '>')) {

-               (void) strcpy(suffix, up);
+               _nc_STRCPY(suffix, up, have);

                *up = '\0';
            }
 
                *up = '\0';
            }
 


@@ -365,19 +367,96 @@ stripped(char *src)
 }
 
 static FILE *
 }
 
 static FILE *

-open_input(const char *filename)
+open_tempfile(char *filename)
+{
+    FILE *result = 0;
+
+    _nc_STRCPY(filename, "/tmp/XXXXXX", PATH_MAX);
+#if HAVE_MKSTEMP
+    {
+       int fd = mkstemp(filename);
+       if (fd >= 0)
+           result = fdopen(fd, "w");
+    }
+#else
+    if (tmpnam(filename) != 0)
+       result = fopen(filename, "w");
+#endif
+    return result;
+}
+
+static FILE *
+copy_input(FILE *source, const char *filename, char *alt_file)
+{
+    FILE *result = 0;
+    FILE *target = open_tempfile(alt_file);
+    int ch;
+
+    if (source == 0) {
+       failed("copy_input (source)");
+    } else if (target == 0) {
+       failed("copy_input (target)");
+    } else {
+       clearerr(source);
+       for (;;) {
+           ch = fgetc(source);
+           if (feof(source)) {
+               break;
+           } else if (ferror(source)) {
+               failed(filename);
+           } else if (ch == 0) {
+               /* don't loop in case someone wants to convert /dev/zero */
+               fprintf(stderr, "%s: %s is not a text-file\n", _nc_progname, filename);
+               ExitProgram(EXIT_FAILURE);
+           }
+           fputc(ch, target);
+       }
+       fclose(source);
+       /*
+        * rewind() does not force the target file's data to disk (not does
+        * fflush()...).  So open a second stream on the data and then close
+        * the one that we were writing on before starting to read from the
+        * second stream.
+        */
+       result = fopen(alt_file, "r+");
+       fclose(target);
+       to_remove = alt_file;
+    }
+    return result;
+}
+
+static FILE *
+open_input(const char *filename, char *alt_file)

 {
 {

-    FILE *fp = fopen(filename, "r");
+    FILE *fp;

     struct stat sb;
     struct stat sb;

+    int mode;

 
 

-    if (fp == 0) {
-       fprintf(stderr, "%s: Can't open %s\n", _nc_progname, filename);
+    if (!strcmp(filename, "-")) {
+       fp = copy_input(stdin, STDIN_NAME, alt_file);
+    } else if (stat(filename, &sb) < 0) {
+       fprintf(stderr, "%s: %s %s\n", _nc_progname, filename, strerror(errno));

        ExitProgram(EXIT_FAILURE);
        ExitProgram(EXIT_FAILURE);

-    }
-    if (fstat(fileno(fp), &sb) < 0
-       || (sb.st_mode & S_IFMT) != S_IFREG) {
+    } else if ((mode = (sb.st_mode & S_IFMT)) == S_IFDIR
+              || (mode != S_IFREG && mode != S_IFCHR)) {

        fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename);
        ExitProgram(EXIT_FAILURE);
        fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename);
        ExitProgram(EXIT_FAILURE);

+    } else {
+       fp = fopen(filename, "r");
+
+       if (fp == 0) {
+           fprintf(stderr, "%s: Can't open %s\n", _nc_progname, filename);
+           ExitProgram(EXIT_FAILURE);
+       }
+       if (mode != S_IFREG) {
+           if (alt_file != 0) {
+               FILE *fp2 = copy_input(fp, filename, alt_file);
+               fp = fp2;
+           } else {
+               fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename);
+               ExitProgram(EXIT_FAILURE);
+           }
+       }

     }
     return fp;
 }
     }
     return fp;
 }


@@ -395,7 +474,7 @@ make_namelist(char *src)
     if (src == 0) {
        /* EMPTY */ ;
     } else if (strchr(src, '/') != 0) {                /* a filename */
     if (src == 0) {
        /* EMPTY */ ;
     } else if (strchr(src, '/') != 0) {                /* a filename */

-       FILE *fp = open_input(src);
+       FILE *fp = open_input(src, (char *) 0);

 
        for (pass = 1; pass <= 2; pass++) {
            nn = 0;
 
        for (pass = 1; pass <= 2; pass++) {
            nn = 0;


@@ -462,21 +541,6 @@ matches(char **needle, const char *haystack)
     return (code);
 }
 
     return (code);
 }
 

-static FILE *
-open_tempfile(char *name)
-{
-    FILE *result = 0;
-#if HAVE_MKSTEMP
-    int fd = mkstemp(name);
-    if (fd >= 0)
-       result = fdopen(fd, "w");
-#else
-    if (tmpnam(name) != 0)
-       result = fopen(name, "w");
-#endif
-    return result;
-}
-

 static const char *
 valid_db_path(const char *nominal)
 {
 static const char *
 valid_db_path(const char *nominal)
 {


@@ -486,9 +550,9 @@ valid_db_path(const char *nominal)
     size_t need = strlen(nominal) + sizeof(suffix);
     char *result = malloc(need);
 
     size_t need = strlen(nominal) + sizeof(suffix);
     char *result = malloc(need);
 

-    strcpy(result, nominal);
+    _nc_STRCPY(result, nominal, need);

     if (strcmp(result + need - sizeof(suffix), suffix)) {
     if (strcmp(result + need - sizeof(suffix), suffix)) {

-       strcat(result, suffix);
+       _nc_STRCAT(result, suffix, need);

     }
 #else
     char *result = strdup(nominal);
     }
 #else
     char *result = strdup(nominal);


@@ -582,6 +646,7 @@ int
 main(int argc, char *argv[])
 {
     char my_tmpname[PATH_MAX];
 main(int argc, char *argv[])
 {
     char my_tmpname[PATH_MAX];

+    char my_altfile[PATH_MAX];

     int v_opt = -1;
     unsigned debug_level;
     int smart_defaults = TRUE;
     int v_opt = -1;
     unsigned debug_level;
     int smart_defaults = TRUE;


@@ -795,16 +860,16 @@ main(int argc, char *argv[])
                if (access(termcap, F_OK) == 0) {
                    /* file exists */
                    source_file = termcap;
                if (access(termcap, F_OK) == 0) {
                    /* file exists */
                    source_file = termcap;

-               } else if ((tmp_fp = open_tempfile(strcpy(my_tmpname,
-                                                         "/tmp/XXXXXX")))
-                          != 0) {
-                   source_file = my_tmpname;
-                   fprintf(tmp_fp, "%s\n", termcap);
-                   fclose(tmp_fp);
-                   tmp_fp = open_input(source_file);
-                   to_remove = source_file;

                } else {
                } else {

-                   failed("tmpnam");
+                   if ((tmp_fp = open_tempfile(my_tmpname)) != 0) {
+                       source_file = my_tmpname;
+                       fprintf(tmp_fp, "%s\n", termcap);
+                       fclose(tmp_fp);
+                       tmp_fp = open_input(source_file, (char *) 0);
+                       to_remove = source_file;
+                   } else {
+                       failed("tmpnam");
+                   }

                }
            }
        } else {
                }
            }
        } else {


@@ -819,19 +884,24 @@ main(int argc, char *argv[])
        }
     }
 
        }
     }
 

-    if (tmp_fp == 0)
-       tmp_fp = open_input(source_file);
+    if (tmp_fp == 0) {
+       tmp_fp = open_input(source_file, my_altfile);
+       if (!strcmp(source_file, "-")) {
+           source_file = STDIN_NAME;
+       }
+    }

 
 

-    if (infodump)
+    if (infodump) {

        dump_init(tversion,
                  smart_defaults
                  ? outform
                  : F_LITERAL,
                  sortmode, width, height, debug_level, formatted);
        dump_init(tversion,
                  smart_defaults
                  ? outform
                  : F_LITERAL,
                  sortmode, width, height, debug_level, formatted);

-    else if (capdump)
+    } else if (capdump) {

        dump_init(tversion,
                  outform,
                  sortmode, width, height, debug_level, FALSE);
        dump_init(tversion,
                  outform,
                  sortmode, width, height, debug_level, FALSE);

+    }

 
     /* parse entries out of the source file */
     _nc_set_source(source_file);
 
     /* parse entries out of the source file */
     _nc_set_source(source_file);


@@ -1281,19 +1351,19 @@ check_keypad(TERMTYPE *tp)
                assert(strlen(show) < (MAX_KP * 4));
                switch (kk) {
                case 0:
                assert(strlen(show) < (MAX_KP * 4));
                switch (kk) {
                case 0:

-                   strcat(show, " ka1");
+                   _nc_STRCAT(show, " ka1", sizeof(show));

                    break;
                case 1:
                    break;
                case 1:

-                   strcat(show, " ka3");
+                   _nc_STRCAT(show, " ka3", sizeof(show));

                    break;
                case 2:
                    break;
                case 2:

-                   strcat(show, " kb2");
+                   _nc_STRCAT(show, " kb2", sizeof(show));

                    break;
                case 3:
                    break;
                case 3:

-                   strcat(show, " kc1");
+                   _nc_STRCAT(show, " kc1", sizeof(show));

                    break;
                case 4:
                    break;
                case 4:

-                   strcat(show, " kc3");
+                   _nc_STRCAT(show, " kc3", sizeof(show));

                    break;
                }
            }
                    break;
                }
            }


@@ -1308,15 +1378,15 @@ check_keypad(TERMTYPE *tp)
               VALID_STRING(key_c3)) {
        show[0] = '\0';
        if (keypad_index(key_a1) >= 0)
               VALID_STRING(key_c3)) {
        show[0] = '\0';
        if (keypad_index(key_a1) >= 0)

-           strcat(show, " ka1");
+           _nc_STRCAT(show, " ka1", sizeof(show));

        if (keypad_index(key_a3) >= 0)
        if (keypad_index(key_a3) >= 0)

-           strcat(show, " ka3");
+           _nc_STRCAT(show, " ka3", sizeof(show));

        if (keypad_index(key_b2) >= 0)
        if (keypad_index(key_b2) >= 0)

-           strcat(show, " kb2");
+           _nc_STRCAT(show, " kb2", sizeof(show));

        if (keypad_index(key_c1) >= 0)
        if (keypad_index(key_c1) >= 0)

-           strcat(show, " kc1");
+           _nc_STRCAT(show, " kc1", sizeof(show));

        if (keypad_index(key_c3) >= 0)
        if (keypad_index(key_c3) >= 0)

-           strcat(show, " kc3");
+           _nc_STRCAT(show, " kc3", sizeof(show));

        if (*show != '\0')
            _nc_warning("vt100 keypad map incomplete:%s", show);
     }
        if (*show != '\0')
            _nc_warning("vt100 keypad map incomplete:%s", show);
     }