Replace current verbose GPL stuff in libbb/*.c with one-line GPL boilerplate.

diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c
index a99a4e73338ef23e849cec7e9556dbba3b709583..4642fa03667343fafab5859899a7646c9f7cb19d 100644 (file)
--- a/libbb/ask_confirmation.c
+++ b/libbb/ask_confirmation.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* Read a line from stdin.  If the first non-whitespace char is 'y' or 'Y',

diff --git a/libbb/bb_asprintf.c b/libbb/bb_asprintf.c
index 51896ddd62e777924271e82428c12f1c3989b9a9..2bef0b59d617ea721a186e0ec530e323f3aa8d54 100644 (file)
--- a/libbb/bb_asprintf.c
+++ b/libbb/bb_asprintf.c
@@ -1,7 +1,9 @@
 /* vi: set sw=4 ts=4: */
 /*
-   Copyright (C) 2002,2005 Vladimir Oleynik <dzo@simtreas.ru>
-*/
+ * Copyright (C) 2002,2005 Vladimir Oleynik <dzo@simtreas.ru>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/libbb/bb_xsocket.c b/libbb/bb_xsocket.c
index 777d59eb4ebd3352b803fba597031b99290dfe00..c14dd7862ae1b850d915048c64c68a862c958f32 100644 (file)
--- a/libbb/bb_xsocket.c
+++ b/libbb/bb_xsocket.c
@@ -6,6 +6,7 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
+
 #include <sys/socket.h>
 #include "libbb.h"
 

diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 3c5460d4741ab722f75b51884e054402428bd989..415b6a2fb48d42d2b35b3e6dfc0b7d3234caccb4 100644 (file)
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -5,20 +5,7 @@
  * Copyright (C) many different people.
  * If you wrote this, please acknowledge your work.
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* concatenate path and file name to new allocation buffer,

diff --git a/libbb/concat_subpath_file.c b/libbb/concat_subpath_file.c
index e7244199971681bcfc5f8665ad33453a8c521da5..6ebc01bf500c4fd0380d624d8565c9d64167f82a 100644 (file)
--- a/libbb/concat_subpath_file.c
+++ b/libbb/concat_subpath_file.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) (C) 2003  Vladimir Oleynik  <dzo@simtreas.ru>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /*

diff --git a/libbb/default_error_retval.c b/libbb/default_error_retval.c
index 35c34b91637e50c151b7b46c083974dc09d0ea0b..ff48a674a7a705116a99c3b17417c2a0fc883562 100644 (file)
--- a/libbb/default_error_retval.c
+++ b/libbb/default_error_retval.c
@@ -2,20 +2,7 @@
 /*
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* Seems silly to copyright a global variable.  ;-)  Oh well.

diff --git a/libbb/fclose_nonstdin.c b/libbb/fclose_nonstdin.c
index 8f489c879922600d9725be218139cc70958ce805..be986d1b1c2e2f5e87e93851cf5a38c6f2d84d31 100644 (file)
--- a/libbb/fclose_nonstdin.c
+++ b/libbb/fclose_nonstdin.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* A number of standard utilities can accept multiple command line args

diff --git a/libbb/fflush_stdout_and_exit.c b/libbb/fflush_stdout_and_exit.c
index cbba04207d469d12bf79b3798893e2f40031375e..7e8152dd6dd38e0cc3845d1f8f79a7dc79cfe515 100644 (file)
--- a/libbb/fflush_stdout_and_exit.c
+++ b/libbb/fflush_stdout_and_exit.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* Attempt to fflush(stdout), and exit with an error code if stdout is

diff --git a/libbb/fgets_str.c b/libbb/fgets_str.c
index bf828be95e4a4019b4bf94cda0488c9f622214e2..8f06fa59c3a22baf5ac06605b95db049a69d16b2 100644 (file)
--- a/libbb/fgets_str.c
+++ b/libbb/fgets_str.c
@@ -5,19 +5,7 @@
  * Copyright (C) many different people.
  * If you wrote this, please acknowledge your work.
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 

diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c
index d1ffc87f50e296cafe71063a4522e9f04dc41013..675f8d2f501b3d539d403c70143b047791d4b4cf 100644 (file)
--- a/libbb/find_root_device.c
+++ b/libbb/find_root_device.c
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <limits.h>

diff --git a/libbb/getopt_ulflags.c b/libbb/getopt_ulflags.c
index d569d707954c6a25edbd908f3a8c9aec3da78160..a57951305b28b1ef5fe257ca9f6f33d78b259efa 100644 (file)
--- a/libbb/getopt_ulflags.c
+++ b/libbb/getopt_ulflags.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003-2005  Vladimir Oleynik  <dzo@simtreas.ru>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <getopt.h>

diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c
index 9bf0bee5ffac7ba921ddc7d74d69424cbcd152d1..9194ac05f03a24cac9da6870942f9db4716cfccf 100644 (file)
--- a/libbb/last_char_is.c
+++ b/libbb/last_char_is.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2001 Larry Doolittle, <ldoolitt@recycle.lbl.gov>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <string.h>

diff --git a/libbb/llist.c b/libbb/llist.c
index fde25e8b7c553dbcb5b888bc0a3dd67ed21c7d5d..13b974decd8cdcd9edc1f9661e7f43b57c43607b 100644 (file)
--- a/libbb/llist.c
+++ b/libbb/llist.c
@@ -9,6 +9,7 @@
  *
  * Licensed under the GPL v2, see the file LICENSE in this tarball.
  */
