[Qemacs-commit] qemacs Makefile cptoqe.c jistoqe.c kmaptoqe.c l...

[Charlie Gordon]

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        08/04/20 14:18:19

Modified files:
        .              : Makefile cptoqe.c jistoqe.c kmaptoqe.c 
                         ligtoqe.c 

Log message:
        use utility functions from cutils.c in utility programs

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/Makefile?cvsroot=qemacs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/qemacs/cptoqe.c?cvsroot=qemacs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/qemacs/jistoqe.c?cvsroot=qemacs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/qemacs/kmaptoqe.c?cvsroot=qemacs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/qemacs/ligtoqe.c?cvsroot=qemacs&r1=1.8&r2=1.9

Patches:
Index: Makefile
===================================================================
RCS file: /cvsroot/qemacs/qemacs/Makefile,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- Makefile    17 Apr 2008 08:42:10 -0000      1.44
+++ Makefile    20 Apr 2008 14:18:17 -0000      1.45
@@ -221,13 +221,13 @@
 #
 # Test for bidir algorithm
 #
-qfribidi$(EXE): qfribidi.c
+qfribidi$(EXE): qfribidi.c cutils.c
        $(HOST_CC) $(CFLAGS) -DTEST -o $@ $<
 
 #
 # build ligature table
 #
-ligtoqe$(EXE): ligtoqe.c
+ligtoqe$(EXE): ligtoqe.c cutils.c
        $(HOST_CC) $(CFLAGS) -o $@ $<
 
 ifdef BUILD_ALL
@@ -254,7 +254,7 @@
 KMAPS_DIR=kmap
 KMAPS:=$(addprefix $(KMAPS_DIR)/, $(KMAPS))
 
-kmaptoqe$(EXE): kmaptoqe.c
+kmaptoqe$(EXE): kmaptoqe.c cutils.c
        $(HOST_CC) $(CFLAGS) -o $@ $<
 
 ifdef BUILD_ALL
@@ -279,10 +279,10 @@
 JIS= JIS0208.TXT JIS0212.TXT
 JIS:=$(addprefix cp/,$(JIS))
 
-cptoqe$(EXE): cptoqe.c
+cptoqe$(EXE): cptoqe.c cutils.c
        $(HOST_CC) $(CFLAGS) -o $@ $<
 
-jistoqe$(EXE): jistoqe.c
+jistoqe$(EXE): jistoqe.c cutils.c
        $(HOST_CC) $(CFLAGS) -o $@ $<
 
 ifdef BUILD_ALL
@@ -302,8 +302,8 @@
       unifont.fbf
 FONTS:=$(addprefix fonts/,$(FONTS))
 
-fbftoqe$(EXE): fbftoqe.o cutils.o
-       $(CC) $(CFLAGS) -o $@ $^
+fbftoqe$(EXE): fbftoqe.c cutils.c
+       $(HOST_CC) $(CFLAGS) -o $@ $<
 
 fbffonts.c: fbftoqe$(EXE) $(FONTS)
        ./fbftoqe $(FONTS) > $@

Index: cptoqe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/cptoqe.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- cptoqe.c    8 Jan 2008 16:37:54 -0000       1.11
+++ cptoqe.c    20 Apr 2008 14:18:18 -0000      1.12
@@ -24,6 +24,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "cutils.h"
+
 static char module_init[4096];
 static char *module_init_p = module_init;
 
@@ -99,18 +101,19 @@
     char includename[256];
     int has_iso_name, has_alias_list;
     int eol_char = 10;
+    int base;
     FILE *f = f0;
     const char *filename = fname;
 
     /* name_id is name with - changed into _ */
-    strcpy(name_id, name);
+    pstrcpy(name_id, sizeof(name_id), name);
     for (p = name_id; *p != '\0'; p++) {
         if (*p == '-')
             *p = '_';
     }
 
