Minor uniformity tweaks, use lutil_progname, don't use fscanf

diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in
index 5316d023aeb252fdbc19b5eb0cae7476039d55d4..ef2e3614a0b31f3ac7d4e1b22059486e376f5791 100644 (file)
--- a/libraries/liblunicode/Makefile.in
+++ b/libraries/liblunicode/Makefile.in
@@ -14,6 +14,7 @@ SRCS  = ucstr.c
 OBJS   = ucdata.o ure.o urestubs.o ucstr.o
 
 XLIB = $(LIBRARY)
+XLIBS = $(LDAP_LIBLUTIL_A)
 PROGRAMS = ucgendat
 
 LDAP_INCDIR= ../../include       

diff --git a/libraries/liblunicode/ucdata/ucgendat.c b/libraries/liblunicode/ucdata/ucgendat.c
index dcb4a91a39604391540acfef2b04ca722dbc1722..d4cb97b2ded905a28dec18374fb2e37113e54e16 100644 (file)
--- a/libraries/liblunicode/ucdata/ucgendat.c
+++ b/libraries/liblunicode/ucdata/ucgendat.c
@@ -806,7 +806,8 @@ read_cdata(FILE *in)
 
     lineno = skip = 0;
     while (!feof(in)) {
-               if( fscanf(in, "%[^\n]\n", line) != 1) break;
+               if( !fgets(line, sizeof(line), in)) break;
+               if( (s=strchr(line, '\n')) ) *s = '\0';
         lineno++;
 
         /*
@@ -1165,7 +1166,8 @@ read_compexdata(FILE *in)
     (void) memset((char *) compexs, 0, sizeof(unsigned long) << 11);
 
     while (!feof(in)) {
-               if( fscanf(in, "%[^\n]\n", line) != 1) break;
+               if( !fgets(line, sizeof(line), in)) break;
+               if( (s=strchr(line, '\n')) ) *s = '\0';
         /*
          * Skip blank lines and lines that start with a '#'.
          */
@@ -1600,10 +1602,7 @@ main(int argc, char *argv[])
     FILE *in;
     char *prog, *opath;
 
-    if ((prog = strrchr(argv[0], *LDAP_DIRSEP)) != 0)
-      prog++;
-    else
-      prog = argv[0];
+    prog = lutil_progname( "ucgendat", argc, argv );
 
     opath = 0;
     in = stdin;