From 5d8843e451c01d8abfe6b5be772637310e9e581e Mon Sep 17 00:00:00 2001 From: "\"Robert P. J. Day\"" Date: Mon, 10 Jul 2006 11:41:19 +0000 Subject: [PATCH] Replace current verbose GPL stuff in libbb/*.c with one-line GPL boilerplate. --- libbb/ask_confirmation.c | 15 +-------------- libbb/bb_asprintf.c | 6 ++++-- libbb/bb_xsocket.c | 1 + libbb/concat_path_file.c | 15 +-------------- libbb/concat_subpath_file.c | 15 +-------------- libbb/default_error_retval.c | 15 +-------------- libbb/fclose_nonstdin.c | 15 +-------------- libbb/fflush_stdout_and_exit.c | 15 +-------------- libbb/fgets_str.c | 14 +------------- libbb/find_root_device.c | 14 +------------- libbb/getopt_ulflags.c | 15 +-------------- libbb/last_char_is.c | 15 +-------------- libbb/llist.c | 1 + libbb/login.c | 16 ++-------------- libbb/loop.c | 1 - libbb/make_directory.c | 15 +-------------- libbb/md5.c | 1 + libbb/messages.c | 1 - libbb/mode_string.c | 1 - libbb/mtab.c | 14 +------------- libbb/parse_mode.c | 15 +-------------- libbb/parse_number.c | 15 +-------------- libbb/perror_nomsg.c | 15 +-------------- libbb/perror_nomsg_and_die.c | 15 +-------------- libbb/pw_encrypt.c | 15 +-------------- libbb/read_package_field.c | 15 +-------------- libbb/safe_strtol.c | 14 +------------- libbb/sha1.c | 24 +----------------------- libbb/simplify_path.c | 15 +-------------- libbb/vherror_msg.c | 14 +------------- libbb/warn_ignoring_args.c | 15 +-------------- libbb/wfopen_input.c | 15 +-------------- libbb/xgethostbyname.c | 15 +-------------- libbb/xgethostbyname2.c | 17 +---------------- libbb/xgetlarg.c | 1 - libbb/xgetularg.c | 15 +-------------- 36 files changed, 36 insertions(+), 404 deletions(-) diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c index a99a4e7..4642fa0 100644 --- a/libbb/ask_confirmation.c +++ b/libbb/ask_confirmation.c @@ -4,20 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * 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 51896dd..2bef0b5 100644 --- 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 -*/ + * Copyright (C) 2002,2005 Vladimir Oleynik + * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + */ #include #include diff --git a/libbb/bb_xsocket.c b/libbb/bb_xsocket.c index 777d59e..c14dd78 100644 --- 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 #include "libbb.h" diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c index 3c5460d..415b6a2 100644 --- 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 e724419..6ebc01b 100644 --- a/libbb/concat_subpath_file.c +++ b/libbb/concat_subpath_file.c @@ -4,20 +4,7 @@ * * Copyright (C) (C) 2003 Vladimir Oleynik * - * 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 35c34b9..ff48a67 100644 --- a/libbb/default_error_retval.c +++ b/libbb/default_error_retval.c @@ -2,20 +2,7 @@ /* * Copyright (C) 2003 Manuel Novoa III * - * 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 8f489c8..be986d1 100644 --- a/libbb/fclose_nonstdin.c +++ b/libbb/fclose_nonstdin.c @@ -4,20 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * 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 cbba042..7e8152d 100644 --- a/libbb/fflush_stdout_and_exit.c +++ b/libbb/fflush_stdout_and_exit.c @@ -4,20 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * 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 bf828be..8f06fa5 100644 --- 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 d1ffc87..675f8d2 100644 --- a/libbb/find_root_device.c +++ b/libbb/find_root_device.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * 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 diff --git a/libbb/getopt_ulflags.c b/libbb/getopt_ulflags.c index d569d70..a579513 100644 --- a/libbb/getopt_ulflags.c +++ b/libbb/getopt_ulflags.c @@ -4,20 +4,7 @@ * * Copyright (C) 2003-2005 Vladimir Oleynik * - * 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 diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c index 9bf0bee..9194ac0 100644 --- a/libbb/last_char_is.c +++ b/libbb/last_char_is.c @@ -4,20 +4,7 @@ * * Copyright (C) 2001 Larry Doolittle, * - * 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 diff --git a/libbb/llist.c b/libbb/llist.c index fde25e8..13b974d 100644 --- 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 #include "libbb.h" diff --git a/libbb/login.c b/libbb/login.c index 7c1cad3..a7f8de4 100644 --- a/libbb/login.c +++ b/libbb/login.c @@ -4,21 +4,9 @@ * * Copyright (C) 2003 Bastian Blank * - * 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 + * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include /* MAXHOSTNAMELEN */ diff --git a/libbb/loop.c b/libbb/loop.c index 5d06116..b9caa97 100644 --- 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 #include #include diff --git a/libbb/make_directory.c b/libbb/make_directory.c index d96acf0..01a8641 100644 --- a/libbb/make_directory.c +++ b/libbb/make_directory.c @@ -4,20 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * 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 5ad6580..cfdffe8 100644 --- 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 #include #include diff --git a/libbb/messages.c b/libbb/messages.c index f215798..2feb6a9 100644 --- a/libbb/messages.c +++ b/libbb/messages.c @@ -3,7 +3,6 @@ * Copyright (C) 1999-2004 by Erik Andersen * * 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 5a97759..01029bf 100644 --- a/libbb/mode_string.c +++ b/libbb/mode_string.c @@ -5,7 +5,6 @@ * Copyright (C) 2003 Manuel Novoa III * * 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 fa4958c..cce1aac 100644 --- a/libbb/mtab.c +++ b/libbb/mtab.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * 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 diff --git a/libbb/parse_mode.c b/libbb/parse_mode.c index ffbf4e1..356d95d 100644 --- a/libbb/parse_mode.c +++ b/libbb/parse_mode.c @@ -4,20 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * 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 ffff666..3b9134a 100644 --- a/libbb/parse_number.c +++ b/libbb/parse_number.c @@ -4,20 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * 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 diff --git a/libbb/perror_nomsg.c b/libbb/perror_nomsg.c index 479b2ba..3a5079b 100644 --- a/libbb/perror_nomsg.c +++ b/libbb/perror_nomsg.c @@ -4,20 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * 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 diff --git a/libbb/perror_nomsg_and_die.c b/libbb/perror_nomsg_and_die.c index 7cbe35e..e5623c2 100644 --- a/libbb/perror_nomsg_and_die.c +++ b/libbb/perror_nomsg_and_die.c @@ -4,20 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * 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 diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c index 9496713..d6b2fe2 100644 --- a/libbb/pw_encrypt.c +++ b/libbb/pw_encrypt.c @@ -4,20 +4,7 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * 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 4292689..9e55903 100644 --- 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 diff --git a/libbb/safe_strtol.c b/libbb/safe_strtol.c index 17ddbbd..ecc1667 100644 --- a/libbb/safe_strtol.c +++ b/libbb/safe_strtol.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * 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 diff --git a/libbb/sha1.c b/libbb/sha1.c index 31b55b1..ea4da24 100644 --- 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 743133c..171798e 100644 --- a/libbb/simplify_path.c +++ b/libbb/simplify_path.c @@ -4,20 +4,7 @@ * * Copyright (C) 2001 Manuel Novoa III * - * 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 diff --git a/libbb/vherror_msg.c b/libbb/vherror_msg.c index a5b1a70..cb55021 100644 --- a/libbb/vherror_msg.c +++ b/libbb/vherror_msg.c @@ -4,19 +4,7 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * 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 diff --git a/libbb/warn_ignoring_args.c b/libbb/warn_ignoring_args.c index cc35fe2..af82a6b 100644 --- a/libbb/warn_ignoring_args.c +++ b/libbb/warn_ignoring_args.c @@ -4,20 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * 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 diff --git a/libbb/wfopen_input.c b/libbb/wfopen_input.c index 0068153..d764f1d 100644 --- a/libbb/wfopen_input.c +++ b/libbb/wfopen_input.c @@ -4,20 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * 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 6b2dff7..0bbe18d 100644 --- a/libbb/xgethostbyname.c +++ b/libbb/xgethostbyname.c @@ -4,20 +4,7 @@ * * Copyright (C) 2001 Matt Kraai . * - * 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 diff --git a/libbb/xgethostbyname2.c b/libbb/xgethostbyname2.c index 3a16ae4..83d5386 100644 --- a/libbb/xgethostbyname2.c +++ b/libbb/xgethostbyname2.c @@ -2,22 +2,7 @@ /* * Mini xgethostbyname2 implementation. * - * Copyright (C) 2001 Matt Kraai . - * - * 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 diff --git a/libbb/xgetlarg.c b/libbb/xgetlarg.c index 893cd28..cadb83e 100644 --- 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 #include #include diff --git a/libbb/xgetularg.c b/libbb/xgetularg.c index 44b8a1d..6110746 100644 --- a/libbb/xgetularg.c +++ b/libbb/xgetularg.c @@ -4,20 +4,7 @@ * * Copyright (C) 2003 Manuel Novoa III * - * 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 -- 2.7.4