aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-03-02 16:50:06 -0800
committerRoland McGrath <roland@hack.frob.com>2012-03-02 16:52:01 -0800
commitd9a17c075e61609bee2b2c3014b53f8630f533a4 (patch)
tree5a5e4fea365808b94153776a884cab7481383e92
parent7181dda8d5bf4f793181f7a672b8605adcb6b700 (diff)
downloadglibc-d9a17c075e61609bee2b2c3014b53f8630f533a4.tar.xz
glibc-d9a17c075e61609bee2b2c3014b53f8630f533a4.zip
BZ #13792: License manual example source files under GPL.
-rw-r--r--ChangeLog47
-rw-r--r--manual/Makefile3
-rw-r--r--manual/examples/README8
-rw-r--r--manual/examples/add.c17
-rw-r--r--manual/examples/argp-ex1.c17
-rw-r--r--manual/examples/argp-ex2.c17
-rw-r--r--manual/examples/argp-ex3.c17
-rw-r--r--manual/examples/argp-ex4.c17
-rw-r--r--manual/examples/atexit.c19
-rw-r--r--manual/examples/db.c17
-rw-r--r--manual/examples/dir.c17
-rw-r--r--manual/examples/dir2.c17
-rw-r--r--manual/examples/execinfo.c17
-rw-r--r--manual/examples/filecli.c17
-rw-r--r--manual/examples/filesrv.c17
-rw-r--r--manual/examples/fmtmsgexpl.c17
-rw-r--r--manual/examples/genpass.c31
-rw-r--r--manual/examples/inetcli.c19
-rw-r--r--manual/examples/inetsrv.c17
-rw-r--r--manual/examples/isockad.c21
-rw-r--r--manual/examples/longopt.c17
-rw-r--r--manual/examples/memopen.c17
-rw-r--r--manual/examples/memstrm.c17
-rw-r--r--manual/examples/mkfsock.c17
-rw-r--r--manual/examples/mkisock.c19
-rw-r--r--manual/examples/mygetpass.c21
-rw-r--r--manual/examples/pipe.c17
-rw-r--r--manual/examples/popen.c17
-rw-r--r--manual/examples/rprintf.c17
-rw-r--r--manual/examples/search.c23
-rw-r--r--manual/examples/select.c17
-rw-r--r--manual/examples/setjmp.c21
-rw-r--r--manual/examples/sigh1.c21
-rw-r--r--manual/examples/sigusr.c21
-rw-r--r--manual/examples/stpcpy.c17
-rw-r--r--manual/examples/strdupa.c17
-rw-r--r--manual/examples/strftim.c17
-rw-r--r--manual/examples/strncat.c17
-rw-r--r--manual/examples/subopt.c17
-rw-r--r--manual/examples/swapcontext.c17
-rw-r--r--manual/examples/termios.c21
-rw-r--r--manual/examples/testopt.c17
-rw-r--r--manual/examples/testpass.c21
-rw-r--r--manual/examples/timeval_subtract.c17
44 files changed, 777 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fa12aaf8a..2ca5280064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,53 @@
2012-03-02 Roland McGrath <roland@hack.frob.com>
[BZ #13792]
+ * manual/examples/README: New file, says the example source files
+ can be used under GPL>=2.
+ * manual/Makefile (%.c.texi): Eat the leading part of the file until a
+ line containing just "*/".
+ * manual/examples/add.c: Add copyright header (GPL>=2).
+ * manual/examples/argp-ex1.c: Likewise.
+ * manual/examples/argp-ex2.c: Likewise.
+ * manual/examples/argp-ex3.c: Likewise.
+ * manual/examples/argp-ex4.c: Likewise.
+ * manual/examples/atexit.c: Likewise.
+ * manual/examples/db.c: Likewise.
+ * manual/examples/dir.c: Likewise.
+ * manual/examples/dir2.c: Likewise.
+ * manual/examples/execinfo.c: Likewise.
+ * manual/examples/filecli.c: Likewise.
+ * manual/examples/filesrv.c: Likewise.
+ * manual/examples/fmtmsgexpl.c: Likewise.
+ * manual/examples/genpass.c: Likewise.
+ * manual/examples/inetcli.c: Likewise.
+ * manual/examples/inetsrv.c: Likewise.
+ * manual/examples/isockad.c: Likewise.
+ * manual/examples/longopt.c: Likewise.
+ * manual/examples/memopen.c: Likewise.
+ * manual/examples/memstrm.c: Likewise.
+ * manual/examples/mkfsock.c: Likewise.
+ * manual/examples/mkisock.c: Likewise.
+ * manual/examples/mygetpass.c: Likewise.
+ * manual/examples/pipe.c: Likewise.
+ * manual/examples/popen.c: Likewise.
+ * manual/examples/rprintf.c: Likewise.
+ * manual/examples/search.c: Likewise.
+ * manual/examples/select.c: Likewise.
+ * manual/examples/setjmp.c: Likewise.
+ * manual/examples/sigh1.c: Likewise.
+ * manual/examples/sigusr.c: Likewise.
+ * manual/examples/stpcpy.c: Likewise.
+ * manual/examples/strdupa.c: Likewise.
+ * manual/examples/strftim.c: Likewise.
+ * manual/examples/strncat.c: Likewise.
+ * manual/examples/subopt.c: Likewise.
+ * manual/examples/swapcontext.c: Likewise.
+ * manual/examples/termios.c: Likewise.
+ * manual/examples/testopt.c: Likewise.
+ * manual/examples/testpass.c: Likewise.
+ * manual/examples/timeval_subtract.c: Likewise.
+
+ [BZ #13792]
* manual/time.texi (Elapsed Time): Move timeval_subtract example
function to ...
* manual/timeval_subtract.c.texi: ... here, new file.
diff --git a/manual/Makefile b/manual/Makefile
index 0137afddd7..e291509a3a 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -122,7 +122,8 @@ stamp-version: $(common-objpfx)config.make
# Generate Texinfo files from the C source for the example programs.
%.c.texi: examples/%.c
- sed -e 's,[{}],@&,g' \
+ sed -e '1,/^\*\/$$/d' \
+ -e 's,[{}],@&,g' \
-e 's,/\*\(@.*\)\*/,\1,g' \
-e 's,/\* *,/* @r{,g' -e 's, *\*/,} */,' \
-e 's/\(@[a-z][a-z]*\)@{\([^}]*\)@}/\1{\2}/g'\
diff --git a/manual/examples/README b/manual/examples/README
new file mode 100644
index 0000000000..7d0070fdd5
--- /dev/null
+++ b/manual/examples/README
@@ -0,0 +1,8 @@
+These are source files for example code that appears in The GNU C
+Library Reference Manual.
+
+While the manual itself is licensed under the terms of the GNU Free
+Documentation License, you can use these source files on their own
+under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License, or (at your
+option) any later version.
diff --git a/manual/examples/add.c b/manual/examples/add.c
index e4b1bba365..d4b9af9c99 100644
--- a/manual/examples/add.c
+++ b/manual/examples/add.c
@@ -1,3 +1,20 @@
+/* Example of a Variadic Function
+ Copyright (C) 1991-2012 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
+ of the License, 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, if not, see <http://www.gnu.org/licenses/>.
+*/
+
#include <stdarg.h>
#include <stdio.h>
diff --git a/manual/examples/argp-ex1.c b/manual/examples/argp-ex1.c
index 931a8264a5..01c3639218 100644
--- a/manual/examples/argp-ex1.c
+++ b/manual/examples/argp-ex1.c
@@ -1,4 +1,19 @@
-/* Argp example #1 -- a minimal program using argp */
+/* Argp example #1 -- a minimal program using argp
+ Copyright (C) 1991-2012 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
+ of the License, 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, if not, see <http://www.gnu.org/licenses/>.
+*/
/* This is (probably) the smallest possible program that
uses argp. It won't do much except give an error
diff --git a/manual/examples/argp-ex2.c b/manual/examples/argp-ex2.c
index 097ce7622c..0e038bbc90 100644
--- a/manual/examples/argp-ex2.c
+++ b/manual/examples/argp-ex2.c
@@ -1,4 +1,19 @@
-/* Argp example #2 -- a pretty minimal program using argp */
+/* Argp example #2 -- a pretty minimal program using argp
+ Copyright (C) 1991-2012 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
+ of the License, 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, if not, see <http://www.gnu.org/licenses/>.
+*/
/* This program doesn't use any options or arguments, but uses
argp to be compliant with the GNU standard command line
diff --git a/manual/examples/argp-ex3.c b/manual/examples/argp-ex3.c
index d5896ee139..689d7cfdaa 100644
--- a/manual/examples/argp-ex3.c
+++ b/manual/examples/argp-ex3.c
@@ -1,4 +1,19 @@
-/* Argp example #3 -- a program with options and arguments using argp */
+/* Argp example #3 -- a program with options and arguments using argp
+ Copyright (C) 1991-2012 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
+ of the License, 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, if not, see <http://www.gnu.org/licenses/>.
+*/
/* This program uses the same features as example 2, and uses options and
arguments.
diff --git a/manual/examples/argp-ex4.c b/manual/examples/argp-ex4.c
index 2b61358c7e..b946dd106b 100644
--- a/manual/examples/argp-ex4.c
+++ b/manual/examples/argp-ex4.c
@@ -1,4 +1,19 @@
-/* Argp example #4 -- a program with somewhat more complicated options */
+/* Argp example #4 -- a program with somewhat more complicated options
+ Copyright (C) 1991-2012 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
+ of the License, 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, if not, see <http://www.gnu.org/licenses/>.
+*/
/* This program uses the same features as example 3, but has more
options, and somewhat more structure in the -help output. It
diff --git a/manual/examples/atexit.c b/manual/examples/atexit.c
index 42bba71126..5f07c87511 100644
--- a/manual/examples/atexit.c
+++ b/manual/examples/atexit.c
@@ -1,7 +1,24 @@
+/* Cleanups on Exit
+ Copyright (C) 1991-2012 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
+ of the License, 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, if not, see <http://www.gnu.org/licenses/>.
+*/
+
#include <stdio.h>
#include <stdlib.h>
-void
+void
bye (void)
{
puts ("Goodbye, cruel world....");
diff --git a/manual/examples/db.c b/manual/examples/db.c
index 1a1cb0c0d7..d6405e50d1 100644
--- a/manual/examples/db.c
+++ b/manual/examples/db.c
@@ -1,3 +1,20 @@
+/* User and Group Database Example
+ Copyright (C) 1991-2012 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
+ of the License, 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, if not, see <http://www.gnu.org/licenses/>.
+*/
+
#include <grp.h>
#include <pwd.h>
#include <sys/types.h>
diff --git a/manual/examples/dir.c b/manual/examples/dir.c
index 8ab77dc34c..9ca63fec0e 100644
--- a/manual/examples/dir.c
+++ b/manual/examples/dir.c
@@ -1,3 +1,20 @@
+/* Simple Program to List a Directory
+ Copyright (C) 1991-2012 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
+ of the License, 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, if not, see <http://www.gnu.org/licenses/>.
+*/
+
/*@group*/
#include <stdio.h>
#include <sys/types.h>
diff --git a/manual/examples/dir2.c b/manual/examples/dir2.c
index a75c885742..7f095c84d9 100644
--- a/manual/examples/dir2.c
+++ b/manual/examples/dir2.c
@@ -1,3 +1,20 @@
+/* Simple Program to List a Directory, Mark II
+ Copyright (C) 1991-2012 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
+ of the License, 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, if not, see <http://www.gnu.org/licenses/>.
+*/
+
/*@group*/
#include <stdio.h>
#include <dirent.h>
diff --git a/manual/examples/execinfo.c b/manual/examples/execinfo.c
index 5a04901957..18a3a29731 100644
--- a/manual/examples/execinfo.c