diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | posix/bits/getopt_core.h | 3 | ||||
| -rw-r--r-- | posix/bits/getopt_ext.h | 3 | ||||
| -rw-r--r-- | posix/bits/getopt_posix.h | 3 | ||||
| -rw-r--r-- | posix/getopt.c | 6 | ||||
| -rw-r--r-- | posix/getopt.h | 2 | ||||
| -rw-r--r-- | posix/getopt1.c | 3 | ||||
| -rw-r--r-- | posix/getopt_int.h | 3 |
8 files changed, 22 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 4637ffbc44..fcd1cbd907 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2017-04-07 Zack Weinberg <zackw@panix.com> + * posix/bits/getopt_core.h, posix/bits/getopt_ext.h + * posix/getopt.c, posix/getopt1.c, posix/getopt_int.h: + Mention in top-of-file boilerplate that these files are shared + with gnulib. + * posix/getopt.h, posix/bits/getopt_posix.h: + Mention in top-of-file boilerplate that these files are NOT shared + with gnulib, unlike the rest of the getopt implementation. + * posix/bits/getopt_core.h, posix/bits/getopt_ext.h: New files, intended to be shared with gnulib. * posix/bits/getopt_posix.h: diff --git a/posix/bits/getopt_core.h b/posix/bits/getopt_core.h index 1e4dc25d77..1744c29b74 100644 --- a/posix/bits/getopt_core.h +++ b/posix/bits/getopt_core.h @@ -1,6 +1,7 @@ /* Declarations for getopt (basic, portable features only). Copyright (C) 1989-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/posix/bits/getopt_ext.h b/posix/bits/getopt_ext.h index 2382f88fc1..c1a58da804 100644 --- a/posix/bits/getopt_ext.h +++ b/posix/bits/getopt_ext.h @@ -1,6 +1,7 @@ /* Declarations for getopt (GNU extensions). Copyright (C) 1989-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/posix/bits/getopt_posix.h b/posix/bits/getopt_posix.h index 9436bb9202..f9f3265a20 100644 --- a/posix/bits/getopt_posix.h +++ b/posix/bits/getopt_posix.h @@ -1,6 +1,7 @@ /* Declarations for getopt (POSIX compatibility shim). Copyright (C) 1989-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. + Unlike the bulk of the getopt implementation, this file is NOT part + of gnulib. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/posix/getopt.c b/posix/getopt.c index 6671787b6f..543c8e7284 100644 --- a/posix/getopt.c +++ b/posix/getopt.c @@ -1,9 +1,7 @@ /* Getopt for GNU. - NOTE: getopt is part of the C library, so if you don't know what - "Keep this file name-space clean" means, talk to drepper@gnu.org - before changing it! Copyright (C) 1987-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/posix/getopt.h b/posix/getopt.h index 2b638658e3..d9db3a6b4c 100644 --- a/posix/getopt.h +++ b/posix/getopt.h @@ -1,6 +1,8 @@ /* Declarations for getopt. Copyright (C) 1989-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. + Unlike the bulk of the getopt implementation, this file is NOT part + of gnulib; gnulib also has a getopt.h but it is different. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/posix/getopt1.c b/posix/getopt1.c index b967d24f57..a1fab22817 100644 --- a/posix/getopt1.c +++ b/posix/getopt1.c @@ -1,6 +1,7 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. Copyright (C) 1987-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/posix/getopt_int.h b/posix/getopt_int.h index 6a029542ab..9a18d5d4e6 100644 --- a/posix/getopt_int.h +++ b/posix/getopt_int.h @@ -1,6 +1,7 @@ /* Internal declarations for getopt. Copyright (C) 1989-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public |