diff -ur id-utils-3.1/ChangeLog id-utils-3.2/ChangeLog --- id-utils-3.1/ChangeLog Sun Jun 30 14:16:47 1996 +++ id-utils-3.2/ChangeLog Tue Aug 6 23:22:56 1996 @@ -1,3 +1,20 @@ +Tue Aug 6 22:46:16 1996 Greg McGary + + * Version 3.2 released + + * src/fid.c (get_file_index): rename shadowing local decl of + file_name. + + * src/lid.c (report_edit): post decrement argv when splicing in + ed_arg_buffer. + + * src/xtokid.c, libidu/idfile.h: #include "xstring.h" to avoid + redeclaration of basename/dirname error. + +Wed Jul 17 18:06:18 1996 Greg McGary + + * Version 3.1 released + Sun Jun 30 13:06:18 1996 Greg McGary * src/lid.c (get_query_func): remove unreachable return stmt. diff -ur id-utils-3.1/Makefile.in id-utils-3.2/Makefile.in --- id-utils-3.1/Makefile.in Wed Jul 17 17:58:15 1996 +++ id-utils-3.2/Makefile.in Tue Aug 6 23:27:21 1996 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.0 from Makefile.am +# Makefile.in generated automatically by automake 1.1b from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -64,7 +64,7 @@ $(srcdir)/Makefile.in: @MAINT@Makefile.am configure.in - cd $(srcdir) && automake Makefile + cd $(srcdir) && automake --strictness=gnits Makefile # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation. @@ -100,7 +100,6 @@ maintainer-clean-recursive: for subdir in $(SUBDIRS); do \ target=`echo $@ | sed s/-recursive//`; \ - echo making $$target in $$subdir; \ (cd $$subdir && $(MAKE) $$target) \ || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" @@ -129,9 +128,9 @@ clean-tags: distclean-tags: - rm -f TAGS ID maintainer-clean-tags: + rm -f TAGS ID distdir = $(PACKAGE)-$(VERSION) # This target untars the dist file and tries a VPATH configuration. Then @@ -144,8 +143,9 @@ mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \ cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ + && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \ && $(MAKE) \ + && $(MAKE) dvi \ && $(MAKE) check \ && $(MAKE) install \ && $(MAKE) installcheck \ @@ -155,17 +155,17 @@ echo "$(distdir).tar.gz is ready for distribution"; \ echo "========================" dist: distdir - chmod -R a+r $(distdir) + -chmod -R a+r $(distdir) $(TAR) chozf $(distdir).tar.gz $(distdir) rm -rf $(distdir) distdir: $(DEP_DISTFILES) - @if sed 15q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \ + @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \ echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ fi rm -rf $(distdir) mkdir $(distdir) - chmod 777 $(distdir) + -chmod 755 $(distdir) @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \ test -f $(distdir)/$$file \ || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \ @@ -175,7 +175,7 @@ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ + chmod 755 $(distdir)/$$subdir; \ (cd $$subdir && $(MAKE) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done diff -ur id-utils-3.1/NEWS id-utils-3.2/NEWS --- id-utils-3.1/NEWS Wed Jul 17 17:14:35 1996 +++ id-utils-3.2/NEWS Tue Aug 6 22:52:50 1996 @@ -1,5 +1,9 @@ id-utils NEWS - User visible changes. +Version 3.2 - August 6, 1996, by Greg McGary + +* Major bug in eid fixed + Version 3.1 - July 17, 1996, by Greg McGary * A few more portability bugs are fixed diff -ur id-utils-3.1/aclocal.m4 id-utils-3.2/aclocal.m4 --- id-utils-3.1/aclocal.m4 Wed Jul 17 17:35:18 1996 +++ id-utils-3.2/aclocal.m4 Tue Aug 6 23:05:28 1996 @@ -2,7 +2,9 @@ # Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. # François Pinard , 1992. -AC_DEFUN(jm_MAINTAINER_MODE, +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering +AC_DEFUN(AM_MAINTAINER_MODE, [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode is disabled by default AC_ARG_ENABLE(maintainer-mode, @@ -31,22 +33,25 @@ ]) ## --------------------------------------------------------- ## -## Use A*_PROG_INSTALL, supplementing it with INSTALL_SCRIPT ## -## substitution. ## +## Use AC_PROG_INSTALL, supplementing it with INSTALL_SCRIPT ## +## substitution. ## +## From Franc,ois Pinard ## ## --------------------------------------------------------- ## -AC_DEFUN(fp_PROG_INSTALL, -[AC_PROG_INSTALL +AC_DEFUN(AM_PROG_INSTALL, +[AC_REQUIRE([AC_PROG_INSTALL]) test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755' AC_SUBST(INSTALL_SCRIPT)dnl ]) ## ------------------------------- ## ## Check for function prototypes. ## +## From Franc,ois Pinard ## ## ------------------------------- ## -AC_DEFUN(fp_C_PROTOTYPES, -[AC_REQUIRE([fp_PROG_CC_STDC]) +AC_DEFUN(AM_C_PROTOTYPES, +[AC_REQUIRE([AM_PROG_CC_STDC]) +AC_BEFORE([$0], [AC_C_INLINE]) AC_MSG_CHECKING([for function prototypes]) if test "$ac_cv_prog_cc_stdc" != no; then AC_MSG_RESULT(yes) @@ -55,6 +60,9 @@ else AC_MSG_RESULT(no) U=_ ANSI2KNR=./ansi2knr + # Ensure some checks needed by ansi2knr itself. + AC_HEADER_STDC + AC_CHECK_HEADERS(string.h) fi AC_SUBST(U)dnl AC_SUBST(ANSI2KNR)dnl @@ -62,6 +70,7 @@ ## ----------------------------------------- ## ## ANSIfy the C compiler whenever possible. ## +## From Franc,ois Pinard ## ## ----------------------------------------- ## # @defmac AC_PROG_CC_STDC @@ -80,20 +89,21 @@ # program @code{ansi2knr}, which comes with Ghostscript. # @end defmac -AC_DEFUN(fp_PROG_CC_STDC, -[AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) +AC_DEFUN(AM_PROG_CC_STDC, +[AC_REQUIRE([AC_PROG_CC]) +AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) AC_CACHE_VAL(ac_cv_prog_cc_stdc, [ac_cv_prog_cc_stdc=no -ac_save_CFLAGS="$CFLAGS" +ac_save_CC="$CC" # Don't try gcc -ansi; that turns off useful extensions and # breaks some systems' header files. # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 # HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +# SVR4 -Xc +for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xc do - CFLAGS="$ac_save_CFLAGS $ac_arg" + CC="$ac_save_CC $ac_arg" AC_TRY_COMPILE( [#if !defined(__STDC__) || __STDC__ != 1 choke me @@ -106,7 +116,7 @@ struct s2 {int (*f) (double a);};], [ac_cv_prog_cc_stdc="$ac_arg"; break]) done -CFLAGS="$ac_save_CFLAGS" +CC="$ac_save_CC" ]) AC_MSG_RESULT($ac_cv_prog_cc_stdc) case "x$ac_cv_prog_cc_stdc" in diff -ur id-utils-3.1/configure id-utils-3.2/configure --- id-utils-3.1/configure Wed Jul 17 17:35:28 1996 +++ id-utils-3.2/configure Tue Aug 6 23:16:35 1996 @@ -550,8 +550,8 @@ ############################################################################## PACKAGE=id-utils -VERSION=3.1 -PACKAGE_VERSION="$PACKAGE-$VERSION" +VERSION=3.2 +PACKAGE_VERSION="GNU $PACKAGE $VERSION" cat >> confdefs.h <&6 @@ -866,13 +867,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -881,13 +882,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -914,7 +915,7 @@ else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -932,7 +933,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -983,7 +984,7 @@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1089,7 +1090,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1098,7 +1099,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1129,7 +1130,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1168,7 +1169,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1209,11 +1210,11 @@ ac_cv_c_cross=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_c_cross=no else @@ -1231,7 +1232,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1239,7 +1240,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1254,7 +1255,7 @@ 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 @@ -1272,7 +1273,7 @@ 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 @@ -1293,7 +1294,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1304,7 +1305,7 @@ exit (0); } EOF -{ (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then : else @@ -1328,7 +1329,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1383,7 +1384,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1400,7 +1401,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1427,12 +1428,12 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1464,12 +1465,12 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1501,12 +1502,12 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1540,7 +1541,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1609,23 +1610,24 @@ fi + echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_prog_cc_stdc=no -ac_save_CFLAGS="$CFLAGS" +ac_save_CC="$CC" # Don't try gcc -ansi; that turns off useful extensions and # breaks some systems' header files. # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 # HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +# SVR4 -Xc +for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xc do - CFLAGS="$ac_save_CFLAGS $ac_arg" + CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_cc_stdc="$ac_arg"; break fi rm -f conftest* done -CFLAGS="$ac_save_CFLAGS" +CC="$ac_save_CC" fi @@ -1659,6 +1661,7 @@ esac + echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 if test "$ac_cv_prog_cc_stdc" != no; then echo "$ac_t""yes" 1>&6 @@ -1670,6 +1673,141 @@ else echo "$ac_t""no" 1>&6 U=_ ANSI2KNR=./ansi2knr + # Ensure some checks needed by ansi2knr itself. + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#include +#include +#include +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + ac_cv_header_stdc=yes +else + echo "$ac_err" >&5 + rm -rf conftest* + ac_cv_header_stdc=no +fi +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 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "memchr" >/dev/null 2>&1; then + : +else + rm -rf conftest* + ac_cv_header_stdc=no +fi +rm -f conftest* + +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 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "free" >/dev/null 2>&1; then + : +else + rm -rf conftest* + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +if test "$cross_compiling" = yes; then + : +else +cat > conftest.$ac_ext < +#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int main () { int i; for (i = 0; i < 256; i++) +if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +exit (0); } + +EOF +{ (eval echo configure:1756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +if test -s conftest && (./conftest; exit) 2>/dev/null; then + : +else + ac_cv_header_stdc=no +fi +fi +rm -fr conftest* +fi +fi + +echo "$ac_t""$ac_cv_header_stdc" 1>&6 +if test $ac_cv_header_stdc = yes; then + cat >> confdefs.h <<\EOF +#define STDC_HEADERS 1 +EOF + +fi + + for ac_hdr in string.h +do +ac_safe=`echo "$ac_hdr" | tr './\055' '___'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` + cat >> confdefs.h <&6 +fi +done + fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 @@ -1677,7 +1815,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1695,7 +1833,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:1699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1717,7 +1855,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1748,7 +1886,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1779,7 +1917,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1788,7 +1926,7 @@ ptrdiff_t p ; return 0; } EOF -if { (eval echo configure:1792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_ptrdiff_t=yes else @@ -1828,7 +1966,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return 0; } @@ -1836,7 +1974,7 @@ char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1860,7 +1998,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* ac_cv_func_alloca=yes else @@ -1919,7 +2057,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2004,7 +2142,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_c_stack_direction=1 else @@ -2062,7 +2200,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_re_rx_search=yes" else @@ -2111,7 +2249,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2161,7 +2299,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2214,7 +2352,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2267,7 +2405,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2318,7 +2456,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2367,7 +2505,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_getopt_long=yes" else @@ -2415,7 +2553,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* gt_cv_func_obstack=yes else @@ -2451,7 +2589,7 @@ ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break fi @@ -2489,7 +2627,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2543,7 +2681,7 @@ ac_cv_func_mmap=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_func_mmap=yes else @@ -2640,12 +2778,12 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2677,7 +2815,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2732,7 +2870,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2792,7 +2930,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return 0; } @@ -2800,7 +2938,7 @@ return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* ud_cv_val_LC_MESSAGES=yes else @@ -2861,12 +2999,12 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2888,7 +3026,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:3042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2929,7 +3067,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:3095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_gettext=yes" else @@ -3009,7 +3147,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:3175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3120,7 +3258,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:3271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -3172,7 +3310,7 @@ ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:3322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3209,7 +3347,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:3375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -3583,12 +3721,12 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* diff -ur id-utils-3.1/configure.in id-utils-3.2/configure.in --- id-utils-3.1/configure.in Wed Jul 17 17:31:02 1996 +++ id-utils-3.2/configure.in Tue Aug 6 23:16:19 1996 @@ -19,8 +19,8 @@ ############################################################################## PACKAGE=id-utils -VERSION=3.1 -PACKAGE_VERSION="$PACKAGE-$VERSION" +VERSION=3.2 +PACKAGE_VERSION="GNU $PACKAGE $VERSION" AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_DEFINE_UNQUOTED(PACKAGE_VERSION, "$PACKAGE_VERSION") @@ -32,7 +32,7 @@ ################ Maintainer Stuff ############################################ ############################################################################## -jm_MAINTAINER_MODE +AM_MAINTAINER_MODE ALL_LINGUAS="de fr" @@ -50,7 +50,7 @@ AC_PROG_CC AC_PROG_LN_S -fp_PROG_INSTALL +AM_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_CPP AC_PROG_GCC_TRADITIONAL @@ -82,7 +82,7 @@ ############################################################################## AC_C_CONST -fp_C_PROTOTYPES +AM_C_PROTOTYPES AC_TYPE_SIGNAL AC_TYPE_OFF_T AC_TYPE_SIZE_T diff -ur id-utils-3.1/doc/Makefile.in id-utils-3.2/doc/Makefile.in --- id-utils-3.1/doc/Makefile.in Wed Jul 17 17:58:16 1996 +++ id-utils-3.2/doc/Makefile.in Tue Aug 6 23:27:21 1996 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.0 from Makefile.am +# Makefile.in generated automatically by automake 1.1b from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -51,7 +51,8 @@ DVIS = id-utils.dvi TEXINFOS = id-utils.texi -DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti version.texi +DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \ +version.texi PACKAGE = @PACKAGE@ @@ -97,20 +98,24 @@ @MAINT@rm -f stamp-vti version.texi id-utils.info: id-utils.texi version.texi +id-utils.dvi: id-utils.texi version.texi .texi.info: - $(MAKEINFO) -I$(srcdir) $< -o $@ + cd $(srcdir) \ + && $(MAKEINFO) `echo $< | sed 's,.*/,,'` .texi.dvi: TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $< install-info: $(INFO_DEPS) $(mkinstalldirs) $(infodir) - for file in $(INFO_DEPS); do \ + for file in $(INFO_DEPS); do \ for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ - test -f $$ifile && $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile || true; \ - done; \ + if test -f $(srcdir)/$$ifile; then \ + $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \ + else : ; fi; \ + done; \ done uninstall-info: @@ -133,8 +138,9 @@ TAGS: -subdir = doc distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = doc distdir: $(DEP_DISTFILES) @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \ test -f $(distdir)/$$file \ diff -ur id-utils-3.1/doc/id-utils.info id-utils-3.2/doc/id-utils.info --- id-utils-3.1/doc/id-utils.info Wed Jul 17 17:58:26 1996 +++ id-utils-3.2/doc/id-utils.info Tue Aug 6 23:24:28 1996 @@ -1,5 +1,5 @@ -This is Info file ../../doc/id-utils.info, produced by Makeinfo-1.63 -from the input file ../../doc/id-utils.texi. +This is Info file id-utils.info, produced by Makeinfo-1.63 from the +input file id-utils.texi. START-INFO-DIR-ENTRY * ID database: (id-utils). Identifier database utilities. @@ -34,7 +34,7 @@ ID utilities ************ - This manual documents version 3.1 of the ID utilities. + This manual documents version 3.2 of the ID utilities. * Menu: @@ -1147,30 +1147,30 @@  Tag Table: -Node: Top1298 -Node: Introduction2051 -Node: Quick start4580 -Node: Common options5505 -Node: Universal options6303 -Node: Reading options6628 -Node: Writing options7745 -Node: Walker options8241 -Node: File listing options9080 -Node: Extraction options10171 -Node: Language map12721 -Node: C/C++ scanner14927 -Node: Assembler scanner16542 -Node: Text scanner18638 -Node: Defining scanners19446 -Node: mkid invocation20668 -Node: lid invocation22949 -Node: lid aliases28334 -Node: Emacs gid interface29012 -Node: eid invocation29929 -Node: fid invocation32513 -Node: fnid invocation33200 -Node: xtokid invocation33875 -Node: Past and Future34814 -Node: Index37506 +Node: Top1278 +Node: Introduction2031 +Node: Quick start4560 +Node: Common options5485 +Node: Universal options6283 +Node: Reading options6608 +Node: Writing options7725 +Node: Walker options8221 +Node: File listing options9060 +Node: Extraction options10151 +Node: Language map12701 +Node: C/C++ scanner14907 +Node: Assembler scanner16522 +Node: Text scanner18618 +Node: Defining scanners19426 +Node: mkid invocation20648 +Node: lid invocation22929 +Node: lid aliases28314 +Node: Emacs gid interface28992 +Node: eid invocation29909 +Node: fid invocation32493 +Node: fnid invocation33180 +Node: xtokid invocation33855 +Node: Past and Future34794 +Node: Index37486  End Tag Table diff -ur id-utils-3.1/doc/version.texi id-utils-3.2/doc/version.texi --- id-utils-3.1/doc/version.texi Wed Jul 17 17:58:25 1996 +++ id-utils-3.2/doc/version.texi Tue Aug 6 23:18:34 1996 @@ -1,3 +1,3 @@ @set UPDATED 4 July 1996 -@set EDITION 3.1 -@set VERSION 3.1 +@set EDITION 3.2 +@set VERSION 3.2 diff -ur id-utils-3.1/lib/Makefile.in id-utils-3.2/lib/Makefile.in --- id-utils-3.1/lib/Makefile.in Wed Jul 17 17:58:16 1996 +++ id-utils-3.2/lib/Makefile.in Tue Aug 6 23:27:21 1996 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.0 from Makefile.am +# Makefile.in generated automatically by automake 1.1b from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -71,7 +71,7 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LINK = $(CC) $(LDFLAGS) -o $@ sys_OBJECTS = xgetcwd.o xmalloc.o EXTRA_sys_SOURCES = @@ -107,14 +107,14 @@ mostlyclean-noinstLIBRARIES: clean-noinstLIBRARIES: - rm -f $(noinst_LIBFILES) + test -z "$(noinst_LIBFILES)" || rm -f $(noinst_LIBFILES) distclean-noinstLIBRARIES: maintainer-clean-noinstLIBRARIES: .c.o: - $(COMPILE) $< + $(COMPILE) -c $< mostlyclean-compile: rm -f *.o core @@ -145,12 +145,13 @@ clean-tags: distclean-tags: - rm -f TAGS ID maintainer-clean-tags: + rm -f TAGS ID -subdir = lib distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = lib distdir: $(DEP_DISTFILES) @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \ test -f $(distdir)/$$file \ diff -ur id-utils-3.1/libidu/Makefile.in id-utils-3.2/libidu/Makefile.in --- id-utils-3.1/libidu/Makefile.in Wed Jul 17 17:58:16 1996 +++ id-utils-3.2/libidu/Makefile.in Tue Aug 6 23:27:21 1996 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.0 from Makefile.am +# Makefile.in generated automatically by automake 1.1b from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -69,7 +69,7 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LINK = $(CC) $(LDFLAGS) -o $@ ANSI2KNR = @ANSI2KNR@ @@ -85,7 +85,7 @@ HEADERS = $(noinst_HEADERS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = Makefile.am Makefile.in ansi2knr.1 ansi2knr.c PACKAGE = @PACKAGE@ @@ -112,14 +112,14 @@ mostlyclean-noinstLIBRARIES: clean-noinstLIBRARIES: - rm -f $(noinst_LIBFILES) + test -z "$(noinst_LIBFILES)" || rm -f $(noinst_LIBFILES) distclean-noinstLIBRARIES: maintainer-clean-noinstLIBRARIES: .c.o: - $(COMPILE) $< + $(COMPILE) -c $< mostlyclean-compile: rm -f *.o core @@ -135,15 +135,15 @@ $(ANSI2KNR) $< > $*.tmp && mv $*.tmp $@ ._c._o: - @echo $(COMPILE) $< + @echo $(COMPILE) -c $< @rm -f _$*.c - @ln $< _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c + @ln $< _$*.c && $(COMPILE) -c _$*.c && mv _$*.o $@ && rm _$*.c .c._o: $(ANSI2KNR) $< > $*.tmp && mv $*.tmp $*._c - @echo $(COMPILE) $*._c + @echo $(COMPILE) -c $*._c @rm -f _$*.c - @ln $*._c _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c + @ln $*._c _$*.c && $(COMPILE) -c _$*.c && mv _$*.o $@ && rm _$*.c ansi2knr: ansi2knr.o $(LINK) ansi2knr.o $(LIBS) @@ -195,12 +195,13 @@ clean-tags: distclean-tags: - rm -f TAGS ID maintainer-clean-tags: + rm -f TAGS ID -subdir = libidu distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = libidu distdir: $(DEP_DISTFILES) @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \ test -f $(distdir)/$$file \ Only in id-utils-3.2/libidu: ansi2knr.1 Only in id-utils-3.2/libidu: ansi2knr.c diff -ur id-utils-3.1/libidu/idfile.h id-utils-3.2/libidu/idfile.h --- id-utils-3.1/libidu/idfile.h Wed Jul 17 16:43:43 1996 +++ id-utils-3.2/libidu/idfile.h Tue Aug 6 23:14:33 1996 @@ -25,6 +25,7 @@ # include #endif #include +#include "xstring.h" #include "xobstack.h" #include "hash.h" #include "dynvec.h" diff -ur id-utils-3.1/lisp/Makefile.in id-utils-3.2/lisp/Makefile.in --- id-utils-3.1/lisp/Makefile.in Wed Jul 17 17:58:16 1996 +++ id-utils-3.2/lisp/Makefile.in Tue Aug 6 23:27:21 1996 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.0 from Makefile.am +# Makefile.in generated automatically by automake 1.1b from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,7 +46,7 @@ CONFIG_HEADER = ../config.h SCRIPTS = $(elc_SCRIPTS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = Makefile.am Makefile.in elisp-comp PACKAGE = @PACKAGE@ @@ -86,8 +86,9 @@ TAGS: -subdir = lisp distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = lisp distdir: $(DEP_DISTFILES) @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \ test -f $(distdir)/$$file \ @@ -153,7 +154,7 @@ @echo "WARNING: Warnings can be ignored. :-)" $(SHELL) $(srcdir)/elisp-comp $< .SUFFIXES: -.SUFFIXES: $(SUFFIXES) +.SUFFIXES: .el .elc # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Binary files id-utils-3.1/po/de.gmo and id-utils-3.2/po/de.gmo differ diff -ur id-utils-3.1/po/de.po id-utils-3.2/po/de.po --- id-utils-3.1/po/de.po Wed Jul 17 17:58:23 1996 +++ id-utils-3.2/po/de.po Tue Aug 6 23:27:28 1996 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU mkid 3.0.8\n" -"POT-Creation-Date: 1996-07-17 17:58-0400\n" +"POT-Creation-Date: 1996-08-06 23:24-0400\n" "PO-Revision-Date: 1996-03-23 22:34 MET\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -36,7 +36,7 @@ msgid "can't determine the io_size of a string!" msgstr "" -#: libidu/idread.c:45 src/mkid.c:386 src/xtokid.c:213 +#: libidu/idread.c:45 src/mkid.c:386 src/xtokid.c:214 #, c-format msgid "can't open `%s'" msgstr "" @@ -245,7 +245,7 @@ msgid "%s: option requires an argument -- %c\n" msgstr "" -#: src/fid.c:70 src/fnid.c:49 src/lid.c:237 src/mkid.c:120 src/xtokid.c:42 +#: src/fid.c:70 src/fnid.c:49 src/lid.c:237 src/mkid.c:120 src/xtokid.c:43 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -400,7 +400,7 @@ msgid "can't match regular-expression: memory exhausted" msgstr "" -#: src/mkid.c:145 src/xtokid.c:63 +#: src/mkid.c:145 src/xtokid.c:64 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "" @@ -527,7 +527,7 @@ msgid "level %d: %ld/%ld = %.0f%%\n" msgstr "level %d: %ld == %ld\n" -#: src/xtokid.c:67 +#: src/xtokid.c:68 msgid "" "Print all tokens found in a source file.\n" " -i, --include=LANGS include languages in LANGS (default: \"C C++ " diff -ur id-utils-3.1/po/id-utils.pot id-utils-3.2/po/id-utils.pot --- id-utils-3.1/po/id-utils.pot Wed Jul 17 17:58:23 1996 +++ id-utils-3.2/po/id-utils.pot Tue Aug 6 23:24:27 1996 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1996-07-17 17:58-0400\n" +"POT-Creation-Date: 1996-08-06 23:24-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,7 +36,7 @@ msgid "can't determine the io_size of a string!" msgstr "" -#: libidu/idread.c:45 src/mkid.c:386 src/xtokid.c:213 +#: libidu/idread.c:45 src/mkid.c:386 src/xtokid.c:214 #, c-format msgid "can't open `%s'" msgstr "" @@ -244,7 +244,7 @@ msgid "%s: option requires an argument -- %c\n" msgstr "" -#: src/fid.c:70 src/fnid.c:49 src/lid.c:237 src/mkid.c:120 src/xtokid.c:42 +#: src/fid.c:70 src/fnid.c:49 src/lid.c:237 src/mkid.c:120 src/xtokid.c:43 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -396,7 +396,7 @@ msgid "can't match regular-expression: memory exhausted" msgstr "" -#: src/mkid.c:145 src/xtokid.c:63 +#: src/mkid.c:145 src/xtokid.c:64 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "" @@ -520,7 +520,7 @@ msgid "level %d: %ld/%ld = %.0f%%\n" msgstr "" -#: src/xtokid.c:67 +#: src/xtokid.c:68 msgid "" "Print all tokens found in a source file.\n" " -i, --include=LANGS include languages in LANGS (default: \"C C++ " diff -ur id-utils-3.1/src/Makefile.in id-utils-3.2/src/Makefile.in --- id-utils-3.1/src/Makefile.in Wed Jul 17 17:58:16 1996 +++ id-utils-3.2/src/Makefile.in Tue Aug 6 23:27:21 1996 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.0 from Makefile.am +# Makefile.in generated automatically by automake 1.1b from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -67,7 +67,7 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LINK = $(CC) $(LDFLAGS) -o $@ ANSI2KNR = @ANSI2KNR@ @@ -94,7 +94,7 @@ xtokid_LDADD = $(LDADD) SCRIPTS = $(bin_SCRIPTS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = Makefile.am Makefile.in ansi2knr.1 ansi2knr.c PACKAGE = @PACKAGE@ @@ -121,7 +121,7 @@ mostlyclean-binPROGRAMS: clean-binPROGRAMS: - rm -f $(bin_PROGRAMS) + test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) distclean-binPROGRAMS: @@ -141,7 +141,7 @@ done .c.o: - $(COMPILE) $< + $(COMPILE) -c $< mostlyclean-compile: rm -f *.o core @@ -157,15 +157,15 @@ $(ANSI2KNR) $< > $*.tmp && mv $*.tmp $@ ._c._o: - @echo $(COMPILE) $< + @echo $(COMPILE) -c $< @rm -f _$*.c - @ln $< _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c + @ln $< _$*.c && $(COMPILE) -c _$*.c && mv _$*.o $@ && rm _$*.c .c._o: $(ANSI2KNR) $< > $*.tmp && mv $*.tmp $*._c - @echo $(COMPILE) $*._c + @echo $(COMPILE) -c $*._c @rm -f _$*.c - @ln $*._c _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c + @ln $*._c _$*.c && $(COMPILE) -c _$*.c && mv _$*.o $@ && rm _$*.c ansi2knr: ansi2knr.o $(LINK) ansi2knr.o $(LIBS) @@ -232,19 +232,20 @@ clean-tags: distclean-tags: - rm -f TAGS ID maintainer-clean-tags: + rm -f TAGS ID -subdir = src distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = src distdir: $(DEP_DISTFILES) @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \ test -f $(distdir)/$$file \ || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $(srcdir)/$$file $(distdir)/$$file; \ done -fid$o: ../src/fid.c ../lib/xstring.h ../lib/xunistd.h \ +fid$o: fid.c ../lib/xstring.h ../lib/xunistd.h \ ../libidu/xnls.h ../libidu/idfile.h ../lib/xobstack.h \ ../lib/xmalloc.h ../libidu/hash.h ../libidu/dynvec.h \ ../libidu/tokflags.h ../lib/error.h ../lib/pathmax.h \ @@ -265,11 +266,10 @@ ../lib/xobstack.h ../lib/xmalloc.h ../libidu/hash.h \ ../libidu/dynvec.h ../libidu/tokflags.h ../libidu/scanners.h \ ../lib/error.h ../lib/xalloca.h -xtokid$o: ../src/xtokid.c ../libidu/xnls.h \ +xtokid$o: xtokid.c ../lib/xstring.h ../libidu/xnls.h \ ../libidu/scanners.h ../lib/xobstack.h ../lib/xmalloc.h \ - ../lib/xstring.h ../libidu/idfile.h ../libidu/hash.h \ - ../libidu/dynvec.h ../libidu/tokflags.h ../lib/pathmax.h \ - ../lib/error.h + ../libidu/idfile.h ../libidu/hash.h ../libidu/dynvec.h \ + ../libidu/tokflags.h ../lib/pathmax.h ../lib/error.h info: diff -ur id-utils-3.1/src/fid.c id-utils-3.2/src/fid.c --- id-utils-3.1/src/fid.c Tue Jul 9 00:19:09 1996 +++ id-utils-3.2/src/fid.c Tue Aug 6 23:22:14 1996 @@ -203,6 +203,7 @@ struct file_link **members; struct file_link **end = &members_0[idh.idh_files]; struct file_link *fn_flink = 0; + char *file_name_buf = ALLOCA (char, PATH_MAX); int has_slash = (strchr (file_name, '/') != 0); int file_name_length = strlen (file_name); int idx = -1; @@ -220,12 +221,11 @@ } else if (has_slash) { - char *file_name = ALLOCA (char, PATH_MAX); int member_length; - maybe_relative_file_name (file_name, flink, cw_dlink); - member_length = strlen (file_name); + maybe_relative_file_name (file_name_buf, flink, cw_dlink); + member_length = strlen (file_name_buf); if (file_name_length > member_length - || !strequ (&file_name[member_length - file_name_length], file_name)) + || !strequ (&file_name_buf[member_length - file_name_length], file_name)) continue; } else if (!strequ (flink->fl_name, file_name)) diff -ur id-utils-3.1/src/lid.c id-utils-3.2/src/lid.c --- id-utils-3.1/src/lid.c Wed Jul 17 16:55:21 1996 +++ id-utils-3.2/src/lid.c Tue Aug 6 22:43:28 1996 @@ -714,7 +714,7 @@ if (eid_arg) { sprintf (ed_arg_buffer, eid_arg, pattern); - *--argv = ed_arg_buffer; + *argv-- = ed_arg_buffer; } *(char const **) argv = editor; execvp (editor, argv); diff -ur id-utils-3.1/src/xtokid.c id-utils-3.2/src/xtokid.c --- id-utils-3.1/src/xtokid.c Tue Jul 9 00:19:09 1996 +++ id-utils-3.2/src/xtokid.c Tue Aug 6 23:14:34 1996 @@ -19,6 +19,7 @@ #include #include #include +#include "xstring.h" #include "xnls.h" #include "scanners.h" #include "idfile.h" diff -ur id-utils-3.1/testsuite/Makefile.in id-utils-3.2/testsuite/Makefile.in --- id-utils-3.1/testsuite/Makefile.in Wed Jul 17 17:58:16 1996 +++ id-utils-3.2/testsuite/Makefile.in Tue Aug 6 23:27:22 1996 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.0 from Makefile.am +# Makefile.in generated automatically by automake 1.1b from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -67,8 +67,9 @@ TAGS: -subdir = testsuite distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = testsuite distdir: $(DEP_DISTFILES) @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \ test -f $(distdir)/$$file \ @@ -82,7 +83,7 @@ all=`expr $$all + 1`; \ if test -f $$tst; then dir=.; \ else dir="$(srcdir)"; fi; \ - if $$dir/$$tst; then \ + if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \ echo "PASS: $$tst"; \ else \ failed=`expr $$failed + 1`; \