+
 #include <stdlib.h>
 #include "libbb.h"
 

diff --git a/libbb/login.c b/libbb/login.c
index 7c1cad3f26f46b0c76e13369a7bc94d85ad436a0..a7f8de41ffcaa096c549a4948d73545c1f310ed4 100644 (file)
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -4,21 +4,9 @@
  *
  * Copyright (C) 2003 Bastian Blank <waldi@tuxbox.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
  * Optimize and correcting OCRNL by Vladimir Oleynik <dzo@simtreas.ru>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <sys/param.h>  /* MAXHOSTNAMELEN */

diff --git a/libbb/loop.c b/libbb/loop.c
index 5d06116e8ce8d7a9643b6884a4d408deba1fc84d..b9caa973b7636be3ffa07d58ce82019511dc1699 100644 (file)
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -7,7 +7,6 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-
 #include <features.h>
 #include <stdio.h>
 #include <errno.h>

diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index d96acf0d9c045cbe912486bb12a6f0346a988a3d..01a864119e8f48014f72ebf4ebcb6820066e116c 100644 (file)
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* Mar 5, 2003    Manuel Novoa III

diff --git a/libbb/md5.c b/libbb/md5.c
index 5ad65804aa72d82605f27b8d3f28748d02023ce6..cfdffe8356621f6af742fbf5e010839ac6df687e 100644 (file)
--- a/libbb/md5.c
+++ b/libbb/md5.c
@@ -12,6 +12,7 @@
  *
  *  Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
+
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>

diff --git a/libbb/messages.c b/libbb/messages.c
index f21579861cf3ce52cefb5c4aaf45ffe5011e1224..2feb6a970fed1c75f023f27341555f56005a19dd 100644 (file)
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -3,7 +3,6 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- *
  */
 
 #include "libbb.h"

diff --git a/libbb/mode_string.c b/libbb/mode_string.c
index 5a9775930ba37a6ec11d0962acb726e2eb95823a..01029bfeed9a9720dbd002f1f78cc2a82e5f3ffc 100644 (file)
--- a/libbb/mode_string.c
+++ b/libbb/mode_string.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- *
  */
 
 /* Aug 13, 2003

diff --git a/libbb/mtab.c b/libbb/mtab.c
index fa4958c263bd4b7e1fccd899791317a555d6f8ad..cce1aac5c45396212bd60c678de523017cd8357e 100644 (file)
--- a/libbb/mtab.c
+++ b/libbb/mtab.c
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdlib.h>

diff --git a/libbb/parse_mode.c b/libbb/parse_mode.c
index ffbf4e1d4d1faf271cd0c8ef9824e9d7b0356b1b..356d95db6f5505afc3d5de2f995883e5d98c4a70 100644 (file)
--- a/libbb/parse_mode.c
+++ b/libbb/parse_mode.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chmod.html */

diff --git a/libbb/parse_number.c b/libbb/parse_number.c
index ffff66635a82f7e92deec15b7b5abc4efb9ae782..3b9134a7443470bcc32938e832234844180ab994 100644 (file)
--- a/libbb/parse_number.c
+++ b/libbb/parse_number.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdlib.h>

diff --git a/libbb/perror_nomsg.c b/libbb/perror_nomsg.c
index 479b2ba93c01848772c8501e6b247d3bf134e2c0..3a5079b992c061136a27d4102ac41064f829a0fd 100644 (file)
--- a/libbb/perror_nomsg.c
+++ b/libbb/perror_nomsg.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stddef.h>

diff --git a/libbb/perror_nomsg_and_die.c b/libbb/perror_nomsg_and_die.c
index 7cbe35e3afd2da9223adeaa317dd50d942716884..e5623c2a9321dd4d4d4ef8e5fbc2965632c57080 100644 (file)
--- a/libbb/perror_nomsg_and_die.c
+++ b/libbb/perror_nomsg_and_die.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stddef.h>

diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
index 94967133c9fc02d8b2891e4fed5f3484323fc9ed..d6b2fe28ddcfcd0990b65caeafa6a8cef3e8b564 100644 (file)
--- a/libbb/pw_encrypt.c
+++ b/libbb/pw_encrypt.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include "libbb.h"

diff --git a/libbb/read_package_field.c b/libbb/read_package_field.c
index 4292689ca9d9681ae861ebaadae10048dba98aed..9e559034738d4cc86fbdb92fbe1001d2893d5e04 100644 (file)
--- a/libbb/read_package_field.c
+++ b/libbb/read_package_field.c
@@ -5,20 +5,7 @@
  * Copyright (C) many different people.
  * If you wrote this, please acknowledge your work.
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdlib.h>