-    strcpy(iso_name, name);
-    strcpy(alias_list, "");
+    pstrcpy(iso_name, sizeof(iso_name), name);
+    pstrcpy(alias_list, sizeof(alias_list), "");
     has_iso_name = has_alias_list = 0;
 
     for (i = 0; i < 256; i++) {
@@ -132,8 +135,10 @@
         if (*p == '\0' || p[0] == '#')
             continue;
         if (!memcmp(p, "include ", 8)) {
-            strcpy(includename, filename);
-            strcpy(get_basename(includename), skipspaces(p + 8));
+            pstrcpy(includename, sizeof(includename), filename);
+            base = get_basename(includename) - includename;
+            pstrcpy(includename + base, sizeof(includename) - base,
+                    skipspaces(p + 8));
             f = fopen(includename, "r");
             if (f == NULL) {
                 fprintf(stderr, "%s: cannot open %s\n", name, includename);
@@ -145,12 +150,12 @@
 
         if (p[0] != '0' || (p[1] != 'x' && p[1] != 'X')) {
             if (!has_iso_name) {
-                strcpy(iso_name, p);
+                pstrcpy(iso_name, sizeof(iso_name), p);
                 has_iso_name = 1;
                 continue;
             }
             if (!has_alias_list) {
-                strcpy(alias_list, p);
+                pstrcpy(alias_list, sizeof(alias_list), p);
                 has_alias_list = 1;
                 continue;
             }
@@ -347,7 +352,7 @@
             continue;
         }
 
-        strcpy(name, get_basename(filename));
+        pstrcpy(name, sizeof(name), get_basename(filename));
         *get_extension(name) = '\0';
         for (p = name; *p; p++) {
             if (*p == '_')

Index: jistoqe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/jistoqe.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- jistoqe.c   3 Jan 2008 09:51:31 -0000       1.2
+++ jistoqe.c   20 Apr 2008 14:18:18 -0000      1.3
@@ -23,6 +23,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "cutils.h"
+
 static char *get_basename(const char *pathname)
 {
     const char *base = pathname;
@@ -187,7 +189,7 @@
     for (i = 1; i < argc; i++) {
         filename = argv[i];
 
-        strcpy(name, get_basename(filename));
+        pstrcpy(name, sizeof(name), get_basename(filename));
         *get_extension(name) = '\0';
 
         f = fopen(filename, "r");

Index: kmaptoqe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/kmaptoqe.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- kmaptoqe.c  8 Jan 2008 16:37:54 -0000       1.10
+++ kmaptoqe.c  20 Apr 2008 14:18:18 -0000      1.11
@@ -25,6 +25,8 @@
 #include <ctype.h>
 #include <assert.h>
 
+#include "cutils.h"
+
 #ifndef countof
 #define countof(a)  ((int)(sizeof(a) / sizeof((a)[0])))
 #endif
@@ -525,13 +527,13 @@
         else
             p++;
 
-        strcpy(name, p);
+        pstrcpy(name, sizeof(name), p);
         for (p = name; *p != '\0' && *p != '.'; p++) {
             if (*p == '-')
                 *p = '_';
         }
         *p = '\0';
-        strcpy(kmap_names[nb_kmaps], name);
+        pstrcpy(kmap_names[nb_kmaps], sizeof(kmap_names[nb_kmaps]), name);
         kmap_offsets[nb_kmaps] = outbuf_ptr - outbuf;
         nb_kmaps++;
         /* special compression for CJ */

Index: ligtoqe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/ligtoqe.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ligtoqe.c   8 Jan 2008 16:37:54 -0000       1.8
+++ ligtoqe.c   20 Apr 2008 14:18:19 -0000      1.9
@@ -26,6 +26,8 @@
 #include <getopt.h>
 #include <assert.h>
 
+#include "cutils.h"
+
 static inline char *skipspaces(char *p) {
     while (isspace((unsigned char)*p))
         p++;