I installed this to sync coreutils from gnulib: 2004-10-17 Paul Eggert <[EMAIL PROTECTED]>
Sync from gnulib. * lib/diacrit.c, lib/diacrit.h: Add copyright notice. * lib/getpass.c (fflush_unlocked, flockfile, funlockfile) (fputs_unlocked, putc_unlocked) [!_LIBCS && !USE_UNLOCKED_IO]: Map to real functions. * m4/getopt.m4 (gl_GETOPT): Detect and reject the incompatible BSD implementation of getopt_long. Index: lib/diacrit.c =================================================================== RCS file: /fetish/cu/lib/diacrit.c,v retrieving revision 1.4 diff -p -u -r1.4 diacrit.c --- lib/diacrit.c 9 Aug 2004 23:26:57 -0000 1.4 +++ lib/diacrit.c 18 Oct 2004 05:03:10 -0000 @@ -3,7 +3,21 @@ FranÃois Pinard <[EMAIL PROTECTED]>, 1988. All this file is a temporary hack, waiting for locales in GNU. -*/ + + 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; see the file COPYING. + If not, write to the Free Software Foundation, + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H # include <config.h> Index: lib/diacrit.h =================================================================== RCS file: /fetish/cu/lib/diacrit.h,v retrieving revision 1.4 diff -p -u -r1.4 diacrit.h --- lib/diacrit.h 9 Aug 2004 23:27:04 -0000 1.4 +++ lib/diacrit.h 18 Oct 2004 05:03:10 -0000 @@ -3,7 +3,21 @@ FranÃois Pinard <[EMAIL PROTECTED]>, 1988. All this file is a temporary hack, waiting for locales in GNU. -*/ + + 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; see the file COPYING. + If not, write to the Free Software Foundation, + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ extern const char diacrit_base[]; /* characters without diacritics */ extern const char diacrit_diac[]; /* diacritic code for each character */ Index: lib/getpass.c =================================================================== RCS file: /fetish/cu/lib/getpass.c,v retrieving revision 1.7 diff -p -u -r1.7 getpass.c --- lib/getpass.c 4 Oct 2004 20:18:43 -0000 1.7 +++ lib/getpass.c 18 Oct 2004 05:03:10 -0000 @@ -57,6 +57,17 @@ # define funlockfile(s) _IO_funlockfile (s) #elif USE_UNLOCKED_IO # include "unlocked-io.h" +#else +# undef fflush_unlocked +# define fflush_unlocked(x) fflush (x) +# undef flockfile +# define flockfile(x) ((void) 0) +# undef funlockfile +# define funlockfile(x) ((void) 0) +# undef fputs_unlocked +# define fputs_unlocked(str,stream) fputs (str, stream) +# undef putc_unlocked +# define putc_unlocked(c,stream) putc (c, stream) #endif #if _LIBC Index: m4/getopt.m4 =================================================================== RCS file: /fetish/cu/m4/getopt.m4,v retrieving revision 1.3 diff -p -u -r1.3 getopt.m4 --- m4/getopt.m4 20 Aug 2004 02:10:18 -0000 1.3 +++ m4/getopt.m4 18 Oct 2004 05:03:10 -0000 @@ -1,4 +1,4 @@ -# getopt.m4 serial 3 +# getopt.m4 serial 4 dnl Copyright (C) 2002, 2003, 2004 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 @@ -38,6 +38,10 @@ AC_DEFUN([gl_GETOPT], AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h]) AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h]) + dnl BSD getopt_long uses an incompatible method to reset option processing, + dnl and (as of 2004-10-15) mishandles optional option-arguments. + AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>]) + if test -n "$GETOPT_H"; then gl_GETOPT_SUBSTITUTE fi _______________________________________________ Bug-coreutils mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/bug-coreutils