diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | libidu/Makefile.in | 55 | ||||
| -rw-r--r-- | po/de.po | 60 | ||||
| -rw-r--r-- | po/fr.po | 60 |
5 files changed, 92 insertions, 95 deletions
@@ -1,5 +1,13 @@ 1999-03-28 Greg McGary <gkm@gnu.org> + * libidu/hash.c (hash_insert): hash_insert_at no longer + returns old contents, but rather the new slot address. + (hash_insert_at): Return slot address of inserted item. + * libidu/walker.c (get_member_file): return member. + (get_link_from_dirent, get_link_from_string): Conform + to new hash_insert_at API, where return value is slot + address of newly inserted item. + * Makefile.am (AUTOMAKE_OPTIONS): Add macro. * config.h.in (WITH_REGEX): Remove. @@ -4,6 +4,8 @@ id-utils TODO - Future directions - Fix file name handling for non-UNIX file systems (notably DOS, Windoze & OS/2). - Fix assumption that (sizeof (int) == sizeof (long)) + - Integrate changes for MSDOS via djgpp + - Port to cygwin * lid - use "long long" (if available) integer comparisons @@ -33,7 +35,7 @@ id-utils TODO - Future directions * grep - Hack GNU grep to use a mkid database for hints about which files to - search. + search. Local Variables: diff --git a/libidu/Makefile.in b/libidu/Makefile.in index 2a0a6f3..a14844e 100644 --- a/libidu/Makefile.in +++ b/libidu/Makefile.in @@ -10,7 +10,6 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. - SHELL = @SHELL@ srcdir = @srcdir@ @@ -77,7 +76,6 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@ LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -94,7 +92,8 @@ VERSION = @VERSION@ l = @l@ lispdir = @lispdir@ -AUTOMAKE_OPTIONS = ansi2knr + +AUTOMAKE_OPTIONS = ../src/ansi2knr noinst_LIBRARIES = libidu.a @@ -107,7 +106,7 @@ EXTRA_DIST = $(idu_DATA) noinst_HEADERS = dynvec.h hash.h idfile.h scanners.h tokflags.h xnls.h -INCLUDES = -I. -I$(srcdir) -I../lib -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl -I.. -I$(top_srcdir) +INCLUDES = -I. -I$(srcdir) -I../lib -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl -I.. -I$(top_srcdir) DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -117,7 +116,7 @@ LIBRARIES = $(noinst_LIBRARIES) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -ANSI2KNR = @ANSI2KNR@ +ANSI2KNR = ../src/ansi2knr libidu_a_LIBADD = libidu_a_OBJECTS = dynvec$U.o hash$U.o idfile$U.o idread$U.o \ idwrite$U.o fnprint$U.o scanners$U.o walker$U.o @@ -176,18 +175,11 @@ distclean-compile: -rm -f *.tab.c maintainer-clean-compile: +../src/ansi2knr: ../src/ansi2knr.o + cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr -mostlyclean-krextra: - -clean-krextra: - -rm -f ansi2knr - -distclean-krextra: - -maintainer-clean-krextra: -ansi2knr: ansi2knr.o - $(LINK) ansi2knr.o $(LIBS) -ansi2knr.o: $(CONFIG_HEADER) +../src/ansi2knr.o: + cd ../src && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o mostlyclean-kr: @@ -341,7 +333,7 @@ install-am: all-am install: install-am uninstall-am: uninstall-iduDATA uninstall: uninstall-am -all-am: Makefile $(ANSI2KNR) $(LIBRARIES) $(DATA) $(HEADERS) +all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install @@ -359,27 +351,26 @@ distclean-generic: maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-krextra mostlyclean-kr mostlyclean-tags \ - mostlyclean-depend mostlyclean-generic + mostlyclean-kr mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic mostlyclean: mostlyclean-am -clean-am: clean-noinstLIBRARIES clean-compile clean-krextra clean-kr \ - clean-tags clean-depend clean-generic mostlyclean-am +clean-am: clean-noinstLIBRARIES clean-compile clean-kr clean-tags \ + clean-depend clean-generic mostlyclean-am clean: clean-am -distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-krextra distclean-kr distclean-tags \ - distclean-depend distclean-generic clean-am +distclean-am: distclean-noinstLIBRARIES distclean-compile distclean-kr \ + distclean-tags distclean-depend distclean-generic \ + clean-am distclean: distclean-am maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ - maintainer-clean-compile maintainer-clean-krextra \ - maintainer-clean-kr maintainer-clean-tags \ - maintainer-clean-depend maintainer-clean-generic \ - distclean-am + maintainer-clean-compile maintainer-clean-kr \ + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -388,9 +379,8 @@ maintainer-clean: maintainer-clean-am .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-krextra distclean-krextra \ -clean-krextra maintainer-clean-krextra mostlyclean-kr distclean-kr \ -clean-kr maintainer-clean-kr uninstall-iduDATA install-iduDATA tags \ +maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \ +maintainer-clean-kr uninstall-iduDATA install-iduDATA tags \ mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ distdir mostlyclean-depend distclean-depend clean-depend \ maintainer-clean-depend info-am info dvi-am dvi check check-am \ @@ -401,9 +391,6 @@ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean -ansi2knr.c: $(top_srcdir)/src/ansi2knr.c - ln $(top_srcdir)/src/ansi2knr.c . - # 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. .NOEXPORT: @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU mkid 3.0.8\n" -"POT-Creation-Date: 1999-01-28 09:05-0600\n" +"POT-Creation-Date: 1999-03-28 02:08-0700\n" "PO-Revision-Date: 1996-03-23 22:34 MET\n" "Last-Translator: Karl Eichwalder <ke@ke.Central.DE>\n" "Language-Team: German <de@li.org>\n" @@ -18,17 +18,17 @@ msgstr "" msgid "can't allocate %ld bytes for hash table: memory exhausted" msgstr "" -#: libidu/hash.c:258 +#: libidu/hash.c:264 #, fuzzy msgid "Load=%ld/%ld=%.0f%%, " msgstr "\"Load\"=%ld/%ld=%.2f, " -#: libidu/hash.c:260 +#: libidu/hash.c:266 #, c-format msgid "Rehash=%d, " msgstr "\"Rehash\"=%d, " -#: libidu/hash.c:261 +#: libidu/hash.c:267 msgid "Collisions=%ld/%ld=%.0f%%" msgstr "" @@ -104,7 +104,7 @@ msgstr "Kein Scanner für die Sprache '%s'" msgid "can't read entire language map file `%s'" msgstr "" -#: libidu/scanners.c:417 +#: libidu/scanners.c:413 msgid "" "C language:\n" " -k,--keep=CHARS Allow CHARS in single-token strings, keep the " @@ -115,17 +115,17 @@ msgid "" "strings\n" msgstr "" -#: libidu/scanners.c:686 libidu/scanners.c:990 libidu/scanners.c:1193 +#: libidu/scanners.c:682 libidu/scanners.c:986 libidu/scanners.c:1189 #, c-format msgid "junk: `%c'" msgstr "\"junk\": '%c'" -#: libidu/scanners.c:688 libidu/scanners.c:992 libidu/scanners.c:1195 +#: libidu/scanners.c:684 libidu/scanners.c:988 libidu/scanners.c:1191 #, c-format msgid "junk: `\\%03o'" msgstr "\"junk\": '\\%03o'" -#: libidu/scanners.c:792 +#: libidu/scanners.c:788 msgid "" "Assembly language:\n" " -c,--comment=CHARS Any of CHARS starts a comment until end-of-line\n" @@ -135,7 +135,7 @@ msgid "" " -n,--no-cpp Don't handle C pre-processor directives\n" msgstr "" -#: libidu/scanners.c:1096 +#: libidu/scanners.c:1092 msgid "" "Text language:\n" " -i,--include=CHAR-CLASS Treat characters of CHAR-CLASS as token " @@ -245,7 +245,7 @@ msgstr "" 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:43 +#: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:120 src/xtokid.c:43 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -273,7 +273,7 @@ msgstr "" msgid "too many file name arguments" msgstr "" -#: src/fid.c:153 src/fnid.c:148 src/lid.c:411 +#: src/fid.c:153 src/fnid.c:148 src/lid.c:407 msgid "can't locate `ID'" msgstr "" @@ -302,12 +302,12 @@ msgid "" " --version output version information and exit\n" msgstr "" -#: src/lid.c:245 +#: src/lid.c:241 #, c-format msgid "Usage: %s [OPTION]... PATTERN...\n" msgstr "" -#: src/lid.c:249 +#: src/lid.c:245 #, c-format msgid "" "Query ID database and report results.\n" @@ -352,51 +352,51 @@ msgid "" " --version output version information and exit\n" msgstr "" -#: src/lid.c:285 +#: src/lid.c:281 msgid "braces" msgstr "" -#: src/lid.c:285 +#: src/lid.c:281 msgid "space" msgstr "" -#: src/lid.c:351 +#: src/lid.c:347 msgid "notice: use of `-e' is deprecated, use `-r' instead" msgstr "" -#: src/lid.c:432 +#: src/lid.c:428 #, fuzzy, c-format msgid "All identifiers are non-ambiguous within the first %d characters\n" msgstr "" "Alle Bezeichner (id's) sind verschieden hinsichtlich der ersten %d Zeichen\n" -#: src/lid.c:467 +#: src/lid.c:463 #, c-format msgid "invalid `--key' style: `%s'" msgstr "" -#: src/lid.c:479 +#: src/lid.c:475 #, c-format msgid "invalid `--result' style: `%s'" msgstr "" # Muss hier auf `_j_ ... / nq' umgestellt werden???? #. FIXME: i18n of responses -#: src/lid.c:636 +#: src/lid.c:632 #, fuzzy msgid "edit? [y1-9^S/nq] " msgstr "Editieren? [y1-9^S/nq] " -#: src/lid.c:705 +#: src/lid.c:701 msgid "can't fork" msgstr "" -#: src/lid.c:723 +#: src/lid.c:719 #, c-format msgid "can't exec `%s'" msgstr "" -#: src/lid.c:854 +#: src/lid.c:849 msgid "can't match regular-expression: memory exhausted" msgstr "" @@ -479,7 +479,7 @@ msgstr "Kommentar=%ld\n" #: src/mkid.c:450 #, fuzzy, c-format -msgid "Files=%lu, " +msgid "Files=%d, " msgstr "Dateien=%d, " #: src/mkid.c:451 @@ -497,32 +497,32 @@ msgstr "Bytes=%ld Kb, " msgid "Heap=%ld+%ld Kb, " msgstr "\"Heap\"=%ld Kb, " -#: src/mkid.c:456 +#: src/mkid.c:455 #, c-format msgid "Output=%ld (%ld tok, %ld hit)\n" msgstr "Ausgabe=%ld (%ld tok, %ld hit)\n" # Frequenz übersetzen? ke -#: src/mkid.c:460 +#: src/mkid.c:458 #, fuzzy, c-format msgid ", Freq=%ld/%ld=%.2f\n" msgstr "\"Freq\"=%ld/%ld=%.2f\n" -#: src/mkid.c:484 +#: src/mkid.c:481 msgid "Sorting tokens...\n" msgstr "Sortiere \"Token\"...\n" -#: src/mkid.c:490 +#: src/mkid.c:487 #, c-format msgid "Writing `%s'...\n" msgstr "Schreibe '%s'...\n" -#: src/mkid.c:493 +#: src/mkid.c:490 #, c-format msgid "can't create `%s'" msgstr "" -#: src/mkid.c:639 +#: src/mkid.c:636 #, fuzzy msgid "level %d: %ld/%ld = %.0f%%\n" msgstr "level %d: %ld == %ld\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-01-28 09:05-0600\n" +"POT-Creation-Date: 1999-03-28 02:08-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -29,17 +29,17 @@ msgstr "" msgid "can't allocate %ld bytes for hash table: memory exhausted" msgstr "" -#: libidu/hash.c:258 +#: libidu/hash.c:264 #, fuzzy msgid "Load=%ld/%ld=%.0f%%, " msgstr "Charge=%ld/%ld=%.2f, " -#: libidu/hash.c:260 +#: libidu/hash.c:266 #, c-format msgid "Rehash=%d, " msgstr "Rehacher=%d, " -#: libidu/hash.c:261 +#: libidu/hash.c:267 msgid "Collisions=%ld/%ld=%.0f%%" msgstr "" @@ -115,7 +115,7 @@ msgstr "Pas d'analyseur lexical pour le langag `%s'" msgid "can't read entire language map file `%s'" msgstr "" -#: libidu/scanners.c:417 +#: libidu/scanners.c:413 msgid "" "C language:\n" " -k,--keep=CHARS Allow CHARS in single-token strings, keep the " @@ -126,17 +126,17 @@ msgid "" "strings\n" msgstr "" -#: libidu/scanners.c:686 libidu/scanners.c:990 libidu/scanners.c:1193 +#: libidu/scanners.c:682 libidu/scanners.c:986 libidu/scanners.c:1189 #, c-format msgid "junk: `%c'" msgstr "déchet: `%c'" -#: libidu/scanners.c:688 libidu/scanners.c:992 libidu/scanners.c:1195 +#: libidu/scanners.c:684 libidu/scanners.c:988 libidu/scanners.c:1191 #, c-format msgid "junk: `\\%03o'" msgstr "déchet: `\\%03o'" -#: libidu/scanners.c:792 +#: libidu/scanners.c:788 msgid "" "Assembly language:\n" " -c,--comment=CHARS Any of CHARS starts a comment until end-of-line\n" @@ -146,7 +146,7 @@ msgid "" " -n,--no-cpp Don't handle C pre-processor directives\n" msgstr "" -#: libidu/scanners.c:1096 +#: libidu/scanners.c:1092 msgid "" "Text language:\n" " -i,--include=CHAR-CLASS Treat characters of CHAR-CLASS as token " @@ -256,7 +256,7 @@ msgstr "" 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:43 +#: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:120 src/xtokid.c:43 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -284,7 +284,7 @@ msgstr "" msgid "too many file name arguments" msgstr "" -#: src/fid.c:153 src/fnid.c:148 src/lid.c:411 +#: src/fid.c:153 src/fnid.c:148 src/lid.c:407 msgid "can't locate `ID'" msgstr "" @@ -313,12 +313,12 @@ msgid "" " --version output version information and exit\n" msgstr "" -#: src/lid.c:245 +#: src/lid.c:241 #, c-format msgid "Usage: %s [OPTION]... PATTERN...\n" msgstr "" -#: src/lid.c:249 +#: src/lid.c:245 #, c-format msgid "" "Query ID database and report results.\n" @@ -363,49 +363,49 @@ msgid "" " --version output version information and exit\n" msgstr "" -#: src/lid.c:285 +#: src/lid.c:281 msgid "braces" msgstr "" -#: src/lid.c:285 +#: src/lid.c:281 msgid "space" msgstr "" -#: src/lid.c:351 +#: src/lid.c:347 msgid "notice: use of `-e' is deprecated, use `-r' instead" msgstr "" -#: src/lid.c:432 +#: src/lid.c:428 #, fuzzy, c-format msgid "All identifiers are non-ambiguous within the first %d characters\n" msgstr "Tous les identificateurs sont unique dans les premiers %d caractères\n" -#: src/lid.c:467 +#: src/lid.c:463 #, c-format msgid "invalid `--key' style: `%s'" msgstr "" -#: src/lid.c:479 +#: src/lid.c:475 #, c-format msgid "invalid `--result' style: `%s'" msgstr "" #. FIXME: i18n of responses -#: src/lid.c:636 +#: src/lid.c:632 #, fuzzy msgid "edit? [y1-9^S/nq] " msgstr "Éditer? [y1-9^S/nq] " -#: src/lid.c:705 +#: src/lid.c:701 msgid "can't fork" msgstr "" -#: src/lid.c:723 +#: src/lid.c:719 #, c-format msgid "can't exec `%s'" msgstr "" -#: src/lid.c:854 +#: src/lid.c:849 msgid "can't match regular-expression: memory exhausted" msgstr "" @@ -487,7 +487,7 @@ msgstr "Commentaire=%ld\n" #: src/mkid.c:450 #, fuzzy, c-format -msgid "Files=%lu, " +msgid "Files=%d, " msgstr "Fichiers=%d, " #: src/mkid.c:451 @@ -505,31 +505,31 @@ msgstr "Octets=%ld Kb, " msgid "Heap=%ld+%ld Kb, " msgstr "tas=%ld Kb, " -#: src/mkid.c:456 +#: src/mkid.c:455 #, c-format msgid "Output=%ld (%ld tok, %ld hit)\n" msgstr "Sortie=%ld (%ld unités lexicales, %ld Touches)\n" -#: src/mkid.c:460 +#: src/mkid.c:458 #, fuzzy, c-format msgid ", Freq=%ld/%ld=%.2f\n" msgstr "Freq=%ld/%ld=%.2f\n" -#: src/mkid.c:484 +#: src/mkid.c:481 msgid "Sorting tokens...\n" msgstr "Tri unités lexicales...\n" -#: src/mkid.c:490 +#: src/mkid.c:487 #, c-format msgid "Writing `%s'...\n" msgstr "Écriture `%s'...\n" -#: src/mkid.c:493 +#: src/mkid.c:490 #, c-format msgid "can't create `%s'" msgstr "" -#: src/mkid.c:639 +#: src/mkid.c:636 #, fuzzy msgid "level %d: %ld/%ld = %.0f%%\n" msgstr "niveau %d: %ld == %ld\n" |