diff options
| author | Claudio Fontana <sick_soul@users.sourceforge.net> | 2005-12-27 04:24:57 +0000 |
|---|---|---|
| committer | Claudio Fontana <sick_soul@users.sourceforge.net> | 2005-12-27 04:24:57 +0000 |
| commit | 50916693c92ce904c5a57e1ab6a5a6982d2d67df (patch) | |
| tree | 998f3226f26a9ee835cd5a8ea1d4e5f87070449c | |
| parent | f25997f7039e40474694aa53031d20f6209ba3d8 (diff) | |
| download | idutils-50916693c92ce904c5a57e1ab6a5a6982d2d67df.tar.gz idutils-50916693c92ce904c5a57e1ab6a5a6982d2d67df.tar.bz2 idutils-50916693c92ce904c5a57e1ab6a5a6982d2d67df.zip | |
* started to address portability problems in the id-utils-4.0 release
40 files changed, 931 insertions, 387 deletions
@@ -1,3 +1,24 @@ +2005-12-27 Claudio Fontana <claudio@gnu.org> + + * configure.ac: fixed unwanted change in bugs mailing list address + * configure.ac: moved development to version 4.1 + + * lib/dirname.c, lib/dirname.h [new files]: added dirname module + * lib/basename.c [new file]: likewise + * lib/stripslash.c [new file]: likewise + * lib/Makefile.am: likewise (gnulib-generated) + * m4/dirname.m4, m4/dos.m4 [new files]: likewise + + * libidu/idfile.c: add missing include directive for strsep.h + * libidu/scanners.c: likewise + * libidu/walker.c: likewise + + * libidu/scanners.c: add missing include for alloca.h + * libidu/walker.c: likewise + + * src/mkid.c: add include directive for dirname.h + * src/lid.c: likewise + 2005-12-15 Claudio Fontana <claudio@gnu.org> * src/mkid.c: tweak alloc-ed size of token signature to a minimum of 1 byte. Fixes assertion failure filed as savannah support request diff --git a/Makefile.in b/Makefile.in index ce4f97a..74073d4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,6 +46,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/closeout.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ @@ -1125,6 +1125,8 @@ m4_include([m4/atexit.m4]) m4_include([m4/closeout.m4]) m4_include([m4/codeset.m4]) m4_include([m4/d-ino.m4]) +m4_include([m4/dirname.m4]) +m4_include([m4/dos.m4]) m4_include([m4/error.m4]) m4_include([m4/exclude.m4]) m4_include([m4/exitfail.m4]) diff --git a/config.h.in b/config.h.in index eadaddc..cfa859f 100644 --- a/config.h.in +++ b/config.h.in @@ -16,6 +16,22 @@ language is requested. */ #undef ENABLE_NLS +/* Define on systems for which file names may have a so-called `drive letter' + prefix, define this to compute the length of that prefix, including the + colon. */ +#undef FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX + +/* Define if the backslash character may also serve as a file name component + separator. */ +#undef FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR + +#if FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX +# define FILE_SYSTEM_PREFIX_LEN(Filename) \ + ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0) +#else +# define FILE_SYSTEM_PREFIX_LEN(Filename) 0 +#endif + /* Define to 1 if you have `alloca' after including <alloca.h>, a header that may be supplied by this distribution. */ #undef HAVE_ALLOCA @@ -380,6 +396,12 @@ /* Define if integer division by zero raises signal SIGFPE. */ #undef INTDIV0_RAISES_SIGFPE +#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +#else +# define ISSLASH(C) ((C) == '/') +#endif + /* Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for id-utils 4.0. +# Generated by GNU Autoconf 2.59 for id-utils 4.1. # -# Report bugs to <bug-id-utils@gnu.org>. +# Report bugs to <bug-gnu-utils@gnu.org>. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -269,9 +269,9 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='id-utils' PACKAGE_TARNAME='id-utils' -PACKAGE_VERSION='4.0' -PACKAGE_STRING='id-utils 4.0' -PACKAGE_BUGREPORT='bug-id-utils@gnu.org' +PACKAGE_VERSION='4.1' +PACKAGE_STRING='id-utils 4.1' +PACKAGE_BUGREPORT='bug-gnu-utils@gnu.org' ac_unique_file="config.h.in" # Factoring default headers for most tests. @@ -790,7 +790,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures id-utils 4.0 to adapt to many kinds of systems. +\`configure' configures id-utils 4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -856,7 +856,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of id-utils 4.0:";; + short | recursive ) echo "Configuration of id-utils 4.1:";; esac cat <<\_ACEOF @@ -901,7 +901,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <bug-id-utils@gnu.org>. +Report bugs to <bug-gnu-utils@gnu.org>. _ACEOF fi @@ -997,7 +997,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -id-utils configure 4.0 +id-utils configure 4.1 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1011,7 +1011,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by id-utils $as_me 4.0, which was +It was created by id-utils $as_me 4.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1673,7 +1673,7 @@ fi # Define the identity of the package. PACKAGE='id-utils' - VERSION='4.0' + VERSION='4.1' cat >>confdefs.h <<_ACEOF @@ -3573,9 +3573,9 @@ echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -3934,9 +3934,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4165,9 +4165,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -6207,9 +6207,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -6993,9 +6993,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -8225,9 +8225,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -9166,9 +9166,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -11261,6 +11261,91 @@ fi; # gnulib + + echo "$as_me:$LINENO: checking whether system is Windows or MSDOS" >&5 +echo $ECHO_N "checking whether system is Windows or MSDOS... $ECHO_C" >&6 +if test "${ac_cv_win_or_dos+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ && !defined __CYGWIN__ +neither MSDOS nor Windows +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_win_or_dos=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_win_or_dos=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $ac_cv_win_or_dos" >&5 +echo "${ECHO_T}$ac_cv_win_or_dos" >&6 + + if test x"$ac_cv_win_or_dos" = xyes; then + ac_fs_accepts_drive_letter_prefix=1 + ac_fs_backslash_is_file_name_separator=1 + else + ac_fs_accepts_drive_letter_prefix=0 + ac_fs_backslash_is_file_name_separator=0 + fi + + + + + +cat >>confdefs.h <<_ACEOF +#define FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX $ac_fs_accepts_drive_letter_prefix +_ACEOF + + + + + + +cat >>confdefs.h <<_ACEOF +#define FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR $ac_fs_backslash_is_file_name_separator +_ACEOF + + echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5 echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6 if test "${ac_cv_have_decl_strerror_r+set}" = set; then @@ -12400,9 +12485,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -12953,9 +13038,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -14017,6 +14102,20 @@ esac : + + case $LIBOBJS in + "dirname.$ac_objext" | \ + *" dirname.$ac_objext" | \ + "dirname.$ac_objext "* | \ + *" dirname.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS dirname.$ac_objext" ;; +esac + + + + + + echo "$as_me:$LINENO: checking for error_at_line" >&5 echo $ECHO_N "checking for error_at_line... $ECHO_C" >&6 if test "${ac_cv_lib_error_at_line+set}" = set; then @@ -14502,9 +14601,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -14677,9 +14776,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -15438,9 +15537,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -15812,9 +15911,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -16584,9 +16683,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to bug-id-utils@gnu.org ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-gnu-utils@gnu.org ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -18478,7 +18577,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by id-utils $as_me 4.0, which was +This file was extended by id-utils $as_me 4.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18541,7 +18640,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -id-utils config.status 4.0 +id-utils config.status 4.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 883692f..606c483 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([id-utils], [4.0], [bug-id-utils@gnu.org]) +AC_INIT([id-utils], [4.1], [bug-gnu-utils@gnu.org]) AC_GNU_SOURCE AM_INIT_AUTOMAKE diff --git a/doc/Makefile.in b/doc/Makefile.in index 5a58027..4047e83 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -43,6 +43,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/closeout.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ diff --git a/doc/version.texi b/doc/version.texi index 0ea9ff1..8f6d5ea 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ @set UPDATED 9 November 2005 @set UPDATED-MONTH November 2005 -@set EDITION 4.0 -@set VERSION 4.0 +@set EDITION 4.1 +@set VERSION 4.1 diff --git a/lib/Makefile.am b/lib/Makefile.am index e04136e..4ab24b9 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -8,7 +8,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --aux-dir=. --macro-prefix=gl alloca alloca-opt atexit closeout error exclude exit exitfail extensions fnmatch fnmatch-gnu fpending getcwd getopt gettext gettext-h havelib inttostr lstat malloc mbchar mbuiter memchr memcpy mempcpy memset obstack pathmax quotearg realloc regex restrict stat-macros stdbool strcase strcspn strdup strnlen1 strpbrk strsep strstr xalloc xalloc-die xgetcwd +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --aux-dir=. --macro-prefix=gl alloca alloca-opt atexit closeout dirname error exclude exit exitfail extensions fnmatch fnmatch-gnu fpending getcwd getopt gettext gettext-h havelib inttostr lstat malloc mbchar mbuiter memchr memcpy mempcpy memset obstack pathmax quotearg realloc regex restrict stat-macros stdbool strcase strcspn strdup strnlen1 strpbrk strsep strstr xalloc xalloc-die xgetcwd AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies @@ -44,6 +44,12 @@ MOSTLYCLEANFILES += alloca.h alloca.h-t ## end gnulib module alloca-opt +## begin gnulib module dirname + +libgnu_a_SOURCES += basename.c stripslash.c + +## end gnulib module dirname + ## begin gnulib module exit libgnu_a_SOURCES += exit.h diff --git a/lib/Makefile.in b/lib/Makefile.in index 19e3585..242b7c3 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -23,7 +23,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --aux-dir=. --macro-prefix=gl alloca alloca-opt atexit closeout error exclude exit exitfail extensions fnmatch fnmatch-gnu fpending getcwd getopt gettext gettext-h havelib inttostr lstat malloc mbchar mbuiter memchr memcpy mempcpy memset obstack pathmax quotearg realloc regex restrict stat-macros stdbool strcase strcspn strdup strnlen1 strpbrk strsep strstr xalloc xalloc-die xgetcwd +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --aux-dir=. --macro-prefix=gl alloca alloca-opt atexit closeout dirname error exclude exit exitfail extensions fnmatch fnmatch-gnu fpending getcwd getopt gettext gettext-h havelib inttostr lstat malloc mbchar mbuiter memchr memcpy mempcpy memset obstack pathmax quotearg realloc regex restrict stat-macros stdbool strcase strcspn strdup strnlen1 strpbrk strsep strstr xalloc xalloc-die xgetcwd SOURCES = $(libgnu_a_SOURCES) @@ -51,20 +51,22 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in __fpending.c \ - __fpending.h alloca.c atexit.c closeout.c closeout.h error.c \ - error.h exclude.c exclude.h exitfail.c exitfail.h fnmatch.c \ - getcwd.c getcwd.h getopt.c getopt1.c imaxtostr.c intprops.h \ - inttostr.c inttostr.h lstat.c lstat.h malloc.c mbchar.c \ - memchr.c memcpy.c mempcpy.c mempcpy.h memset.c obstack.c \ - obstack.h offtostr.c pathmax.h quotearg.c quotearg.h realloc.c \ - regcomp.c regex.c regex.h regex_internal.c regex_internal.h \ - regexec.c stat-macros.h strcasecmp.c strcspn.c strdup.c \ - strdup.h strncasecmp.c strpbrk.c strsep.c strstr.c umaxtostr.c \ - xalloc.h xgetcwd.c xgetcwd.h xmalloc.c + __fpending.h alloca.c atexit.c closeout.c closeout.h dirname.c \ + dirname.h error.c error.h exclude.c exclude.h exitfail.c \ + exitfail.h fnmatch.c getcwd.c getcwd.h getopt.c getopt1.c \ + imaxtostr.c intprops.h inttostr.c inttostr.h lstat.c lstat.h \ + malloc.c mbchar.c memchr.c memcpy.c mempcpy.c mempcpy.h \ + memset.c obstack.c obstack.h offtostr.c pathmax.h quotearg.c \ + quotearg.h realloc.c regcomp.c regex.c regex.h \ + regex_internal.c regex_internal.h regexec.c stat-macros.h \ + strcasecmp.c strcspn.c strdup.c strdup.h strncasecmp.c \ + strpbrk.c strsep.c strstr.c umaxtostr.c xalloc.h xgetcwd.c \ + xgetcwd.h xmalloc.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/closeout.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ @@ -108,7 +110,8 @@ AR = ar ARFLAGS = cru libgnu_a_AR = $(AR) $(ARFLAGS) libgnu_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@ -am_libgnu_a_OBJECTS = strnlen1.$(OBJEXT) xalloc-die.$(OBJEXT) +am_libgnu_a_OBJECTS = basename.$(OBJEXT) stripslash.$(OBJEXT) \ + strnlen1.$(OBJEXT) xalloc-die.$(OBJEXT) libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = @@ -246,8 +249,9 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies noinst_LIBRARIES = libgnu.a -libgnu_a_SOURCES = exit.h gettext.h mbchar.h mbuiter.h strcase.h \ - strnlen1.h strnlen1.c strpbrk.h strsep.h strstr.h xalloc-die.c +libgnu_a_SOURCES = basename.c stripslash.c exit.h gettext.h mbchar.h \ + mbuiter.h strcase.h strnlen1.h strnlen1.c strpbrk.h strsep.h \ + strstr.h xalloc-die.c libgnu_a_LIBADD = @LIBOBJS@ @ALLOCA@ EXTRA_DIST = alloca_.h fnmatch_.h fnmatch_loop.c getopt_.h \ getopt_int.h inttostr.c stdbool_.h diff --git a/lib/basename.c b/lib/basename.c new file mode 100644 index 0000000..5cc97cd --- /dev/null +++ b/lib/basename.c @@ -0,0 +1,79 @@ +/* basename.c -- return the last element in a file name + + Copyright (C) 1990, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free + Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#include "dirname.h" +#include <string.h> + +/* In general, we can't use the builtin `basename' function if available, + since it has different meanings in different environments. + In some environments the builtin `basename' modifies its argument. + + Return the address of the last file name component of NAME. If + NAME has no file name components because it is all slashes, return + NAME if it is empty, the address of its last slash otherwise. */ + +char * +base_name (char const *name) +{ + char const *base = name + FILE_SYSTEM_PREFIX_LEN (name); + char const *p; + + for (p = base; *p; p++) + { + if (ISSLASH (*p)) + { + /* Treat multiple adjacent slashes like a single slash. */ + do p++; + while (ISSLASH (*p)); + + /* If the file name ends in slash, use the trailing slash as + the basename if no non-slashes have been found. */ + if (! *p) + { + if (ISSLASH (*base)) + base = p - 1; + break; + } + + /* *P is a non-slash preceded by a slash. */ + base = p; + } + } + + return (char *) base; +} + +/* Return the length of of the basename NAME. Typically NAME is the + value returned by base_name. Act like strlen (NAME), except omit + redundant trailing slashes. */ + +size_t +base_len (char const *name) +{ + size_t len; + + for (len = strlen (name); 1 < len && ISSLASH (name[len - 1]); len--) + continue; + + return len; +} diff --git a/lib/dirname.c b/lib/dirname.c new file mode 100644 index 0000000..e2b9d64 --- /dev/null +++ b/lib/dirname.c @@ -0,0 +1,121 @@ +/* dirname.c -- return all but the last element in a file name + + Copyright (C) 1990, 1998, 2000, 2001, 2003, 2004, 2005 Free Software + Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#include "dirname.h" + +#include <string.h> +#include "xalloc.h" + +/* Return the length of `dirname (FILE)', or zero if FILE is + in the working directory. Works properly even if + there are trailing slashes (by effectively ignoring them). */ +size_t +dir_len (char const *file) +{ + size_t prefix_length = FILE_SYSTEM_PREFIX_LEN (file); + size_t length; + + /* Strip the basename and any redundant slashes before it. */ + for (length = base_name (file) - file; prefix_length < length; length--) + if (! ISSLASH (file[length - 1])) + return length; + + /* But don't strip the only slash from "/". */ + return prefix_length + ISSLASH (file[prefix_length]); +} + +/* Return the leading directories part of FILE, + allocated with xmalloc. + Works properly even if there are trailing slashes + (by effectively ignoring them). */ + +char * +dir_name (char const *file) +{ + size_t length = dir_len (file); + bool append_dot = (length == FILE_SYSTEM_PREFIX_LEN (file)); + char *dir = xmalloc (length + append_dot + 1); + memcpy (dir, file, length); + if (append_dot) + dir[length++] = '.'; + dir[length] = 0; + return dir; +} + +#ifdef TEST_DIRNAME +/* + +Run the test like this (expect no output): + gcc -DHAVE_CONFIG_H -DTEST_DIRNAME -I.. -O -Wall \ + basename.c dirname.c xmalloc.c error.c + sed -n '/^BEGIN-DATA$/,/^END-DATA$/p' dirname.c|grep -v DATA|./a.out + +If it's been built on a DOS or Windows platforms, run another test like +this (again, expect no output): + sed -n '/^BEGIN-DOS-DATA$/,/^END-DOS-DATA$/p' dirname.c|grep -v DATA|./a.out + +BEGIN-DATA +foo//// . +bar/foo//// bar +foo/ . +/ / +. . +a . +END-DATA + +BEGIN-DOS-DATA +c:///// c:/ +c:/ c:/ +c:/. c:/ +c:foo c:. +c:foo/bar c:foo +END-DOS-DATA + +*/ + +# define MAX_BUFF_LEN 1024 +# include <stdio.h> + +char *program_name; + +int +main (int argc, char *argv[]) +{ + char buff[MAX_BUFF_LEN + 1]; + + program_name = argv[0]; + + buff[MAX_BUFF_LEN] = 0; + while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0]) + { + char file[MAX_BUFF_LEN]; + char expected_result[MAX_BUFF_LEN]; + char const *result; + sscanf (buff, "%s %s", file, expected_result); + result = dir_name (file); + if (strcmp (result, expected_result)) + printf ("%s: got %s, expected %s\n", file, result, expected_result); + } + return 0; +} +#endif diff --git a/lib/dirname.h b/lib/dirname.h new file mode 100644 index 0000000..1688ae8 --- /dev/null +++ b/lib/dirname.h @@ -0,0 +1,47 @@ +/* Take file names apart into directory and base names. + + Copyright (C) 1998, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifndef DIRNAME_H_ +# define DIRNAME_H_ 1 + +# include <stdbool.h> +# include <stddef.h> + +# ifndef DIRECTORY_SEPARATOR +# define DIRECTORY_SEPARATOR '/' +# endif + +# ifndef ISSLASH +# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR) +# endif + +# ifndef FILE_SYSTEM_PREFIX_LEN +# define FILE_SYSTEM_PREFIX_LEN(File_name) 0 +# endif + +# define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)]) +# define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F)) + +char *base_name (char const *file); +char *dir_name (char const *file); +size_t base_len (char const *file); +size_t dir_len (char const *file); + +bool strip_trailing_slashes (char *file); + +#endif /* not DIRNAME_H_ */ diff --git a/lib/stripslash.c b/lib/stripslash.c new file mode 100644 index 0000000..9b55da4 --- /dev/null +++ b/lib/stripslash.c @@ -0,0 +1,40 @@ +/* stripslash.c -- remove redundant trailing slashes from a file name + + Copyright (C) 1990, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#include "dirname.h" + +/* Remove trailing slashes from FILE. + Return true if a trailing slash was removed. + This is useful when using file name completion from a shell that + adds a "/" after directory names (such as tcsh and bash), because + the Unix rename and rmdir system calls return an "Invalid argument" error + when given a file that ends in "/" (except for the root directory). */ + +bool +strip_trailing_slashes (char *file) +{ + char *base = base_name (file); + char *base_lim = base + base_len (base); + bool had_slash = (*base_lim != '\0'); + *base_lim = '\0'; + return had_slash; +} diff --git a/libidu/Makefile.in b/libidu/Makefile.in index 76ad8b6..30cb6fa 100644 --- a/libidu/Makefile.in +++ b/libidu/Makefile.in @@ -45,6 +45,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/closeout.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ diff --git a/libidu/dynvec.c b/libidu/dynvec.c index b098214..2b75490 100644 --- a/libidu/dynvec.c +++ b/libidu/dynvec.c @@ -19,8 +19,8 @@ #include <config.h> #include <stdlib.h> +#include <xalloc.h> #include "dynvec.h" -#include "xalloc.h" struct dynvec * make_dynvec (int n) diff --git a/libidu/fnprint.c b/libidu/fnprint.c index 1ba0159..45ad946 100644 --- a/libidu/fnprint.c +++ b/libidu/fnprint.c @@ -22,10 +22,11 @@ #include <alloca.h> #include <unistd.h> #include <string.h> -#include "pathmax.h" +#include <pathmax.h> +#include <error.h> + #include "idfile.h" #include "xnls.h" -#include "error.h" #include "iduglobal.h" char const *root_name (char const *path); diff --git a/libidu/hash.c b/libidu/hash.c index ce93fa7..7941ad5 100644 --- a/libidu/hash.c +++ b/libidu/hash.c @@ -20,10 +20,11 @@ #include <config.h> #include <stdio.h> #include <stdlib.h> +#include <xalloc.h> +#include <error.h> + #include "hash.h" #include "xnls.h" -#include "xalloc.h" -#include "error.h" static void hash_rehash (struct hash_table* ht); static unsigned long round_up_2 (unsigned long rough); diff --git a/libidu/idfile.c b/libidu/idfile.c index 04afb16..6d2d539 100644 --- a/libidu/idfile.c +++ b/libidu/idfile.c @@ -22,11 +22,13 @@ #include <errno.h> #include <stdlib.h> #include <string.h> +#include <strsep.h> #include <sys/stat.h> +#include <obstack.h> +#include <error.h> + #include "xnls.h" -#include "obstack.h" #include "idfile.h" -#include "error.h" int io_size (FILE *, void *, unsigned int size, int); diff --git a/libidu/idread.c b/libidu/idread.c index 4d4215f..81301d0 100644 --- a/libidu/idread.c +++ b/libidu/idread.c @@ -22,12 +22,12 @@ #include <stddef.h> #include <errno.h> #include <stdlib.h> +#include <obstack.h> +#include <xalloc.h> +#include <error.h> #include "idfile.h" #include "hash.h" -#include "error.h" -#include "obstack.h" -#include "xalloc.h" #include "xnls.h" #include "iduglobal.h" diff --git a/libidu/idwrite.c b/libidu/idwrite.c index 08aa480..ac88edf 100644 --- a/libidu/idwrite.c +++ b/libidu/idwrite.c @@ -19,12 +19,13 @@ #include <config.h> #include <stdlib.h> +#include <obstack.h> +#include <xalloc.h> +#include <error.h> + #include "idfile.h" #include "hash.h" -#include "obstack.h" -#include "xalloc.h" #include "xnls.h" -#include "error.h" int file_link_qsort_compare (void const *x, void const *y); diff --git a/libidu/scanners.c b/libidu/scanners.c index eaeb8b9..3ede033 100644 --- a/libidu/scanners.c +++ b/libidu/scanners.c @@ -26,10 +26,12 @@ #include <unistd.h> #include <sys/stat.h> #include <string.h> +#include <strsep.h> #include <errno.h> -#include "xalloc.h" +#include <xalloc.h> +#include <error.h> + #include "xnls.h" -#include "error.h" #include "scanners.h" #include "tokflags.h" #include "iduglobal.h" diff --git a/libidu/walker.c b/libidu/walker.c index 7b63e5d..c3e5369 100644 --- a/libidu/walker.c +++ b/libidu/walker.c @@ -24,17 +24,19 @@ #include <stddef.h> #include <unistd.h> #include <string.h> +#include <strsep.h> #include <fnmatch.h> #include <dirent.h> #include <errno.h> +#include <alloca.h> +#include <xalloc.h> +#include <error.h> +#include <pathmax.h> + #include "xnls.h" #include "idfile.h" -#include "error.h" -#include "xalloc.h" #include "dynvec.h" #include "scanners.h" -#include "pathmax.h" -#include "xalloc.h" #include "iduglobal.h" int walker_verbose_flag = 0; diff --git a/lisp/Makefile.in b/lisp/Makefile.in index a0651bb..f91faef 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -43,6 +43,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/closeout.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ diff --git a/m4/Makefile.in b/m4/Makefile.in index 9ebf7a4..2c2dcba 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -41,6 +41,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/closeout.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ diff --git a/m4/dirname.m4 b/m4/dirname.m4 new file mode 100644 index 0000000..e36937d --- /dev/null +++ b/m4/dirname.m4 @@ -0,0 +1,16 @@ +# dirname.m4 serial 5 +dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_DIRNAME], +[ + AC_LIBSOURCES([dirname.c, dirname.h]) + AC_LIBOBJ([dirname]) + + dnl Prerequisites of lib/dirname.h. + AC_REQUIRE([gl_AC_DOS]) + + dnl No prerequisites of lib/basename.c, lib/dirname.c, lib/stripslash.c. +]) diff --git a/m4/dos.m4 b/m4/dos.m4 new file mode 100644 index 0000000..0713cf1 --- /dev/null +++ b/m4/dos.m4 @@ -0,0 +1,58 @@ +#serial 9 + +# Define some macros required for proper operation of code in lib/*.c +# on MSDOS/Windows systems. + +# Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# From Jim Meyering. + +AC_DEFUN([gl_AC_DOS], + [ + AC_CACHE_CHECK([whether system is Windows or MSDOS], [ac_cv_win_or_dos], + [ + AC_TRY_COMPILE([], + [#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ && !defined __CYGWIN__ +neither MSDOS nor Windows +#endif], + [ac_cv_win_or_dos=yes], + [ac_cv_win_or_dos=no]) + ]) + + if test x"$ac_cv_win_or_dos" = xyes; then + ac_fs_accepts_drive_letter_prefix=1 + ac_fs_backslash_is_file_name_separator=1 + else + ac_fs_accepts_drive_letter_prefix=0 + ac_fs_backslash_is_file_name_separator=0 + fi + + AH_VERBATIM(FILE_SYSTEM_PREFIX_LEN, + [#if FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX +# define FILE_SYSTEM_PREFIX_LEN(Filename) \ + ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0) +#else +# define FILE_SYSTEM_PREFIX_LEN(Filename) 0 +#endif]) + + AC_DEFINE_UNQUOTED([FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX], + $ac_fs_accepts_drive_letter_prefix, + [Define on systems for which file names may have a so-called + `drive letter' prefix, define this to compute the length of that + prefix, including the colon.]) + + AH_VERBATIM(ISSLASH, + [#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +#else +# define ISSLASH(C) ((C) == '/') +#endif]) + + AC_DEFINE_UNQUOTED([FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR], + $ac_fs_backslash_is_file_name_separator, + [Define if the backslash character may also serve as a file name + component separator.]) + ]) diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index 0cd632c..2257882 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -14,10 +14,10 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --aux-dir=. --macro-prefix=gl alloca alloca-opt atexit closeout error exclude exit exitfail extensions fnmatch fnmatch-gnu fpending getcwd getopt gettext gettext-h havelib inttostr lstat malloc mbchar mbuiter memchr memcpy mempcpy memset obstack pathmax quotearg realloc regex restrict stat-macros stdbool strcase strcspn strdup strnlen1 strpbrk strsep strstr xalloc xalloc-die xgetcwd +# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --aux-dir=. --macro-prefix=gl alloca alloca-opt atexit closeout dirname error exclude exit exitfail extensions fnmatch fnmatch-gnu fpending getcwd getopt gettext gettext-h havelib inttostr lstat malloc mbchar mbuiter memchr memcpy mempcpy memset obstack pathmax quotearg realloc regex restrict stat-macros stdbool strcase strcspn strdup strnlen1 strpbrk strsep strstr xalloc xalloc-die xgetcwd # Specification in the form of a few gnulib-tool.m4 macro invocations: -gl_MODULES([alloca alloca-opt atexit closeout error exclude exit exitfail extensions fnmatch fnmatch-gnu fpending getcwd getopt gettext gettext-h havelib inttostr lstat malloc mbchar mbuiter memchr memcpy mempcpy memset obstack pathmax quotearg realloc regex restrict stat-macros stdbool strcase strcspn strdup strnlen1 strpbrk strsep strstr xalloc xalloc-die xgetcwd]) +gl_MODULES([alloca alloca-opt atexit closeout dirname error exclude exit exitfail extensions fnmatch fnmatch-gnu fpending getcwd getopt gettext gettext-h havelib inttostr lstat malloc mbchar mbuiter memchr memcpy mempcpy memset obstack pathmax quotearg realloc regex restrict stat-macros stdbool strcase strcspn strdup strnlen1 strpbrk strsep strstr xalloc xalloc-die xgetcwd]) gl_AVOID([]) gl_SOURCE_BASE([lib]) gl_M4_BASE([m4]) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index f33dbbb..96b0f7c 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -29,6 +29,7 @@ AC_DEFUN([gl_INIT], gl_FUNC_ALLOCA gl_FUNC_ATEXIT gl_CLOSEOUT + gl_DIRNAME gl_ERROR gl_EXCLUDE gl_EXITFAIL @@ -75,8 +76,11 @@ AC_DEFUN([gl_FILE_LIST], [ lib/alloca.c lib/alloca_.h lib/atexit.c + lib/basename.c lib/closeout.c lib/closeout.h + lib/dirname.c + lib/dirname.h lib/error.c lib/error.h lib/exclude.c @@ -129,6 +133,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/strcspn.c lib/strdup.c lib/strdup.h + lib/stripslash.c lib/strncasecmp.c lib/strnlen1.c lib/strnlen1.h @@ -149,6 +154,8 @@ AC_DEFUN([gl_FILE_LIST], [ m4/closeout.m4 m4/codeset.m4 m4/d-ino.m4 + m4/dirname.m4 + m4/dos.m4 m4/error.m4 m4/exclude.m4 m4/exitfail.m4 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU mkid 3.0.8\n" "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n" -"POT-Creation-Date: 2005-12-15 16:37+0100\n" +"POT-Creation-Date: 2005-12-27 04:46+0100\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" @@ -39,11 +39,11 @@ msgstr "\"Rehash\"=%d, " msgid "Collisions=%ld/%ld=%.0f%%" msgstr "" -#: libidu/idfile.c:104 +#: libidu/idfile.c:105 msgid "can't determine the io_size of a string!" msgstr "" -#: libidu/idread.c:49 src/mkid.c:474 src/xtokid.c:227 +#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:227 #, c-format msgid "can't open `%s'" msgstr "" @@ -73,45 +73,45 @@ msgstr "" msgid "unsupported size in io_write (): %d" msgstr "Nicht unterstützte Größe (`size') in \"io_write ()\": %d" -#: libidu/scanners.c:100 +#: libidu/scanners.c:101 #, fuzzy, c-format msgid "unrecognized language: `%s'" msgstr "Kein Scanner für die Sprache '%s'" -#: libidu/scanners.c:146 +#: libidu/scanners.c:147 msgid "can't allocate language args obstack: memory exhausted" msgstr "" -#: libidu/scanners.c:200 libidu/scanners.c:269 +#: libidu/scanners.c:201 libidu/scanners.c:270 msgid "can't allocate language args: memory exhausted" msgstr "" -#: libidu/scanners.c:208 +#: libidu/scanners.c:209 #, c-format msgid "language name expected following `%s' in file `%s'" msgstr "" -#: libidu/scanners.c:263 +#: libidu/scanners.c:264 #, fuzzy, c-format msgid "can't open language map file `%s'" msgstr "Kein Scanner für die Sprache '%s'" -#: libidu/scanners.c:265 +#: libidu/scanners.c:266 #, c-format msgid "can't get size of map file `%s'" msgstr "" -#: libidu/scanners.c:275 +#: libidu/scanners.c:276 #, fuzzy, c-format msgid "can't read language map file `%s'" msgstr "Kein Scanner für die Sprache '%s'" -#: libidu/scanners.c:278 +#: libidu/scanners.c:279 #, c-format msgid "can't read entire language map file `%s'" msgstr "" -#: libidu/scanners.c:423 +#: libidu/scanners.c:424 #, c-format msgid "" "C language:\n" @@ -123,7 +123,7 @@ msgid "" "strings\n" msgstr "" -#: libidu/scanners.c:434 +#: libidu/scanners.c:435 #, c-format msgid "" "C++ language:\n" @@ -135,19 +135,19 @@ msgid "" "strings\n" msgstr "" -#: libidu/scanners.c:717 libidu/scanners.c:988 libidu/scanners.c:1191 -#: libidu/scanners.c:1455 +#: libidu/scanners.c:718 libidu/scanners.c:989 libidu/scanners.c:1192 +#: libidu/scanners.c:1456 #, c-format msgid "junk: `%c'" msgstr "\"junk\": '%c'" -#: libidu/scanners.c:719 libidu/scanners.c:990 libidu/scanners.c:1193 -#: libidu/scanners.c:1457 +#: libidu/scanners.c:720 libidu/scanners.c:991 libidu/scanners.c:1194 +#: libidu/scanners.c:1458 #, c-format msgid "junk: `\\%03o'" msgstr "\"junk\": '\\%03o'" -#: libidu/scanners.c:823 +#: libidu/scanners.c:824 #, c-format msgid "" "Assembly language:\n" @@ -158,7 +158,7 @@ msgid "" " -n,--no-cpp Don't handle C pre-processor directives\n" msgstr "" -#: libidu/scanners.c:1094 +#: libidu/scanners.c:1095 #, c-format msgid "" "Text language:\n" @@ -168,7 +168,7 @@ msgid "" "delimiters\n" msgstr "" -#: libidu/scanners.c:1299 +#: libidu/scanners.c:1300 #, c-format msgid "" "Perl language:\n" @@ -179,55 +179,55 @@ msgid "" " -d,--dtags Include documentation tags\n" msgstr "" -#: libidu/walker.c:111 +#: libidu/walker.c:113 #, c-format msgid "can't read directory `%s' (`.' from `%s')" msgstr "" -#: libidu/walker.c:178 +#: libidu/walker.c:180 #, c-format msgid "notice: `%s' was a %s, but is now a %s!" msgstr "" -#: libidu/walker.c:179 libidu/walker.c:180 +#: libidu/walker.c:181 libidu/walker.c:182 msgid "file" msgstr "" -#: libidu/walker.c:179 libidu/walker.c:180 +#: libidu/walker.c:181 libidu/walker.c:182 msgid "directory" msgstr "" -#: libidu/walker.c:303 +#: libidu/walker.c:305 #, c-format msgid "warning: `%s' and `%s' are the same file, but yield different scans!" msgstr "" -#: libidu/walker.c:397 +#: libidu/walker.c:399 #, c-format msgid "notice: scan parameters changed for `%s'" msgstr "" -#: libidu/walker.c:600 +#: libidu/walker.c:602 #, fuzzy msgid "can't get working directory" msgstr "%s: Name des aktuellen Verzeichnisses nicht zu erreichen." -#: libidu/walker.c:657 +#: libidu/walker.c:659 #, c-format msgid "can't chdir to `%s'" msgstr "" -#: libidu/walker.c:662 +#: libidu/walker.c:664 #, c-format msgid "can't chdir to `%s' from `%s'" msgstr "" -#: libidu/walker.c:723 +#: libidu/walker.c:725 #, c-format msgid "can't lstat `%s' from `%s'" msgstr "" -#: libidu/walker.c:731 +#: libidu/walker.c:733 #, c-format msgid "can't stat `%s' from `%s'" msgstr "" @@ -287,7 +287,7 @@ msgstr "" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" -#: src/fid.c:73 src/fnid.c:53 src/lid.c:237 src/mkid.c:124 src/xtokid.c:47 +#: src/fid.c:73 src/fnid.c:53 src/lid.c:238 src/mkid.c:126 src/xtokid.c:47 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -316,7 +316,7 @@ msgstr "" msgid "too many file name arguments" msgstr "" -#: src/fid.c:159 src/fnid.c:154 src/lid.c:413 +#: src/fid.c:159 src/fnid.c:154 src/lid.c:414 msgid "can't locate `ID'" msgstr "" @@ -346,12 +346,12 @@ msgid "" " --version output version information and exit\n" msgstr "" -#: src/lid.c:245 +#: src/lid.c:246 #, c-format msgid "Usage: %s [OPTION]... PATTERN...\n" msgstr "" -#: src/lid.c:249 +#: src/lid.c:250 #, c-format msgid "" "Query ID database and report results.\n" @@ -396,59 +396,59 @@ msgid "" " --version output version information and exit\n" msgstr "" -#: src/lid.c:285 +#: src/lid.c:286 msgid "braces" msgstr "" -#: src/lid.c:285 +#: src/lid.c:286 msgid "space" msgstr "" -#: src/lid.c:353 +#: src/lid.c:354 msgid "notice: use of `-e' is deprecated, use `-r' instead" msgstr "" -#: src/lid.c:434 +#: src/lid.c:435 #, 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:469 +#: src/lid.c:470 #, c-format msgid "invalid `--key' style: `%s'" msgstr "" -#: src/lid.c:481 +#: src/lid.c:482 #, c-format msgid "invalid `--result' style: `%s'" msgstr "" # Muss hier auf `_j_ ... / nq' umgestellt werden???? -#: src/lid.c:638 +#: src/lid.c:639 #, fuzzy, c-format msgid "edit? [y1-9^S/nq] " msgstr "Editieren? [y1-9^S/nq] " -#: src/lid.c:707 +#: src/lid.c:708 msgid "can't fork" msgstr "" -#: src/lid.c:725 +#: src/lid.c:726 #, c-format msgid "can't exec `%s'" msgstr "" -#: src/lid.c:866 +#: src/lid.c:867 msgid "can't match regular-expression: memory exhausted" msgstr "" -#: src/mkid.c:149 src/xtokid.c:68 +#: src/mkid.c:151 src/xtokid.c:68 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "" -#: src/mkid.c:153 +#: src/mkid.c:155 #, c-format msgid "" "Build an identifier database.\n" @@ -475,104 +475,104 @@ msgid "" "The following arguments apply to the language-specific scanners:\n" msgstr "" -#: src/mkid.c:376 +#: src/mkid.c:378 #, c-format msgid "can't create `%s' in `%s'" msgstr "" -#: src/mkid.c:380 +#: src/mkid.c:382 #, c-format msgid "can't modify `%s'" msgstr "" -#: src/mkid.c:457 +#: src/mkid.c:459 #, c-format msgid "can't stat `%s'" msgstr "" -#: src/mkid.c:526 +#: src/mkid.c:528 #, fuzzy, c-format msgid " new = %d/%d" msgstr ", new=%d/%d" -#: src/mkid.c:535 +#: src/mkid.c:537 #, c-format msgid "Name=%ld, " msgstr "Name=%ld, " -#: src/mkid.c:536 +#: src/mkid.c:538 #, c-format msgid "Number=%ld, " msgstr "Zahl=%ld, " -#: src/mkid.c:537 +#: src/mkid.c:539 #, c-format msgid "String=%ld, " msgstr "Zeichenkette=%ld, " # ist das gemeint? ### -#: src/mkid.c:538 +#: src/mkid.c:540 #, c-format msgid "Literal=%ld, " msgstr "Zeichen=%ld, " -#: src/mkid.c:539 +#: src/mkid.c:541 #, c-format msgid "Comment=%ld\n" msgstr "Kommentar=%ld\n" -#: src/mkid.c:541 +#: src/mkid.c:543 #, fuzzy, c-format msgid "Files=%ld, " msgstr "Dateien=%d, " -#: src/mkid.c:542 +#: src/mkid.c:544 #, c-format msgid "Tokens=%ld, " msgstr "Tokens=%ld, " -#: src/mkid.c:543 +#: src/mkid.c:545 #, c-format msgid "Bytes=%ld Kb, " msgstr "Bytes=%ld Kb, " -#: src/mkid.c:544 +#: src/mkid.c:546 #, fuzzy, c-format msgid "Heap=%d+%d Kb, " msgstr "\"Heap\"=%ld Kb, " -#: src/mkid.c:546 +#: src/mkid.c:548 #, c-format msgid "Output=%ld (%ld tok, %ld hit)\n" msgstr "Ausgabe=%ld (%ld tok, %ld hit)\n" # Frequenz übersetzen? ke -#: src/mkid.c:549 +#: src/mkid.c:551 #, fuzzy, c-format msgid ", Freq=%ld/%ld=%.2f\n" msgstr "\"Freq\"=%ld/%ld=%.2f\n" -#: src/mkid.c:573 +#: src/mkid.c:575 #, c-format msgid "Sorting tokens...\n" msgstr "Sortiere \"Token\"...\n" -#: src/mkid.c:579 +#: src/mkid.c:581 #, c-format msgid "Writing `%s'...\n" msgstr "Schreibe '%s'...\n" -#: src/mkid.c:582 +#: src/mkid.c:584 #, c-format msgid "can't create `%s'" msgstr "" -#: src/mkid.c:650 +#: src/mkid.c:652 #, c-format msgid "error closing `%s'" msgstr "" -#: src/mkid.c:738 +#: src/mkid.c:740 #, fuzzy, c-format msgid "level %d: %ld/%ld = %.0f%%\n" msgstr "level %d: %ld == %ld\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU mkid 3.0.8\n" "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n" -"POT-Creation-Date: 2005-12-15 16:37+0100\n" +"POT-Creation-Date: 2005-12-27 04:46+0100\n" "PO-Revision-Date: 1996-03-23 22:34 MET\n" "Last-Translator: Unknown <unknown@unknown.fr>\n" "Language-Team: French <fr@li.org>\n" @@ -50,11 +50,11 @@ msgstr "Rehacher=%d, " msgid "Collisions=%ld/%ld=%.0f%%" msgstr "" -#: libidu/idfile.c:104 +#: libidu/idfile.c:105 msgid "can't determine the io_size of a string!" msgstr "" -#: libidu/idread.c:49 src/mkid.c:474 src/xtokid.c:227 +#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:227 #, c-format msgid "can't open `%s'" msgstr "" @@ -84,45 +84,45 @@ msgstr "" msgid "unsupported size in io_write (): %d" msgstr "Paramtre taille pass io_write () non suport: %d" -#: libidu/scanners.c:100 +#: libidu/scanners.c:101 #, fuzzy, c-format msgid "unrecognized language: `%s'" msgstr "Pas d'analyseur lexical pour le langag `%s'" -#: libidu/scanners.c:146 +#: libidu/scanners.c:147 msgid "can't allocate language args obstack: memory exhausted" msgstr "" -#: libidu/scanners.c:200 libidu/scanners.c:269 +#: libidu/scanners.c:201 libidu/scanners.c:270 msgid "can't allocate language args: memory exhausted" msgstr "" -#: libidu/scanners.c:208 +#: libidu/scanners.c:209 #, c-format msgid "language name expected following `%s' in file `%s'" msgstr "" -#: libidu/scanners.c:263 +#: libidu/scanners.c:264 #, fuzzy, c-format msgid "can't open language map file `%s'" msgstr "Pas d'analyseur lexical pour le langag `%s'" -#: libidu/scanners.c:265 +#: libidu/scanners.c:266 #, c-format msgid "can't get size of map file `%s'" msgstr "" -#: libidu/scanners.c:275 +#: libidu/scanners.c:276 #, fuzzy, c-format msgid "can't read language map file `%s'" msgstr "Pas d'analyseur lexical pour le langag `%s'" -#: libidu/scanners.c:278 +#: libidu/scanners.c:279 #, c-format msgid "can't read entire language map file `%s'" msgstr "" -#: libidu/scanners.c:423 +#: libidu/scanners.c:424 #, c-format msgid "" "C language:\n" @@ -134,7 +134,7 @@ msgid "" "strings\n" msgstr "" -#: libidu/scanners.c:434 +#: libidu/scanners.c:435 #, c-format msgid "" "C++ language:\n" @@ -146,19 +146,19 @@ msgid "" "strings\n" msgstr "" -#: libidu/scanners.c:717 libidu/scanners.c:988 libidu/scanners.c:1191 -#: libidu/scanners.c:1455 +#: libidu/scanners.c:718 libidu/scanners.c:989 libidu/scanners.c:1192 +#: libidu/scanners.c:1456 #, c-format msgid "junk: `%c'" msgstr "dchet: `%c'" -#: libidu/scanners.c:719 libidu/scanners.c:990 libidu/scanners.c:1193 -#: libidu/scanners.c:1457 +#: libidu/scanners.c:720 libidu/scanners.c:991 libidu/scanners.c:1194 +#: libidu/scanners.c:1458 #, c-format msgid "junk: `\\%03o'" msgstr "dchet: `\\%03o'" -#: libidu/scanners.c:823 +#: libidu/scanners.c:824 #, c-format msgid "" "Assembly language:\n" @@ -169,7 +169,7 @@ msgid "" " -n,--no-cpp Don't handle C pre-processor directives\n" msgstr "" -#: libidu/scanners.c:1094 +#: libidu/scanners.c:1095 #, c-format msgid "" "Text language:\n" @@ -179,7 +179,7 @@ msgid "" "delimiters\n" msgstr "" -#: libidu/scanners.c:1299 +#: libidu/scanners.c:1300 #, c-format msgid "" "Perl language:\n" @@ -190,55 +190,55 @@ msgid "" " -d,--dtags Include documentation tags\n" msgstr "" -#: libidu/walker.c:111 +#: libidu/walker.c:113 #, c-format msgid "can't read directory `%s' (`.' from `%s')" msgstr "" -#: libidu/walker.c:178 +#: libidu/walker.c:180 #, c-format msgid "notice: `%s' was a %s, but is now a %s!" msgstr "" -#: libidu/walker.c:179 libidu/walker.c:180 +#: libidu/walker.c:181 libidu/walker.c:182 msgid "file" msgstr "" -#: libidu/walker.c:179 libidu/walker.c:180 +#: libidu/walker.c:181 libidu/walker.c:182 msgid "directory" msgstr "" -#: libidu/walker.c:303 +#: libidu/walker.c:305 #, c-format msgid "warning: `%s' and `%s' are the same file, but yield different scans!" msgstr "" -#: libidu/walker.c:397 +#: libidu/walker.c:399 #, c-format msgid "notice: scan parameters changed for `%s'" msgstr "" -#: libidu/walker.c:600 +#: libidu/walker.c:602 #, fuzzy msgid "can't get working directory" msgstr "%s: Impossible d'obtenir le rpertoire courant." -#: libidu/walker.c:657 +#: libidu/walker.c:659 #, c-format msgid "can't chdir to `%s'" msgstr "" -#: libidu/walker.c:662 +#: libidu/walker.c:664 #, c-format msgid "can't chdir to `%s' from `%s'" msgstr "" -#: libidu/walker.c:723 +#: libidu/walker.c:725 #, c-format msgid "can't lstat `%s' from `%s'" msgstr "" -#: libidu/walker.c:731 +#: libidu/walker.c:733 #, c-format msgid "can't stat `%s' from `%s'" msgstr "" @@ -298,7 +298,7 @@ msgstr "" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" -#: src/fid.c:73 src/fnid.c:53 src/lid.c:237 src/mkid.c:124 src/xtokid.c:47 +#: src/fid.c:73 src/fnid.c:53 src/lid.c:238 src/mkid.c:126 src/xtokid.c:47 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -327,7 +327,7 @@ msgstr "" msgid "too many file name arguments" msgstr "" -#: src/fid.c:159 src/fnid.c:154 src/lid.c:413 +#: src/fid.c:159 src/fnid.c:154 src/lid.c:414 msgid "can't locate `ID'" msgstr "" @@ -357,12 +357,12 @@ msgid "" " --version output version information and exit\n" msgstr "" -#: src/lid.c:245 +#: src/lid.c:246 #, c-format msgid "Usage: %s [OPTION]... PATTERN...\n" msgstr "" -#: src/lid.c:249 +#: src/lid.c:250 #, c-format msgid "" "Query ID database and report results.\n" @@ -407,57 +407,57 @@ msgid "" " --version output version information and exit\n" msgstr "" -#: src/lid.c:285 +#: src/lid.c:286 msgid "braces" msgstr "" -#: src/lid.c:285 +#: src/lid.c:286 msgid "space" msgstr "" -#: src/lid.c:353 +#: src/lid.c:354 msgid "notice: use of `-e' is deprecated, use `-r' instead" msgstr "" -#: src/lid.c:434 +#: src/lid.c:435 #, 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 caractres\n" -#: src/lid.c:469 +#: src/lid.c:470 #, c-format msgid "invalid `--key' style: `%s'" msgstr "" -#: src/lid.c:481 +#: src/lid.c:482 #, c-format msgid "invalid `--result' style: `%s'" msgstr "" -#: src/lid.c:638 +#: src/lid.c:639 #, fuzzy, c-format msgid "edit? [y1-9^S/nq] " msgstr "diter? [y1-9^S/nq] " -#: src/lid.c:707 +#: src/lid.c:708 msgid "can't fork" msgstr "" -#: src/lid.c:725 +#: src/lid.c:726 #, c-format msgid "can't exec `%s'" msgstr "" -#: src/lid.c:866 +#: src/lid.c:867 msgid "can't match regular-expression: memory exhausted" msgstr "" -#: src/mkid.c:149 src/xtokid.c:68 +#: src/mkid.c:151 src/xtokid.c:68 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "" -#: src/mkid.c:153 +#: src/mkid.c:155 #, c-format msgid "" "Build an identifier database.\n" @@ -484,102 +484,102 @@ msgid "" "The following arguments apply to the language-specific scanners:\n" msgstr "" -#: src/mkid.c:376 +#: src/mkid.c:378 #, c-format msgid "can't create `%s' in `%s'" msgstr "" -#: src/mkid.c:380 +#: src/mkid.c:382 #, c-format msgid "can't modify `%s'" msgstr "" -#: src/mkid.c:457 +#: src/mkid.c:459 #, c-format msgid "can't stat `%s'" msgstr "" -#: src/mkid.c:526 +#: src/mkid.c:528 #, fuzzy, c-format msgid " new = %d/%d" msgstr ", nouveau=%d/%d" -#: src/mkid.c:535 +#: src/mkid.c:537 #, c-format msgid "Name=%ld, " msgstr "Nom=%ld, " -#: src/mkid.c:536 +#: src/mkid.c:538 #, c-format msgid "Number=%ld, " msgstr "Numro=%ld, " -#: src/mkid.c:537 +#: src/mkid.c:539 #, c-format msgid "String=%ld, " msgstr "Chane=%ld, " -#: src/mkid.c:538 +#: src/mkid.c:540 #, c-format msgid "Literal=%ld, " msgstr "Litral=%ld, " -#: src/mkid.c:539 +#: src/mkid.c:541 #, c-format msgid "Comment=%ld\n" msgstr "Commentaire=%ld\n" -#: src/mkid.c:541 +#: src/mkid.c:543 #, fuzzy, c-format msgid "Files=%ld, " msgstr "Fichiers=%d, " -#: src/mkid.c:542 +#: src/mkid.c:544 #, c-format msgid "Tokens=%ld, " msgstr "Units lexicales=%ld, " -#: src/mkid.c:543 +#: src/mkid.c:545 #, c-format msgid "Bytes=%ld Kb, " msgstr "Octets=%ld Kb, " -#: src/mkid.c:544 +#: src/mkid.c:546 #, fuzzy, c-format msgid "Heap=%d+%d Kb, " msgstr "tas=%ld Kb, " -#: src/mkid.c:546 +#: src/mkid.c:548 #, c-format msgid "Output=%ld (%ld tok, %ld hit)\n" msgstr "Sortie=%ld (%ld units lexicales, %ld Touches)\n" -#: src/mkid.c:549 +#: src/mkid.c:551 #, fuzzy, c-format msgid ", Freq=%ld/%ld=%.2f\n" msgstr "Freq=%ld/%ld=%.2f\n" -#: src/mkid.c:573 +#: src/mkid.c:575 #, c-format msgid "Sorting tokens...\n" msgstr "Tri units lexicales...\n" -#: src/mkid.c:579 +#: src/mkid.c:581 #, c-format msgid "Writing `%s'...\n" msgstr "criture `%s'...\n" -#: src/mkid.c:582 +#: src/mkid.c:584 #, c-format msgid "can't create `%s'" msgstr "" -#: src/mkid.c:650 +#: src/mkid.c:652 #, c-format msgid "error closing `%s'" msgstr "" -#: src/mkid.c:738 +#: src/mkid.c:740 #, fuzzy, c-format msgid "level %d: %ld/%ld = %.0f%%\n" msgstr "niveau %d: %ld == %ld\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: id-utils 3.2\n" "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n" -"POT-Creation-Date: 2005-12-15 16:37+0100\n" +"POT-Creation-Date: 2005-12-27 04:46+0100\n" "PO-Revision-Date: 1998-09-30 13:31+02:00\n" "Last-Translator: Ivo Timmermans <zarq@iname.com>\n" "Language-Team: Dutch <nl@li.org>\n" @@ -39,11 +39,11 @@ msgstr "herverfrommeling=%d, " msgid "Collisions=%ld/%ld=%.0f%%" msgstr "Botsingen=%ld/%ld=%.0f%%" -#: libidu/idfile.c:104 +#: libidu/idfile.c:105 msgid "can't determine the io_size of a string!" msgstr "kan de io_size van een letterreeks niet vaststellen!" -#: libidu/idread.c:49 src/mkid.c:474 src/xtokid.c:227 +#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:227 #, c-format msgid "can't open `%s'" msgstr "kan `%s' niet openen" @@ -73,45 +73,45 @@ msgstr "onbekend I/O type: %d" msgid "unsupported size in io_write (): %d" msgstr "niet-ondersteunde afmeting in io_write(): %d" -#: libidu/scanners.c:100 +#: libidu/scanners.c:101 #, c-format msgid "unrecognized language: `%s'" msgstr "niet herkende taal: `%s'" -#: libidu/scanners.c:146 +#: libidu/scanners.c:147 msgid "can't allocate language args obstack: memory exhausted" msgstr "kan geen objectstapel voor taalargumenten vrijmaken: geheugen vol" -#: libidu/scanners.c:200 libidu/scanners.c:269 +#: libidu/scanners.c:201 libidu/scanners.c:270 msgid "can't allocate language args: memory exhausted" msgstr "kan geen geheugen vrijmaken voor taalargumenten: geheugen vol" -#: libidu/scanners.c:208 +#: libidu/scanners.c:209 #, c-format msgid "language name expected following `%s' in file `%s'" msgstr "taalnaam verwacht na `%s' in bestand `%s'" -#: libidu/scanners.c:263 +#: libidu/scanners.c:264 #, c-format msgid "can't open language map file `%s'" msgstr "kan taalbestand `%s' niet openen" -#: libidu/scanners.c:265 +#: libidu/scanners.c:266 #, c-format msgid "can't get size of map file `%s'" msgstr "kan grootte van mapbestand `%s' niet krijgen" -#: libidu/scanners.c:275 +#: libidu/scanners.c:276 #, c-format msgid "can't read language map file `%s'" msgstr "kan taalbestand `%s' niet lezen" -#: libidu/scanners.c:278 +#: libidu/scanners.c:279 #, c-format msgid "can't read entire language map file `%s'" msgstr "kan niet het hele taalbestand `%s' lezen" -#: libidu/scanners.c:423 +#: libidu/scanners.c:424 #, c-format msgid "" "C language:\n" @@ -130,7 +130,7 @@ msgstr "" " -u,--strip-underscore Haal een voorgaand laag liggend streepje (`_')\n" " weg van reeksen van een eenheid\n" -#: libidu/scanners.c:434 +#: libidu/scanners.c:435 #, fuzzy, c-format msgid "" "C++ language:\n" @@ -149,19 +149,19 @@ msgstr "" " -u,--strip-underscore Haal een voorgaand laag liggend streepje (`_')\n" " weg van reeksen van een eenheid\n" -#: libidu/scanners.c:717 libidu/scanners.c:988 libidu/scanners.c:1191 -#: libidu/scanners.c:1455 +#: libidu/scanners.c:718 libidu/scanners.c:989 libidu/scanners.c:1192 +#: libidu/scanners.c:1456 #, c-format msgid "junk: `%c'" msgstr "onzin: `%c'" -#: libidu/scanners.c:719 libidu/scanners.c:990 libidu/scanners.c:1193 -#: libidu/scanners.c:1457 +#: libidu/scanners.c:720 libidu/scanners.c:991 libidu/scanners.c:1194 +#: libidu/scanners.c:1458 #, c-format msgid "junk: `\\%03o'" msgstr "onzin: `\\%03o'" -#: libidu/scanners.c:823 +#: libidu/scanners.c:824 #, c-format msgid "" "Assembly language:\n" @@ -180,7 +180,7 @@ msgstr "" "eenheden\n" " -n,--no-cpp Behandel geen C pre-processor aanwijzingen\n" -#: libidu/scanners.c:1094 +#: libidu/scanners.c:1095 #, c-format msgid "" "Text language:\n" @@ -195,7 +195,7 @@ msgstr "" " -x,--exclude=TEKEN-KLASSE Behandel tekens van TEKEN-KLASSE als " "eenheidscheiding\n" -#: libidu/scanners.c:1299 +#: libidu/scanners.c:1300 #, fuzzy, c-format msgid "" "Perl language:\n" @@ -211,56 +211,56 @@ msgstr "" " -x,--exclude=TEKEN-KLASSE Behandel tekens van TEKEN-KLASSE als " "eenheidscheiding\n" -#: libidu/walker.c:111 +#: libidu/walker.c:113 #, c-format msgid "can't read directory `%s' (`.' from `%s')" msgstr "kan map `%s' niet lezen (`.' van `%s')" -#: libidu/walker.c:178 +#: libidu/walker.c:180 #, c-format msgid "notice: `%s' was a %s, but is now a %s!" msgstr "opmerking: `%s' was een %s, maar is nu een %s!" -#: libidu/walker.c:179 libidu/walker.c:180 +#: libidu/walker.c:181 libidu/walker.c:182 msgid "file" msgstr "bestand" -#: libidu/walker.c:179 libidu/walker.c:180 +#: libidu/walker.c:181 libidu/walker.c:182 msgid "directory" msgstr "map" -#: libidu/walker.c:303 +#: libidu/walker.c:305 #, c-format msgid "warning: `%s' and `%s' are the same file, but yield different scans!" msgstr "" "waarschuwing: `%s' en `%s' zijn het zelfde bestand, maar leveren " "verschillende resultaten op!" -#: libidu/walker.c:397 +#: libidu/walker.c:399 #, c-format msgid "notice: scan parameters changed for `%s'" msgstr "opmerking: leesparameters veranderd voor `%s'" -#: libidu/walker.c:600 +#: libidu/walker.c:602 msgid "can't get working directory" msgstr "kan huidige map niet verkrijgen" -#: libidu/walker.c:657 +#: libidu/walker.c:659 #, c-format msgid "can't chdir to `%s'" msgstr "kan niet naar map `%s' gaan" -#: libidu/walker.c:662 +#: libidu/walker.c:664 #, c-format msgid "can't chdir to `%s' from `%s'" msgstr "kan niet van map `%s' naar `%s' gaan" -#: libidu/walker.c:723 +#: libidu/walker.c:725 #, c-format msgid "can't lstat `%s' from `%s'" msgstr "kan de status van de link `%s' niet opvragen vanuit `%s'" -#: libidu/walker.c:731 +#: libidu/walker.c:733 #, c-format msgid "can't stat `%s' from `%s'" msgstr "kan de status van `%s' niet opvragen vanuit `%s'" @@ -320,7 +320,7 @@ msgstr "%s: optie `%s' is dubbelzinnig\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: optie `--%s' staat geen argumenten toe\n" -#: src/fid.c:73 src/fnid.c:53 src/lid.c:237 src/mkid.c:124 src/xtokid.c:47 +#: src/fid.c:73 src/fnid.c:53 src/lid.c:238 src/mkid.c:126 src/xtokid.c:47 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Probeer `%s --help' voor meer informatie.\n" @@ -356,7 +356,7 @@ msgstr "geen bestandsnaam argumenten" msgid "too many file name arguments" msgstr "te veel bestandsnaam argumenten" -#: src/fid.c:159 src/fnid.c:154 src/lid.c:413 +#: src/fid.c:159 src/fnid.c:154 src/lid.c:414 msgid "can't locate `ID'" msgstr "kan `ID' niet vinden" @@ -393,12 +393,12 @@ msgstr "" " --help geef deze hulp en beëindig\n" " --version geef versie informatie en beëindig\n" -#: src/lid.c:245 +#: src/lid.c:246 #, c-format msgid "Usage: %s [OPTION]... PATTERN...\n" msgstr "Aanroep: %s [OPTIE]... PATROON...\n" -#: src/lid.c:249 +#: src/lid.c:250 #, c-format msgid "" "Query ID database and report results.\n" @@ -483,59 +483,59 @@ msgstr "" " --help display this help and exit\n" " --version output version information and exit\n" -#: src/lid.c:285 +#: src/lid.c:286 msgid "braces" msgstr "accolades" -#: src/lid.c:285 +#: src/lid.c:286 msgid "space" msgstr "spatie" -#: src/lid.c:353 +#: src/lid.c:354 msgid "notice: use of `-e' is deprecated, use `-r' instead" msgstr "" "opmerking: gebruik van `-e' is verouderd, gebruik `-r' in plaats daarvan" -#: src/lid.c:434 +#: src/lid.c:435 #, c-format msgid "All identifiers are non-ambiguous within the first %d characters\n" msgstr "" "Alle namen van variabelen zijn niet dubbelzinnig in de eerste %d tekens\n" -#: src/lid.c:469 +#: src/lid.c:470 #, c-format msgid "invalid `--key' style: `%s'" msgstr "ongeldige `--key' stijl: `%s'" -#: src/lid.c:481 +#: src/lid.c:482 #, c-format msgid "invalid `--result' style: `%s'" msgstr "ongeldige `--result' stijl: `%s'" -#: src/lid.c:638 +#: src/lid.c:639 #, c-format msgid "edit? [y1-9^S/nq] " msgstr "bewerken? [j1-9^S/nq]" -#: src/lid.c:707 +#: src/lid.c:708 msgid "can't fork" msgstr "kan geen nieuw proces beginnen" -#: src/lid.c:725 +#: src/lid.c:726 #, c-format msgid "can't exec `%s'" msgstr "kan `%s' niet uitvoeren" -#: src/lid.c:866 +#: src/lid.c:867 msgid "can't match regular-expression: memory exhausted" msgstr "kan reguliere expressie niet vergelijken: geheugen vol" -#: src/mkid.c:149 src/xtokid.c:68 +#: src/mkid.c:151 src/xtokid.c:68 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Aanroep: %s [OPTIE]... [BESTAND]...\n" -#: src/mkid.c:153 +#: src/mkid.c:155 #, c-format msgid "" "Build an identifier database.\n" @@ -584,102 +584,102 @@ msgstr "" "\n" "The following arguments apply to the language-specific scanners:\n" -#: src/mkid.c:376 +#: src/mkid.c:378 #, c-format msgid "can't create `%s' in `%s'" msgstr "kan `%s' niet aanmaken in `%s'" -#: src/mkid.c:380 +#: src/mkid.c:382 #, c-format msgid "can't modify `%s'" msgstr "kan `%s' niet veranderen" -#: src/mkid.c:457 +#: src/mkid.c:459 #, c-format msgid "can't stat `%s'" msgstr "kan de status van `%s' niet opvragen" -#: src/mkid.c:526 +#: src/mkid.c:528 #, c-format msgid " new = %d/%d" msgstr " nieuw = %d/%d" -#: src/mkid.c:535 +#: src/mkid.c:537 #, c-format msgid "Name=%ld, " msgstr "Naam=%ld, " -#: src/mkid.c:536 +#: src/mkid.c:538 #, c-format msgid "Number=%ld, " msgstr "Nummer = %ld, " -#: src/mkid.c:537 +#: src/mkid.c:539 #, c-format msgid "String=%ld, " msgstr "Letterreeks=%ld, " -#: src/mkid.c:538 +#: src/mkid.c:540 #, c-format msgid "Literal=%ld, " msgstr "Letterlijk=%ld, " -#: src/mkid.c:539 +#: src/mkid.c:541 #, c-format msgid "Comment=%ld\n" msgstr "Commentaar=%ld\n" -#: src/mkid.c:541 +#: src/mkid.c:543 #, fuzzy, c-format msgid "Files=%ld, " msgstr "Bestanden=%d, " -#: src/mkid.c:542 +#: src/mkid.c:544 #, c-format msgid "Tokens=%ld, " msgstr "Eenheden=%ld, " -#: src/mkid.c:543 +#: src/mkid.c:545 #, c-format msgid "Bytes=%ld Kb, " msgstr "Bytes=%ld Kb, " -#: src/mkid.c:544 +#: src/mkid.c:546 #, fuzzy, c-format msgid "Heap=%d+%d Kb, " msgstr "Data=%ld+%ld Kb, " -#: src/mkid.c:546 +#: src/mkid.c:548 #, c-format msgid "Output=%ld (%ld tok, %ld hit)\n" msgstr "Uitvoer=%ld (%ld eenheden, %ld gevonden)\n" -#: src/mkid.c:549 +#: src/mkid.c:551 #, c-format msgid ", Freq=%ld/%ld=%.2f\n" msgstr ", Freq=%ld/%ld=%.2f\n" -#: src/mkid.c:573 +#: src/mkid.c:575 #, c-format msgid "Sorting tokens...\n" msgstr "Eenheden sorteren...\n" -#: src/mkid.c:579 +#: src/mkid.c:581 #, c-format msgid "Writing `%s'...\n" msgstr "`%s' schrijven...\n" -#: src/mkid.c:582 +#: src/mkid.c:584 #, c-format msgid "can't create `%s'" msgstr "kan `%s' niet aanmaken" -#: src/mkid.c:650 +#: src/mkid.c:652 #, c-format msgid "error closing `%s'" msgstr "" -#: src/mkid.c:738 +#: src/mkid.c:740 #, c-format msgid "level %d: %ld/%ld = %.0f%%\n" msgstr "niveau %d: %ld/%ld = %.0f%%\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: id-utils 3.0.8\n" "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n" -"POT-Creation-Date: 2005-12-15 16:37+0100\n" +"POT-Creation-Date: 2005-12-27 04:46+0100\n" "PO-Revision-Date: 1997-03-26 23:59 +0100\n" "Last-Translator: Wojciech Marek Gałązka <wgalazka@chem.uw.edu.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -39,11 +39,11 @@ msgstr "Ponownie mieszanie=%d, " msgid "Collisions=%ld/%ld=%.0f%%" msgstr "Próby=%ld/%ld=%.2f, " -#: libidu/idfile.c:104 +#: libidu/idfile.c:105 msgid "can't determine the io_size of a string!" msgstr "" -#: libidu/idread.c:49 src/mkid.c:474 src/xtokid.c:227 +#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:227 #, c-format msgid "can't open `%s'" msgstr "" @@ -73,45 +73,45 @@ msgstr "" msgid "unsupported size in io_write (): %d" msgstr "Nie obsługiwany rozmiar w io_write (): %d\n" -#: libidu/scanners.c:100 +#: libidu/scanners.c:101 #, fuzzy, c-format msgid "unrecognized language: `%s'" msgstr "Brak skanera dla języka `%s'\n" -#: libidu/scanners.c:146 +#: libidu/scanners.c:147 msgid "can't allocate language args obstack: memory exhausted" msgstr "" -#: libidu/scanners.c:200 libidu/scanners.c:269 +#: libidu/scanners.c:201 libidu/scanners.c:270 msgid "can't allocate language args: memory exhausted" msgstr "" -#: libidu/scanners.c:208 +#: libidu/scanners.c:209 #, c-format msgid "language name expected following `%s' in file `%s'" msgstr "" -#: libidu/scanners.c:263 +#: libidu/scanners.c:264 #, fuzzy, c-format msgid "can't open language map file `%s'" msgstr "Brak skanera dla języka `%s'\n" -#: libidu/scanners.c:265 +#: libidu/scanners.c:266 #, c-format msgid "can't get size of map file `%s'" msgstr "" -#: libidu/scanners.c:275 +#: libidu/scanners.c:276 #, fuzzy, c-format msgid "can't read language map file `%s'" msgstr "Brak skanera dla języka `%s'\n" -#: libidu/scanners.c:278 +#: libidu/scanners.c:279 #, c-format msgid "can't read entire language map file `%s'" msgstr "" -#: libidu/scanners.c:423 +#: libidu/scanners.c:424 #, c-format msgid "" "C language:\n" @@ -123,7 +123,7 @@ msgid "" "strings\n" msgstr "" -#: libidu/scanners.c:434 +#: libidu/scanners.c:435 #, c-format msgid "" "C++ language:\n" @@ -135,19 +135,19 @@ msgid "" "strings\n" msgstr "" -#: libidu/scanners.c:717 libidu/scanners.c:988 libidu/scanners.c:1191 -#: libidu/scanners.c:1455 +#: libidu/scanners.c:718 libidu/scanners.c:989 libidu/scanners.c:1192 +#: libidu/scanners.c:1456 #, c-format msgid "junk: `%c'" msgstr "śmieć: `%c'" -#: libidu/scanners.c:719 libidu/scanners.c:990 libidu/scanners.c:1193 -#: libidu/scanners.c:1457 +#: libidu/scanners.c:720 libidu/scanners.c:991 libidu/scanners.c:1194 +#: libidu/scanners.c:1458 #, c-format msgid "junk: `\\%03o'" msgstr "śmieć: `\\%03o'" -#: libidu/scanners.c:823 +#: libidu/scanners.c:824 #, c-format msgid "" "Assembly language:\n" @@ -158,7 +158,7 @@ msgid "" " -n,--no-cpp Don't handle C pre-processor directives\n" msgstr "" -#: libidu/scanners.c:1094 +#: libidu/scanners.c:1095 #, c-format msgid "" "Text language:\n" @@ -168,7 +168,7 @@ msgid "" "delimiters\n" msgstr "" -#: libidu/scanners.c:1299 +#: libidu/scanners.c:1300 #, c-format msgid "" "Perl language:\n" @@ -179,55 +179,55 @@ msgid "" " -d,--dtags Include documentation tags\n" msgstr "" -#: libidu/walker.c:111 +#: libidu/walker.c:113 #, c-format msgid "can't read directory `%s' (`.' from `%s')" msgstr "" -#: libidu/walker.c:178 +#: libidu/walker.c:180 #, c-format msgid "notice: `%s' was a %s, but is now a %s!" msgstr "" -#: libidu/walker.c:179 libidu/walker.c:180 +#: libidu/walker.c:181 libidu/walker.c:182 msgid "file" msgstr "" -#: libidu/walker.c:179 libidu/walker.c:180 +#: libidu/walker.c:181 libidu/walker.c:182 msgid "directory" msgstr "" -#: libidu/walker.c:303 +#: libidu/walker.c:305 #, c-format msgid "warning: `%s' and `%s' are the same file, but yield different scans!" msgstr "" -#: libidu/walker.c:397 +#: libidu/walker.c:399 #, c-format msgid "notice: scan parameters changed for `%s'" msgstr "" -#: libidu/walker.c:600 +#: libidu/walker.c:602 #, fuzzy msgid "can't get working directory" msgstr "%s: nie mogę pobrać nazwy bieżącego katalogu.\n" -#: libidu/walker.c:657 +#: libidu/walker.c:659 #, c-format msgid "can't chdir to `%s'" msgstr "" -#: libidu/walker.c:662 +#: libidu/walker.c:664 #, c-format msgid "can't chdir to `%s' from `%s'" msgstr "" -#: libidu/walker.c:723 +#: libidu/walker.c:725 #, c-format msgid "can't lstat `%s' from `%s'" msgstr "" -#: libidu/walker.c:731 +#: libidu/walker.c:733 #, c-format msgid "can't stat `%s' from `%s'" msgstr "" @@ -287,7 +287,7 @@ msgstr "" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" -#: src/fid.c:73 src/fnid.c:53 src/lid.c:237 src/mkid.c:124 src/xtokid.c:47 +#: src/fid.c:73 src/fnid.c:53 src/lid.c:238 src/mkid.c:126 src/xtokid.c:47 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -316,7 +316,7 @@ msgstr "" msgid "too many file name arguments" msgstr "" -#: src/fid.c:159 src/fnid.c:154 src/lid.c:413 +#: src/fid.c:159 src/fnid.c:154 src/lid.c:414 msgid "can't locate `ID'" msgstr "" @@ -346,12 +346,12 @@ msgid "" " --version output version information and exit\n" msgstr "" -#: src/lid.c:245 +#: src/lid.c:246 #, c-format msgid "Usage: %s [OPTION]... PATTERN...\n" msgstr "" -#: src/lid.c:249 +#: src/lid.c:250 #, c-format msgid "" "Query ID database and report results.\n" @@ -396,57 +396,57 @@ msgid "" " --version output version information and exit\n" msgstr "" -#: src/lid.c:285 +#: src/lid.c:286 msgid "braces" msgstr "" -#: src/lid.c:285 +#: src/lid.c:286 msgid "space" msgstr "" -#: src/lid.c:353 +#: src/lid.c:354 msgid "notice: use of `-e' is deprecated, use `-r' instead" msgstr "" -#: src/lid.c:434 +#: src/lid.c:435 #, fuzzy, c-format msgid "All identifiers are non-ambiguous within the first %d characters\n" msgstr "Identyfikatory są jednoznaczne w zakresie pierwszych %d znaków\n" -#: src/lid.c:469 +#: src/lid.c:470 #, c-format msgid "invalid `--key' style: `%s'" msgstr "" -#: src/lid.c:481 +#: src/lid.c:482 #, c-format msgid "invalid `--result' style: `%s'" msgstr "" -#: src/lid.c:638 +#: src/lid.c:639 #, fuzzy, c-format msgid "edit? [y1-9^S/nq] " msgstr "Edytować? [y1-9^S/nq] " -#: src/lid.c:707 +#: src/lid.c:708 msgid "can't fork" msgstr "" -#: src/lid.c:725 +#: src/lid.c:726 #, c-format msgid "can't exec `%s'" msgstr "" -#: src/lid.c:866 +#: src/lid.c:867 msgid "can't match regular-expression: memory exhausted" msgstr "" -#: src/mkid.c:149 src/xtokid.c:68 +#: src/mkid.c:151 src/xtokid.c:68 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "" -#: src/mkid.c:153 +#: src/mkid.c:155 #, c-format msgid "" "Build an identifier database.\n" @@ -473,102 +473,102 @@ msgid "" "The following arguments apply to the language-specific scanners:\n" msgstr "" -#: src/mkid.c:376 +#: src/mkid.c:378 #, c-format msgid "can't create `%s' in `%s'" msgstr "" -#: src/mkid.c:380 +#: src/mkid.c:382 #, c-format msgid "can't modify `%s'" msgstr "" -#: src/mkid.c:457 +#: src/mkid.c:459 #, c-format msgid "can't stat `%s'" msgstr "" -#: src/mkid.c:526 +#: src/mkid.c:528 #, fuzzy, c-format msgid " new = %d/%d" msgstr ", nowy=%d/%d" -#: src/mkid.c:535 +#: src/mkid.c:537 #, c-format msgid "Name=%ld, " msgstr "Nazwa=%ld, " -#: src/mkid.c:536 +#: src/mkid.c:538 #, c-format msgid "Number=%ld, " msgstr "Numer=%ld, " -#: src/mkid.c:537 +#: src/mkid.c:539 #, c-format msgid "String=%ld, " msgstr "Łańcuch=%ld, " -#: src/mkid.c:538 +#: src/mkid.c:540 #, c-format msgid "Literal=%ld, " msgstr "Literał=%ld, " -#: src/mkid.c:539 +#: src/mkid.c:541 #, c-format msgid "Comment=%ld\n" msgstr "Komentarz=%ld\n" -#: src/mkid.c:541 +#: src/mkid.c:543 #, fuzzy, c-format msgid "Files=%ld, " msgstr "Pliki=%d, " -#: src/mkid.c:542 +#: src/mkid.c:544 #, c-format msgid "Tokens=%ld, " msgstr "Znaczniki=%ld, " -#: src/mkid.c:543 +#: src/mkid.c:545 #, c-format msgid "Bytes=%ld Kb, " msgstr "Bajty=%ld Kb, " -#: src/mkid.c:544 +#: src/mkid.c:546 #, fuzzy, c-format msgid "Heap=%d+%d Kb, " msgstr "Sterta=%ld Kb, " -#: src/mkid.c:546 +#: src/mkid.c:548 #, c-format msgid "Output=%ld (%ld tok, %ld hit)\n" msgstr "Wynik=%ld (%ld tok, %ld hit)\n" -#: src/mkid.c:549 +#: src/mkid.c:551 #, fuzzy, c-format msgid ", Freq=%ld/%ld=%.2f\n" msgstr "Częstość=%ld/%ld=%.2f\n" -#: src/mkid.c:573 +#: src/mkid.c:575 #, c-format msgid "Sorting tokens...\n" msgstr "Sortowanie znaczników...\n" -#: src/mkid.c:579 +#: src/mkid.c:581 #, c-format msgid "Writing `%s'...\n" msgstr "Zapisuję `%s'...\n" -#: src/mkid.c:582 +#: src/mkid.c:584 #, c-format msgid "can't create `%s'" msgstr "" -#: src/mkid.c:650 +#: src/mkid.c:652 #, c-format msgid "error closing `%s'" msgstr "" -#: src/mkid.c:738 +#: src/mkid.c:740 #, fuzzy, c-format msgid "level %d: %ld/%ld = %.0f%%\n" msgstr "poziom %d: %ld == %ld\n" diff --git a/src/Makefile.in b/src/Makefile.in index 7b082c6..7e163ee 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -48,6 +48,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/closeout.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ @@ -23,12 +23,13 @@ #include <unistd.h> #include <stdlib.h> #include <errno.h> +#include <error.h> +#include <pathmax.h> +#include <xalloc.h> +#include <alloca.h> + #include "xnls.h" #include "idfile.h" -#include "error.h" -#include "pathmax.h" -#include "xalloc.h" -#include "alloca.h" #include "iduglobal.h" int get_file_index (char *file_name); @@ -24,12 +24,13 @@ #include <errno.h> #include <stdlib.h> #include <errno.h> -#include "xalloc.h" +#include <alloca.h> +#include <xalloc.h> +#include <pathmax.h> +#include <error.h> + #include "xnls.h" #include "idfile.h" -#include "pathmax.h" -#include "error.h" -#include "alloca.h" #include "iduglobal.h" void scan_files (struct idhead *idhp); @@ -25,21 +25,22 @@ #include <sys/types.h> #include <sys/wait.h> #include <assert.h> -#include "getopt.h" +#include <getopt.h> #include <limits.h> #include <string.h> +#include <dirname.h> #include <unistd.h> #include <termios.h> -#include "regex.h" +#include <alloca.h> +#include <regex.h> +#include <xalloc.h> +#include <pathmax.h> +#include <error.h> + #include "xnls.h" -#include "xalloc.h" #include "idfile.h" -#include "error.h" -#include "pathmax.h" -#include "alloca.h" #include "iduglobal.h" - typedef void (*report_func_t) (char const *name, struct file_link **flinkv); typedef int (*query_func_t) (char const *arg, report_func_t); @@ -25,17 +25,19 @@ #include <sys/stat.h> #include <stddef.h> #include <unistd.h> -#include "xnls.h" -#include "pathmax.h" +#include <pathmax.h> #include <string.h> +#include <dirname.h> +#include <alloca.h> +#include <limits.h> +#include <inttostr.h> +#include <xalloc.h> +#include <error.h> + +#include "xnls.h" #include "idfile.h" -#include "xalloc.h" #include "hash.h" #include "scanners.h" -#include "error.h" -#include "alloca.h" -#include <limits.h> -#include "inttostr.h" #include "iduglobal.h" char* dirname(char* path); diff --git a/src/xtokid.c b/src/xtokid.c index f9be38d..fc3c4cf 100644 --- a/src/xtokid.c +++ b/src/xtokid.c @@ -22,12 +22,13 @@ #include <string.h> #include <stdlib.h> #include <errno.h> -#include "xalloc.h" +#include <xalloc.h> +#include <pathmax.h> +#include <error.h> + #include "xnls.h" #include "scanners.h" #include "idfile.h" -#include "pathmax.h" -#include "error.h" #include "iduglobal.h" void scan_files (struct idhead *idhp); diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 10da762..6e2e175 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -41,6 +41,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/closeout.m4 \ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ |