diff options
| -rw-r--r-- | config/ChangeLog | 16 | ||||
| -rwxr-xr-x | config/srclist-update | 23 | ||||
| -rw-r--r-- | config/srclist.txt | 22 | ||||
| -rw-r--r-- | config/srclistvars.sh | 13 | ||||
| -rw-r--r-- | lib/ChangeLog | 10 | ||||
| -rw-r--r-- | lib/asnprintf.c | 17 | ||||
| -rw-r--r-- | lib/asprintf.c | 17 | ||||
| -rwxr-xr-x | lib/config.charset | 25 | ||||
| -rw-r--r-- | lib/gettext.h | 17 | ||||
| -rw-r--r-- | lib/localcharset.c | 17 | ||||
| -rw-r--r-- | lib/localcharset.h | 17 | ||||
| -rw-r--r-- | lib/mkdtemp.c | 21 | ||||
| -rw-r--r-- | lib/printf-args.c | 17 | ||||
| -rw-r--r-- | lib/printf-args.h | 17 | ||||
| -rw-r--r-- | lib/printf-parse.c | 17 | ||||
| -rw-r--r-- | lib/printf-parse.h | 17 | ||||
| -rw-r--r-- | lib/ref-add.sin | 25 | ||||
| -rw-r--r-- | lib/ref-del.sin | 25 | ||||
| -rw-r--r-- | lib/setenv.c | 22 | ||||
| -rw-r--r-- | lib/unsetenv.c | 21 | ||||
| -rw-r--r-- | lib/vasnprintf.c | 17 | ||||
| -rw-r--r-- | lib/vasnprintf.h | 17 | ||||
| -rw-r--r-- | lib/vasprintf.c | 17 | ||||
| -rw-r--r-- | lib/vasprintf.h | 17 |
24 files changed, 248 insertions, 196 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 52c0a3d399..38d9175c93 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,19 @@ +2003-07-14 Paul Eggert <eggert@twinsun.com> + + * srclist.txt: Add tons more gettext files. $GETTEXT is now + assumed to refer to the root of the most recent stable gettext version. + * srclistvars.sh: Add defaults for eggert. + * srclist-update: Convert LGPL to GPL in shell scripts, too. + Match "This program" as well as "The program". This is needed + for gettext. + +2003-07-09 Paul Eggert <eggert@twinsun.com> + + * srclist.txt: Sort sublists. Add $LIBCSRC/sysdeps/generic/strtoul.c. + In comments, add more libc files that differ from gnulib for one + reason or another; we'd like this list to be smaller but for now + let's document what we have. + 2003-07-08 Paul Eggert <eggert@twinsun.com> * srclist-update: Port to POSIX 1003.1-2001 hosts by avoiding the diff --git a/config/srclist-update b/config/srclist-update index cbe1af5292..0145b4f7e6 100755 --- a/config/srclist-update +++ b/config/srclist-update @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: srclist-update,v 1.6 2003-07-08 23:33:45 eggert Exp $ +# $Id: srclist-update,v 1.7 2003-07-14 22:44:04 eggert Exp $ # # Check for files in directory $1 being up to date, according to the # list on stdin. Don't actually make any changes, just show the diffs. @@ -26,7 +26,24 @@ test -r $mydir/srclistvars.sh && . $mydir/srclistvars.sh # fixlicense() \ { - sed '/The .* is free software/,/USA\. *\*\//c\ + sed ' + + /^\([[:space:]]*#[[:space:]]*\)Th[ei][ s].* is free software/,/^[[:space:]]*#.*USA\./c\ +# 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. + + /Th[ei][ s].* is free software/,/USA\. *\*\//c\ 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)\ @@ -57,7 +74,7 @@ fixfile() \ *) cat $1;; esac \ - | grep -v '\$Id: srclist-update,v 1.6 2003-07-08 23:33:45 eggert Exp $' >$2 + | grep -v '\$Id: srclist-update,v 1.7 2003-07-14 22:44:04 eggert Exp $' >$2 } diff --git a/config/srclist.txt b/config/srclist.txt index 0d74496306..c0ffbbc568 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -1,4 +1,4 @@ -# $Id: srclist.txt,v 1.17 2003-07-10 05:07:45 eggert Exp $ +# $Id: srclist.txt,v 1.18 2003-07-14 22:44:04 eggert Exp $ # Files for which we are not the source. See ./srclistvars.sh for the # variable definitions. @@ -18,7 +18,25 @@ $AUTOCONF/INSTALL doc $GNUORG/COPYING.DOC doc $GNUORG/fdl.texi doc -$GETTEXT/gettext.h lib +$GETTEXT/gettext-runtime/libasprintf/asnprintf.c lib gpl +$GETTEXT/gettext-runtime/libasprintf/asprintf.c lib gpl +$GETTEXT/gettext-runtime/libasprintf/printf-args.c lib gpl +$GETTEXT/gettext-runtime/libasprintf/printf-args.h lib gpl +$GETTEXT/gettext-runtime/libasprintf/printf-parse.c lib gpl +$GETTEXT/gettext-runtime/libasprintf/printf-parse.h lib gpl +$GETTEXT/gettext-runtime/libasprintf/vasnprintf.c lib gpl +$GETTEXT/gettext-runtime/libasprintf/vasnprintf.h lib gpl +$GETTEXT/gettext-runtime/libasprintf/vasprintf.c lib gpl +$GETTEXT/gettext-tools/lib/config.charset lib gpl +$GETTEXT/gettext-tools/lib/gettext.h lib gpl +$GETTEXT/gettext-tools/lib/localcharset.c lib gpl +$GETTEXT/gettext-tools/lib/localcharset.h lib gpl +$GETTEXT/gettext-tools/lib/mkdtemp.c lib gpl +$GETTEXT/gettext-tools/lib/ref-add.sin lib gpl +$GETTEXT/gettext-tools/lib/ref-del.sin lib gpl +$GETTEXT/gettext-tools/lib/setenv.c lib gpl +$GETTEXT/gettext-tools/lib/unsetenv.c lib gpl +$GETTEXT/gettext-tools/lib/vasprintf.h lib gpl # $LIBCSRC/argp/argp-ba.c lib gpl $LIBCSRC/argp/argp-eexst.c lib gpl diff --git a/config/srclistvars.sh b/config/srclistvars.sh index d7e385fe5b..73f8b7c512 100644 --- a/config/srclistvars.sh +++ b/config/srclistvars.sh @@ -1,7 +1,18 @@ -# $Id: srclistvars.sh,v 1.8 2003-05-18 15:28:33 karl Exp $ +# $Id: srclistvars.sh,v 1.9 2003-07-14 22:44:04 eggert Exp $ # Variables for srclist-update and srclist.txt. # Will change for each user. +case $LOGNAME in +eggert) + : ${AUTOCONF=../autoconf} + : ${AUTOMAKE=../automake} + : ${GETTEXT=../gettext} + : ${GNUCONFIG=../config} + : ${GNUORG=../gnuorg} + : ${LIBCSRC=../libc} + : ${TEXINFOSRC=../texinfo} +esac + : ${ACLOCAL=/usr/local/gnu/share/aclocal} : ${AUTOCONF=/usr/local/gnu/share/autoconf} : ${AUTOMAKE=$HOME/gnu/src/automake} diff --git a/lib/ChangeLog b/lib/ChangeLog index 5760076f67..02f07359cb 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,13 @@ +2003-07-14 Paul Eggert <eggert@twinsun.com> + + * asnprintf.c, asprintf.c, config.charset, gettext.h, + localcharset.c, localcharset.h, mkdtemp.c, printf-args.c, + printf-args.h, printf-parse.c, printf-parse.h, ref-add.sin, + ref-del.sin, setenv.c, unsetenv.c, vasnprintf.c, vasnprintf.h, + vasprintf.c, vasprintf.h: Regenerate. These files are now being + updated automatically by ../config/srclist-update. This changes + their license from LPGL to GPL. + 2003-07-14 Jim Meyering <jim@meyering.net> Don't emit diagnostics. Let callers do that. diff --git a/lib/asnprintf.c b/lib/asnprintf.c index 8fb9d3c823..4881a9238f 100644 --- a/lib/asnprintf.c +++ b/lib/asnprintf.c @@ -1,20 +1,19 @@ /* Formatted output to strings. Copyright (C) 1999, 2002 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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 <config.h> diff --git a/lib/asprintf.c b/lib/asprintf.c index a8e1bf8992..5935c53e65 100644 --- a/lib/asprintf.c +++ b/lib/asprintf.c @@ -1,20 +1,19 @@ /* Formatted output to strings. Copyright (C) 1999, 2002 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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 <config.h> diff --git a/lib/config.charset b/lib/config.charset index 32becece96..b94d83fb33 100755 --- a/lib/config.charset +++ b/lib/config.charset @@ -3,20 +3,19 @@ # # 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 Library General Public License as published -# by the Free Software Foundation; either version 2, or (at your option) -# any later version. +# 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 -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library 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. +# 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. # # The table consists of lines of the form # ALIAS CANONICAL diff --git a/lib/gettext.h b/lib/gettext.h index 8b262f4cfd..835732e01f 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -1,20 +1,19 @@ /* Convenience header for conditional use of GNU <libintl.h>. Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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. */ #ifndef _LIBGETTEXT_H #define _LIBGETTEXT_H 1 diff --git a/lib/localcharset.c b/lib/localcharset.c index d04d05368f..eb5563df49 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -2,20 +2,19 @@ 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 Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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. */ /* Written by Bruno Haible <bruno@clisp.org>. */ diff --git a/lib/localcharset.h b/lib/localcharset.h index 3b137e73c5..5058c84362 100644 --- a/lib/localcharset.h +++ b/lib/localcharset.h @@ -2,20 +2,19 @@ Copyright (C) 2000-2003 Free Software Foundation, Inc. This file is part of the GNU CHARSET Library. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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. */ #ifndef _LOCALCHARSET_H #define _LOCALCHARSET_H diff --git a/lib/mkdtemp.c b/lib/mkdtemp.c index 8434acf9cb..2f46c18edf 100644 --- a/lib/mkdtemp.c +++ b/lib/mkdtemp.c @@ -1,20 +1,19 @@ /* Copyright (C) 1999, 2001-2003 Free Software Foundation, Inc. This file is part of the GNU C Library. - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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. - The GNU C Library is distributed in the hope that it will be useful, + 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 - Library General Public License for more details. + 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 Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + 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. */ /* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c. */ diff --git a/lib/printf-args.c b/lib/printf-args.c index f391974023..6972cfd42e 100644 --- a/lib/printf-args.c +++ b/lib/printf-args.c @@ -1,20 +1,19 @@ /* Decomposed printf argument list. Copyright (C) 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 Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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 <config.h> diff --git a/lib/printf-args.h b/lib/printf-args.h index 35114a8fad..c938192b7a 100644 --- a/lib/printf-args.h +++ b/lib/printf-args.h @@ -1,20 +1,19 @@ /* Decomposed printf argument list. Copyright (C) 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 Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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. */ #ifndef _PRINTF_ARGS_H #define _PRINTF_ARGS_H diff --git a/lib/printf-parse.c b/lib/printf-parse.c index bdfe88fe8f..51b08bbb0a 100644 --- a/lib/printf-parse.c +++ b/lib/printf-parse.c @@ -1,20 +1,19 @@ /* Formatted output to strings. Copyright (C) 1999-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 Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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 <config.h> diff --git a/lib/printf-parse.h b/lib/printf-parse.h index 97e432af1f..54b429f129 100644 --- a/lib/printf-parse.h +++ b/lib/printf-parse.h @@ -1,20 +1,19 @@ /* Parse printf format string. Copyright (C) 1999, 2002 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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. */ #ifndef _PRINTF_PARSE_H #define _PRINTF_PARSE_H diff --git a/lib/ref-add.sin b/lib/ref-add.sin index 167374e3c5..acd9ff94d6 100644 --- a/lib/ref-add.sin +++ b/lib/ref-add.sin @@ -2,20 +2,19 @@ # # Copyright (C) 2000 Free Software Foundation, Inc. # -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published -# by the Free Software Foundation; either version 2, or (at your option) -# any later version. +# 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 -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library 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. +# 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. # # Written by Bruno Haible <haible@clisp.cons.org>. # diff --git a/lib/ref-del.sin b/lib/ref-del.sin index 613cf37f3b..731f66fd38 100644 --- a/lib/ref-del.sin +++ b/lib/ref-del.sin @@ -2,20 +2,19 @@ # # Copyright (C) 2000 Free Software Foundation, Inc. # -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU Library General Public License as published -# by the Free Software Foundation; either version 2, or (at your option) -# any later version. +# 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 -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library 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. +# 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. # # Written by Bruno Haible <haible@clisp.cons.org>. # diff --git a/lib/setenv.c b/lib/setenv.c index fdbf354342..04073caa03 100644 --- a/lib/setenv.c +++ b/lib/setenv.c @@ -1,25 +1,23 @@ /* Copyright (C) 1992,1995-1999,2000-2003 Free Software Foundation, Inc. This file is part of the GNU C Library. - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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. - The GNU C Library is distributed in the hope that it will be useful, + 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 - Library General Public License for more details. + 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 Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + 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. */ #if HAVE_CONFIG_H # include <config.h> #endif - #include <alloca.h> #include <errno.h> diff --git a/lib/unsetenv.c b/lib/unsetenv.c index 734589dce0..5568919c04 100644 --- a/lib/unsetenv.c +++ b/lib/unsetenv.c @@ -1,20 +1,19 @@ /* Copyright (C) 1992,1995-1999,2000-2002 Free Software Foundation, Inc. This file is part of the GNU C Library. - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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. - The GNU C Library is distributed in the hope that it will be useful, + 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 - Library General Public License for more details. + 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 Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + 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. */ #if HAVE_CONFIG_H # include <config.h> diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index b3ab2d6124..29e601f0b5 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -1,20 +1,19 @@ /* vsprintf with automatic memory allocation. Copyright (C) 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 Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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. */ /* Tell glibc's <stdio.h> to provide a prototype for snprintf(). This must come before <config.h> because <config.h> may include diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h index 65f1bc13dd..4edb95d654 100644 --- a/lib/vasnprintf.h +++ b/lib/vasnprintf.h @@ -1,20 +1,19 @@ /* vsprintf with automatic memory allocation. Copyright (C) 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 Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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. */ #ifndef _VASNPRINTF_H #define _VASNPRINTF_H diff --git a/lib/vasprintf.c b/lib/vasprintf.c index 925d2fb818..7c8f212d72 100644 --- a/lib/vasprintf.c +++ b/lib/vasprintf.c @@ -1,20 +1,19 @@ /* Formatted output to strings. Copyright (C) 1999, 2002 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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 <config.h> diff --git a/lib/vasprintf.h b/lib/vasprintf.h index 0b4808e549..fdd831f20a 100644 --- a/lib/vasprintf.h +++ b/lib/vasprintf.h @@ -1,20 +1,19 @@ /* vsprintf with automatic memory allocation. Copyright (C) 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 Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) + 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 - Library General Public License for more details. + 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 Library 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. */ + 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. */ #ifndef _VASPRINTF_H #define _VASPRINTF_H |