aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2017-04-05 11:04:35 -0400
committerZack Weinberg <zackw@panix.com>2017-04-07 07:53:37 -0400
commit06576cbf4eae13324985df1a690afa2705c992cc (patch)
treea0c50c5934fc9c873bf3876ccd15e09ab97af440
parent10a33cf8b403e3c031c5dd10a06b4a2a6489e48c (diff)
downloadglibc-06576cbf4eae13324985df1a690afa2705c992cc.zip
glibc-06576cbf4eae13324985df1a690afa2705c992cc.tar.gz
glibc-06576cbf4eae13324985df1a690afa2705c992cc.tar.bz2
getopt: annotate files with relationship to gnulib.
As the final act in this patchset, adjust the "This file is part of the GNU C Library" message at the top of each file to indicate which files are synced with gnulib. * 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.
-rw-r--r--ChangeLog8
-rw-r--r--posix/bits/getopt_core.h3
-rw-r--r--posix/bits/getopt_ext.h3
-rw-r--r--posix/bits/getopt_posix.h3
-rw-r--r--posix/getopt.c6
-rw-r--r--posix/getopt.h2
-rw-r--r--posix/getopt1.c3
-rw-r--r--posix/getopt_int.h3
8 files changed, 22 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 4637ffb..fcd1cbd 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 1e4dc25..1744c29 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 2382f88..c1a58da 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 9436bb9..f9f3265 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 6671787..543c8e7 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 2b63865..d9db3a6 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 b967d24..a1fab22 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 6a02954..9a18d5d 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