X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Fmake_keys.c;h=8eb4a9afc6a5928d423b32c18933987c138b44a6;hp=a1fd1d0b66f89ca4f9e3bd4d21d33945d48787c4;hb=d803343ca3e2a419085e76fc9f04a6fbd14498b8;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/tinfo/make_keys.c b/ncurses/tinfo/make_keys.c
index a1fd1d0b..8eb4a9af 100644
--- a/ncurses/tinfo/make_keys.c
+++ b/ncurses/tinfo/make_keys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2007,2008 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            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
+ *  Author: Thomas E. Dickey                    1997-on                     *
  ****************************************************************************/
 
 /*
@@ -35,100 +35,114 @@
  * making the output show the indices into the TERMTYPE Strings array.  Doing
  * it that way lets us cut down on the size of the init_keytry() function.
  */
+
+#define USE_TERMLIB 1
 #include <curses.priv.h>
 
-MODULE_ID("$Id: make_keys.c,v 1.7 1999/09/11 17:32:57 Jeffrey.Honig Exp $")
+MODULE_ID("$Id: make_keys.c,v 1.15 2008/11/16 00:19:59 juergen Exp $")
 
 #include <names.c>
 
 #define UNKNOWN (SIZEOF(strnames) + SIZEOF(strfnames))
 
-static size_t lookup(const char *name)
+static unsigned
+lookup(const char *name)
 {
-	size_t n;
-	bool found = FALSE;
-	for (n = 0; strnames[n] != 0; n++) {
-		if (!strcmp(name, strnames[n])) {
-			found = TRUE;
-			break;
-		}
+    unsigned n;
+    bool found = FALSE;
+    for (n = 0; strnames[n] != 0; n++) {
+	if (!strcmp(name, strnames[n])) {
+	    found = TRUE;
+	    break;
 	}
-	if (!found) {
-		for (n = 0; strfnames[n] != 0; n++) {
-			if (!strcmp(name, strfnames[n])) {
-				found = TRUE;
-				break;
-			}
-		}
+    }
+    if (!found) {
+	for (n = 0; strfnames[n] != 0; n++) {
+	    if (!strcmp(name, strfnames[n])) {
+		found = TRUE;
+		break;
+	    }
 	}
-	return found ? n : UNKNOWN;
+    }
+    return found ? n : UNKNOWN;
 }
 
-static void make_keys(FILE *ifp, FILE *ofp)
+static void
+make_keys(FILE *ifp, FILE *ofp)
 {
-	char buffer[BUFSIZ];
-	char from[BUFSIZ];
-	char to[BUFSIZ];
-	int maxlen = 16;
+    char buffer[BUFSIZ];
+    char from[256];
+    char to[256];
+    unsigned maxlen = 16;
+    int scanned;
+
+    while (fgets(buffer, sizeof(buffer), ifp) != 0) {
+	if (*buffer == '#')
+	    continue;
+
+	to[sizeof(to) - 1] = '\0';
+	from[sizeof(from) - 1] = '\0';
 
-	while (fgets(buffer, sizeof(buffer), ifp) != 0) {
-		if (*buffer == '#')
-			continue;
-		if (sscanf(buffer, "%s %s", to, from) == 2) {
-			int code = lookup(from);
-			if (code == UNKNOWN)
-				continue;
-			if ((int)strlen(from) > maxlen)
-				maxlen = strlen(from);
-			fprintf(ofp, "\t{ %4d, %-*.*s },\t/* %s */\n",
-				code,
-				maxlen, maxlen,
-				to,
-				from);
-		}
+	scanned = sscanf(buffer, "%255s %255s", to, from);
+	if (scanned == 2) {
+	    unsigned code = lookup(from);
+	    if (code == UNKNOWN)
+		continue;
+	    if (strlen(from) > maxlen)
+		maxlen = strlen(from);
+	    fprintf(ofp, "\t{ %4d, %-*.*s },\t/* %s */\n",
+		    code,
+		    maxlen, maxlen,
+		    to,
+		    from);
 	}
+    }
 }
 
-static void write_list(FILE *ofp, const char **list)
+static void
+write_list(FILE *ofp, const char **list)
 {
-	while (*list != 0)
-		fprintf(ofp, "%s\n", *list++);
+    while (*list != 0)
+	fprintf(ofp, "%s\n", *list++);
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
-	static const char *prefix[] = {
-		"#ifndef NCU_KEYS_H",
-		"#define NCU_KEYS_H 1",
-		"",
-		"/* This file was generated by MAKE_KEYS */",
-		"",
-		"#ifdef BROKEN_LINKER",
-		"static",
-		"#endif",
-		"struct tinfo_fkeys _nc_tinfo_fkeys[] = {",
-		0
-	};
-	static const char *suffix[] = {
-		"\t{ 0, 0} };",
-		"",
-		"#endif /* NCU_KEYS_H */",
-		0
-	};
+    static const char *prefix[] =
+    {
+	"#ifndef NCU_KEYS_H",
+	"#define NCU_KEYS_H 1",
+	"",
+	"/* This file was generated by MAKE_KEYS */",
+	"",
+	"#if BROKEN_LINKER",
+	"static",
+	"#endif",
+	"const struct tinfo_fkeys _nc_tinfo_fkeys[] = {",
+	0
+    };
+    static const char *suffix[] =
+    {
+	"\t{ 0, 0} };",
+	"",
+	"#endif /* NCU_KEYS_H */",
+	0
+    };
 
-	write_list(stdout, prefix);
-	if (argc > 1) {
-		int n;
-		for (n = 1; n < argc; n++) {
-			FILE *fp = fopen(argv[n], "r");
-			if (fp != 0) {
-				make_keys(fp, stdout);
-				fclose(fp);
-			}
-		}
-	} else {
-		make_keys(stdin, stdout);
+    write_list(stdout, prefix);
+    if (argc > 1) {
+	int n;
+	for (n = 1; n < argc; n++) {
+	    FILE *fp = fopen(argv[n], "r");
+	    if (fp != 0) {
+		make_keys(fp, stdout);
+		fclose(fp);
+	    }
 	}
-	write_list(stdout, suffix);
-	return EXIT_SUCCESS;
+    } else {
+	make_keys(stdin, stdout);
+    }
+    write_list(stdout, suffix);
+    return EXIT_SUCCESS;
 }