diff --git a/libbb/safe_strtol.c b/libbb/safe_strtol.c
index 17ddbbd7e07321a30c8a6b9c76c9c24bc385642c..ecc1667db823be8af5d59c9b1c1cdec03f234480 100644 (file)
--- a/libbb/safe_strtol.c
+++ b/libbb/safe_strtol.c
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdlib.h>

diff --git a/libbb/sha1.c b/libbb/sha1.c
index 31b55b1da7a7ef9542184572af093b7e1491bfba..ea4da24748bc2f06c41bbfe7c6d18e1d741bc16a 100644 (file)
--- a/libbb/sha1.c
+++ b/libbb/sha1.c
@@ -7,30 +7,8 @@
  *  Copyright (C) 2003 Glenn L. McGrath
  *  Copyright (C) 2003 Erik Andersen
  *  
- *  LICENSE TERMS
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
- *  The free distribution and use of this software in both source and binary
- *  form is allowed (with or without changes) provided that:
- *
- *    1. distributions of this source code include the above copyright
- *       notice, this list of conditions and the following disclaimer;
- *
- *    2. distributions in binary form include the above copyright
- *       notice, this list of conditions and the following disclaimer
- *       in the documentation and/or other associated materials;
- *
- *    3. the copyright holder's name is not used to endorse products
- *       built using this software without specific written permission.
- *
- *  ALTERNATIVELY, provided that this notice is retained in full, this product
- *  may be distributed under the terms of the GNU General Public License (GPL),
- *  in which case the provisions of the GPL apply INSTEAD OF those given above.
- *
- *  DISCLAIMER
- *
- *  This software is provided 'as is' with no explicit or implied warranties
- *  in respect of its properties, including, but not limited to, correctness
- *  and/or fitness for purpose.
  *  ---------------------------------------------------------------------------
  *  Issue Date: 10/11/2002
  *

diff --git a/libbb/simplify_path.c b/libbb/simplify_path.c
index 743133cd1ed209c5dde88a085da11093a9969902..171798e6048cccf517dfc001171a5e30a063b7be 100644 (file)
--- a/libbb/simplify_path.c
+++ b/libbb/simplify_path.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2001  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdlib.h>

diff --git a/libbb/vherror_msg.c b/libbb/vherror_msg.c
index a5b1a70305f125f8c8801a57cd53c419cced1737..cb5502176ff67571e9706f08b0a95e9e62825055 100644 (file)
--- a/libbb/vherror_msg.c
+++ b/libbb/vherror_msg.c
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdarg.h>

diff --git a/libbb/warn_ignoring_args.c b/libbb/warn_ignoring_args.c
index cc35fe26a2cc327748b169da21bb283749f2035c..af82a6b5bb559a30ff0b82cac9044c79ffe8c5bb 100644 (file)
--- a/libbb/warn_ignoring_args.c
+++ b/libbb/warn_ignoring_args.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <libbb.h>

diff --git a/libbb/wfopen_input.c b/libbb/wfopen_input.c
index 006815300a3aa2f4213e6964057f7b8e0b67a2c4..d764f1d060be923aac5047cf4ce711a28114cf4f 100644 (file)
--- a/libbb/wfopen_input.c
+++ b/libbb/wfopen_input.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* A number of applets need to open a file for reading, where the filename

diff --git a/libbb/xgethostbyname.c b/libbb/xgethostbyname.c
index 6b2dff7113a43c54f1892bcfa5e4b28be4d517b2..0bbe18da2e74f6cc64456a1dea4f2b88bd6ee5e4 100644 (file)
--- a/libbb/xgethostbyname.c
+++ b/libbb/xgethostbyname.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>.
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <netdb.h>

diff --git a/libbb/xgethostbyname2.c b/libbb/xgethostbyname2.c
index 3a16ae4dcd26a782159accb1ae184718b266eade..83d5386699e6dac1e50d1fda906b206fa31d7c22 100644 (file)
--- a/libbb/xgethostbyname2.c
+++ b/libbb/xgethostbyname2.c
@@ -2,22 +2,7 @@
 /*
  * Mini xgethostbyname2 implementation.
  *
- * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>.
- *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <netdb.h>

diff --git a/libbb/xgetlarg.c b/libbb/xgetlarg.c
index 893cd28133e9dd55b10e9676b2bf62e5f0664bd7..cadb83e085abdf440f48b70e3bfeb94fedf3d5f9 100644 (file)
--- a/libbb/xgetlarg.c
+++ b/libbb/xgetlarg.c
@@ -5,7 +5,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>

diff --git a/libbb/xgetularg.c b/libbb/xgetularg.c
index 44b8a1dcf32e4e7dad0037086782218ce3d1020b..6110746a53c9774d1b590810fe808a0da32c99a2 100644 (file)
--- a/libbb/xgetularg.c
+++ b/libbb/xgetularg.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdlib.h>