mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-30 13:30:57 +08:00
Minor uniformity tweaks, use lutil_progname, don't use fscanf
This commit is contained in:
parent
42ef1aab4d
commit
84b91f70ad
@ -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
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user