diff options
| -rw-r--r-- | ChangeLog | 52 | ||||
| -rw-r--r-- | Makefile.in | 68 | ||||
| -rw-r--r-- | README.alpha-test | 2 | ||||
| -rw-r--r-- | THANKS | 28 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | acconfig.h | 64 | ||||
| -rw-r--r-- | config.h.in | 75 | ||||
| -rwxr-xr-x | configure | 191 | ||||
| -rw-r--r-- | configure.in | 26 | ||||
| -rw-r--r-- | idfile.c | 69 | ||||
| -rw-r--r-- | idfile.h | 24 | ||||
| -rwxr-xr-x | idtest | 8 | ||||
| -rw-r--r-- | lid.c | 2 | ||||
| -rw-r--r-- | mkid.c | 7 | ||||
| -rw-r--r-- | regex.c | 4 | ||||
| -rw-r--r-- | scanners.c | 24 | ||||
| -rw-r--r-- | stamp-h.in | 2 |
17 files changed, 258 insertions, 390 deletions
@@ -1,38 +1,52 @@ -Thu Feb 16 23:55:44 EST 1995 Greg McGary <gkm@magilla.cichlid.com> +Sat Feb 18 21:44:39 1995 Greg McGary <gkm@magilla.cichlid.com> - * Version 3.0.5 released. + * Version 3.0.6 released. - * iid.y (main): Eliminate useless Do1 variable. + * Makefile.in, accconfig.h, mkid.c: Revised & simplified package + name & version macros. - * filenames.c (kshgetwd): Conditionally getcwd or getwd. + * Makefile.in (DIST_MISC_FILES): Added version.texi, stamp-vti. + (TAGS): Fixed. (config.status): Removed dependency on config.cache. - * acconfig.h: Added typedefs of uint8_t, uint16_t, uint32_t, - int32_t. + * acconfig.h: Added #ifndef _config_h_ ... #endif around file. + (SIZEOF_INT, SIZEOF_CHAR, SIZEOF_SHORT, uint8_t, uint16_t, + uint32_t, int32_t): Deleted. (SIZEOF_LONG): Changed typedef name + to intmin32_t and uintmin32_t; all uses changed. + * configure.in (AC_CHECK_SIZEOF (int, short, char)): Deleted. + * idfile.h (struct idhead): Dropped uint8_t, uint16_t, + uint32_t, int32_t, added intmin32_t & uintmin32_t. + * idfile.c (io_idhead, io_write, io_read): Use constants to express + integer sizes for I/O on struct idhead. - * idfile.c (io_read, io_write): Use uint8_t, uint16_t, uint32_t, - int32_t. + * idtest, Makefile.in (stamp-vti): Dumbed-down shell code for portability. - * idfile.h (struct idhead): Use uint8_t, uint16_t, uint32_t, - int32_t. + * lid.c (enum radix): Deleted trailing comma. - * README.alpha-test: Added. + * scanners.c (ctype_c, ctype_asm, ctype_text): Made unsigned. - * TODO: Updated. +Thu Feb 16 23:55:44 EST 1995 Greg McGary <gkm@magilla.cichlid.com> + + * Version 3.0.5 released. + + * iid.y (main): Eliminate useless Do1 variable. + + * filenames.c (kshgetwd): Conditionally use getcwd or getwd. + + * acconfig.h: Added typedefs of uint8_t, uint16_t, uint32_t, int32_t. + * idfile.h (struct idhead), idfile.c (io_read, io_write): Use + uint8_t, uint16_t, uint32_t, int32_t. * lid.c (savetty, restoretty, linetty, chartty): Handle POSIX termios properly. (HAVE_SYS_IOCTL_H): #include <sys/ioctl.h> if !HAVE_TERMIOS_H. - * README: Updated. - * configure.in (OLD_PATCH_LEVEL, MAJOR_VERSION, MINOR_VERSION, FULL_VERSION, AC_CHECK_SIZEOF(int, long, short, char), AC_CHECK_HEADERS(regex.h), AC_CHECK_FUNCS(regcomp regcmp): Added. * mkdirhier: Added. - * Makefile.in (DIST_MISC_FILES): Added ChangeLog. - (depend): $(DEPEND) and Makefile are now .PRECIOUS. - (dist-dir-links): Added. - (check, install, uninstall): Fixed. - (install): Use mkdirhier. + * Makefile.in (DIST_MISC_FILES): Added ChangeLog. (depend): + $(DEPEND) and Makefile are now .PRECIOUS. (dist-dir-links): + Added. (check, install, uninstall): Fixed. (install): Use + mkdirhier. diff --git a/Makefile.in b/Makefile.in index 6777086..971c591 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,13 +18,10 @@ ############################################################################## -PRODUCT = @PRODUCT@ -MAJOR_VERSION = @MAJOR_VERSION@ -MINOR_VERSION = @MINOR_VERSION@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ PATCH_LEVEL = @PATCH_LEVEL@ OLD_PATCH_LEVEL=@OLD_PATCH_LEVEL@ -VERSION = @VERSION@ -FULL_VERSION = @FULL_VERSION@ SHELL = /bin/sh VPATH = @srcdir@ @@ -64,12 +61,16 @@ TARGETS = $(PROGRAMS) $(LID_LINKS) PROGRAMS = mkid lid fid idx iid LID_LINKS = eid aid gid pid +######################################## + MKID_OFILES = mkid.o misc.o scanners.o idfile.o filenames.o bitops.o $(LIB_OFILES) LID_OFILES = lid.o misc.o idfile.o filenames.o bitops.o token.o $(REGEXP) $(LIB_OFILES) FID_OFILES = fid.o misc.o idfile.o filenames.o bitops.o token.o $(LIB_OFILES) IDX_OFILES = idx.o scanners.o filenames.o misc.o $(LIB_OFILES) IID_OFILES = iid.o $(STRCASECMP) $(LIB_OFILES) +######################################## + SRC_YFILES = iid.y SRC_CFILES = mkid.c lid.c fid.c idx.c misc.c scanners.c idfile.c \ @@ -82,11 +83,11 @@ SRC_HFILES = alloc.h bitops.h filenames.h idarg.h \ idfile.h misc.h scanners.h strxtra.h token.h LIB_HFILES = regex.h getopt.h -ID_SRC_FILES = $(SRC_HFILES) $(LIB_HFILES) $(SRC_CFILES) $(LIB_CFILES) $(SRC_YFILES) +TAG_SRC_FILES = $(SRC_HFILES) $(LIB_HFILES) $(SRC_CFILES) $(LIB_CFILES) $(SRC_YFILES) DIST_SRC_FILES =$(ALL_CFILES) $(SRC_HFILES) $(LIB_HFILES) $(SRC_YFILES) INFO_FILES = mkid.info -DIST_DOC_FILES =mkid.texinfo $(INFO_FILES) fid.1 iid.1 lid.1 mkid.1 iid.help +DIST_DOC_FILES =mkid.texinfo version.texi stamp-vti $(INFO_FILES) fid.1 iid.1 lid.1 mkid.1 iid.help DIST_CONF_FILES=aclocal.m4 acconfig.h configure.in Makefile.in mkdirhier install-sh \ stamp-h.in config.h.in configure $(DEPEND) DIST_MISC_FILES=COPYING README README.alpha-test INSTALL NEWS TODO THANKS \ @@ -94,14 +95,17 @@ DIST_MISC_FILES=COPYING README README.alpha-test INSTALL NEWS TODO THANKS \ DIST_FILES = $(DIST_CONF_FILES) $(DIST_SRC_FILES) $(DIST_DOC_FILES) $(DIST_MISC_FILES) -DIST_DIR = $(PRODUCT)-$(FULL_VERSION) +######################################## + +DIST_DIR = $(PACKAGE)-$(VERSION).$(PATCH_LEVEL) DIST_TGZ = $(DIST_DIR).tar.gz DIST_UU = $(DIST_TGZ).uu -OLD_DIST_DIR = $(PRODUCT)-$(VERSION).$(OLD_PATCH_LEVEL) +OLD_DIST_DIR = $(PACKAGE)-$(VERSION).$(OLD_PATCH_LEVEL) -PATCH_GZ = $(OLD_DIST_DIR)-$(FULL_VERSION).diff.gz -PATCH_UU = $(PATCH_GZ).uu +PATCH_C_GZ = $(OLD_DIST_DIR)-$(VERSION).$(PATCH_LEVEL).diff.gz +PATCH_U_GZ = $(OLD_DIST_DIR)-$(VERSION).$(PATCH_LEVEL).udiff.gz +PATCH_C_UU = $(PATCH_C_GZ).uu ############################################################################## @@ -157,10 +161,13 @@ dvi: mkid.dvi mkid.dvi: mkid.texinfo version.texi $(TEXI2DVI) $(srcdir)/mkid.texinfo -version.texi: configure.in - if ! echo "@set VERSION $(VERSION)" |cmp -s - $(srcdir)/version.texi; then \ +version.texi: stamp-vti +stamp-vti: configure.in + if echo "@set VERSION $(VERSION)" |cmp -s - $(srcdir)/version.texi; then \ + :; else \ echo "@set VERSION $(VERSION)" >$(srcdir)/version.texi; \ fi + date >stamp-vti ############################################################################## @@ -197,18 +204,17 @@ uninstall: check: mkid lid fid idx here=`pwd`; PATH=$$here:$$PATH; cd $(srcdir) \ - && $$here/mkid -v -f$$here/ID $(ID_SRC_FILES) \ - && $(srcdir)/idtest -f$$here/ID $(ID_SRC_FILES) \ + && $$here/mkid -v -f$$here/ID $(TAG_SRC_FILES) \ + && $(SHELL) ./idtest -f$$here/ID $(TAG_SRC_FILES) \ && rm -f $$here/ID -ID: $(ID_SRC_FILES) mkid - here=`pwd`; PATH=$$here:$$PATH; cd $(srcdir) \ - && $$here/mkid -f$$here/ID $$here/config.h $(ID_SRC_FILES) \ +ID: $(TAG_SRC_FILES) mkid + here=`pwd`; PATH=$$here:$$PATH; export PATH; cd $(srcdir) \ + && $$here/mkid -f$$here/ID $$here/config.h $(TAG_SRC_FILES) tags: TAGS - -TAGS: $(SRC_FILES) - cd $(srcdir) && etags -t $(SRC_FILES) +TAGS: $(TAG_SRC_FILES) + here=`pwd`; cd $(srcdir) && etags -t $(TAG_SRC_FILES) -o $$here/TAGS ############################################################################## @@ -257,19 +263,27 @@ $(DIST_DIR): $(DIST_FILES) distdir=`pwd`/$@; cd $(srcdir); cp -p $(DIST_FILES) $$distdir chmod -R a+r $@ -patch-uu: $(PATCH_UU) -$(PATCH_UU): $(PATCH_GZ) - uuencode $(PATCH_GZ) <$(PATCH_GZ) >$@ +######################################## -patch patch-gz: $(PATCH_GZ) -$(PATCH_GZ): $(OLD_DIST_DIR) $(DIST_DIR) +# context-diff patches are for distribution +patch-uu: $(PATCH_C_UU) +$(PATCH_C_UU): $(PATCH_C_GZ) + uuencode $(PATCH_C_GZ) <$(PATCH_C_GZ) >$@ + +patch patch-gz: $(PATCH_C_GZ) +$(PATCH_C_GZ): $(OLD_DIST_DIR) $(DIST_DIR) diff -r -c --show-c-function --new-file $(OLD_DIST_DIR) $(DIST_DIR) |gzip >$@ +# unidiff patches are for the maintainer's information +patchu patchu-gz: $(PATCH_U_GZ) +$(PATCH_U_GZ): $(OLD_DIST_DIR) $(DIST_DIR) + diff -r -u $(OLD_DIST_DIR) $(DIST_DIR) |gzip >$@ + ############################################################################## Makefile: Makefile.in config.status $(DEPEND) CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status -config.status: configure config.cache +config.status: configure ./config.status --recheck $(srcdir)/configure: configure.in aclocal.m4 cd $(srcdir) && autoconf diff --git a/README.alpha-test b/README.alpha-test index d91ee9d..585dbd3 100644 --- a/README.alpha-test +++ b/README.alpha-test @@ -24,7 +24,7 @@ Special instructions for alpha testers: vendor-supplied compiler and gcc. By default, configure will use gcc if it is available. You can override this by doing this: - rm config.cache + make distclean CC=vendor-supplied-cc ./configure # bourne-shell syntax -or- setenv CC vendor-supplied-cc; ./configure # csh syntax @@ -1,17 +1,23 @@ mkid THANKS file -mkid and lid were originally written by Greg McGary. iid was written -by Tom Horsley, who also maintained the programs for a time and -released mkid2 to comp.sources.unix. +Mkid, lid, fid, and idx were originally written by Greg McGary. iid +and pid were written by Tom Horsley, who also maintained the programs +for a time and released mkid2 to comp.sources.unix. -Many people further contributed to GNU m4 by reporting problems, -suggesting improvements, or submitting actual code. Here is a list of +Many people further contributed to mkid by reporting problems, +suggesting improvements, or submitting patches. Here is a list of these people. If you contributed, but don't see your name here, please notify me at the address in the README file. Help me keep this -list complete and error-free. +list complete and accurate. -Wolfgang Rupprecht wolfgang@wsrcc.com -Tom Horsley Tom.Horsley@mail.hcsc.com -Marty Leisner leisner@sdsp.mc.xerox.com - -... (I'm not done with this yet --gkm) ... +Tom Horsley <Tom.Horsley@mail.hcsc.com> +Wolfgang Rupprecht <wolfgang@wsrcc.com> +Marty Leisner <leisner@sdsp.mc.xerox.com> +Francois Pinard <pinard@iro.umontreal.ca> +Hal Peterson <hrp@ironwood.cray.com> +Jay Lawlor <jlawlor@ptdcs2.intel.com> +Paul Lew <lew@omocha.tay.dec.com> +Karl Berry <karl@owl.hq.ileaf.com> +Nathanael Makarevitch <nat@nataa.frmug.fr.net> +Rodney Brown <rdb@mel.cocam.oz.au> +Richard Stallman <rms@gnu.ai.mit.edu> @@ -31,6 +31,8 @@ * mkid & lid - store & retrieve floating point literals + - automatically crack (optionally gzipped or compressed) tar files, so + you can index and search archived source without having to unpack it. * mkid - add a recursive file tree walker, so a complete list of file names @@ -2,55 +2,39 @@ This file is in the public domain. */ +#ifndef _config_h_ +#define _config_h_ + +@TOP@ + /* Define if you have the <sys/ioctl.h> header file. */ #undef HAVE_SYS_IOCTL_H +/* Define to filename of iid help text. */ +#undef IID_HELP_FILE + /* Define to the name of the distribution. */ -#undef PRODUCT +#undef PACKAGE + +/* Define to the patch-level of the distribution. */ +#undef PATCH_LEVEL /* Define to 1 if ANSI function prototypes are usable. */ #undef PROTOTYPES -/* Define to the major version # of the distribution. */ -#undef MAJOR_VERSION - -/* Define to the minor version # of the distribution. */ -#undef MINOR_VERSION - -/* Define to the minor.minor version # of the distribution. */ +/* Define to the major.minor version # of the distribution. */ #undef VERSION -/* Define to the minor.minor.patch_level # of the distribution. */ -#undef FULL_VERSION - -/* Define to the patch level of the distribution. */ -#undef PATCH_LEVEL - -/* Define to filename of iid help text. */ -#undef IID_HELP_FILE - @BOTTOM@ -#if SIZEOF_LONG == 4 -typedef unsigned long uint32_t; -typedef long int32_t; -#else /* SIZEOF_LONG != 4 */ -#if SIZEOF_INT == 4 -typedef unsigned int uint32_t; -typedef int int32_t; -#else /* SIZEOF_INT != 4 */ -#error "Your system is weird. What integer has sizeof () == 4 ???" -#endif /* SIZEOF_INT != 4 */ -#endif /* SIZEOF_LONG != 4 */ - -#if SIZEOF_SHORT == 2 -typedef unsigned short uint16_t; -#else -#error "Your system is weird. sizeof (short) != 2" -#endif - -#if SIZEOF_CHAR == 1 -typedef unsigned char uint8_t; -#else -#error "Your system is weird. sizeof (char) != 1" -#endif +/* (u)intmin32_t are integer types that are *at least* 32 bits. + Larger ints are OK. */ +# if SIZEOF_LONG == 4 + typedef unsigned long uintmin32_t; + typedef long intmin32_t; +# else + typedef unsigned int uintmin32_t; + typedef int intmin32_t; +# endif + +#endif /* _config_h_ */ diff --git a/config.h.in b/config.h.in index 84e4b65..ab7206c 100644 --- a/config.h.in +++ b/config.h.in @@ -1,4 +1,11 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ +/* Special definitions for `mkid', processed by autoheader. + This file is in the public domain. +*/ + +#ifndef _config_h_ +#define _config_h_ + /* Define if using alloca.c. */ #undef C_ALLOCA @@ -40,42 +47,24 @@ /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Define to filename of iid help text. */ +#undef IID_HELP_FILE + /* Define to the name of the distribution. */ -#undef PRODUCT +#undef PACKAGE + +/* Define to the patch-level of the distribution. */ +#undef PATCH_LEVEL /* Define to 1 if ANSI function prototypes are usable. */ #undef PROTOTYPES -/* Define to the major version # of the distribution. */ -#undef MAJOR_VERSION - -/* Define to the minor version # of the distribution. */ -#undef MINOR_VERSION - -/* Define to the minor.minor version # of the distribution. */ +/* Define to the major.minor version # of the distribution. */ #undef VERSION -/* Define to the minor.minor.patch_level # of the distribution. */ -#undef FULL_VERSION - -/* Define to the patch level of the distribution. */ -#undef PATCH_LEVEL - -/* Define to filename of iid help text. */ -#undef IID_HELP_FILE - -/* The number of bytes in a char. */ -#undef SIZEOF_CHAR - -/* The number of bytes in a int. */ -#undef SIZEOF_INT - /* The number of bytes in a long. */ #undef SIZEOF_LONG -/* The number of bytes in a short. */ -#undef SIZEOF_SHORT - /* Define if you have the bcopy function. */ #undef HAVE_BCOPY @@ -175,26 +164,14 @@ /* Define if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -#if SIZEOF_LONG == 4 -typedef unsigned long uint32_t; -typedef long int32_t; -#else /* SIZEOF_LONG != 4 */ -#if SIZEOF_INT == 4 -typedef unsigned int uint32_t; -typedef int int32_t; -#else /* SIZEOF_INT != 4 */ -#error "Your system is weird. What integer has sizeof () == 4 ???" -#endif /* SIZEOF_INT != 4 */ -#endif /* SIZEOF_LONG != 4 */ - -#if SIZEOF_SHORT == 2 -typedef unsigned short uint16_t; -#else -#error "Your system is weird. sizeof (short) != 2" -#endif - -#if SIZEOF_CHAR == 1 -typedef unsigned char uint8_t; -#else -#error "Your system is weird. sizeof (char) != 1" -#endif +/* (u)intmin32_t are integer types that are *at least* 32 bits. + Larger ints are OK. */ +# if SIZEOF_LONG == 4 + typedef unsigned long uintmin32_t; + typedef long intmin32_t; +# else + typedef unsigned int uintmin32_t; + typedef int intmin32_t; +# endif + +#endif /* _config_h_ */ @@ -399,27 +399,12 @@ fi -PRODUCT=mkid -MAJOR_VERSION=3 -MINOR_VERSION=0 -PATCH_LEVEL=5 +PACKAGE=mkid +VERSION=3.0 +PATCH_LEVEL=6 OLD_PATCH_LEVEL=`expr $PATCH_LEVEL - 1` -VERSION=$MAJOR_VERSION.$MINOR_VERSION -FULL_VERSION=$VERSION.$PATCH_LEVEL cat >> confdefs.h <<EOF -#define PRODUCT "$PRODUCT" -EOF - -cat >> confdefs.h <<EOF -#define MAJOR_VERSION "$MAJOR_VERSION" -EOF - -cat >> confdefs.h <<EOF -#define MINOR_VERSION "$MINOR_VERSION" -EOF - -cat >> confdefs.h <<EOF -#define PATCH_LEVEL "$PATCH_LEVEL" +#define PACKAGE "$PACKAGE" EOF cat >> confdefs.h <<EOF @@ -427,7 +412,7 @@ cat >> confdefs.h <<EOF EOF cat >> confdefs.h <<EOF -#define FULL_VERSION "$FULL_VERSION" +#define PATCH_LEVEL "$PATCH_LEVEL" EOF @@ -435,9 +420,6 @@ EOF - - - for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -678,7 +660,7 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 682 "configure" +#line 664 "configure" #include "confdefs.h" #include <assert.h> Syntax Error @@ -692,7 +674,7 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 696 "configure" +#line 678 "configure" #include "confdefs.h" #include <assert.h> Syntax Error @@ -724,7 +706,7 @@ else ac_cv_cross=yes else cat > conftest.$ac_ext <<EOF -#line 728 "configure" +#line 710 "configure" #include "confdefs.h" main(){return(0);} EOF @@ -745,7 +727,7 @@ if eval "test \"`echo '${'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 749 "configure" +#line 731 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -767,7 +749,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 771 "configure" +#line 753 "configure" #include "confdefs.h" #include <string.h> EOF @@ -785,7 +767,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 789 "configure" +#line 771 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -806,7 +788,7 @@ if test "$cross_compiling" = yes; then ac_cv_header_stdc=no else cat > conftest.$ac_ext <<EOF -#line 810 "configure" +#line 792 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -840,7 +822,7 @@ if eval "test \"`echo '${'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 844 "configure" +#line 826 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -883,7 +865,7 @@ if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 887 "configure" +#line 869 "configure" #include "confdefs.h" #include <$ac_hdr> EOF @@ -919,7 +901,7 @@ if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 923 "configure" +#line 905 "configure" #include "confdefs.h" #include <$ac_hdr> EOF @@ -955,7 +937,7 @@ if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 959 "configure" +#line 941 "configure" #include "confdefs.h" #include <$ac_hdr> EOF @@ -989,7 +971,7 @@ if eval "test \"`echo '${'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 993 "configure" +#line 975 "configure" #include "confdefs.h" int main() { return 0; } @@ -1074,7 +1056,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xa -Xc do CFLAGS="$ac_save_CFLAGS $ac_arg" cat > conftest.$ac_ext <<EOF -#line 1078 "configure" +#line 1060 "configure" #include "confdefs.h" #if !defined(__STDC__) || __STDC__ != 1 choke me @@ -1123,7 +1105,7 @@ if eval "test \"`echo '${'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1127 "configure" +#line 1109 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -1157,7 +1139,7 @@ if eval "test \"`echo '${'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1161 "configure" +#line 1143 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1188,7 +1170,7 @@ if eval "test \"`echo '${'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1192 "configure" +#line 1174 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1214,38 +1196,6 @@ EOF fi -echo $ac_n "checking size of int""... $ac_c" 1>&4 -if eval "test \"`echo '${'ac_cv_sizeof_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&4 -else - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -else -cat > conftest.$ac_ext <<EOF -#line 1226 "configure" -#include "confdefs.h" -#include <stdio.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(int)); - exit(0); -} -EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_sizeof_int=`cat conftestval` -fi -fi -rm -fr conftest* -fi -echo "$ac_t""$ac_cv_sizeof_int" 1>&4 -cat >> confdefs.h <<EOF -#define SIZEOF_INT $ac_cv_sizeof_int -EOF - - echo $ac_n "checking size of long""... $ac_c" 1>&4 if eval "test \"`echo '${'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 @@ -1254,7 +1204,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1258 "configure" +#line 1208 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1278,70 +1228,6 @@ cat >> confdefs.h <<EOF EOF -echo $ac_n "checking size of short""... $ac_c" 1>&4 -if eval "test \"`echo '${'ac_cv_sizeof_short'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&4 -else - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -else -cat > conftest.$ac_ext <<EOF -#line 1290 "configure" -#include "confdefs.h" -#include <stdio.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(short)); - exit(0); -} -EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_sizeof_short=`cat conftestval` -fi -fi -rm -fr conftest* -fi -echo "$ac_t""$ac_cv_sizeof_short" 1>&4 -cat >> confdefs.h <<EOF -#define SIZEOF_SHORT $ac_cv_sizeof_short -EOF - - -echo $ac_n "checking size of char""... $ac_c" 1>&4 -if eval "test \"`echo '${'ac_cv_sizeof_char'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&4 -else - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -else -cat > conftest.$ac_ext <<EOF -#line 1322 "configure" -#include "confdefs.h" -#include <stdio.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(char)); - exit(0); -} -EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_sizeof_char=`cat conftestval` -fi -fi -rm -fr conftest* -fi -echo "$ac_t""$ac_cv_sizeof_char" 1>&4 -cat >> confdefs.h <<EOF -#define SIZEOF_CHAR $ac_cv_sizeof_char -EOF - - CFLAGS=${CFLAGS--g} LDFLAGS=${LDFLAGS--g} @@ -1355,7 +1241,7 @@ if eval "test \"`echo '${'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 1359 "configure" +#line 1245 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -1373,7 +1259,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 1377 "configure" +#line 1263 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -1400,7 +1286,7 @@ if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1404 "configure" +#line 1290 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1449,7 +1335,7 @@ if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1453 "configure" +#line 1339 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1498,7 +1384,7 @@ if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1502 "configure" +#line 1388 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1547,7 +1433,7 @@ if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1551 "configure" +#line 1437 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1596,7 +1482,7 @@ if eval "test \"`echo '${'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1600 "configure" +#line 1486 "configure" #include "confdefs.h" #include <alloca.h> int main() { return 0; } @@ -1627,7 +1513,7 @@ if eval "test \"`echo '${'ac_cv_func_alloca'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1631 "configure" +#line 1517 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -1685,7 +1571,7 @@ if eval "test \"`echo '${'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1689 "configure" +#line 1575 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -1712,7 +1598,7 @@ if eval "test \"`echo '${'ac_cv_func__getb67'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1716 "configure" +#line 1602 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1755,7 +1641,7 @@ if eval "test \"`echo '${'ac_cv_func_GETB67'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1759 "configure" +#line 1645 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1798,7 +1684,7 @@ if eval "test \"`echo '${'ac_cv_func_getb67'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1802 "configure" +#line 1688 "configure" #include "confdefs.h" #include <ctype.h> /* Arbitrary system header to define __stub macros. */ /* Override any gcc2 internal prototype to avoid an error. */ @@ -1852,7 +1738,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 1856 "configure" +#line 1742 "configure" #include "confdefs.h" find_stack_direction () { @@ -2011,13 +1897,10 @@ s%@LIBS@%$LIBS%g s%@exec_prefix@%$exec_prefix%g s%@prefix@%$prefix%g s%@program_transform_name@%$program_transform_name%g -s%@PRODUCT@%$PRODUCT%g -s%@MAJOR_VERSION@%$MAJOR_VERSION%g -s%@MINOR_VERSION@%$MINOR_VERSION%g +s%@PACKAGE@%$PACKAGE%g +s%@VERSION@%$VERSION%g s%@PATCH_LEVEL@%$PATCH_LEVEL%g s%@OLD_PATCH_LEVEL@%$OLD_PATCH_LEVEL%g -s%@VERSION@%$VERSION%g -s%@FULL_VERSION@%$FULL_VERSION%g s%@YACC@%$YACC%g s%@CC@%$CC%g s%@LN_S@%$LN_S%g diff --git a/configure.in b/configure.in index f563f09..edb17a8 100644 --- a/configure.in +++ b/configure.in @@ -2,26 +2,17 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(mkid.c) AC_CONFIG_HEADER(config.h) -PRODUCT=mkid -MAJOR_VERSION=3 -MINOR_VERSION=0 -PATCH_LEVEL=5 +PACKAGE=mkid +VERSION=3.0 +PATCH_LEVEL=6 OLD_PATCH_LEVEL=`expr $PATCH_LEVEL - 1` -VERSION=$MAJOR_VERSION.$MINOR_VERSION -FULL_VERSION=$VERSION.$PATCH_LEVEL -AC_DEFINE_UNQUOTED(PRODUCT, "$PRODUCT") -AC_DEFINE_UNQUOTED(MAJOR_VERSION, "$MAJOR_VERSION") -AC_DEFINE_UNQUOTED(MINOR_VERSION, "$MINOR_VERSION") -AC_DEFINE_UNQUOTED(PATCH_LEVEL, "$PATCH_LEVEL") +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") -AC_DEFINE_UNQUOTED(FULL_VERSION, "$FULL_VERSION") -AC_SUBST(PRODUCT) -AC_SUBST(MAJOR_VERSION) -AC_SUBST(MINOR_VERSION) +AC_DEFINE_UNQUOTED(PATCH_LEVEL, "$PATCH_LEVEL") +AC_SUBST(PACKAGE) +AC_SUBST(VERSION) AC_SUBST(PATCH_LEVEL) AC_SUBST(OLD_PATCH_LEVEL) -AC_SUBST(VERSION) -AC_SUBST(FULL_VERSION) dnl Checks for programs. AC_PROG_YACC @@ -47,10 +38,7 @@ fp_C_PROTOTYPES AC_TYPE_SIGNAL AC_TYPE_OFF_T AC_TYPE_SIZE_T -AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(char) CFLAGS=${CFLAGS--g} LDFLAGS=${LDFLAGS--g} @@ -111,18 +111,18 @@ io_read (FILE *input_FILE, void *addr, unsigned int size, int is_int) { switch (size) { - case sizeof (uint32_t): - *(uint32_t *)addr = getc (input_FILE); - *(uint32_t *)addr += getc (input_FILE) << 010; - *(uint32_t *)addr += getc (input_FILE) << 020; - *(uint32_t *)addr += getc (input_FILE) << 030; + case 4: /* This must be a literal 4. Don't use sizeof (uintmin32_t)! */ + *(uintmin32_t *)addr = getc (input_FILE); + *(uintmin32_t *)addr += getc (input_FILE) << 010; + *(uintmin32_t *)addr += getc (input_FILE) << 020; + *(uintmin32_t *)addr += getc (input_FILE) << 030; break; - case sizeof (uint16_t): - *(uint16_t *)addr = getc (input_FILE); - *(uint16_t *)addr += getc (input_FILE) << 010; + case 2: + *(unsigned short *)addr = getc (input_FILE); + *(unsigned short *)addr += getc (input_FILE) << 010; break; - case sizeof (uint8_t): - *(uint8_t *)addr = getc (input_FILE); + case 1: + *(unsigned char *)addr = getc (input_FILE); break; default: fprintf (stderr, "Unsupported size in io_write (): %d\n", size); @@ -143,18 +143,18 @@ io_write (FILE *output_FILE, void *addr, unsigned int size, int is_int) { switch (size) { - case sizeof (uint32_t): - putc (*(uint32_t *)addr, output_FILE); - putc (*(uint32_t *)addr >> 010, output_FILE); - putc (*(uint32_t *)addr >> 020, output_FILE); - putc (*(uint32_t *)addr >> 030, output_FILE); + case 4: /* This must be a literal 4. Don't use sizeof (uintmin32_t)! */ + putc (*(uintmin32_t *)addr, output_FILE); + putc (*(uintmin32_t *)addr >> 010, output_FILE); + putc (*(uintmin32_t *)addr >> 020, output_FILE); + putc (*(uintmin32_t *)addr >> 030, output_FILE); break; - case sizeof (uint16_t): - putc (*(uint16_t *)addr, output_FILE); - putc (*(uint16_t *)addr >> 010, output_FILE); + case 2: + putc (*(unsigned short *)addr, output_FILE); + putc (*(unsigned short *)addr >> 010, output_FILE); break; - case sizeof (uint8_t): - putc (*(uint8_t *)addr, output_FILE); + case 1: + putc (*(unsigned char *)addr, output_FILE); break; default: fprintf (stderr, "Unsupported size in io_write (): %d\n", size); @@ -168,23 +168,28 @@ io_write (FILE *output_FILE, void *addr, unsigned int size, int is_int) return size; } +/* The sizes of the fields must be hard-coded. They aren't + necessarily the sizes of the struct members, because some + architectures don't have any way to declare 4-byte integers + (e.g., Cray) */ + static int io_idhead (FILE *fp, int (*io) (FILE *, void *, unsigned int, int), struct idhead *idh) { unsigned int size = 0; if (fp) fseek (fp, 0L, 0); - size += io (fp, idh->idh_magic, sizeof (idh->idh_magic), 0); - size += io (fp, &idh->idh_pad_1, sizeof (idh->idh_pad_1), 0); - size += io (fp, &idh->idh_version, sizeof (idh->idh_version), 0); - size += io (fp, &idh->idh_flags, sizeof (idh->idh_flags), 1); - size += io (fp, &idh->idh_args, sizeof (idh->idh_args), 1); - size += io (fp, &idh->idh_paths, sizeof (idh->idh_paths), 1); - size += io (fp, &idh->idh_tokens, sizeof (idh->idh_tokens), 1); - size += io (fp, &idh->idh_buf_size, sizeof (idh->idh_buf_size), 1); - size += io (fp, &idh->idh_vec_size, sizeof (idh->idh_vec_size), 1); - size += io (fp, &idh->idh_args_offset, sizeof (idh->idh_args_offset), 1); - size += io (fp, &idh->idh_tokens_offset, sizeof (idh->idh_tokens_offset), 1); - size += io (fp, &idh->idh_end_offset, sizeof (idh->idh_end_offset), 1); + size += io (fp, idh->idh_magic, 2, 0); + size += io (fp, &idh->idh_pad_1, 1, 0); + size += io (fp, &idh->idh_version, 1, 0); + size += io (fp, &idh->idh_flags, 2, 1); + size += io (fp, &idh->idh_args, 4, 1); + size += io (fp, &idh->idh_paths, 4, 1); + size += io (fp, &idh->idh_tokens, 4, 1); + size += io (fp, &idh->idh_buf_size, 4, 1); + size += io (fp, &idh->idh_vec_size, 4, 1); + size += io (fp, &idh->idh_args_offset, 4, 1); + size += io (fp, &idh->idh_tokens_offset, 4, 1); + size += io (fp, &idh->idh_end_offset, 4, 1); return size; } @@ -26,22 +26,22 @@ struct idhead { - uint8_t idh_magic[2]; + unsigned char idh_magic[2]; #define IDH_MAGIC_0 ('I'|0x80) #define IDH_MAGIC_1 ('D'|0x80) - uint8_t idh_pad_1; - uint8_t idh_version; + unsigned char idh_pad_1; + unsigned char idh_version; #define IDH_VERSION 3 - uint16_t short idh_flags; + unsigned short idh_flags; #define IDH_COUNTS 0x0001 /* occurrence counts are included with each token */ - uint32_t idh_args; /* total # of args for mkid update */ - uint32_t idh_paths; /* total # of file names for mkid update */ - uint32_t idh_tokens; /* total # of tokens */ - uint32_t idh_buf_size; /* # of bytes in longest entry (bufsiz for lid) */ - uint32_t idh_vec_size; /* # of hits in longest entry (max vector size for lid) */ - int32_t idh_args_offset; /* file offset of args */ - int32_t idh_tokens_offset; /* file offset of tokens section */ - int32_t idh_end_offset; /* file offset beyond tokens section */ + uintmin32_t idh_args; /* total # of args for mkid update */ + uintmin32_t idh_paths; /* total # of file names for mkid update */ + uintmin32_t idh_tokens; /* total # of tokens */ + uintmin32_t idh_buf_size; /* # of bytes in longest entry (bufsiz for lid) */ + uintmin32_t idh_vec_size; /* # of hits in longest entry (max vector size for lid) */ + intmin32_t idh_args_offset; /* file offset of args */ + intmin32_t idh_tokens_offset; /* file offset of tokens section */ + intmin32_t idh_end_offset; /* file offset beyond tokens section */ }; struct idarg; @@ -3,21 +3,21 @@ set -x case $# in -0) 1>&2 echo Usage: $(basename $0) files...; exit 1;; +0) 1>&2 echo Usage: $0 files...; exit 1;; esac case $1 in -f*) _fID=$1; shift;; esac -idx "$@" |sort -u >|ids.idx -lid $_fID |sed -e 's/[ ].*//' |sort -u >|ids.lid +idx "$@" |sort -u >ids.idx +lid $_fID |sed -e 's/[ ].*//' |sort -u >ids.lid for file do case x$file in x-*) continue;; esac fid $_fID $file -done |sort -u >|ids.fid +done |sort -u >ids.fid if cmp ids.idx ids.lid then @@ -80,7 +80,7 @@ enum radix { RADIX_OCT = 1, RADIX_DEC = 2, RADIX_HEX = 4, - RADIX_ALL = RADIX_DEC | RADIX_OCT | RADIX_HEX, + RADIX_ALL = RADIX_DEC | RADIX_OCT | RADIX_HEX }; #define TOLOWER(c) (isupper (c) ? tolower (c) : (c)) @@ -158,8 +158,8 @@ Usage: %s [-v] [-f<idfile>] [(+|-)l[<lang>]] [(+|-)S<scanarg>] [-a<argfile>] [-] -S<lang>? Print usage documentation for <lang>\n\ -u Update an existing database (unimplemented)\n\ \n\ -Version %s; Made %s %s\n", - program_name, FULL_VERSION, __DATE__, __TIME__); +Version %s.%s; Made %s %s\n", + program_name, VERSION, PATCH_LEVEL, __DATE__, __TIME__); exit (1); } @@ -768,9 +768,6 @@ round2 (int rough) return round; } -/* Allocate a new token struct and fill in the name field. We - allocate memory in large chunks to avoid frequent calls to malloc () - which is a major pig. */ struct token * make_token (char const *name, int flags) { @@ -26,9 +26,7 @@ #define _GNU_SOURCE -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" /* We need this for `regex.h', and perhaps for the Emacs include files. */ #include <sys/types.h> @@ -412,7 +412,7 @@ usage_scan (void) #define ISQ1BORING(c) (!((rct)[c] & (EF|NL|Q1|ES))) /* char const fluff */ #define ISQ2BORING(c) (!((rct)[c] & (EF|NL|Q2|ES))) /* quoted str fluff */ -static short ctype_c[257] = +static unsigned short ctype_c[257] = { EF, /* 0 1 2 3 4 5 6 7 */ @@ -456,7 +456,7 @@ get_token_c (FILE *input_FILE, int *flags) { static char input_buffer[BUFSIZ]; static int new_line = 1; - short *rct = &ctype_c[1]; + unsigned short *rct = &ctype_c[1]; int c; char *id = input_buffer; @@ -686,7 +686,7 @@ next: static void set_ctype_c (char const *chars, int type) { - short *rct = &ctype_c[1]; + unsigned short *rct = &ctype_c[1]; while (*chars) rct[*chars++] |= type; @@ -695,7 +695,7 @@ set_ctype_c (char const *chars, int type) static void clear_ctype_c (char const *chars, int type) { - short *rct = &ctype_c[1]; + unsigned short *rct = &ctype_c[1]; while (*chars) rct[*chars++] &= ~type; @@ -795,7 +795,7 @@ set_args_c (char const *lang_name, int op, char const *arg) #define ISCCBORING(c) (!((rct)[c] & (EF|C2))) #define ISIGNORE(c) ((rct)[c] & (IG)) -static char ctype_asm[257] = +static unsigned char ctype_asm[257] = { EF, /* 0 1 2 3 4 5 6 7 */ @@ -830,7 +830,7 @@ static char const * get_token_asm (FILE *input_FILE, int *flags) { static char input_buffer[BUFSIZ]; - char *rct = &ctype_asm[1]; + unsigned char *rct = &ctype_asm[1]; int c; char *id = input_buffer; static int new_line = 1; @@ -960,7 +960,7 @@ next: static void set_ctype_asm (char const *chars, int type) { - char *rct = &ctype_asm[1]; + unsigned char *rct = &ctype_asm[1]; while (*chars) rct[*chars++] |= type; @@ -969,7 +969,7 @@ set_ctype_asm (char const *chars, int type) static void clear_ctype_asm (char const *chars, int type) { - char *rct = &ctype_asm[1]; + unsigned char *rct = &ctype_asm[1]; while (*chars) rct[*chars++] &= ~type; @@ -1065,7 +1065,7 @@ set_args_asm (char const *lang_name, int op, char const *arg) #define ISBORING(c) (!((rct)[c] & (I1|NM|EF))) #define ISIDSQUEEZE(c) ((rct)[c] & (SQ)) -static char ctype_text[257] = +static unsigned char ctype_text[257] = { EF, /* 0 1 2 3 4 5 6 7 */ @@ -1097,7 +1097,7 @@ static char const * get_token_text (FILE *input_FILE, int *flags) { static char input_buffer[BUFSIZ]; - char *rct = &ctype_text[1]; + unsigned char *rct = &ctype_text[1]; int c; char *id = input_buffer; @@ -1140,7 +1140,7 @@ top: static void set_ctype_text (char const *chars, int type) { - char *rct = &ctype_text[1]; + unsigned char *rct = &ctype_text[1]; while (*chars) rct[*chars++] |= type; @@ -1149,7 +1149,7 @@ set_ctype_text (char const *chars, int type) static void clear_ctype_text (char const *chars, int type) { - char *rct = &ctype_text[1]; + unsigned char *rct = &ctype_text[1]; while (*chars) rct[*chars++] &= ~type; @@ -1 +1 @@ -Thu Feb 16 23:40:14 EST 1995 +Sat Feb 18 08:55:23 EST 1995 |