From MAILER-DAEMON Sat May 17 07:54:49 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.10.13) id 19H0Fo-0004rn-00 for mharc-bug-gnulib@gnu.org; Sat, 17 May 2003 07:53:32 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 19H0FN-0004Py-00 for bug-gnulib@gnu.org; Sat, 17 May 2003 07:53:05 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 19H0Ew-00031a-00 for bug-gnulib@gnu.org; Sat, 17 May 2003 07:52:46 -0400 Received: from ftp.ilog.fr ([81.80.162.195]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19H0Eo-0002e2-00 for bug-gnulib@gnu.org; Sat, 17 May 2003 07:52:30 -0400 Received: from laposte.ilog.fr (cerbere-qe0 [81.80.162.193]) by ftp.ilog.fr (8.12.9/8.12.9) with ESMTP id h4HBqTNN027352 for ; Sat, 17 May 2003 13:52:29 +0200 (MET DST) Received: from honolulu.ilog.fr ([172.16.15.121]) by laposte.ilog.fr (8.11.6/8.11.6) with ESMTP id h4HBqMP27216; Sat, 17 May 2003 13:52:27 +0200 (MET DST) Received: (from haible@localhost) by honolulu.ilog.fr (8.9.3/8.9.3/SuSE Linux 8.9.3-0.1) id NAA22671; Sat, 17 May 2003 13:53:23 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <16070.8878.446861.220109@honolulu.ilog.fr> Date: Sat, 17 May 2003 13:53:18 +0200 (CEST) From: Bruno Haible To: bug-gnulib@gnu.org X-Mailer: VM 6.72 under 21.1 (patch 8) "Bryce Canyon" XEmacs Lucid Subject: [Bug-gnulib] fixed three autoconf macros X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Sat, 17 May 2003 11:53:31 -0000 Hi, Following the advice of Akim Demaille http://mail.gnu.org/archive/html/bug-autoconf/2003-05/threads.html I've fixed three quoting bugs in the m4 macros. 2003-05-17 Bruno Haible * dirfd.m4 (UTILS_FUNC_DIRFD): Fix a quoting bug leading to an invalid expansion for AC_EGREP_CPP. * strtoimax.m4 (gl_FUNC_STRTOIMAX): Likewise. * strtoumax.m4 (gl_FUNC_STRTOUMAX): Likewise. *** dirfd.m4 23 Jan 2003 17:59:15 -0000 1.11 --- dirfd.m4 17 May 2003 11:46:37 -0000 *************** *** 1,4 **** ! #serial 4 dnl Find out how to get the file descriptor associated with an open DIR*. dnl From Jim Meyering --- 1,4 ---- ! #serial 5 dnl Find out how to get the file descriptor associated with an open DIR*. dnl From Jim Meyering *************** *** 31,42 **** AC_CACHE_CHECK([whether dirfd is a macro], jm_cv_func_dirfd_macro, ! AC_EGREP_CPP([dirent_header_defines_dirfd], [$dirfd_headers #ifdef dirfd dirent_header_defines_dirfd #endif], ! jm_cv_func_dirfd_macro=yes, ! jm_cv_func_dirfd_macro=no)) # Use the replacement only if we have no function, macro, # or declaration with that name. --- 31,42 ---- AC_CACHE_CHECK([whether dirfd is a macro], jm_cv_func_dirfd_macro, ! [AC_EGREP_CPP([dirent_header_defines_dirfd], [$dirfd_headers #ifdef dirfd dirent_header_defines_dirfd #endif], ! jm_cv_func_dirfd_macro=yes, ! jm_cv_func_dirfd_macro=no)]) # Use the replacement only if we have no function, macro, # or declaration with that name. *** strtoimax.m4 31 Dec 2002 13:42:07 -0000 1.1 --- strtoimax.m4 17 May 2003 11:46:37 -0000 *************** *** 1,5 **** ! # strtoimax.m4 serial 1 ! dnl Copyright (C) 2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program --- 1,5 ---- ! # strtoimax.m4 serial 2 ! dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program *************** *** 14,25 **** AC_CACHE_CHECK([whether defines strtoimax as a macro], jm_cv_func_strtoimax_macro, ! AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include #ifdef strtoimax inttypes_h_defines_strtoimax #endif], ! jm_cv_func_strtoimax_macro=yes, ! jm_cv_func_strtoimax_macro=no)) if test "$jm_cv_func_strtoimax_macro" != yes; then AC_REPLACE_FUNCS(strtoimax) --- 14,25 ---- AC_CACHE_CHECK([whether defines strtoimax as a macro], jm_cv_func_strtoimax_macro, ! [AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include #ifdef strtoimax inttypes_h_defines_strtoimax #endif], ! jm_cv_func_strtoimax_macro=yes, ! jm_cv_func_strtoimax_macro=no)]) if test "$jm_cv_func_strtoimax_macro" != yes; then AC_REPLACE_FUNCS(strtoimax) *** strtoumax.m4 31 Dec 2002 13:42:07 -0000 1.1 --- strtoumax.m4 17 May 2003 11:46:37 -0000 *************** *** 1,5 **** ! # strtoumax.m4 serial 1 ! dnl Copyright (C) 2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program --- 1,5 ---- ! # strtoumax.m4 serial 2 ! dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program *************** *** 14,25 **** AC_CACHE_CHECK([whether defines strtoumax as a macro], jm_cv_func_strtoumax_macro, ! AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include #ifdef strtoumax inttypes_h_defines_strtoumax #endif], ! jm_cv_func_strtoumax_macro=yes, ! jm_cv_func_strtoumax_macro=no)) if test "$jm_cv_func_strtoumax_macro" != yes; then AC_REPLACE_FUNCS(strtoumax) --- 14,25 ---- AC_CACHE_CHECK([whether defines strtoumax as a macro], jm_cv_func_strtoumax_macro, ! [AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include #ifdef strtoumax inttypes_h_defines_strtoumax #endif], ! jm_cv_func_strtoumax_macro=yes, ! jm_cv_func_strtoumax_macro=no)]) if test "$jm_cv_func_strtoumax_macro" != yes; then AC_REPLACE_FUNCS(strtoumax) From MAILER-DAEMON Thu May 22 03:53:25 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19IkqO-0002fR-Gk for mharc-bug-gnulib@gnu.org; Thu, 22 May 2003 03:50:32 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19IkqC-0002dB-G0 for bug-gnulib@gnu.org; Thu, 22 May 2003 03:50:20 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19Ikpg-00025Y-5P for bug-gnulib@gnu.org; Thu, 22 May 2003 03:50:19 -0400 Received: from parmenides.zen.co.uk ([212.23.8.69]) by monty-python.gnu.org with smtp (Exim 4.20) id 19IklV-0000Ll-68 for bug-gnulib@gnu.org; Thu, 22 May 2003 03:45:29 -0400 Received: (qmail 6282 invoked from network); 22 May 2003 07:45:27 -0000 Received: from protagoras.zen.co.uk (212.23.8.61) by parmenides.zen.co.uk with QMQP; 22 May 2003 07:45:27 -0000 Received: from dsl-217-155-175-18.zen.co.uk (217.155.175.18) by protagoras.zen.co.uk with SMTP; 22 May 2003 07:45:27 -0000 X-Zen-Trace: 217.155.175.18 Received: by dsl-217-155-175-18.zen.co.uk (Postfix, from userid 1001) id AFA3A1414A; Thu, 22 May 2003 08:45:27 +0100 (BST) To: bug-gnulib@gnu.org From: James Youngman Organization: Free Software Foundation Date: 22 May 2003 08:45:27 +0100 Message-ID: <867k8j1l2g.fsf@dsl-217-155-175-18.zen.co.uk> Lines: 56 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Bug-gnulib] Calls to getstr() from findutils X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Thu, 22 May 2003 07:50:21 -0000 Hi there. I've recently taken on the maintenance of findutils. Following some difficulty in getting findutils's lib/* and m4/* to work with recent versions of GNU auto*, I've updated to the current CVS version of gnulib. That has been a great step forward, but I have one remaining problem I'd like a little advice on. Findutils calls getstr(), whose interface it expects to conform to versions 1.10 and previous of gnulib's lib/getline.c file (versions 1.3 and previous of lib/getstr.c). Specifically, findutils does this in locate/locate.c:- pathsize = 1026; /* Increased as necessary by getstr. */ path = xmalloc (pathsize); /* ... */ /* Overlay the old path with the remainder of the new. */ nread = getstr (&path, &pathsize, fp, '\0', count); getstr() is now static in gnulib's getline.c file, but none of the globally-available functions allow an offset to be specified ("count", above). Using "getdelim(path+count, ...)" wouldn't work because locate.c expects the function to perform realloc() as appropriate. There are two obvious options :- 1. Modify getline.c to add a getstr() interface (possibly renaming it) and maintain the modified version 2. Copy getline.c to another directory, and use my local getline.c replacement, tracking changes in gnulib periodically. 3. Devise some horrible patching arrangement for the build process so that we keep the pristine gnulib sources but just tack on a global function to the end of getline.c which exposes the required functionality. Yuck. This is not a real option. Option (1) Obviously means that I can no longer simply use "gnulib-tool" to blast a new version of gnulib into place. Option (2) imposes an additional code maintenance burden upon me but will certainly solve the problem. However, the real point of my email is to find out if option (4) is viable:- 4. Ask nicely to see if the gnulib maintainters will expose a function like the getstr() of version 1.10 of getline.c (obviously with a different name in order to avoid the potential conflict with curses). Many thanks, James. -- James Youngman, Manchester, UK. Telephone +44 161 445 1998 Findutils Home Page: http://www.gnu.org/software/findutils/ Findutils Bug Reporting https://savannah.gnu.org/bugs/?group=findutils From MAILER-DAEMON Thu May 22 08:29:31 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19IpAB-00005j-ES for mharc-bug-gnulib@gnu.org; Thu, 22 May 2003 08:27:15 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19Ip0x-0004pc-CK for bug-gnulib@gnu.org; Thu, 22 May 2003 08:17:43 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19Ioy2-0003eL-QD for bug-gnulib@gnu.org; Thu, 22 May 2003 08:15:13 -0400 Received: from ftp.ilog.fr ([81.80.162.195]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19Ioxa-0003MM-VX; Thu, 22 May 2003 08:14:15 -0400 Received: from laposte.ilog.fr (cerbere-qe0 [81.80.162.193]) by ftp.ilog.fr (8.12.9/8.12.9) with ESMTP id h4MCE9NN009474; Thu, 22 May 2003 14:14:09 +0200 (MET DST) Received: from honolulu.ilog.fr ([172.16.15.122]) by laposte.ilog.fr (8.11.6/8.11.6) with ESMTP id h4MCE6k20496; Thu, 22 May 2003 14:14:06 +0200 (MET DST) Received: (from haible@localhost) by honolulu.ilog.fr (8.9.3/8.9.3/SuSE Linux 8.9.3-0.1) id OAA04398; Thu, 22 May 2003 14:15:05 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <16076.48969.640472.965178@honolulu.ilog.fr> Date: Thu, 22 May 2003 14:15:05 +0200 (CEST) From: Bruno Haible To: James Youngman Subject: Re: [Bug-gnulib] Calls to getstr() from findutils In-Reply-To: <867k8j1l2g.fsf@dsl-217-155-175-18.zen.co.uk> References: <867k8j1l2g.fsf@dsl-217-155-175-18.zen.co.uk> X-Mailer: VM 6.72 under 21.1 (patch 8) "Bryce Canyon" XEmacs Lucid cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Thu, 22 May 2003 12:27:13 -0000 James Youngman writes: > Findutils calls getstr(), whose interface it expects to conform to > versions 1.10 and previous of gnulib's lib/getline.c file (versions > 1.3 and previous of lib/getstr.c). Specifically, findutils does this > in locate/locate.c:- > > pathsize = 1026; /* Increased as necessary by getstr. */ > path = xmalloc (pathsize); > /* ... */ > /* Overlay the old path with the remainder of the new. */ > nread = getstr (&path, &pathsize, fp, '\0', count); > > getstr() is now static in gnulib's getline.c file We made it static because we thought noone was using it, and overlooked findutils. I see that 'locate' uses it in an inner loop. Can you try using a different char* variable for reading the line, then use memcpy, and measure how much speed difference it makes? I mean, it's better for maintainability to use standard APIs. > 1. Modify getline.c to add a getstr() interface (possibly renaming it) > and maintain the modified version Of course we need to rename it, to avoid the clash with curses. My proposal is 'getdelimo' or 'getdelim_offset'. But the problem with reintroducing getstr in getline.c is that so many programs don't use this function - they need getdelim and getline only - and would compile useless code if we removed the "#if defined __GNU_LIBRARY__ && HAVE_GETDELIM" conditional. > 2. Copy getline.c to another directory, and use my local getline.c > replacement, tracking changes in gnulib periodically. We wish to avoid code duplication like this. gnulib is precisely an effort to avoid this kind of maintenance hassle. > 3. Devise some horrible patching arrangement for the build process > so that we keep the pristine gnulib sources but just tack on a > global function to the end of getline.c which exposes the required > functionality. Not an option either. What I propose - in the case that getstr() is really performance relevant for 'locate' - is to move out the getstr() function from getline.c to a separate file getdelimo.c. findutils would use a new module 'getdelimo', whereas all other programs continue to just use 'getline'. If that sounds ok, I can do the modifications tomorrow. Bruno From MAILER-DAEMON Sat May 24 17:22:35 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19JgTL-0001MC-0n for mharc-bug-gnulib@gnu.org; Sat, 24 May 2003 17:22:35 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19JgSg-0000pH-Mp for bug-gnulib@gnu.org; Sat, 24 May 2003 17:21:54 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19JgSJ-0000hV-Lw for bug-gnulib@gnu.org; Sat, 24 May 2003 17:21:32 -0400 Received: from parmenides.zen.co.uk ([212.23.8.69]) by monty-python.gnu.org with smtp (Exim 4.20) id 19JgRl-0000SJ-HY for bug-gnulib@gnu.org; Sat, 24 May 2003 17:20:57 -0400 Received: (qmail 14552 invoked from network); 24 May 2003 21:20:55 -0000 Received: from protagoras.zen.co.uk (212.23.8.61) by parmenides.zen.co.uk with QMQP; 24 May 2003 21:20:55 -0000 Received: from dsl-217-155-175-18.zen.co.uk (217.155.175.18) by protagoras.zen.co.uk with SMTP; 24 May 2003 21:20:55 -0000 X-Zen-Trace: 217.155.175.18 Received: by dsl-217-155-175-18.zen.co.uk (Postfix, from userid 1001) id 290DA14073; Sat, 24 May 2003 22:20:55 +0100 (BST) To: bug-gnulib@gnu.org References: <867k8j1l2g.fsf@dsl-217-155-175-18.zen.co.uk> From: James Youngman Date: 24 May 2003 22:20:55 +0100 In-Reply-To: <867k8j1l2g.fsf@dsl-217-155-175-18.zen.co.uk> Message-ID: <86addckpmw.fsf@dsl-217-155-175-18.zen.co.uk> Lines: 45 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Bug-gnulib] Wrong path to fnmatch_.h with gl_FUNC_FNMATCH_GNU ? X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Sat, 24 May 2003 21:22:32 -0000 Hi there. I've imported gnulib into findutils like this :- destdir="gnulib" modules="\ alloca argmatch dirname error fileblocks fnmatch \ getline getopt human idcache lstat malloc memcmp memset mktime \ modechange pathmax quotearg realloc regex rpmatch savedir stat \ stpcpy strdup strftime strstr strtol strtoul strtoull strtoumax \ xalloc xgetcwd xstrtol xstrtoumax yesno human basename filemode \ getline stpcpy" exec "$1"/gnulib-tool --create-testdir --dir="$destdir" --lib=libgnulib $modules I then use AC_CONFIG_SUBDIRS(gnulib). This works fine on GNU/Linux. However, when I try the result on Solaris 2.8, I get an error relating to the use of FNM_CASEFOLD. This is because gnulib/m4/fnmatch.m4 does AC_CONFIG_LINKS([lib/fnmatch.h:lib/fnmatch_.h]) However, in this case the relevant command to make the link I need would be AC_CONFIG_LINKS([gnulib/lib/fnmatch.h:gnulib/lib/fnmatch_.h]) Hence since the symlink has not been made, I'm still using the system fnmatch.h, which doesn't have FNM_CASEFOLD. The extra "gnulib" in the changed command above is the same as the argument that was given to gnulib-tool's --dir option. Of course, I don't want to edit gnulib/m4/fnmatch.m4 to fix the problem, because I'd prefer to keep the gnulib sources unmodified. So, is the problem really that I invoked gnulib-tool wrongly? Should I have used --dir=.? If so, presumably I can't use --create-testdir because the generated configure.ac file would have superseded my own file. -- James Youngman Manchester, UK. From MAILER-DAEMON Mon May 26 07:44:00 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19KGO9-0002ft-C7 for mharc-bug-gnulib@gnu.org; Mon, 26 May 2003 07:43:37 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KGNX-0002KN-HB for bug-gnulib@gnu.org; Mon, 26 May 2003 07:42:59 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19KGIL-0000yx-IS for bug-gnulib@gnu.org; Mon, 26 May 2003 07:37:40 -0400 Received: from ftp.ilog.fr ([81.80.162.195]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19KGB8-0007SC-Di; Mon, 26 May 2003 07:30:10 -0400 Received: from laposte.ilog.fr (cerbere-qe0 [81.80.162.193]) by ftp.ilog.fr (8.12.9/8.12.9) with ESMTP id h4QBU0NN006888; Mon, 26 May 2003 13:30:00 +0200 (MET DST) Received: from honolulu.ilog.fr ([172.16.15.122]) by laposte.ilog.fr (8.11.6/8.11.6) with ESMTP id h4QBTvk17578; Mon, 26 May 2003 13:29:57 +0200 (MET DST) Received: (from haible@localhost) by honolulu.ilog.fr (8.9.3/8.9.3/SuSE Linux 8.9.3-0.1) id NAA12277; Mon, 26 May 2003 13:30:59 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <16081.64243.327393.299741@honolulu.ilog.fr> Date: Mon, 26 May 2003 13:30:59 +0200 (CEST) From: Bruno Haible To: James Youngman Subject: Re: [Bug-gnulib] Wrong path to fnmatch_.h with gl_FUNC_FNMATCH_GNU ? In-Reply-To: <86addckpmw.fsf@dsl-217-155-175-18.zen.co.uk> References: <867k8j1l2g.fsf@dsl-217-155-175-18.zen.co.uk> <86addckpmw.fsf@dsl-217-155-175-18.zen.co.uk> X-Mailer: VM 6.72 under 21.1 (patch 8) "Bryce Canyon" XEmacs Lucid cc: bonzini@gnu.org cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Mon, 26 May 2003 11:43:35 -0000 James Youngman writes: > exec "$1"/gnulib-tool --create-testdir --dir="$destdir" --lib=libgnulib $modules Cool! You're succeeding to use gnulib-tool although the --import option is NYI :-) > However, when I try the result on Solaris 2.8, I get an error relating > to the use of FNM_CASEFOLD. This is because gnulib/m4/fnmatch.m4 > does > > AC_CONFIG_LINKS([lib/fnmatch.h:lib/fnmatch_.h]) > > However, in this case the relevant command to make the link I need > would be > > AC_CONFIG_LINKS([gnulib/lib/fnmatch.h:gnulib/lib/fnmatch_.h]) Does the appended patch work for you? It touches the modules 'fnmatch' and 'poll', which has the same problem. Bruno *** modules/fnmatch 20 Jan 2003 10:02:37 -0000 1.3 --- modules/fnmatch 26 May 2003 11:28:52 -0000 *************** *** 15,23 **** # No macro. You should also use one of fnmatch-posix or fnmatch-gnu. Makefile.am: ! lib_SOURCES += fnmatch_.h ! EXTRA_DIST += fnmatch_loop.c ! DISTCLEANFILES += fnmatch.h Include: --- 15,28 ---- # No macro. You should also use one of fnmatch-posix or fnmatch-gnu. Makefile.am: ! EXTRA_DIST += fnmatch_.h fnmatch_loop.c ! ! # The following is needed in order to create an when the system ! # doesn't have one that supports the required API. ! all-local $(lib_OBJECTS): @FNMATCH_H@ ! fnmatch.h: fnmatch_.h ! cp $(srcdir)/fnmatch_.h fnmatch.h ! MOSTLYCLEANFILES += fnmatch.h Include: *** m4/fnmatch.m4 31 Dec 2002 13:43:06 -0000 1.12 --- m4/fnmatch.m4 26 May 2003 11:28:52 -0000 *************** *** 3,9 **** # This is a modified version of autoconf's AC_FUNC_FNMATCH. # This file should be simplified after Autoconf 2.57 is required. ! # Copyright (C) 2000, 2001, 2002 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 --- 3,9 ---- # This is a modified version of autoconf's AC_FUNC_FNMATCH. # This file should be simplified after Autoconf 2.57 is required. ! # Copyright (C) 2000-2003 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 *************** *** 73,79 **** AC_CHECK_FUNCS([btowc mbsrtowcs mempcpy wmempcpy]) AC_CHECK_HEADERS([wchar.h wctype.h]) AC_LIBOBJ([fnmatch]) ! AC_CONFIG_LINKS([lib/fnmatch.h:lib/fnmatch_.h]) AC_DEFINE(fnmatch, rpl_fnmatch, [Define to rpl_fnmatch if the replacement function should be used.]) ])# _AC_LIBOBJ_FNMATCH --- 73,79 ---- AC_CHECK_FUNCS([btowc mbsrtowcs mempcpy wmempcpy]) AC_CHECK_HEADERS([wchar.h wctype.h]) AC_LIBOBJ([fnmatch]) ! FNMATCH_H=fnmatch.h AC_DEFINE(fnmatch, rpl_fnmatch, [Define to rpl_fnmatch if the replacement function should be used.]) ])# _AC_LIBOBJ_FNMATCH *************** *** 89,94 **** --- 89,95 ---- AC_DEFUN([gl_FUNC_FNMATCH_POSIX], [ + FNMATCH_H= _AC_FUNC_FNMATCH_IF([POSIX], [ac_cv_func_fnmatch_posix], [rm -f lib/fnmatch.h], [_AC_LIBOBJ_FNMATCH]) *************** *** 100,105 **** --- 101,107 ---- AC_DEFINE([fnmatch], [posix_fnmatch], [Define to a replacement function name for fnmatch().]) fi + AC_SUBST([FNMATCH_H]) ]) *************** *** 108,113 **** --- 110,116 ---- dnl Persuade glibc to declare FNM_CASEFOLD etc. AC_REQUIRE([AC_GNU_SOURCE]) + FNMATCH_H= _AC_FUNC_FNMATCH_IF([GNU], [ac_cv_func_fnmatch_gnu], [rm -f lib/fnmatch.h], [_AC_LIBOBJ_FNMATCH]) *************** *** 119,122 **** --- 122,126 ---- AC_DEFINE([fnmatch], [gnu_fnmatch], [Define to a replacement function name for fnmatch().]) fi + AC_SUBST([FNMATCH_H]) ]) *** modules/poll 20 Feb 2003 13:10:05 -0000 1.1 --- modules/poll 26 May 2003 11:28:52 -0000 *************** *** 12,19 **** gl_FUNC_POLL Makefile.am: ! noinst_HEADERS += poll_.h ! DISTCLEANFILES += poll.h Include: #include --- 12,25 ---- gl_FUNC_POLL Makefile.am: ! EXTRA_DIST += poll_.h ! ! # The following is needed in order to create an when the system ! # doesn't have one. ! all-local $(lib_OBJECTS): @POLL_H@ ! poll.h: poll_.h ! cp $(srcdir)/poll_.h poll.h ! MOSTLYCLEANFILES += poll.h Include: #include *** m4/poll.m4 20 Feb 2003 13:10:05 -0000 1.1 --- m4/poll.m4 26 May 2003 11:28:52 -0000 *************** *** 1,4 **** ! # poll.m4 serial 1 dnl Copyright (c) 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General --- 1,4 ---- ! # poll.m4 serial 2 dnl Copyright (c) 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General *************** *** 9,17 **** AC_DEFUN([gl_FUNC_POLL], [ AC_CHECK_HEADERS(poll.h) ! if test x$ac_cv_header_poll_h = xno; then ! AC_CONFIG_LINKS([lib/poll.h:lib/poll_.h]) fi AC_REPLACE_FUNCS(poll) if test $ac_cv_func_poll = no; then --- 9,20 ---- AC_DEFUN([gl_FUNC_POLL], [ AC_CHECK_HEADERS(poll.h) ! if test "$ac_cv_header_poll_h" = no; then ! POLL_H=poll.h ! else ! POLL_H= fi + AC_SUBST([POLL_H]) AC_REPLACE_FUNCS(poll) if test $ac_cv_func_poll = no; then From MAILER-DAEMON Mon May 26 08:49:03 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19KHPI-0000Ba-Aq for mharc-bug-gnulib@gnu.org; Mon, 26 May 2003 08:48:52 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KHP5-0008Aw-01 for bug-gnulib@gnu.org; Mon, 26 May 2003 08:48:39 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19KHOw-0007qv-VX for bug-gnulib@gnu.org; Mon, 26 May 2003 08:48:32 -0400 Received: from parmenides.zen.co.uk ([212.23.8.69]) by monty-python.gnu.org with smtp (Exim 4.20) id 19KHOs-0007eH-9X for bug-gnulib@gnu.org; Mon, 26 May 2003 08:48:26 -0400 Received: (qmail 23209 invoked from network); 26 May 2003 12:48:11 -0000 Received: from protagoras.zen.co.uk (212.23.8.61) by parmenides.zen.co.uk with QMQP; 26 May 2003 12:48:11 -0000 Received: from dsl-217-155-175-18.zen.co.uk (217.155.175.18) by protagoras.zen.co.uk with SMTP; 26 May 2003 12:48:11 -0000 X-Zen-Trace: 217.155.175.18 Received: by dsl-217-155-175-18.zen.co.uk (Postfix, from userid 1001) id E8EF71410F; Mon, 26 May 2003 13:48:10 +0100 (BST) To: Bruno Haible Subject: Re: [Bug-gnulib] Wrong path to fnmatch_.h with gl_FUNC_FNMATCH_GNU ? References: <867k8j1l2g.fsf@dsl-217-155-175-18.zen.co.uk> <86addckpmw.fsf@dsl-217-155-175-18.zen.co.uk> <16081.64243.327393.299741@honolulu.ilog.fr> From: James Youngman Date: 26 May 2003 13:48:10 +0100 In-Reply-To: <16081.64243.327393.299741@honolulu.ilog.fr> Message-ID: <86d6i5ub5h.fsf@dsl-217-155-175-18.zen.co.uk> Lines: 37 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii cc: bonzini@gnu.org cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Mon, 26 May 2003 12:48:51 -0000 Bruno Haible writes: > Does the appended patch work for you? It touches the modules 'fnmatch' > and 'poll', which has the same problem. Yes, it does. I also had to change the line all-local $(lib_OBJECTS): @FNMATCH_H@ to all-local $(lib_OBJECTS): fnmatch.h ... in modules/fnmatch, because @FNMATCH_H@ wasn't being substituted. Perhaps this is because the configure.ac fragment generated by "--create-testdir" doesn't include a test for fnmatch because of the incompatibility between the two variants :- # No macro. You should also use one of fnmatch-posix or fnmatch-gnu. So, applying your patch has enabled me to move a long way forward. Many thanks! The next problem I have is that gnulib builds "getline.c" into the gnulib library, but I get a link error on "getline". This is because I have #included my own , but I need also to include gnulib/config.h to see necessary declarations, for example :- /* Define to a replacement function name for getline(). */ #define getline gnu_getline ... So, this is my problem to fix now :-) Thanks again for your help, James. -- James Youngman Manchester, UK. From MAILER-DAEMON Mon May 26 17:52:48 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19KPtb-0006Ko-Hh for mharc-bug-gnulib@gnu.org; Mon, 26 May 2003 17:52:43 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KPtM-0005po-3f for bug-gnulib@gnu.org; Mon, 26 May 2003 17:52:28 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19KPtC-0005ZV-Rx for bug-gnulib@gnu.org; Mon, 26 May 2003 17:52:19 -0400 Received: from as2-1-6.lh.m.bonet.se ([194.236.130.162] helo=alpha) by monty-python.gnu.org with esmtp (Exim 4.20) id 19KPsf-0003zM-FC for bug-gnulib@gnu.org; Mon, 26 May 2003 17:51:47 -0400 Received: from oskar ([192.168.1.2] ident=mail) by alpha with esmtp (Exim 3.36 #1 (Debian)) id 19KPph-0002Gc-00 for ; Mon, 26 May 2003 23:48:41 +0200 Received: from usel by oskar with local (Exim 3.36 #1 (Debian)) id 19KPrm-0003e1-00 for ; Mon, 26 May 2003 23:50:50 +0200 Date: Mon, 26 May 2003 23:50:50 +0200 To: bug-gnulib@gnu.org Message-ID: <20030526215050.GA13877@oskar> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.4i From: Oskar Liljeblad Subject: [Bug-gnulib] dirname.h self-contained? X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Mon, 26 May 2003 21:52:42 -0000 I don't know if the idea is to make each header file provided by gnulib self-contained or not, but if it is then dirname.h needs some #include for size_t. I guess the needed header file is . This patch is related to this problem: http://mail.gnu.org/archive/html/bug-gnulib/2002-12/msg00044.html Also, browsing the other gnulib modules I encountered this: Most of the time stddef.h is included unconditionally, but sometimes it is included like this (regex.h): #if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS /* VMS doesn't have `size_t' in , even though POSIX says it should be there. */ # include #endif sometimes like this (fnmatch.c): #if defined STDC_HEADERS || defined _LIBC # include # include #endif or like this (localcharset.c): #if HAVE_STDDEF_H # include #endif or (printf-args.h): #ifdef HAVE_WCHAR_T # include #endif ...just to name a few. I want to be picky, so I ask, which one is correct? :) Regards, Oskar Liljeblad (oskar@osk.mine.nu) From MAILER-DAEMON Mon May 26 18:40:18 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19KQdb-0008KG-SU for mharc-bug-gnulib@gnu.org; Mon, 26 May 2003 18:40:15 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KQdU-00087e-Oy for bug-gnulib@gnu.org; Mon, 26 May 2003 18:40:08 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19KQdT-000871-2Z for bug-gnulib@gnu.org; Mon, 26 May 2003 18:40:07 -0400 Received: from parmenides.zen.co.uk ([212.23.8.69]) by monty-python.gnu.org with smtp (Exim 4.20) id 19KQd4-00081L-Bk for bug-gnulib@gnu.org; Mon, 26 May 2003 18:39:42 -0400 Received: (qmail 11740 invoked from network); 26 May 2003 22:31:30 -0000 Received: from protagoras.zen.co.uk (212.23.8.61) by parmenides.zen.co.uk with QMQP; 26 May 2003 22:31:30 -0000 Received: from dsl-217-155-175-18.zen.co.uk (217.155.175.18) by protagoras.zen.co.uk with SMTP; 26 May 2003 22:31:30 -0000 X-Zen-Trace: 217.155.175.18 Received: by dsl-217-155-175-18.zen.co.uk (Postfix, from userid 1001) id 99A3E14110; Mon, 26 May 2003 23:31:30 +0100 (BST) To: Oskar Liljeblad Subject: Re: [Bug-gnulib] dirname.h self-contained? References: <20030526215050.GA13877@oskar> From: James Youngman Date: 26 May 2003 23:31:30 +0100 In-Reply-To: <20030526215050.GA13877@oskar> Message-ID: <86n0h92vct.fsf@dsl-217-155-175-18.zen.co.uk> Lines: 57 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Mon, 26 May 2003 22:40:14 -0000 Oskar Liljeblad writes: > Also, browsing the other gnulib modules I encountered this: > Most of the time stddef.h is included unconditionally, but > sometimes it is included like this (regex.h): > > #if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS > /* VMS doesn't have `size_t' in , even though POSIX says it > should be there. */ > # include > #endif There must be a reason why the inclusion of stddef.h isn't done whenever we determine that it's available, but I don't know what it is. > sometimes like this (fnmatch.c): > > #if defined STDC_HEADERS || defined _LIBC > # include > # include > #endif This will certainly work; AC_HEADER_STDC causes STDC_HEADERS to be #defined if stdlib.h, stdarg.h, string.h and float.h are all available. I suppose there might be systems where stddef.h and stdlib.h are available but don't define size_t, but I' dnot say it's worth worrying about the possibility overmuch. > or like this (localcharset.c): > > #if HAVE_STDDEF_H > # include > #endif This is plainly correct. > > or (printf-args.h): > > #ifdef HAVE_WCHAR_T > # include > #endif This does, on the face of it, seem a bit odd. However, there is method to it. What's happening is that the gt_TYPE_WCHAR_T macro in m4/wchar_t.m4 #includes in a test program, and determines if wchar_t is thus available. Hence if this test works, we know that not only is wchar_t is available, but it lives in . So that code snippet looks a bit odd, but it's correct. -- James Youngman Manchester, UK. From MAILER-DAEMON Tue May 27 03:16:57 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19KYXz-00041q-Jq for mharc-bug-gnulib@gnu.org; Tue, 27 May 2003 03:06:59 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KYUQ-0002hb-OE for bug-gnulib@gnu.org; Tue, 27 May 2003 03:03:18 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19KYUP-0002hB-25 for bug-gnulib@gnu.org; Tue, 27 May 2003 03:03:17 -0400 Received: from anice-201-1-1-11.w80-13.abo.wanadoo.fr ([80.13.35.11] helo=elf.meyering.net) by monty-python.gnu.org with esmtp (Exim 4.20) id 19KYQ8-0001U7-UC for bug-gnulib@gnu.org; Tue, 27 May 2003 02:58:53 -0400 Received: by elf.meyering.net (Postfix, from userid 1002) id 6D1F13F63; Tue, 27 May 2003 08:58:51 +0200 (CEST) To: Oskar Liljeblad Subject: Re: [Bug-gnulib] dirname.h self-contained? In-Reply-To: <20030526215050.GA13877@oskar> (Oskar Liljeblad's message of "Mon, 26 May 2003 23:50:50 +0200") References: <20030526215050.GA13877@oskar> From: Jim Meyering Date: Tue, 27 May 2003 08:58:51 +0200 Message-ID: <85wugcc1uc.fsf@pi.meyering.net> Lines: 49 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Tue, 27 May 2003 07:06:58 -0000 Oskar Liljeblad wrote: > I don't know if the idea is to make each header file provided by > gnulib self-contained or not, Usually it is. If not, there should be a good reason and a comment describing the dependency. > but if it is then dirname.h needs > some #include for size_t. I guess the needed header file is > . > > This patch is related to this problem: > > http://mail.gnu.org/archive/html/bug-gnulib/2002-12/msg00044.html > > Also, browsing the other gnulib modules I encountered this: > Most of the time stddef.h is included unconditionally, but > sometimes it is included like this (regex.h): > > #if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS > /* VMS doesn't have `size_t' in , even though POSIX says it > should be there. */ > # include > #endif > > sometimes like this (fnmatch.c): > > #if defined STDC_HEADERS || defined _LIBC > # include > # include > #endif > > or like this (localcharset.c): > > #if HAVE_STDDEF_H > # include > #endif IMHO, the way to do it is like this: #include #include The others may be changed eventually. These days, the few systems without those header files are so few that it's not worth supporting them. fnmatch and regex lag a bit because they are kept in sync with libc, and it takes more work for us to update those. From MAILER-DAEMON Tue May 27 04:21:41 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19KZiE-0007E4-H1 for mharc-bug-gnulib@gnu.org; Tue, 27 May 2003 04:21:38 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KZg1-00066H-Ec for bug-gnulib@gnu.org; Tue, 27 May 2003 04:19:21 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19KZg0-000651-3q for bug-gnulib@gnu.org; Tue, 27 May 2003 04:19:20 -0400 Received: from smtp0.libero.it ([193.70.192.33]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19KZfa-00061s-Od; Tue, 27 May 2003 04:18:54 -0400 Received: from engineer (151.29.220.4) by smtp0.libero.it (7.0.012) id 3ECC83C40019FB3A; Tue, 27 May 2003 10:18:52 +0200 Message-ID: <002501c32428$43398240$04dc1d97@bonz> From: "Bonzini" To: "Bruno Haible" , "James Youngman" References: <867k8j1l2g.fsf@dsl-217-155-175-18.zen.co.uk><86addckpmw.fsf@dsl-217-155-175-18.zen.co.uk> <16081.64243.327393.299741@honolulu.ilog.fr> Subject: Re: [Bug-gnulib] Wrong path to fnmatch_.h with gl_FUNC_FNMATCH_GNU ? Date: Tue, 27 May 2003 10:16:22 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 5.00.2919.6700 X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2919.6700 cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Tue, 27 May 2003 08:21:36 -0000 > Does the appended patch work for you? It touches the modules 'fnmatch' > and 'poll', which has the same problem. Cool. Only a comment: > ! cp $(srcdir)/fnmatch_.h fnmatch.h Why not $(LN_S) instead of cp? Paolo From MAILER-DAEMON Tue May 27 07:49:05 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19KcvV-0005JJ-Tb for mharc-bug-gnulib@gnu.org; Tue, 27 May 2003 07:47:33 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KcsP-0004Yn-1J for bug-gnulib@gnu.org; Tue, 27 May 2003 07:44:21 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19Kcqd-0003mf-O2 for bug-gnulib@gnu.org; Tue, 27 May 2003 07:42:32 -0400 Received: from ftp.ilog.fr ([81.80.162.195]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19KcnM-0002aC-FQ; Tue, 27 May 2003 07:39:08 -0400 Received: from laposte.ilog.fr (cerbere-qe0 [81.80.162.193]) by ftp.ilog.fr (8.12.9/8.12.9) with ESMTP id h4RBd7NN028773; Tue, 27 May 2003 13:39:07 +0200 (MET DST) Received: from honolulu.ilog.fr ([172.16.15.121]) by laposte.ilog.fr (8.11.6/8.11.6) with ESMTP id h4RBd5k22075; Tue, 27 May 2003 13:39:05 +0200 (MET DST) Received: (from haible@localhost) by honolulu.ilog.fr (8.9.3/8.9.3/SuSE Linux 8.9.3-0.1) id NAA17851; Tue, 27 May 2003 13:40:03 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <16083.20115.541130.861805@honolulu.ilog.fr> Date: Tue, 27 May 2003 13:40:03 +0200 (CEST) From: Bruno Haible To: "Bonzini" Subject: Re: [Bug-gnulib] Wrong path to fnmatch_.h with gl_FUNC_FNMATCH_GNU ? In-Reply-To: <002501c32428$43398240$04dc1d97@bonz> References: <867k8j1l2g.fsf@dsl-217-155-175-18.zen.co.uk> <86addckpmw.fsf@dsl-217-155-175-18.zen.co.uk> <16081.64243.327393.299741@honolulu.ilog.fr> <002501c32428$43398240$04dc1d97@bonz> X-Mailer: VM 6.72 under 21.1 (patch 8) "Bryce Canyon" XEmacs Lucid cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Tue, 27 May 2003 11:47:32 -0000 Paolo Bonzini asks: > > ! cp $(srcdir)/fnmatch_.h fnmatch.h > > Why not $(LN_S) instead of cp? - It requires yet another autoconf test, AC_PROG_LN_S. - It will fail in particular situations (e.g. on systems without symlinks, LN_S="ln", which will fail if $srcdir and $builddir are in different filesystems. - HP-UX "make" does the wrong thing w.r.t. to modification times of symlinks. Enough reasons to just use "cp". bruno From MAILER-DAEMON Tue May 27 08:06:49 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19KdE9-00041f-Ac for mharc-bug-gnulib@gnu.org; Tue, 27 May 2003 08:06:49 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KdDk-0003ok-Q7 for bug-gnulib@gnu.org; Tue, 27 May 2003 08:06:24 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19KdCZ-0003b9-Vg for bug-gnulib@gnu.org; Tue, 27 May 2003 08:05:12 -0400 Received: from ftp.ilog.fr ([81.80.162.195]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19Kd3C-0007z9-8M for bug-gnulib@gnu.org; Tue, 27 May 2003 07:55:30 -0400 Received: from laposte.ilog.fr (cerbere-qe0 [81.80.162.193]) by ftp.ilog.fr (8.12.9/8.12.9) with ESMTP id h4RBtTNN029151; Tue, 27 May 2003 13:55:29 +0200 (MET DST) Received: from honolulu.ilog.fr ([172.16.15.121]) by laposte.ilog.fr (8.11.6/8.11.6) with ESMTP id h4RBtSk23840; Tue, 27 May 2003 13:55:28 +0200 (MET DST) Received: (from haible@localhost) by honolulu.ilog.fr (8.9.3/8.9.3/SuSE Linux 8.9.3-0.1) id NAA17954; Tue, 27 May 2003 13:56:26 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <16083.21098.216647.510176@honolulu.ilog.fr> Date: Tue, 27 May 2003 13:56:26 +0200 (CEST) From: Bruno Haible To: Oskar Liljeblad Subject: Re: [Bug-gnulib] dirname.h self-contained? In-Reply-To: <20030526215050.GA13877@oskar> References: <20030526215050.GA13877@oskar> X-Mailer: VM 6.72 under 21.1 (patch 8) "Bryce Canyon" XEmacs Lucid cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Tue, 27 May 2003 12:06:48 -0000 Oskar Liljeblad writes: > I don't know if the idea is to make each header file provided by > gnulib self-contained or not Yes it is desired that each .h file can be included without any prerequisites and without ordering constraints. Now even glibc's has become self-contained (since 2003-04-17). > but if it is then dirname.h needs some #include for size_t. I guess > the needed header file is . Right, for size_t you need or . So if one needs nothing from I prefer since it is smaller. > Also, browsing the other gnulib modules I encountered this: > Most of the time stddef.h is included unconditionally We are generally assuming ANSI C89 by now. See also http://mail.gnu.org/archive/html/bug-gnulib/2002-11/msg00031.html > but sometimes it is included like this (regex.h): That's because regex.h is shared with glibc, and noone has so far bothered to convince the glibc maintainers that removing K&R C compatibility has a value in this case. > #if defined STDC_HEADERS || defined _LIBC > # include > # include > #endif I wouldn't write code like that. There is no reason to not #include and/or on IRIX 4 just because this system has a non-standard . Jim Meyering wrote: > IMHO, the way to do it is like this: > > #include > #include And if all you need is size_t, then just is enough. Bruno From MAILER-DAEMON Tue May 27 10:41:53 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19KfXy-000344-SS for mharc-bug-gnulib@gnu.org; Tue, 27 May 2003 10:35:26 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KfML-0008TT-Jm for bug-gnulib@gnu.org; Tue, 27 May 2003 10:23:25 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19KfMF-0008Mi-NS for bug-gnulib@gnu.org; Tue, 27 May 2003 10:23:20 -0400 Received: from smtp-out.comcast.net ([24.153.64.113]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19KfM3-00086G-SA for bug-gnulib@gnu.org; Tue, 27 May 2003 10:23:07 -0400 Received: from mail.ximbiot.com (pcp01464431pcs.lpaxtn01.pa.comcast.net [68.82.83.152]) by mtaout03.icomcast.net (iPlanet Messaging Server 5.2 HotFix 1.14 (built Mar 18 2003)) with SMTP id <0HFJ00MPPUIR83@mtaout03.icomcast.net> for bug-gnulib@gnu.org; Tue, 27 May 2003 10:20:51 -0400 (EDT) Received: (qmail 28170 invoked from network); Tue, 27 May 2003 14:20:51 +0000 Received: from localhost (HELO ximbiot.com) (?XB4YfqFQfwFma56I6uVu13nBrKbzqlFY?@127.0.0.1) by localhost with SMTP; Tue, 27 May 2003 14:20:51 +0000 Date: Tue, 27 May 2003 10:20:51 -0400 From: Derek Robert Price To: bug-gnulib@gnu.org Message-id: <3ED37443.1030405@ximbiot.com> Organization: Ximbiot MIME-version: 1.0 Content-type: text/plain; charset=us-ascii; format=flowed Content-transfer-encoding: 7BIT X-Accept-Language: en-us, en User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.2) Gecko/20030208 Netscape/7.02 Subject: [Bug-gnulib] Autoconf version X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Tue, 27 May 2003 14:35:25 -0000 I've been having to remove the _ONCE off of some AC_CHECK_DECLS_ONCE calls and turn space delimited arguments into comma delimited arguments for the same function in order to get some of the GNULIB macros to play nice with Autoconf version 2.57. I can't seem to find the AC_CHECK_DECLS_ONCE function in the development version of Autoconf, so I assume GNULIB was built to work with some older version of Autoconf. Would you like the patches? Derek -- *8^) Email: derek@ximbiot.com Get CVS support at ! -- I saw nothing unusual in the teacher's lounge. I saw nothing unusual in the teacher's lounge. I saw nothing unusual in the teacher's lounge... - Bart Simpson on chalkboard, _The Simpsons_ From MAILER-DAEMON Tue May 27 11:44:34 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19Kgcr-0001rW-Pq for mharc-bug-gnulib@gnu.org; Tue, 27 May 2003 11:44:33 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19Kgcp-0001pD-0c for bug-gnulib@gnu.org; Tue, 27 May 2003 11:44:31 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19KgMJ-0006CB-MG for bug-gnulib@gnu.org; Tue, 27 May 2003 11:27:30 -0400 Received: from smtp-out.comcast.net ([24.153.64.109]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19KgJA-0005Ra-Vt for bug-gnulib@gnu.org; Tue, 27 May 2003 11:24:13 -0400 Received: from mail.ximbiot.com (pcp01464431pcs.lpaxtn01.pa.comcast.net [68.82.83.152]) by mtaout05.icomcast.net (iPlanet Messaging Server 5.2 HotFix 1.14 (built Mar 18 2003)) with SMTP id <0HFJ00MLCXD8RW@mtaout05.icomcast.net> for bug-gnulib@gnu.org; Tue, 27 May 2003 11:22:20 -0400 (EDT) Received: (qmail 28790 invoked from network); Tue, 27 May 2003 15:22:19 +0000 Received: from localhost (HELO ximbiot.com) (?MHQTwCr0W5Fm9y50awy38EJ0cwoSLkxW?@127.0.0.1) by localhost with SMTP; Tue, 27 May 2003 15:22:19 +0000 Date: Tue, 27 May 2003 11:22:19 -0400 From: Derek Robert Price Subject: Re: [Bug-gnulib] Autoconf version To: bug-gnulib@gnu.org Message-id: <3ED382AB.5010700@ximbiot.com> Organization: Ximbiot MIME-version: 1.0 Content-type: text/plain; charset=us-ascii; format=flowed Content-transfer-encoding: 7BIT X-Accept-Language: en-us, en User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.2) Gecko/20030208 Netscape/7.02 References: <3ED37443.1030405@ximbiot.com> X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Tue, 27 May 2003 15:44:32 -0000 Derek Robert Price wrote: > I've been having to remove the _ONCE off of some AC_CHECK_DECLS_ONCE > calls and turn space delimited arguments into comma delimited > arguments for the same function in order to get some of the GNULIB > macros to play nice with Autoconf version 2.57. I can't seem to find > the AC_CHECK_DECLS_ONCE function in the development version of > Autoconf, so I assume GNULIB was built to work with some older version > of Autoconf. Whoops. I found the onceonly*.m4 macros in GNULIB/m4. I haven't tried them yet but I expect they were what I was looking for. Please ignore my previous email. Derek -- *8^) Email: derek@ximbiot.com Get CVS support at ! -- "Very funny Scotty, now beam down my clothes!" From MAILER-DAEMON Tue May 27 11:55:25 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19Kgfj-0002Or-AM for mharc-bug-gnulib@gnu.org; Tue, 27 May 2003 11:47:31 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KgXp-0000QW-3o for bug-gnulib@gnu.org; Tue, 27 May 2003 11:39:21 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19KgQP-0007Ba-L8 for bug-gnulib@gnu.org; Tue, 27 May 2003 11:31:42 -0400 Received: from smtp-out.comcast.net ([24.153.64.116]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19KfaR-0003oR-SR for bug-gnulib@gnu.org; Tue, 27 May 2003 10:37:59 -0400 Received: from mail.ximbiot.com (pcp01464431pcs.lpaxtn01.pa.comcast.net [68.82.83.152]) by mtaout01.icomcast.net (iPlanet Messaging Server 5.2 HotFix 1.12 (built Feb 13 2003)) with SMTP id <0HFJ00G2TV7XHG@mtaout01.icomcast.net> for bug-gnulib@gnu.org; Tue, 27 May 2003 10:35:57 -0400 (EDT) Received: (qmail 28311 invoked from network); Tue, 27 May 2003 14:35:57 +0000 Received: from localhost (HELO ximbiot.com) (?54wZPbtt1QhR65hstylAeYQ8fv9ipeMx?@127.0.0.1) by localhost with SMTP; Tue, 27 May 2003 14:35:57 +0000 Date: Tue, 27 May 2003 10:35:56 -0400 From: Derek Robert Price To: bug-gnulib@gnu.org Message-id: <3ED377CC.7040505@ximbiot.com> Organization: Ximbiot MIME-version: 1.0 Content-type: text/plain; charset=us-ascii; format=flowed Content-transfer-encoding: 7BIT X-Accept-Language: en-us, en User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.2) Gecko/20030208 Netscape/7.02 Subject: [Bug-gnulib] lstat/stat X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Tue, 27 May 2003 15:47:29 -0000 I've attached a patch for the lstat half of the stat replacements. The main problem this addresses is that on systems where lstat has problems with trailing slashes, AC_LIBOBJ(lstat) is called by AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK, which is called via AC_FUNC_LSTAT. The jm_FUNC_LSTAT macro used to check an sh variable set by AC_FUNC_LSTAT before calling gl_PREREQ_STAT and miss the case where AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK found the problem. This causes compiler errors when compiling lib/stat.c since the gl_PREREQ_LSTAT macro was never called. I also tweaked stat.c to not compile the slash-safe lstat unless configure actually detected that the system didn't treat slashes as we'd like. The patch is against the CVS tree, but it should apply to GNULIB without a problem since the layout is the same. Index: lib/ChangeLog =================================================================== RCS file: /cvs/ccvs/lib/ChangeLog,v retrieving revision 1.184 diff -u -r1.184 ChangeLog --- lib/ChangeLog 20 May 2003 18:56:28 -0000 1.184 +++ lib/ChangeLog 20 May 2003 22:07:30 -0000 @@ -1,5 +1,10 @@ 2003-05-20 Derek Price + * stat.c: Don't compile LSTAT code unless configure detected that we + need to be trailing-slash-safe. + +2003-05-20 Derek Price + * Makefile.in: Regenerated. 2003-05-20 Derek Price Index: lib/stat.c =================================================================== RCS file: /cvs/ccvs/lib/stat.c,v retrieving revision 1.1 diff -u -r1.1 stat.c --- lib/stat.c 19 May 2003 22:05:54 -0000 1.1 +++ lib/stat.c 20 May 2003 22:07:30 -0000 @@ -27,7 +27,7 @@ #ifndef errno extern int errno; #endif -#ifdef LSTAT +#if defined( LSTAT ) && !defined( LSTAT_FOLLOWS_SLASHED_SYMLINK ) # include # if HAVE_STDLIB_H @@ -94,7 +94,7 @@ return lstat_result; } -#endif /* LSTAT */ +#endif /* LSTAT && !LSTAT_FOLLOWS_SLASHED_SYMLINK */ /* This is a wrapper for stat/lstat. If FILE is the empty string, fail with errno == ENOENT. @@ -109,7 +109,11 @@ #ifdef LSTAT # define rpl_xstat rpl_lstat -# define xstat_return_val(F, S) slash_aware_lstat (F, S) +# ifdef LSTAT_FOLLOWS_SLASHED_SYMLINK +# define xstat_return_val(F, S) lstat (F, S) +# else /* !LSTAT_FOLLOWS_SLASHED_SYMLINK */ +# define xstat_return_val(F, S) slash_aware_lstat (F, S) +# endif /* LSTAT_FOLLOWS_SLASHED_SYMLINK */ #else # define rpl_xstat rpl_stat # define xstat_return_val(F, S) stat (F, S) Index: m4/ChangeLog =================================================================== RCS file: /cvs/ccvs/m4/ChangeLog,v retrieving revision 1.6 diff -u -r1.6 ChangeLog --- m4/ChangeLog 20 May 2003 18:50:16 -0000 1.6 +++ m4/ChangeLog 20 May 2003 22:07:30 -0000 @@ -1,5 +1,10 @@ 2003-05-20 Derek Price + * lstat.m4 (jm_FUNC_LSTAT): Add check for the lstat directory with a + trailing slash bug. + +2003-05-20 Derek Price + * acx_with_external_zlib.m4 (--with-external-zlib): New file with new ACX_WITH_SYSTEM_VLIB function to use the system's installed version of zlib library. Index: m4/lstat.m4 =================================================================== RCS file: /cvs/ccvs/m4/lstat.m4,v retrieving revision 1.1 diff -u -r1.1 lstat.m4 --- m4/lstat.m4 19 May 2003 22:05:36 -0000 1.1 +++ m4/lstat.m4 20 May 2003 22:07:30 -0000 @@ -13,7 +13,11 @@ [ AC_FUNC_LSTAT dnl Note: AC_FUNC_LSTAT does AC_LIBOBJ(lstat). - if test $ac_cv_func_lstat_empty_string_bug = yes; then + dnl + dnl It might be possible (and hopefully less code) to scan LIBOBJ here + dnl rather than checking multiple cache variables. I just plain don't know. + if test $ac_cv_func_lstat_empty_string_bug = yes || + test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then gl_PREREQ_LSTAT fi ]) Derek -- *8^) Email: derek@ximbiot.com Get CVS support at ! -- Man who live in glass house dress in basement. From MAILER-DAEMON Tue May 27 11:58:12 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19Kgq4-0005Ew-4K for mharc-bug-gnulib@gnu.org; Tue, 27 May 2003 11:58:12 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19Kgq2-0005Dj-0y for bug-gnulib@gnu.org; Tue, 27 May 2003 11:58:10 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19Kgq0-0005DG-N4 for bug-gnulib@gnu.org; Tue, 27 May 2003 11:58:09 -0400 Received: from parmenides.zen.co.uk ([212.23.8.69]) by monty-python.gnu.org with smtp (Exim 4.20) id 19KgVU-00086Q-0W for bug-gnulib@gnu.org; Tue, 27 May 2003 11:36:56 -0400 Received: (qmail 11969 invoked from network); 27 May 2003 15:07:38 -0000 Received: from protagoras.zen.co.uk (212.23.8.61) by parmenides.zen.co.uk with QMQP; 27 May 2003 15:07:38 -0000 Received: from dsl-217-155-175-18.zen.co.uk (217.155.175.18) by protagoras.zen.co.uk with SMTP; 27 May 2003 15:07:38 -0000 X-Zen-Trace: 217.155.175.18 Received: by dsl-217-155-175-18.zen.co.uk (Postfix, from userid 1001) id 9648C1400B; Tue, 27 May 2003 16:07:38 +0100 (BST) To: Derek Robert Price Subject: Re: [Bug-gnulib] Autoconf version References: <3ED37443.1030405@ximbiot.com> From: James Youngman Date: 27 May 2003 16:07:38 +0100 In-Reply-To: <3ED37443.1030405@ximbiot.com> Message-ID: <8665nwe8cl.fsf@dsl-217-155-175-18.zen.co.uk> Lines: 13 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Tue, 27 May 2003 15:58:10 -0000 Derek Robert Price writes: > I can't seem to find the AC_CHECK_DECLS_ONCE function in the > development version of Autoconf, so I assume GNULIB was built to > work with some older version of Autoconf. I think you'll find a definition in gnulib/m4/onceonly_2_57.m4, which aclocal should pick up with "aclocal -I m4". -- James Youngman Manchester, UK. From MAILER-DAEMON Tue May 27 15:07:34 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19KjnJ-0006eV-Pp for mharc-bug-gnulib@gnu.org; Tue, 27 May 2003 15:07:33 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KjnH-0006eE-UE for bug-gnulib@gnu.org; Tue, 27 May 2003 15:07:31 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19KjnE-0006dD-Jr for bug-gnulib@gnu.org; Tue, 27 May 2003 15:07:31 -0400 Received: from panther.cs.ucla.edu ([131.179.128.25]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19KjnD-0006d1-Tv for bug-gnulib@gnu.org; Tue, 27 May 2003 15:07:28 -0400 Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) h4RJ7Qu10239; Tue, 27 May 2003 12:07:26 -0700 (PDT) Received: from eggert by penguin.cs.ucla.edu with local (Exim 3.35 #1 (Debian)) id 19KjnC-0003X8-00; Tue, 27 May 2003 12:07:26 -0700 To: bug-gnulib@gnu.org Subject: Re: [Bug-gnulib] dirname.h self-contained? References: <20030526215050.GA13877@oskar> <16083.21098.216647.510176@honolulu.ilog.fr> From: Paul Eggert Date: 27 May 2003 12:07:26 -0700 In-Reply-To: <16083.21098.216647.510176@honolulu.ilog.fr> Message-ID: <87of1ous29.fsf@penguin.cs.ucla.edu> Lines: 686 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: Paul Eggert cc: Oskar Liljeblad X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Tue, 27 May 2003 19:07:32 -0000 Bruno Haible writes: > for size_t you need or . So if one needs > nothing from I prefer since it is smaller. Another reason is that freestanding C89 implementations need not support . This is still an issue for old hosts like SunOS 4.1.x, since our current recommendation is to use GCC on such hosts (rather than the bundled K&R compiler). But GCC is freestanding, not hosted, so we can't assume that works properly on such hosts. We can assume the following C89 headers: Plus we can assume C99 since we emulate it (thanks to Bruno). Here's a proposed patch to gnulib to simplify the code a bit (and help forestall the question that started this thread) by assuming the above-listed headers. I haven't changed the modules imported from glibc, nor the modules that I know are used by Emacs (it still wants portability to K&R, right?), nor have I bothered to change files like strtol.c that emulate C89 functions. Index: lib/ChangeLog =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/ChangeLog,v retrieving revision 1.467 diff -p -u -r1.467 ChangeLog --- lib/ChangeLog 12 May 2003 09:49:42 -0000 1.467 +++ lib/ChangeLog 27 May 2003 19:03:51 -0000 @@ -1,3 +1,25 @@ +2003-05-27 Paul Eggert + + * addext.c, backupfile.c, fsusage.c, human.c, pathmax.h, + rpmatch.c, userspec.c, xreadlink.c, xstrtol.c: Include + without checking for HAVE_LIMITS_H. + * backupfile.c, fsusage.c, hash.c, human.c, safe-read.c, userspec.c, + xstrtol.c (CHAR_BIT) : Don't define, since is guaranteed + to do that. + * error.c, fatal.c: Include without checking for __STDC__. + * exclude.c: Include unconditionally. + * fnmatch.c, localcharset.c, tempname.c: Include + unconditionally. + * hash.c: Include , since we no longer define CHAR_BIT. + * modechange.c, rpmatch.c (NULL): Don't define, since + does that. + * quote.c: Dont include or ; not needed. + * safe-read.c (INT_MAX): Don't define, since does that. + * safe-read.c (TYPE_MINIMUM, TYPE_MAXIMUM): Remove; no longer needed. + * xstrtol.c: Likewise. + * safe-read.c: Remove TYPE_SIGNED; no longer needed. + * savedir.c: Include instead of defining NULL. + 2003-05-10 Bruno Haible * linebreak.c (iconv_string_length): Don't return -1 just because the Index: lib/addext.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/addext.c,v retrieving revision 1.8 diff -p -u -r1.8 addext.c --- lib/addext.c 13 Aug 2001 06:30:10 -0000 1.8 +++ lib/addext.c 27 May 2003 19:03:51 -0000 @@ -29,9 +29,7 @@ # define HAVE_LONG_FILE_NAMES 0 #endif -#if HAVE_LIMITS_H -# include -#endif +#include #ifndef _POSIX_NAME_MAX # define _POSIX_NAME_MAX 14 #endif Index: lib/backupfile.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/backupfile.c,v retrieving revision 1.37 diff -p -u -r1.37 backupfile.c --- lib/backupfile.c 16 Jan 2002 22:44:43 -0000 1.37 +++ lib/backupfile.c 27 May 2003 19:03:51 -0000 @@ -80,12 +80,8 @@ char *malloc (); # define HAVE_DIR 0 #endif -#if HAVE_LIMITS_H -# include -#endif -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif +#include + /* Upper bound on the string length of an integer converted to string. 302 / 1000 is ceil (log10 (2.0)). Subtract 1 for the sign bit; add 1 for integer division truncation; add 1 more for a minus sign. */ Index: lib/error.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/error.c,v retrieving revision 1.29 diff -p -u -r1.29 error.c --- lib/error.c 6 Dec 2002 08:08:13 -0000 1.29 +++ lib/error.c 27 May 2003 19:03:51 -0000 @@ -34,13 +34,8 @@ #endif #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC -# if __STDC__ -# include -# define VA_START(args, lastarg) va_start(args, lastarg) -# else -# include -# define VA_START(args, lastarg) va_start(args) -# endif +# include +# define VA_START(args, lastarg) va_start(args, lastarg) #else # define va_alist a1, a2, a3, a4, a5, a6, a7, a8 # define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8; Index: lib/exclude.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/exclude.c,v retrieving revision 1.12 diff -p -u -r1.12 exclude.c --- lib/exclude.c 5 Apr 2003 06:53:24 -0000 1.12 +++ lib/exclude.c 27 May 2003 19:03:51 -0000 @@ -24,11 +24,7 @@ # include #endif -#if HAVE_STDBOOL_H -# include -#else -typedef enum {false = 0, true = 1} bool; -#endif +#include #include #ifndef errno Index: lib/fatal.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/fatal.c,v retrieving revision 1.3 diff -p -u -r1.3 fatal.c --- lib/fatal.c 17 Nov 2001 13:29:42 -0000 1.3 +++ lib/fatal.c 27 May 2003 19:03:51 -0000 @@ -7,13 +7,8 @@ #include #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC -# if __STDC__ -# include -# define VA_START(args, lastarg) va_start(args, lastarg) -# else -# include -# define VA_START(args, lastarg) va_start(args) -# endif +# include +# define VA_START(args, lastarg) va_start(args, lastarg) #else # define va_alist a1, a2, a3, a4, a5, a6, a7, a8 # define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8; Index: lib/fnmatch.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/fnmatch.c,v retrieving revision 1.23 diff -p -u -r1.23 fnmatch.c --- lib/fnmatch.c 26 Jun 2002 06:17:35 -0000 1.23 +++ lib/fnmatch.c 27 May 2003 19:03:51 -0000 @@ -58,8 +58,8 @@ char *alloca (); # endif #endif -#if defined STDC_HEADERS || defined _LIBC -# include +#include +#if STDC_HEADERS || defined _LIBC # include #endif Index: lib/fsusage.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/fsusage.c,v retrieving revision 1.44 diff -p -u -r1.44 fsusage.c --- lib/fsusage.c 17 Dec 2002 11:48:24 -0000 1.44 +++ lib/fsusage.c 27 May 2003 19:03:52 -0000 @@ -35,12 +35,7 @@ #include #include "fsusage.h" -#if HAVE_LIMITS_H -# include -#endif -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif +#include int statfs (); Index: lib/hash.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/hash.c,v retrieving revision 1.31 diff -p -u -r1.31 hash.c --- lib/hash.c 13 Mar 2003 19:44:25 -0000 1.31 +++ lib/hash.c 27 May 2003 19:03:52 -0000 @@ -31,6 +31,7 @@ # include #endif +#include #include #include @@ -403,9 +404,6 @@ hash_do_for_each (const Hash_table *tabl unsigned hash_string (const char *string, unsigned n_buckets) { -# ifndef CHAR_BIT -# define CHAR_BIT 8 -# endif # define ROTATE_LEFT(Value, Shift) \ ((Value) << (Shift) | (Value) >> ((sizeof (unsigned) * CHAR_BIT) - (Shift))) # define HASH_ONE_CHAR(Value, Byte) \ Index: lib/human.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/human.c,v retrieving revision 1.17 diff -p -u -r1.17 human.c --- lib/human.c 5 Nov 2002 21:45:29 -0000 1.17 +++ lib/human.c 27 May 2003 19:03:52 -0000 @@ -27,10 +27,7 @@ #include #include - -#if HAVE_LIMITS_H -# include -#endif +#include #if HAVE_STRING_H # include @@ -38,9 +35,6 @@ # include #endif -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif #if HAVE_STDLIB_H # include #endif Index: lib/localcharset.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/localcharset.c,v retrieving revision 1.13 diff -p -u -r1.13 localcharset.c --- lib/localcharset.c 31 Dec 2002 13:20:21 -0000 1.13 +++ lib/localcharset.c 27 May 2003 19:03:52 -0000 @@ -26,9 +26,7 @@ /* Specification. */ #include "localcharset.h" -#if HAVE_STDDEF_H -# include -#endif +#include #include #if HAVE_STRING_H Index: lib/modechange.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/modechange.c,v retrieving revision 1.23 diff -p -u -r1.23 modechange.c --- lib/modechange.c 9 Dec 2001 22:54:19 -0000 1.23 +++ lib/modechange.c 27 May 2003 19:03:52 -0000 @@ -31,15 +31,12 @@ #include "modechange.h" #include #include "xstrtol.h" +#include #if STDC_HEADERS # include #else char *malloc (); -#endif - -#ifndef NULL -# define NULL 0 #endif #if STAT_MACROS_BROKEN Index: lib/pathmax.h =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/pathmax.h,v retrieving revision 1.8 diff -p -u -r1.8 pathmax.h --- lib/pathmax.h 12 Aug 2001 18:49:13 -0000 1.8 +++ lib/pathmax.h 27 May 2003 19:03:52 -0000 @@ -25,7 +25,7 @@ /* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define PATH_MAX but might cause redefinition warnings when sys/param.h is later included (as on MORE/BSD 4.3). */ -# if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__) +# if defined _POSIX_VERSION || !defined __GNUC__ # include # endif Index: lib/quote.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/quote.c,v retrieving revision 1.4 diff -p -u -r1.4 quote.c --- lib/quote.c 18 Mar 2003 08:50:56 -0000 1.4 +++ lib/quote.c 27 May 2003 19:03:52 -0000 @@ -21,10 +21,6 @@ # include #endif -#if HAVE_STDDEF_H -# include /* For the definition of size_t on windows w/MSVC. */ -#endif -#include #include "quotearg.h" #include "quote.h" Index: lib/rpmatch.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/rpmatch.c,v retrieving revision 1.15 diff -p -u -r1.15 rpmatch.c --- lib/rpmatch.c 5 Nov 2002 21:45:29 -0000 1.15 +++ lib/rpmatch.c 27 May 2003 19:03:52 -0000 @@ -20,20 +20,14 @@ # include #endif +#include #if STDC_HEADERS || _LIBC -# include # include -#else -# ifndef NULL -# define NULL 0 -# endif #endif #if ENABLE_NLS # include -# if HAVE_LIMITS_H -# include -# endif +# include # include # include "gettext.h" # define _(msgid) gettext (msgid) Index: lib/safe-read.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/safe-read.c,v retrieving revision 1.22 diff -p -u -r1.22 safe-read.c --- lib/safe-read.c 8 Jan 2003 18:42:38 -0000 1.22 +++ lib/safe-read.c 27 May 2003 19:03:52 -0000 @@ -45,22 +45,6 @@ extern int errno; #include -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif - -/* The extra casts work around common compiler bugs. */ -#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) -/* The outer cast is needed to work around a bug in Cray C 5.0.3.0. - It is necessary at least when t == time_t. */ -#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \ - ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0)) -#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t))) - -#ifndef INT_MAX -# define INT_MAX TYPE_MAXIMUM (int) -#endif - #ifdef SAFE_WRITE # define safe_rw safe_write # define rw write Index: lib/savedir.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/savedir.c,v retrieving revision 1.20 diff -p -u -r1.20 savedir.c --- lib/savedir.c 31 Aug 2001 09:09:53 -0000 1.20 +++ lib/savedir.c 27 May 2003 19:03:52 -0000 @@ -56,9 +56,7 @@ extern int errno; # include # include #endif -#ifndef NULL -# define NULL 0 -#endif +#include #include "savedir.h" #include "xalloc.h" Index: lib/tempname.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/tempname.c,v retrieving revision 1.9 diff -p -u -r1.9 tempname.c --- lib/tempname.c 6 Jan 2003 12:38:36 -0000 1.9 +++ lib/tempname.c 27 May 2003 19:03:53 -0000 @@ -43,8 +43,9 @@ # define __GT_NOCREATE 3 #endif +#include + #if STDC_HEADERS || _LIBC -# include # include #endif Index: lib/userspec.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/userspec.c,v retrieving revision 1.35 diff -p -u -r1.35 userspec.c --- lib/userspec.c 10 Jan 2003 21:06:49 -0000 1.35 +++ lib/userspec.c 27 May 2003 19:03:53 -0000 @@ -32,9 +32,7 @@ # include #endif -#if HAVE_LIMITS_H -# include -#endif +#include #if HAVE_STRING_H # include @@ -72,10 +70,6 @@ struct group *getgrgid (); #ifndef HAVE_ENDPWENT # define endpwent() ((void) 0) -#endif - -#ifndef CHAR_BIT -# define CHAR_BIT 8 #endif /* The extra casts work around common compiler bugs. */ Index: lib/xreadlink.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/xreadlink.c,v retrieving revision 1.8 diff -p -u -r1.8 xreadlink.c --- lib/xreadlink.c 9 Dec 2001 22:46:53 -0000 1.8 +++ lib/xreadlink.c 27 May 2003 19:03:53 -0000 @@ -29,9 +29,7 @@ extern int errno; #endif -#if HAVE_LIMITS_H -# include -#endif +#include #if HAVE_SYS_TYPES_H # include #endif Index: lib/xstrtol.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/xstrtol.c,v retrieving revision 1.30 diff -p -u -r1.30 xstrtol.c --- lib/xstrtol.c 19 Dec 2001 10:41:27 -0000 1.30 +++ lib/xstrtol.c 27 May 2003 19:03:53 -0000 @@ -52,21 +52,10 @@ extern int errno; #endif -#if HAVE_LIMITS_H -# include -#endif - -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif +#include /* The extra casts work around common compiler bugs. */ #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) -/* The outer cast is needed to work around a bug in Cray C 5.0.3.0. - It is necessary at least when t == time_t. */ -#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \ - ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0)) -#define TYPE_MAXIMUM(t) (~ (t) 0 - TYPE_MINIMUM (t)) #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) # define IN_CTYPE_DOMAIN(c) 1 Index: m4/ChangeLog =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/ChangeLog,v retrieving revision 1.448 diff -p -u -r1.448 ChangeLog --- m4/ChangeLog 26 May 2003 19:39:45 -0000 1.448 +++ m4/ChangeLog 27 May 2003 19:03:53 -0000 @@ -1,3 +1,16 @@ +2003-05-27 Paul Eggert + + * backupfile.m4 (gl_BACKUPFILE): Don't check for limits.h. + * fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Likewise. + * human.m4 (gl_HUMAN): Likewise. + * localcharset.m4 (gl_LOCALCHARSET): Likewise. + * pathmax.m4 (gl_PATHMAX): Likewise. + * rpmatch.m4 (gl_FUNC_RPMATCH): Likewise. + * userspec.m4 (gl_USERSPEC): Likewise. + * xreadlink.m4 (gl_XREADLINK): Likewise. + * m4/xstrtol.m4 (gl_PREREQ_XSTRTOL): Likewise. + * quote.m4 (gl_QUOTE): Don't check for stddef.h. + 2003-05-26 Jim Meyering Merge in a change from coreutils: Index: m4/backupfile.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/backupfile.m4,v retrieving revision 1.1 diff -p -u -r1.1 backupfile.m4 --- m4/backupfile.m4 31 Dec 2002 13:42:06 -0000 1.1 +++ m4/backupfile.m4 27 May 2003 19:03:53 -0000 @@ -11,13 +11,13 @@ AC_DEFUN([gl_BACKUPFILE], dnl Prerequisites of lib/backupfile.c. AC_REQUIRE([AC_HEADER_DIRENT]) AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID]) - AC_CHECK_HEADERS_ONCE(limits.h stdlib.h string.h) + AC_CHECK_HEADERS_ONCE(stdlib.h string.h) AC_CHECK_DECLS_ONCE(getenv malloc) jm_CHECK_TYPE_STRUCT_DIRENT_D_INO dnl Prerequisites of lib/addext.c. AC_REQUIRE([jm_AC_DOS]) AC_SYS_LONG_FILE_NAMES - AC_CHECK_HEADERS_ONCE(limits.h string.h unistd.h) + AC_CHECK_HEADERS_ONCE(string.h unistd.h) AC_CHECK_FUNCS(pathconf) ]) Index: m4/fsusage.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/fsusage.m4,v retrieving revision 1.15 diff -p -u -r1.15 fsusage.m4 --- m4/fsusage.m4 31 Dec 2002 13:43:06 -0000 1.15 +++ m4/fsusage.m4 27 May 2003 19:03:54 -0000 @@ -235,7 +235,7 @@ choke -- this is a workaround for a Sun- AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA], [ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) - AC_CHECK_HEADERS_ONCE(fcntl.h limits.h) + AC_CHECK_HEADERS_ONCE(fcntl.h) AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h sys/statvfs.h) jm_STATFS_TRUNCATES ]) Index: m4/human.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/human.m4,v retrieving revision 1.1 diff -p -u -r1.1 human.m4 --- m4/human.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/human.m4 27 May 2003 19:03:54 -0000 @@ -12,6 +12,6 @@ AC_DEFUN([gl_HUMAN], AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) dnl Prerequisites of lib/human.c. - AC_CHECK_HEADERS_ONCE(limits.h stdlib.h string.h) + AC_CHECK_HEADERS_ONCE(stdlib.h string.h) AC_CHECK_DECLS_ONCE([getenv]) ]) Index: m4/localcharset.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/localcharset.m4,v retrieving revision 1.1 diff -p -u -r1.1 localcharset.m4 --- m4/localcharset.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/localcharset.m4 27 May 2003 19:03:54 -0000 @@ -9,7 +9,7 @@ dnl the same distribution terms as the r AC_DEFUN([gl_LOCALCHARSET], [ dnl Prerequisites of lib/localcharset.c. - AC_CHECK_HEADERS_ONCE(stddef.h stdlib.h string.h) + AC_CHECK_HEADERS_ONCE(stdlib.h string.h) AC_REQUIRE([AM_LANGINFO_CODESET]) AC_CHECK_FUNCS_ONCE(setlocale) Index: m4/pathmax.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/pathmax.m4,v retrieving revision 1.1 diff -p -u -r1.1 pathmax.m4 --- m4/pathmax.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/pathmax.m4 27 May 2003 19:03:54 -0000 @@ -9,5 +9,5 @@ dnl the same distribution terms as the r AC_DEFUN([gl_PATHMAX], [ dnl Prerequisites of lib/pathmax.h. - AC_CHECK_HEADERS_ONCE(limits.h sys/param.h unistd.h) + AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h) ]) Index: m4/quote.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/quote.m4,v retrieving revision 1.1 diff -p -u -r1.1 quote.m4 --- m4/quote.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/quote.m4 27 May 2003 19:03:54 -0000 @@ -9,5 +9,5 @@ dnl the same distribution terms as the r AC_DEFUN([gl_QUOTE], [ dnl Prerequisites of lib/quote.c. - AC_CHECK_HEADERS_ONCE(stddef.h) + dnl (none) ]) Index: m4/rpmatch.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/rpmatch.m4,v retrieving revision 1.1 diff -p -u -r1.1 rpmatch.m4 --- m4/rpmatch.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/rpmatch.m4 27 May 2003 19:03:54 -0000 @@ -17,6 +17,5 @@ AC_DEFUN([gl_FUNC_RPMATCH], # Prerequisites of lib/rpmatch.c. AC_DEFUN([gl_PREREQ_RPMATCH], [ AC_REQUIRE([AC_HEADER_STDC]) - AC_CHECK_HEADERS_ONCE(limits.h) ]) Index: m4/userspec.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/userspec.m4,v retrieving revision 1.1 diff -p -u -r1.1 userspec.m4 --- m4/userspec.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/userspec.m4 27 May 2003 19:03:54 -0000 @@ -11,5 +11,5 @@ AC_DEFUN([gl_USERSPEC], dnl Prerequisites of lib/userspec.c. AC_REQUIRE([AC_HEADER_STDC]) AC_REQUIRE([AC_FUNC_ALLOCA]) - AC_CHECK_HEADERS_ONCE(limits.h string.h sys/param.h unistd.h) + AC_CHECK_HEADERS_ONCE(string.h sys/param.h unistd.h) ]) Index: m4/xreadlink.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/xreadlink.m4,v retrieving revision 1.1 diff -p -u -r1.1 xreadlink.m4 --- m4/xreadlink.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/xreadlink.m4 27 May 2003 19:03:54 -0000 @@ -9,5 +9,5 @@ dnl the same distribution terms as the r AC_DEFUN([gl_XREADLINK], [ dnl Prerequisites of lib/xreadlink.c. - AC_CHECK_HEADERS_ONCE(limits.h stdlib.h sys/types.h unistd.h) + AC_CHECK_HEADERS_ONCE(stdlib.h sys/types.h unistd.h) ]) Index: m4/xstrtol.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/xstrtol.m4,v retrieving revision 1.2 diff -p -u -r1.2 xstrtol.m4 --- m4/xstrtol.m4 31 Dec 2002 13:49:01 -0000 1.2 +++ m4/xstrtol.m4 27 May 2003 19:03:54 -0000 @@ -24,7 +24,7 @@ AC_DEFUN([gl_PREREQ_XSTRTOL], [ AC_REQUIRE([gl_PREREQ_XSTRTOL_H]) AC_REQUIRE([AC_HEADER_STDC]) - AC_CHECK_HEADERS_ONCE(limits.h string.h) + AC_CHECK_HEADERS_ONCE(string.h) AC_CHECK_FUNCS_ONCE(isascii) AC_CHECK_DECLS_ONCE(strtol strtoul) AC_CHECK_DECLS([strtoimax, strtoumax]) From MAILER-DAEMON Tue May 27 16:02:28 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19KkeS-0006LZ-Hj for mharc-bug-gnulib@gnu.org; Tue, 27 May 2003 16:02:28 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KkeP-0006IM-VH for bug-gnulib@gnu.org; Tue, 27 May 2003 16:02:25 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19Kkdx-0005wo-NV for bug-gnulib@gnu.org; Tue, 27 May 2003 16:01:58 -0400 Received: from ftp.ilog.fr ([81.80.162.195]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19Kkbm-00056t-Hk for bug-gnulib@gnu.org; Tue, 27 May 2003 15:59:42 -0400 Received: from laposte.ilog.fr (cerbere-qe0 [81.80.162.193]) by ftp.ilog.fr (8.12.9/8.12.9) with ESMTP id h4RJxcNN009684; Tue, 27 May 2003 21:59:39 +0200 (MET DST) Received: from honolulu.ilog.fr ([172.16.15.121]) by laposte.ilog.fr (8.11.6/8.11.6) with ESMTP id h4RJxOk12138; Tue, 27 May 2003 21:59:28 +0200 (MET DST) Received: (from haible@localhost) by honolulu.ilog.fr (8.9.3/8.9.3/SuSE Linux 8.9.3-0.1) id WAA23011; Tue, 27 May 2003 22:00:18 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <16083.50130.360355.660049@honolulu.ilog.fr> Date: Tue, 27 May 2003 22:00:18 +0200 (CEST) From: Bruno Haible To: Paul Eggert Subject: Re: [Bug-gnulib] dirname.h self-contained? In-Reply-To: <87of1ous29.fsf@penguin.cs.ucla.edu> References: <20030526215050.GA13877@oskar> <16083.21098.216647.510176@honolulu.ilog.fr> <87of1ous29.fsf@penguin.cs.ucla.edu> X-Mailer: VM 6.72 under 21.1 (patch 8) "Bryce Canyon" XEmacs Lucid cc: Oskar Liljeblad cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Tue, 27 May 2003 20:02:26 -0000 Paul Eggert writes: > Here's a proposed patch to gnulib to simplify the code a bit (and help > forestall the question that started this thread) by assuming the > above-listed headers. I haven't changed the modules imported from > glibc, nor the modules that I know are used by Emacs (it still wants > portability to K&R, right?) Hi, Glad to see this old cruft go away. Your patch looks good, except for: - error.c and fnmatch.c which are shared with glibc and which according to your above reasoning you would like to exclude from the modernization? - localcharset.c which is used in libintl, and libintl needs to maintain K&R C compatibility as long as the GCC sources maintain K&R C compatibility. So please could you drop the changes to localcharset.c and localcharset.m4 ? Also I note that I had forgotten to check for limits.h in exclude.m4. This bug was unnoticed and now goes away without having hurt anyone. Bruno From MAILER-DAEMON Tue May 27 16:16:44 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19Kks6-00079e-TU for mharc-bug-gnulib@gnu.org; Tue, 27 May 2003 16:16:34 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19KkrU-00065Z-Vm for bug-gnulib@gnu.org; Tue, 27 May 2003 16:15:56 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19Kkqb-0005ib-IV for bug-gnulib@gnu.org; Tue, 27 May 2003 16:15:02 -0400 Received: from delta.nisa.net ([207.194.212.31]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19Kkpl-0005Mf-RY for bug-gnulib@gnu.org; Tue, 27 May 2003 16:14:10 -0400 Received: from delta.nisa.net (localhost [127.0.0.1])h4RKDlYB014718; Tue, 27 May 2003 13:13:47 -0700 Received: (from jbailey@localhost) by delta.nisa.net (8.12.3/8.12.3/Debian-6.3) id h4RKDkRp014716; Tue, 27 May 2003 13:13:46 -0700 X-Authentication-Warning: delta.nisa.net: jbailey set sender to jbailey@nisa.net using -f Date: Tue, 27 May 2003 13:13:46 -0700 From: Jeff Bailey To: Bruno Haible Subject: Re: [Bug-gnulib] dirname.h self-contained? Message-ID: <20030527201346.GE13769@nisa.net> References: <20030526215050.GA13877@oskar> <16083.21098.216647.510176@honolulu.ilog.fr> <87of1ous29.fsf@penguin.cs.ucla.edu> <16083.50130.360355.660049@honolulu.ilog.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <16083.50130.360355.660049@honolulu.ilog.fr> User-Agent: Mutt/1.3.28i cc: bug-gnulib@gnu.org cc: Paul Eggert cc: Oskar Liljeblad X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Tue, 27 May 2003 20:16:33 -0000 On Tue, May 27, 2003 at 10:00:18PM +0200, Bruno Haible wrote: > - localcharset.c which is used in libintl, and libintl needs to > maintain K&R C compatibility as long as the GCC sources maintain K&R C > compatibility. So please could you drop the changes to > localcharset.c and localcharset.m4 ? Thinking of which - I saw recently that there's some concern over some of the licenses in libiberty. Is anyone here involved in gcc programming? Perhaps they might want to consider using some (or all *g*) of gnulib. Tks, Jeff Bailey -- You said homosexuals form a small percentage of the population. So do Jews. Is that a reason to deny someone equality? - Richard Marceau From MAILER-DAEMON Wed May 28 19:43:48 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19LAZU-0005I9-4f for mharc-bug-gnulib@gnu.org; Wed, 28 May 2003 19:43:04 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19LASK-0003u0-Je for bug-gnulib@gnu.org; Wed, 28 May 2003 19:35:40 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19LARl-0003bY-FM for bug-gnulib@gnu.org; Wed, 28 May 2003 19:35:06 -0400 Received: from panther.cs.ucla.edu ([131.179.128.25]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19LAQl-0003GE-Ed for bug-gnulib@gnu.org; Wed, 28 May 2003 19:34:03 -0400 Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) h4SNY2u28226 for ; Wed, 28 May 2003 16:34:02 -0700 (PDT) Received: from eggert by penguin.cs.ucla.edu with local (Exim 3.35 #1 (Debian)) id 19LAQk-0003we-00 for ; Wed, 28 May 2003 16:34:02 -0700 To: bug-gnulib@gnu.org From: Paul Eggert Date: 28 May 2003 16:34:02 -0700 Message-ID: <87vfvuwsr9.fsf@penguin.cs.ucla.edu> Lines: 39 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: Paul Eggert Subject: [Bug-gnulib] addext.c import from GNU patch 2.5.9 X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Wed, 28 May 2003 23:43:02 -0000 I merged this change from GNU patch 2.5.9 into gnulib. Hmm, I now see that coreutils made a similar change, but I like this version better as it doesn't have a cast in it. 2003-05-28 Paul Eggert * addext.c (addext): Use assignment rather than cast, to avoid warnings on some platforms. Index: addext.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/addext.c,v retrieving revision 1.8 retrieving revision 1.9 diff -p -u -r1.8 -r1.9 --- addext.c 13 Aug 2001 06:30:10 -0000 1.8 +++ addext.c 28 May 2003 23:31:00 -0000 1.9 @@ -1,5 +1,7 @@ /* addext.c -- add an extension to a file name - Copyright 1990, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. + + Copyright (C) 1990, 1997, 1998, 1999, 2001, 2003 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 @@ -83,7 +85,11 @@ addext (char *filename, char const *ext, *s = c; } if (0 <= name_max || errno == 0) - slen_max = name_max == (size_t) name_max ? name_max : -1; + { + long size = slen_max = name_max; + if (name_max != size) + slen_max = -1; + } } #endif From MAILER-DAEMON Thu May 29 03:28:24 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19LHph-0002gX-G6 for mharc-bug-gnulib@gnu.org; Thu, 29 May 2003 03:28:17 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19LHpZ-0002IU-9H for bug-gnulib@gnu.org; Thu, 29 May 2003 03:28:09 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19LHpC-0001GU-Lt for bug-gnulib@gnu.org; Thu, 29 May 2003 03:27:57 -0400 Received: from panther.cs.ucla.edu ([131.179.128.25]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19LHpB-00019r-I2 for bug-gnulib@gnu.org; Thu, 29 May 2003 03:27:45 -0400 Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) h4T7RAu20158; Thu, 29 May 2003 00:27:11 -0700 (PDT) Received: from eggert by penguin.cs.ucla.edu with local (Exim 3.35 #1 (Debian)) id 19LHoc-000415-00; Thu, 29 May 2003 00:27:10 -0700 To: Bruno Haible Subject: Re: [Bug-gnulib] dirname.h self-contained? References: <20030526215050.GA13877@oskar> <16083.21098.216647.510176@honolulu.ilog.fr> <87of1ous29.fsf@penguin.cs.ucla.edu> <16083.50130.360355.660049@honolulu.ilog.fr> From: Paul Eggert Date: 29 May 2003 00:27:10 -0700 In-Reply-To: <16083.50130.360355.660049@honolulu.ilog.fr> Message-ID: <87d6i22oxd.fsf@penguin.cs.ucla.edu> Lines: 757 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: Paul Eggert cc: Oskar Liljeblad cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Thu, 29 May 2003 07:28:14 -0000 Bruno Haible writes: > Glad to see this old cruft go away. Your patch looks good, except for: Thanks for reviewing it. I made the changes that you suggested and updated copyright notices and serial numbers, and then installed the patch. Here it is, for the record. (This does not solve the original request, as dirname.h is still not self-contained, but one step at a time.) 2003-05-28 Paul Eggert Assume the headers required for C89 freestanding compilers. * addext.c, backupfile.c, fsusage.c, human.c, pathmax.h, rpmatch.c, userspec.c, xreadlink.c, xstrtol.c: Include without checking for HAVE_LIMITS_H. * backupfile.c, fsusage.c, hash.c, human.c, safe-read.c, userspec.c, xstrtol.c (CHAR_BIT) : Don't define, since is guaranteed to do that. * fatal.c: Include without checking for __STDC__. * exclude.c: Include unconditionally. * tempname.c: Include unconditionally. * hash.c: Include , since we no longer define CHAR_BIT. * modechange.c, rpmatch.c (NULL): Don't define, since does that. * quote.c: Dont include or ; not needed. * safe-read.c (INT_MAX): Don't define, since does that. * safe-read.c (TYPE_MINIMUM, TYPE_MAXIMUM): Remove; no longer needed. * xstrtol.c: Likewise. * safe-read.c: Remove TYPE_SIGNED; no longer needed. * savedir.c: Include instead of defining NULL. Index: lib/addext.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/addext.c,v retrieving revision 1.9 diff -p -u -r1.9 addext.c --- lib/addext.c 28 May 2003 23:31:00 -0000 1.9 +++ lib/addext.c 29 May 2003 07:16:23 -0000 @@ -31,9 +31,7 @@ # define HAVE_LONG_FILE_NAMES 0 #endif -#if HAVE_LIMITS_H -# include -#endif +#include #ifndef _POSIX_NAME_MAX # define _POSIX_NAME_MAX 14 #endif Index: lib/backupfile.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/backupfile.c,v retrieving revision 1.37 diff -p -u -r1.37 backupfile.c --- lib/backupfile.c 16 Jan 2002 22:44:43 -0000 1.37 +++ lib/backupfile.c 29 May 2003 07:16:24 -0000 @@ -1,6 +1,7 @@ /* backupfile.c -- make Emacs style backup file names - Copyright (C) 1990,91,92,93,94,95,96,97,98,99,2000, 2001, 2002 Free Software - Foundation, Inc. + + Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2001, 2002, 2003 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 @@ -80,12 +81,8 @@ char *malloc (); # define HAVE_DIR 0 #endif -#if HAVE_LIMITS_H -# include -#endif -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif +#include + /* Upper bound on the string length of an integer converted to string. 302 / 1000 is ceil (log10 (2.0)). Subtract 1 for the sign bit; add 1 for integer division truncation; add 1 more for a minus sign. */ Index: lib/exclude.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/exclude.c,v retrieving revision 1.12 diff -p -u -r1.12 exclude.c --- lib/exclude.c 5 Apr 2003 06:53:24 -0000 1.12 +++ lib/exclude.c 29 May 2003 07:16:24 -0000 @@ -24,11 +24,7 @@ # include #endif -#if HAVE_STDBOOL_H -# include -#else -typedef enum {false = 0, true = 1} bool; -#endif +#include #include #ifndef errno Index: lib/fatal.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/fatal.c,v retrieving revision 1.3 diff -p -u -r1.3 fatal.c --- lib/fatal.c 17 Nov 2001 13:29:42 -0000 1.3 +++ lib/fatal.c 29 May 2003 07:16:24 -0000 @@ -1,3 +1,21 @@ +/* Fatal exits for noninteractive utilities + + Copyright (C) 2001, 2003 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #ifdef HAVE_CONFIG_H # include #endif @@ -7,13 +25,8 @@ #include #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC -# if __STDC__ -# include -# define VA_START(args, lastarg) va_start(args, lastarg) -# else -# include -# define VA_START(args, lastarg) va_start(args) -# endif +# include +# define VA_START(args, lastarg) va_start(args, lastarg) #else # define va_alist a1, a2, a3, a4, a5, a6, a7, a8 # define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8; Index: lib/fsusage.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/fsusage.c,v retrieving revision 1.44 diff -p -u -r1.44 fsusage.c --- lib/fsusage.c 17 Dec 2002 11:48:24 -0000 1.44 +++ lib/fsusage.c 29 May 2003 07:16:24 -0000 @@ -1,6 +1,7 @@ /* fsusage.c -- return space usage of mounted filesystems - Copyright (C) 1991, 1992, 1996, 1998, 1999, 2002 Free Software - Foundation, Inc. + + Copyright (C) 1991, 1992, 1996, 1998, 1999, 2002, 2003 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 @@ -35,12 +36,7 @@ #include #include "fsusage.h" -#if HAVE_LIMITS_H -# include -#endif -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif +#include int statfs (); Index: lib/hash.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/hash.c,v retrieving revision 1.31 diff -p -u -r1.31 hash.c --- lib/hash.c 13 Mar 2003 19:44:25 -0000 1.31 +++ lib/hash.c 29 May 2003 07:16:26 -0000 @@ -31,6 +31,7 @@ # include #endif +#include #include #include @@ -403,9 +404,6 @@ hash_do_for_each (const Hash_table *tabl unsigned hash_string (const char *string, unsigned n_buckets) { -# ifndef CHAR_BIT -# define CHAR_BIT 8 -# endif # define ROTATE_LEFT(Value, Shift) \ ((Value) << (Shift) | (Value) >> ((sizeof (unsigned) * CHAR_BIT) - (Shift))) # define HASH_ONE_CHAR(Value, Byte) \ Index: lib/human.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/human.c,v retrieving revision 1.17 diff -p -u -r1.17 human.c --- lib/human.c 5 Nov 2002 21:45:29 -0000 1.17 +++ lib/human.c 29 May 2003 07:16:26 -0000 @@ -1,7 +1,7 @@ /* human.c -- print human readable file size - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software - Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 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 @@ -27,10 +27,7 @@ #include #include - -#if HAVE_LIMITS_H -# include -#endif +#include #if HAVE_STRING_H # include @@ -38,9 +35,6 @@ # include #endif -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif #if HAVE_STDLIB_H # include #endif Index: lib/modechange.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/modechange.c,v retrieving revision 1.23 diff -p -u -r1.23 modechange.c --- lib/modechange.c 9 Dec 2001 22:54:19 -0000 1.23 +++ lib/modechange.c 29 May 2003 07:16:27 -0000 @@ -1,5 +1,7 @@ /* modechange.c -- file mode manipulation - Copyright (C) 1989, 1990, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. + + Copyright (C) 1989, 1990, 1997, 1998, 1999, 2001, 2003 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 @@ -31,15 +33,12 @@ #include "modechange.h" #include #include "xstrtol.h" +#include #if STDC_HEADERS # include #else char *malloc (); -#endif - -#ifndef NULL -# define NULL 0 #endif #if STAT_MACROS_BROKEN Index: lib/pathmax.h =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/pathmax.h,v retrieving revision 1.8 diff -p -u -r1.8 pathmax.h --- lib/pathmax.h 12 Aug 2001 18:49:13 -0000 1.8 +++ lib/pathmax.h 29 May 2003 07:16:27 -0000 @@ -1,5 +1,5 @@ /* Define PATH_MAX somehow. Requires sys/types.h. - Copyright (C) 1992, 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1992, 1999, 2001, 2003 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 @@ -25,7 +25,7 @@ /* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define PATH_MAX but might cause redefinition warnings when sys/param.h is later included (as on MORE/BSD 4.3). */ -# if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__) +# if defined _POSIX_VERSION || !defined __GNUC__ # include # endif Index: lib/quote.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/quote.c,v retrieving revision 1.4 diff -p -u -r1.4 quote.c --- lib/quote.c 18 Mar 2003 08:50:56 -0000 1.4 +++ lib/quote.c 29 May 2003 07:16:27 -0000 @@ -21,10 +21,6 @@ # include #endif -#if HAVE_STDDEF_H -# include /* For the definition of size_t on windows w/MSVC. */ -#endif -#include #include "quotearg.h" #include "quote.h" Index: lib/rpmatch.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/rpmatch.c,v retrieving revision 1.15 diff -p -u -r1.15 rpmatch.c --- lib/rpmatch.c 5 Nov 2002 21:45:29 -0000 1.15 +++ lib/rpmatch.c 29 May 2003 07:16:27 -0000 @@ -1,6 +1,6 @@ /* Determine whether string value is affirmation or negative response according to current locale's data. - Copyright (C) 1996, 1998, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1996, 1998, 2000, 2002, 2003 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 @@ -20,20 +20,14 @@ # include #endif +#include #if STDC_HEADERS || _LIBC -# include # include -#else -# ifndef NULL -# define NULL 0 -# endif #endif #if ENABLE_NLS # include -# if HAVE_LIMITS_H -# include -# endif +# include # include # include "gettext.h" # define _(msgid) gettext (msgid) Index: lib/safe-read.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/safe-read.c,v retrieving revision 1.22 diff -p -u -r1.22 safe-read.c --- lib/safe-read.c 8 Jan 2003 18:42:38 -0000 1.22 +++ lib/safe-read.c 29 May 2003 07:16:27 -0000 @@ -45,22 +45,6 @@ extern int errno; #include -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif - -/* The extra casts work around common compiler bugs. */ -#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) -/* The outer cast is needed to work around a bug in Cray C 5.0.3.0. - It is necessary at least when t == time_t. */ -#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \ - ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0)) -#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t))) - -#ifndef INT_MAX -# define INT_MAX TYPE_MAXIMUM (int) -#endif - #ifdef SAFE_WRITE # define safe_rw safe_write # define rw write Index: lib/savedir.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/savedir.c,v retrieving revision 1.20 diff -p -u -r1.20 savedir.c --- lib/savedir.c 31 Aug 2001 09:09:53 -0000 1.20 +++ lib/savedir.c 29 May 2003 07:16:27 -0000 @@ -1,6 +1,6 @@ /* savedir.c -- save the list of files in a directory in a string - Copyright 1990, 1997, 1998, 1999, 2000, 2001 Free Software + Copyright 1990, 1997, 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -56,9 +56,7 @@ extern int errno; # include # include #endif -#ifndef NULL -# define NULL 0 -#endif +#include #include "savedir.h" #include "xalloc.h" Index: lib/tempname.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/tempname.c,v retrieving revision 1.9 diff -p -u -r1.9 tempname.c --- lib/tempname.c 6 Jan 2003 12:38:36 -0000 1.9 +++ lib/tempname.c 29 May 2003 07:16:27 -0000 @@ -1,7 +1,7 @@ /* tempname.c - generate the name of a temporary file. Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002 Free Software Foundation, Inc. + 2000, 2001, 2002, 2003 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 @@ -43,8 +43,9 @@ # define __GT_NOCREATE 3 #endif +#include + #if STDC_HEADERS || _LIBC -# include # include #endif Index: lib/userspec.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/userspec.c,v retrieving revision 1.35 diff -p -u -r1.35 userspec.c --- lib/userspec.c 10 Jan 2003 21:06:49 -0000 1.35 +++ lib/userspec.c 29 May 2003 07:16:27 -0000 @@ -32,9 +32,7 @@ # include #endif -#if HAVE_LIMITS_H -# include -#endif +#include #if HAVE_STRING_H # include @@ -72,10 +70,6 @@ struct group *getgrgid (); #ifndef HAVE_ENDPWENT # define endpwent() ((void) 0) -#endif - -#ifndef CHAR_BIT -# define CHAR_BIT 8 #endif /* The extra casts work around common compiler bugs. */ Index: lib/xreadlink.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/xreadlink.c,v retrieving revision 1.8 diff -p -u -r1.8 xreadlink.c --- lib/xreadlink.c 9 Dec 2001 22:46:53 -0000 1.8 +++ lib/xreadlink.c 29 May 2003 07:16:27 -0000 @@ -1,6 +1,6 @@ /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage - Copyright 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2003 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 @@ -29,9 +29,7 @@ extern int errno; #endif -#if HAVE_LIMITS_H -# include -#endif +#include #if HAVE_SYS_TYPES_H # include #endif Index: lib/xstrtol.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/xstrtol.c,v retrieving revision 1.30 diff -p -u -r1.30 xstrtol.c --- lib/xstrtol.c 19 Dec 2001 10:41:27 -0000 1.30 +++ lib/xstrtol.c 29 May 2003 07:16:27 -0000 @@ -1,5 +1,7 @@ /* A more useful interface to strtol. - Copyright (C) 1995, 1996, 1998-2001 Free Software Foundation, Inc. + + Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2003 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 @@ -52,21 +54,10 @@ extern int errno; #endif -#if HAVE_LIMITS_H -# include -#endif - -#ifndef CHAR_BIT -# define CHAR_BIT 8 -#endif +#include /* The extra casts work around common compiler bugs. */ #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) -/* The outer cast is needed to work around a bug in Cray C 5.0.3.0. - It is necessary at least when t == time_t. */ -#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \ - ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0)) -#define TYPE_MAXIMUM(t) (~ (t) 0 - TYPE_MINIMUM (t)) #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) # define IN_CTYPE_DOMAIN(c) 1 2003-05-28 Paul Eggert Assume the headers required for C89 freestanding compilers. * backupfile.m4 (gl_BACKUPFILE): Don't check for limits.h. * fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Likewise. * human.m4 (gl_HUMAN): Likewise. * pathmax.m4 (gl_PATHMAX): Likewise. * rpmatch.m4 (gl_FUNC_RPMATCH): Likewise. * userspec.m4 (gl_USERSPEC): Likewise. * xreadlink.m4 (gl_XREADLINK): Likewise. * m4/xstrtol.m4 (gl_PREREQ_XSTRTOL): Likewise. * quote.m4 (gl_QUOTE): Don't check for stddef.h. Index: m4/backupfile.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/backupfile.m4,v retrieving revision 1.1 diff -p -u -r1.1 backupfile.m4 --- m4/backupfile.m4 31 Dec 2002 13:42:06 -0000 1.1 +++ m4/backupfile.m4 29 May 2003 07:16:28 -0000 @@ -1,5 +1,5 @@ -# backupfile.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# backupfile.m4 serial 2 +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -11,13 +11,13 @@ AC_DEFUN([gl_BACKUPFILE], dnl Prerequisites of lib/backupfile.c. AC_REQUIRE([AC_HEADER_DIRENT]) AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID]) - AC_CHECK_HEADERS_ONCE(limits.h stdlib.h string.h) + AC_CHECK_HEADERS_ONCE(stdlib.h string.h) AC_CHECK_DECLS_ONCE(getenv malloc) jm_CHECK_TYPE_STRUCT_DIRENT_D_INO dnl Prerequisites of lib/addext.c. AC_REQUIRE([jm_AC_DOS]) AC_SYS_LONG_FILE_NAMES - AC_CHECK_HEADERS_ONCE(limits.h string.h unistd.h) + AC_CHECK_HEADERS_ONCE(string.h unistd.h) AC_CHECK_FUNCS(pathconf) ]) Index: m4/fsusage.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/fsusage.m4,v retrieving revision 1.15 diff -p -u -r1.15 fsusage.m4 --- m4/fsusage.m4 31 Dec 2002 13:43:06 -0000 1.15 +++ m4/fsusage.m4 29 May 2003 07:16:28 -0000 @@ -1,4 +1,4 @@ -#serial 9 +#serial 10 # From fileutils/configure.in @@ -235,7 +235,7 @@ choke -- this is a workaround for a Sun- AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA], [ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) - AC_CHECK_HEADERS_ONCE(fcntl.h limits.h) + AC_CHECK_HEADERS_ONCE(fcntl.h) AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h sys/statvfs.h) jm_STATFS_TRUNCATES ]) Index: m4/human.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/human.m4,v retrieving revision 1.1 diff -p -u -r1.1 human.m4 --- m4/human.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/human.m4 29 May 2003 07:16:28 -0000 @@ -1,5 +1,5 @@ -# human.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# human.m4 serial 2 +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -12,6 +12,6 @@ AC_DEFUN([gl_HUMAN], AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) dnl Prerequisites of lib/human.c. - AC_CHECK_HEADERS_ONCE(limits.h stdlib.h string.h) + AC_CHECK_HEADERS_ONCE(stdlib.h string.h) AC_CHECK_DECLS_ONCE([getenv]) ]) Index: m4/pathmax.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/pathmax.m4,v retrieving revision 1.1 diff -p -u -r1.1 pathmax.m4 --- m4/pathmax.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/pathmax.m4 29 May 2003 07:16:28 -0000 @@ -1,5 +1,5 @@ -# pathmax.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# pathmax.m4 serial 2 +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -9,5 +9,5 @@ dnl the same distribution terms as the r AC_DEFUN([gl_PATHMAX], [ dnl Prerequisites of lib/pathmax.h. - AC_CHECK_HEADERS_ONCE(limits.h sys/param.h unistd.h) + AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h) ]) Index: m4/quote.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/quote.m4,v retrieving revision 1.1 diff -p -u -r1.1 quote.m4 --- m4/quote.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/quote.m4 29 May 2003 07:16:28 -0000 @@ -1,5 +1,5 @@ -# quote.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# quote.m4 serial 2 +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -9,5 +9,5 @@ dnl the same distribution terms as the r AC_DEFUN([gl_QUOTE], [ dnl Prerequisites of lib/quote.c. - AC_CHECK_HEADERS_ONCE(stddef.h) + dnl (none) ]) Index: m4/rpmatch.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/rpmatch.m4,v retrieving revision 1.1 diff -p -u -r1.1 rpmatch.m4 --- m4/rpmatch.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/rpmatch.m4 29 May 2003 07:16:28 -0000 @@ -1,5 +1,5 @@ -# rpmatch.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# rpmatch.m4 serial 2 +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -17,6 +17,5 @@ AC_DEFUN([gl_FUNC_RPMATCH], # Prerequisites of lib/rpmatch.c. AC_DEFUN([gl_PREREQ_RPMATCH], [ AC_REQUIRE([AC_HEADER_STDC]) - AC_CHECK_HEADERS_ONCE(limits.h) ]) Index: m4/userspec.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/userspec.m4,v retrieving revision 1.1 diff -p -u -r1.1 userspec.m4 --- m4/userspec.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/userspec.m4 29 May 2003 07:16:28 -0000 @@ -1,5 +1,5 @@ -# userspec.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# userspec.m4 serial 2 +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -11,5 +11,5 @@ AC_DEFUN([gl_USERSPEC], dnl Prerequisites of lib/userspec.c. AC_REQUIRE([AC_HEADER_STDC]) AC_REQUIRE([AC_FUNC_ALLOCA]) - AC_CHECK_HEADERS_ONCE(limits.h string.h sys/param.h unistd.h) + AC_CHECK_HEADERS_ONCE(string.h sys/param.h unistd.h) ]) Index: m4/xreadlink.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/xreadlink.m4,v retrieving revision 1.1 diff -p -u -r1.1 xreadlink.m4 --- m4/xreadlink.m4 31 Dec 2002 13:42:07 -0000 1.1 +++ m4/xreadlink.m4 29 May 2003 07:16:28 -0000 @@ -1,5 +1,5 @@ -# xreadlink.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# xreadlink.m4 serial 2 +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -9,5 +9,5 @@ dnl the same distribution terms as the r AC_DEFUN([gl_XREADLINK], [ dnl Prerequisites of lib/xreadlink.c. - AC_CHECK_HEADERS_ONCE(limits.h stdlib.h sys/types.h unistd.h) + AC_CHECK_HEADERS_ONCE(stdlib.h sys/types.h unistd.h) ]) Index: m4/xstrtol.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/xstrtol.m4,v retrieving revision 1.2 diff -p -u -r1.2 xstrtol.m4 --- m4/xstrtol.m4 31 Dec 2002 13:49:01 -0000 1.2 +++ m4/xstrtol.m4 29 May 2003 07:16:28 -0000 @@ -1,5 +1,5 @@ -# xstrtol.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# xstrtol.m4 serial 2 +dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -24,7 +24,7 @@ AC_DEFUN([gl_PREREQ_XSTRTOL], [ AC_REQUIRE([gl_PREREQ_XSTRTOL_H]) AC_REQUIRE([AC_HEADER_STDC]) - AC_CHECK_HEADERS_ONCE(limits.h string.h) + AC_CHECK_HEADERS_ONCE(string.h) AC_CHECK_FUNCS_ONCE(isascii) AC_CHECK_DECLS_ONCE(strtol strtoul) AC_CHECK_DECLS([strtoimax, strtoumax]) From MAILER-DAEMON Thu May 29 13:58:45 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19LRfo-0007V8-NZ for mharc-bug-gnulib@gnu.org; Thu, 29 May 2003 13:58:44 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19LRfn-0007TT-3s for bug-gnulib@gnu.org; Thu, 29 May 2003 13:58:43 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19LRfk-0007Sk-KI for bug-gnulib@gnu.org; Thu, 29 May 2003 13:58:42 -0400 Received: from panther.cs.ucla.edu ([131.179.128.25]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19LRfk-0007Rd-3t for bug-gnulib@gnu.org; Thu, 29 May 2003 13:58:40 -0400 Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) h4THwbu10749; Thu, 29 May 2003 10:58:38 -0700 (PDT) Received: from eggert by penguin.cs.ucla.edu with local (Exim 3.35 #1 (Debian)) id 19LRfh-0004AK-00; Thu, 29 May 2003 10:58:37 -0700 To: bug-gnulib@gnu.org Subject: Re: [Bug-gnulib] dirname.h self-contained? References: <20030526215050.GA13877@oskar> <16083.21098.216647.510176@honolulu.ilog.fr> <87of1ous29.fsf@penguin.cs.ucla.edu> <16083.50130.360355.660049@honolulu.ilog.fr> <87d6i22oxd.fsf@penguin.cs.ucla.edu> From: Paul Eggert Date: 29 May 2003 10:58:37 -0700 In-Reply-To: <87d6i22oxd.fsf@penguin.cs.ucla.edu> Message-ID: <87he7d3a9e.fsf@penguin.cs.ucla.edu> Lines: 337 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: Paul Eggert cc: Oskar Liljeblad X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Thu, 29 May 2003 17:58:44 -0000 Here's a proposed patch to fix Oskar Liljeblad's original problem, along with other instances of similar problems that I noticed. Index: lib/ChangeLog =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/ChangeLog,v retrieving revision 1.470 diff -p -u -r1.470 ChangeLog --- lib/ChangeLog 29 May 2003 07:21:59 -0000 1.470 +++ lib/ChangeLog 29 May 2003 17:56:34 -0000 @@ -1,3 +1,16 @@ +2003-05-29 Paul Eggert + + * __fpending.h, addext.c, backupfile.c, exclude.c, getline.c, + malloc.c, utenv.c, realloc.c, strcasecmp.c: Include + rather than , as we merely need size_t. + * dirname.h, memcoll.h, xalloc.h, xmemcoll.h: Include , + to get size_t. + * linebuffer.h: Include , to get FILE. + * memcasecmp.c: Don't include , as we can assume + memcasecmp.h has included and all we need is size_t. + * memcoll.c: Include "memcoll.h", which gets us size_t and checks + our interface, instead of including + 2003-05-28 Paul Eggert Assume the headers required for C89 freestanding compilers. Index: lib/__fpending.h =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/__fpending.h,v retrieving revision 1.3 diff -p -u -r1.3 __fpending.h --- lib/__fpending.h 28 Aug 2000 14:55:18 -0000 1.3 +++ lib/__fpending.h 29 May 2003 17:56:34 -0000 @@ -2,13 +2,12 @@ # include #endif +#include #include #if HAVE_STDIO_EXT_H # include #endif - -#include #ifndef HAVE_DECL___FPENDING "this configure-time declaration test was not run" Index: lib/addext.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/addext.c,v retrieving revision 1.10 diff -p -u -r1.10 addext.c --- lib/addext.c 29 May 2003 07:21:59 -0000 1.10 +++ lib/addext.c 29 May 2003 17:56:34 -0000 @@ -36,7 +36,7 @@ # define _POSIX_NAME_MAX 14 #endif -#include +#include #if HAVE_STRING_H # include #else Index: lib/backupfile.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/backupfile.c,v retrieving revision 1.38 diff -p -u -r1.38 backupfile.c --- lib/backupfile.c 29 May 2003 07:21:59 -0000 1.38 +++ lib/backupfile.c 29 May 2003 17:56:34 -0000 @@ -25,8 +25,8 @@ # include #endif +#include #include -#include #if HAVE_STRING_H # include #else Index: lib/dirname.h =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/dirname.h,v retrieving revision 1.6 diff -p -u -r1.6 dirname.h --- lib/dirname.h 12 May 2001 15:46:36 -0000 1.6 +++ lib/dirname.h 29 May 2003 17:56:34 -0000 @@ -17,6 +17,8 @@ #ifndef DIRNAME_H_ # define DIRNAME_H_ 1 +# include + # ifndef PARAMS # if defined PROTOTYPES || (defined __STDC__ && __STDC__) # define PARAMS(Args) Args Index: lib/exclude.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/exclude.c,v retrieving revision 1.13 diff -p -u -r1.13 exclude.c --- lib/exclude.c 29 May 2003 07:21:59 -0000 1.13 +++ lib/exclude.c 29 May 2003 17:56:35 -0000 @@ -30,10 +30,8 @@ #ifndef errno extern int errno; #endif +#include #include -#if HAVE_SYS_TYPES_H -# include -#endif #if HAVE_STDLIB_H # include #endif Index: lib/getline.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/getline.c,v retrieving revision 1.11 diff -p -u -r1.11 getline.c --- lib/getline.c 13 Jan 2003 07:07:30 -0000 1.11 +++ lib/getline.c 29 May 2003 17:56:35 -0000 @@ -31,8 +31,8 @@ # define _GNU_SOURCE 1 #endif +#include #include -#include #if defined __GNU_LIBRARY__ && HAVE_GETDELIM Index: lib/linebuffer.h =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/linebuffer.h,v retrieving revision 1.12 diff -p -u -r1.12 linebuffer.h --- lib/linebuffer.h 13 Jan 2003 07:09:45 -0000 1.12 +++ lib/linebuffer.h 29 May 2003 17:56:35 -0000 @@ -20,6 +20,8 @@ #if !defined LINEBUFFER_H # define LINEBUFFER_H +# include + /* A `struct linebuffer' holds a line of text. */ struct linebuffer Index: lib/malloc.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/malloc.c,v retrieving revision 1.4 diff -p -u -r1.4 malloc.c --- lib/malloc.c 7 Aug 2000 15:48:18 -0000 1.4 +++ lib/malloc.c 29 May 2003 17:56:35 -0000 @@ -22,7 +22,7 @@ #endif #undef malloc -#include +#include char *malloc (); Index: lib/memcasecmp.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/memcasecmp.c,v retrieving revision 1.8 diff -p -u -r1.8 memcasecmp.c --- lib/memcasecmp.c 7 Jan 2000 06:59:36 -0000 1.8 +++ lib/memcasecmp.c 29 May 2003 17:56:35 -0000 @@ -21,7 +21,6 @@ # include #endif -#include #include #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) Index: lib/memcasecmp.h =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/memcasecmp.h,v retrieving revision 1.5 diff -p -u -r1.5 memcasecmp.h --- lib/memcasecmp.h 16 Jan 1998 08:51:51 -0000 1.5 +++ lib/memcasecmp.h 29 May 2003 17:56:35 -0000 @@ -1,3 +1,5 @@ +#include + #ifndef PARAMS # if defined PROTOTYPES || (defined __STDC__ && __STDC__) # define PARAMS(Args) Args Index: lib/memcoll.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/memcoll.c,v retrieving revision 1.8 diff -p -u -r1.8 memcoll.c --- lib/memcoll.c 31 Dec 2002 22:11:34 -0000 1.8 +++ lib/memcoll.c 29 May 2003 17:56:35 -0000 @@ -21,12 +21,12 @@ # include #endif +#include "memcoll.h" + #include #ifndef errno extern int errno; #endif - -#include #if HAVE_STRING_H # include Index: lib/memcoll.h =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/memcoll.h,v retrieving revision 1.1 diff -p -u -r1.1 memcoll.h --- lib/memcoll.h 4 Jul 1999 10:38:43 -0000 1.1 +++ lib/memcoll.h 29 May 2003 17:56:35 -0000 @@ -5,6 +5,8 @@ # include # endif +# include + # ifndef PARAMS # if defined PROTOTYPES || (defined __STDC__ && __STDC__) # define PARAMS(Args) Args Index: lib/putenv.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/putenv.c,v retrieving revision 1.23 diff -p -u -r1.23 putenv.c --- lib/putenv.c 7 Apr 2000 09:24:18 -0000 1.23 +++ lib/putenv.c 29 May 2003 17:56:36 -0000 @@ -21,7 +21,7 @@ # include #endif -#include +#include /* Include errno.h *after* sys/types.h to work around header problems on AIX 3.2.5. */ Index: lib/realloc.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/realloc.c,v retrieving revision 1.6 diff -p -u -r1.6 realloc.c --- lib/realloc.c 7 Aug 2000 15:48:18 -0000 1.6 +++ lib/realloc.c 29 May 2003 17:56:36 -0000 @@ -22,7 +22,7 @@ #endif #undef realloc -#include +#include char *malloc (); char *realloc (); Index: lib/strcasecmp.c =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/strcasecmp.c,v retrieving revision 1.4 diff -p -u -r1.4 strcasecmp.c --- lib/strcasecmp.c 7 Aug 2000 15:48:18 -0000 1.4 +++ lib/strcasecmp.c 29 May 2003 17:56:36 -0000 @@ -29,7 +29,7 @@ # define LENGTH_LIMIT_EXPR(Expr) 0 #endif -#include +#include #include #define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) Index: lib/xalloc.h =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/xalloc.h,v retrieving revision 1.13 diff -p -u -r1.13 xalloc.h --- lib/xalloc.h 31 Oct 2000 07:09:56 -0000 1.13 +++ lib/xalloc.h 29 May 2003 17:56:36 -0000 @@ -18,6 +18,8 @@ #ifndef XALLOC_H_ # define XALLOC_H_ +# include + # ifndef PARAMS # if defined PROTOTYPES || (defined __STDC__ && __STDC__) # define PARAMS(Args) Args Index: lib/xmemcoll.h =================================================================== RCS file: /cvsroot/gnulib/gnulib/lib/xmemcoll.h,v retrieving revision 1.1 diff -p -u -r1.1 xmemcoll.h --- lib/xmemcoll.h 22 Jan 2002 08:03:03 -0000 1.1 +++ lib/xmemcoll.h 29 May 2003 17:56:36 -0000 @@ -1,2 +1,3 @@ +#include extern int xmemcoll_exit_failure; int xmemcoll (char *, size_t, char *, size_t); Index: m4/ChangeLog =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/ChangeLog,v retrieving revision 1.449 diff -p -u -r1.449 ChangeLog --- m4/ChangeLog 29 May 2003 07:21:59 -0000 1.449 +++ m4/ChangeLog 29 May 2003 17:56:40 -0000 @@ -1,3 +1,8 @@ +2003-05-29 Paul Eggert + + * exclude.m4 (gl_EXCLUDE): Don't check for sys/types.h; no loner + needed. + 2003-05-28 Paul Eggert Assume the headers required for C89 freestanding compilers. Index: m4/exclude.m4 =================================================================== RCS file: /cvsroot/gnulib/gnulib/m4/exclude.m4,v retrieving revision 1.1 diff -p -u -r1.1 exclude.m4 --- m4/exclude.m4 31 Dec 2002 13:42:06 -0000 1.1 +++ m4/exclude.m4 29 May 2003 17:56:41 -0000 @@ -9,5 +9,5 @@ dnl the same distribution terms as the r AC_DEFUN([gl_EXCLUDE], [ dnl Prerequisites of lib/exclude.c. - AC_CHECK_HEADERS_ONCE(stdlib.h string.h strings.h sys/types.h) + AC_CHECK_HEADERS_ONCE(stdlib.h string.h strings.h) ]) From MAILER-DAEMON Thu May 29 18:58:00 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19LWL7-0007ir-0l for mharc-bug-gnulib@gnu.org; Thu, 29 May 2003 18:57:41 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19LWKn-0007O3-Oq for bug-gnulib@gnu.org; Thu, 29 May 2003 18:57:21 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19LWKL-0006ux-A9 for bug-gnulib@gnu.org; Thu, 29 May 2003 18:56:54 -0400 Received: from consort.superb.net ([209.61.216.22] helo=f7.net) by monty-python.gnu.org with esmtp (Exim 4.20) id 19LWJE-0005oz-Sb for bug-gnulib@gnu.org; Thu, 29 May 2003 18:55:44 -0400 Received: (from karl@localhost) by f7.net (8.11.7/8.11.6) id h4TMta629794; Thu, 29 May 2003 18:55:36 -0400 Date: Thu, 29 May 2003 18:55:36 -0400 Message-Id: <200305292255.h4TMta629794@f7.net> From: karl@freefriends.org (Karl Berry) To: bug-gnulib@gnu.org Subject: [Bug-gnulib] gnulib vs gettext X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Thu, 29 May 2003 22:57:38 -0000 I installed gettext 0.12.1 on my development system today and found some discrepancies with gnulib. 1) config.rpath was updated in gettext 0.12.1, but the gnulib version remained the same (from 2002). I updated it in gnulib and added it to config/srclist.txt. 2) mkinstalldirs had an older version in gettext 0.12.1 than in gnulib. Bruno, can you update gettext or do you want me to mail bug-gettext? (Or do you see some problem with the gnulib version?) 3) gettext's m4/ulonglong.m4 was at serial 2, but gnulib has serial 3. (Just adds a comment and corrects a user message.) Bruno, same question here. 4) gnulib/m4/inttype_h.m4, stdint_h.m4, and uintmax_t.m4 all have the gettext version in their serial line. If we're going to consider those files as sourced from gettext, fine, I will add them to srclist.txt. Otherwise, can we (I) remove the gettext version from the gnulib sources? It causes spurious diffs. Thanks, karl From MAILER-DAEMON Fri May 30 03:39:32 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19LeTu-0004VC-M2 for mharc-bug-gnulib@gnu.org; Fri, 30 May 2003 03:39:18 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19LeTK-0003j1-FL for bug-gnulib@gnu.org; Fri, 30 May 2003 03:38:42 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19LeSr-00038M-0N for bug-gnulib@gnu.org; Fri, 30 May 2003 03:38:13 -0400 Received: from anice-201-1-1-11.w80-13.abo.wanadoo.fr ([80.13.35.11] helo=elf.meyering.net) by monty-python.gnu.org with esmtp (Exim 4.20) id 19LeQT-0001oT-4i for bug-gnulib@gnu.org; Fri, 30 May 2003 03:35:45 -0400 Received: by elf.meyering.net (Postfix, from userid 1002) id 832594031; Fri, 30 May 2003 09:35:43 +0200 (CEST) To: Paul Eggert Subject: Re: [Bug-gnulib] dirname.h self-contained? In-Reply-To: <87he7d3a9e.fsf@penguin.cs.ucla.edu> (Paul Eggert's message of "29 May 2003 10:58:37 -0700") References: <20030526215050.GA13877@oskar> <16083.21098.216647.510176@honolulu.ilog.fr> <87of1ous29.fsf@penguin.cs.ucla.edu> <16083.50130.360355.660049@honolulu.ilog.fr> <87d6i22oxd.fsf@penguin.cs.ucla.edu> <87he7d3a9e.fsf@penguin.cs.ucla.edu> From: Jim Meyering Date: Fri, 30 May 2003 09:35:43 +0200 Message-ID: <85vfvsc2eo.fsf@pi.meyering.net> Lines: 29 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii cc: Oskar Liljeblad cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Fri, 30 May 2003 07:39:17 -0000 Paul Eggert wrote: > Here's a proposed patch to fix Oskar Liljeblad's original problem, > along with other instances of similar problems that I noticed. > > Index: lib/ChangeLog > =================================================================== > RCS file: /cvsroot/gnulib/gnulib/lib/ChangeLog,v > retrieving revision 1.470 > diff -p -u -r1.470 ChangeLog > --- lib/ChangeLog 29 May 2003 07:21:59 -0000 1.470 > +++ lib/ChangeLog 29 May 2003 17:56:34 -0000 > @@ -1,3 +1,16 @@ > +2003-05-29 Paul Eggert > + > + * __fpending.h, addext.c, backupfile.c, exclude.c, getline.c, > + malloc.c, utenv.c, realloc.c, strcasecmp.c: Include > + rather than , as we merely need size_t. > + * dirname.h, memcoll.h, xalloc.h, xmemcoll.h: Include , > + to get size_t. > + * linebuffer.h: Include , to get FILE. > + * memcasecmp.c: Don't include , as we can assume > + memcasecmp.h has included and all we need is size_t. > + * memcoll.c: Include "memcoll.h", which gets us size_t and checks > + our interface, instead of including > + > 2003-05-28 Paul Eggert Looks fine. Thanks for doing all that! From MAILER-DAEMON Fri May 30 03:42:11 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19LeVt-0007Yq-IV for mharc-bug-gnulib@gnu.org; Fri, 30 May 2003 03:41:21 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19LeVi-000753-41 for bug-gnulib@gnu.org; Fri, 30 May 2003 03:41:10 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19LeUh-0006AH-Jo for bug-gnulib@gnu.org; Fri, 30 May 2003 03:40:10 -0400 Received: from anice-201-1-1-11.w80-13.abo.wanadoo.fr ([80.13.35.11] helo=elf.meyering.net) by monty-python.gnu.org with esmtp (Exim 4.20) id 19LeUW-0005gu-N4 for bug-gnulib@gnu.org; Fri, 30 May 2003 03:39:56 -0400 Received: by elf.meyering.net (Postfix, from userid 1002) id EE6474031; Fri, 30 May 2003 09:39:55 +0200 (CEST) To: Paul Eggert Subject: Re: [Bug-gnulib] addext.c import from GNU patch 2.5.9 In-Reply-To: <87vfvuwsr9.fsf@penguin.cs.ucla.edu> (Paul Eggert's message of "28 May 2003 16:34:02 -0700") References: <87vfvuwsr9.fsf@penguin.cs.ucla.edu> From: Jim Meyering Date: Fri, 30 May 2003 09:39:55 +0200 Message-ID: <85ptm0c27o.fsf@pi.meyering.net> Lines: 12 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Fri, 30 May 2003 07:41:18 -0000 Paul Eggert wrote: > I merged this change from GNU patch 2.5.9 into gnulib. Hmm, I now see > that coreutils made a similar change, but I like this version better > as it doesn't have a cast in it. > > 2003-05-28 Paul Eggert > > * addext.c (addext): Use assignment rather than cast, to avoid > warnings on some platforms. I prefer this approach, too. Thanks. From MAILER-DAEMON Fri May 30 09:35:37 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19Lk1W-00007z-Uv for mharc-bug-gnulib@gnu.org; Fri, 30 May 2003 09:34:22 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19Ljz4-0007CG-Om for bug-gnulib@gnu.org; Fri, 30 May 2003 09:31:50 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19Ljwo-0006CK-Fm for bug-gnulib@gnu.org; Fri, 30 May 2003 09:29:31 -0400 Received: from ftp.ilog.fr ([81.80.162.195]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19Ljt5-0004v6-Py for bug-gnulib@gnu.org; Fri, 30 May 2003 09:25:39 -0400 Received: from laposte.ilog.fr (cerbere-qe0 [81.80.162.193]) by ftp.ilog.fr (8.12.9/8.12.9) with ESMTP id h4UDPZNN001324; Fri, 30 May 2003 15:25:35 +0200 (MET DST) Received: from honolulu.ilog.fr ([172.16.15.122]) by laposte.ilog.fr (8.11.6/8.11.6) with ESMTP id h4UDPYk28286; Fri, 30 May 2003 15:25:34 +0200 (MET DST) Received: (from haible@localhost) by honolulu.ilog.fr (8.9.3/8.9.3/SuSE Linux 8.9.3-0.1) id OAA31426; Fri, 30 May 2003 14:45:15 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <16087.21078.288936.516577@honolulu.ilog.fr> Date: Fri, 30 May 2003 14:45:10 +0200 (CEST) From: Bruno Haible To: Paul Eggert Subject: Re: [Bug-gnulib] dirname.h self-contained? In-Reply-To: <87he7d3a9e.fsf@penguin.cs.ucla.edu> References: <20030526215050.GA13877@oskar> <16083.21098.216647.510176@honolulu.ilog.fr> <87of1ous29.fsf@penguin.cs.ucla.edu> <16083.50130.360355.660049@honolulu.ilog.fr> <87d6i22oxd.fsf@penguin.cs.ucla.edu> <87he7d3a9e.fsf@penguin.cs.ucla.edu> X-Mailer: VM 6.72 under 21.1 (patch 8) "Bryce Canyon" XEmacs Lucid cc: Oskar Liljeblad cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Fri, 30 May 2003 13:34:21 -0000 Paul Eggert writes: > Here's a proposed patch to fix Oskar Liljeblad's original problem, > along with other instances of similar problems that I noticed. Looks good, except that the ChangeLog entry should mention putenv.c, not utenv.c. And the files hash.h, readtokens.h, stdio-safer.h, version-etc.h should also #include , for FILE. Bruno From MAILER-DAEMON Fri May 30 09:42:08 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19Lk91-000385-O0 for mharc-bug-gnulib@gnu.org; Fri, 30 May 2003 09:42:07 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19Lk90-00037h-2s for bug-gnulib@gnu.org; Fri, 30 May 2003 09:42:06 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19Lk8y-00037E-M5 for bug-gnulib@gnu.org; Fri, 30 May 2003 09:42:05 -0400 Received: from ftp.ilog.fr ([81.80.162.195]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19Lk8y-00037A-8k for bug-gnulib@gnu.org; Fri, 30 May 2003 09:42:04 -0400 Received: from laposte.ilog.fr (cerbere-qe0 [81.80.162.193]) by ftp.ilog.fr (8.12.9/8.12.9) with ESMTP id h4UDg2NN001680; Fri, 30 May 2003 15:42:02 +0200 (MET DST) Received: from honolulu.ilog.fr ([172.16.15.122]) by laposte.ilog.fr (8.11.6/8.11.6) with ESMTP id h4UDg1k29735; Fri, 30 May 2003 15:42:01 +0200 (MET DST) Received: (from haible@localhost) by honolulu.ilog.fr (8.9.3/8.9.3/SuSE Linux 8.9.3-0.1) id PAA31693; Fri, 30 May 2003 15:42:49 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <16087.24537.388962.355005@honolulu.ilog.fr> Date: Fri, 30 May 2003 15:42:49 +0200 (CEST) From: Bruno Haible To: karl@freefriends.org (Karl Berry) Subject: Re: [Bug-gnulib] gnulib vs gettext In-Reply-To: <200305292255.h4TMta629794@f7.net> References: <200305292255.h4TMta629794@f7.net> X-Mailer: VM 6.72 under 21.1 (patch 8) "Bryce Canyon" XEmacs Lucid cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Fri, 30 May 2003 13:42:06 -0000 Karl Berry writes: > I installed gettext 0.12.1 on my development system today and found some > discrepancies with gnulib. Yes I wanted to let people test gettext a while before I merge the macros into gnulib. I've now made the upgrade: 2003-05-30 Bruno Haible * modules/gettext: Add files m4/nls.m4 and m4/po.m4. * config/config.rpath: Upgrade to gettext-0.12.1. lib: * config.charset: Upgrade to gettext-0.12.1 and libiconv-1.9.1. * localcharset.h: Likewise. * localcharset.c: Likewise. m4: * gettext.m4: Upgrade to gettext-0.12.1. * nls.m4: New file, from gettext-0.12.1. * po.m4: New file, from gettext-0.12.1. * progtest.m4: Upgrade to gettext-0.12.1. > 1) config.rpath was updated in gettext 0.12.1, but the gnulib version > remained the same (from 2002). I updated it in gnulib and added it > to config/srclist.txt. I prefer a manual update. Some gettext releases need a while of testing until I trust them. > 2) mkinstalldirs had an older version in gettext 0.12.1 than in gnulib. > Bruno, can you update gettext or do you want me to mail bug-gettext? > (Or do you see some problem with the gnulib version?) The master source of mkinstalldirs is in automake, not gettext. Please report a bug to bug-gnu-gettext only if this old version of mkinstalldirs causes malfunctioning. Remember that using older versions of automake _can_ be a source of reliablity :-) > 3) gettext's m4/ulonglong.m4 was at serial 2, but gnulib has serial 3. > (Just adds a comment and corrects a user message.) Bruno, same > question here. I'll look at it. > 4) gnulib/m4/inttype_h.m4, stdint_h.m4, and uintmax_t.m4 all have the > gettext version in their serial line. If we're going to consider > those files as sourced from gettext, fine, I will add them to > srclist.txt. No these file don't originate in gettext. The comment in the serial line is only a reminder which packages use the macro. Feel free to add coreutils-x.y, diffutils-x.y, findutils-x.y etc. there when you make a release of them. And remove all the release tags when you bump the serial version, of course. The purpose of the comments is to give an indication who is responsible for a .m4 file. Well, maybe these comments are not necessary now that every module lists its .m4 files and every module has a formal maintainer? I don't know. Bruno From MAILER-DAEMON Fri May 30 10:13:02 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19LkbW-0003lo-5B for mharc-bug-gnulib@gnu.org; Fri, 30 May 2003 10:11:34 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19LkbK-0003ZO-3t for bug-gnulib@gnu.org; Fri, 30 May 2003 10:11:22 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19LkTf-0008Jf-LC for bug-gnulib@gnu.org; Fri, 30 May 2003 10:03:30 -0400 Received: from consort.superb.net ([209.61.216.22] helo=f7.net) by monty-python.gnu.org with esmtp (Exim 4.20) id 19LkTD-0007WU-EW for bug-gnulib@gnu.org; Fri, 30 May 2003 10:02:59 -0400 Received: (from karl@localhost) by f7.net (8.11.7/8.11.6) id h4UE2v312055; Fri, 30 May 2003 10:02:57 -0400 Date: Fri, 30 May 2003 10:02:57 -0400 Message-Id: <200305301402.h4UE2v312055@f7.net> From: karl@freefriends.org (Karl Berry) To: bruno@clisp.org Subject: Re: [Bug-gnulib] gnulib vs gettext cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Fri, 30 May 2003 14:11:33 -0000 I prefer a manual update. Some gettext releases need a while of testing until I trust them. Gettext, yes. But config.rpath? The master source of mkinstalldirs is in automake, not gettext. That's what I thought. So then I don't think gettextize should update mkinstalldirs, unless it didn't exist in the target package or is definitely newer. Not that it's a big deal. The comment in the serial line is only a reminder which packages use the macro. This seems unmaintainable to me? The only way to really know what packages use what macros is to inspect the source. It doesn't seem feasible for every GNU maintainer to add their package name and version to every gnulib macro they use! The purpose of the comments is to give an indication who is responsible for a .m4 file. That's important, but that seems different to me than which packages use it. The ChangeLog or cvs log showing who has checked in changes to the file would be my approach to finding out who is responsible. Thanks, karl From MAILER-DAEMON Fri May 30 10:38:24 2003 Received: from list by monty-python.gnu.org with archive (Exim 4.20) id 19Ll0H-00064X-2m for mharc-bug-gnulib@gnu.org; Fri, 30 May 2003 10:37:09 -0400 Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.20) id 19LkwQ-0003YF-IA for bug-gnulib@gnu.org; Fri, 30 May 2003 10:33:10 -0400 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.20) id 19LkwD-00030Y-GT for bug-gnulib@gnu.org; Fri, 30 May 2003 10:33:00 -0400 Received: from ftp.ilog.fr ([81.80.162.195]) by monty-python.gnu.org with esmtp (Exim 4.20) id 19Lkjo-0007dl-GD for bug-gnulib@gnu.org; Fri, 30 May 2003 10:20:08 -0400 Received: from laposte.ilog.fr (cerbere-qe0 [81.80.162.193]) by ftp.ilog.fr (8.12.9/8.12.9) with ESMTP id h4UEJcNN002328; Fri, 30 May 2003 16:19:38 +0200 (MET DST) Received: from honolulu.ilog.fr ([172.16.15.122]) by laposte.ilog.fr (8.11.6/8.11.6) with ESMTP id h4UEJak02644; Fri, 30 May 2003 16:19:36 +0200 (MET DST) Received: (from haible@localhost) by honolulu.ilog.fr (8.9.3/8.9.3/SuSE Linux 8.9.3-0.1) id QAA31952; Fri, 30 May 2003 16:20:24 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <16087.26792.871041.695710@honolulu.ilog.fr> Date: Fri, 30 May 2003 16:20:24 +0200 (CEST) From: Bruno Haible To: karl@freefriends.org (Karl Berry) Subject: Re: [Bug-gnulib] gnulib vs gettext In-Reply-To: <200305292255.h4TMta629794@f7.net> References: <200305292255.h4TMta629794@f7.net> X-Mailer: VM 6.72 under 21.1 (patch 8) "Bryce Canyon" XEmacs Lucid cc: bug-gnulib@gnu.org X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: The GNUlib portability library bug discussion list List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , X-List-Received-Date: Fri, 30 May 2003 14:37:08 -0000 Karl Berry writes: > 3) gettext's m4/ulonglong.m4 was at serial 2, but gnulib has serial 3. The one in gettext was not up to date. In the long run, "gnulib-tool --import" should avoid this kind of inconsistencies. Bruno