svn commit: trunk/busybox/libbb

rpjday at busybox.net rpjday at busybox.net
Mon Jul 10 11:41:24 UTC 2006


Author: rpjday
Date: 2006-07-10 04:41:19 -0700 (Mon, 10 Jul 2006)
New Revision: 15674

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


Modified:
   trunk/busybox/libbb/ask_confirmation.c
   trunk/busybox/libbb/bb_asprintf.c
   trunk/busybox/libbb/bb_xsocket.c
   trunk/busybox/libbb/concat_path_file.c
   trunk/busybox/libbb/concat_subpath_file.c
   trunk/busybox/libbb/default_error_retval.c
   trunk/busybox/libbb/fclose_nonstdin.c
   trunk/busybox/libbb/fflush_stdout_and_exit.c
   trunk/busybox/libbb/fgets_str.c
   trunk/busybox/libbb/find_root_device.c
   trunk/busybox/libbb/getopt_ulflags.c
   trunk/busybox/libbb/last_char_is.c
   trunk/busybox/libbb/llist.c
   trunk/busybox/libbb/login.c
   trunk/busybox/libbb/loop.c
   trunk/busybox/libbb/make_directory.c
   trunk/busybox/libbb/md5.c
   trunk/busybox/libbb/messages.c
   trunk/busybox/libbb/mode_string.c
   trunk/busybox/libbb/mtab.c
   trunk/busybox/libbb/parse_mode.c
   trunk/busybox/libbb/parse_number.c
   trunk/busybox/libbb/perror_nomsg.c
   trunk/busybox/libbb/perror_nomsg_and_die.c
   trunk/busybox/libbb/pw_encrypt.c
   trunk/busybox/libbb/read_package_field.c
   trunk/busybox/libbb/safe_strtol.c
   trunk/busybox/libbb/sha1.c
   trunk/busybox/libbb/simplify_path.c
   trunk/busybox/libbb/vherror_msg.c
   trunk/busybox/libbb/warn_ignoring_args.c
   trunk/busybox/libbb/wfopen_input.c
   trunk/busybox/libbb/xgethostbyname.c
   trunk/busybox/libbb/xgethostbyname2.c
   trunk/busybox/libbb/xgetlarg.c
   trunk/busybox/libbb/xgetularg.c


Changeset:
Modified: trunk/busybox/libbb/ask_confirmation.c
===================================================================
--- trunk/busybox/libbb/ask_confirmation.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/ask_confirmation.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at 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',

Modified: trunk/busybox/libbb/bb_asprintf.c
===================================================================
--- trunk/busybox/libbb/bb_asprintf.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/bb_asprintf.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -1,7 +1,9 @@
 /* vi: set sw=4 ts=4: */
 /*
-   Copyright (C) 2002,2005 Vladimir Oleynik <dzo at simtreas.ru>
-*/
+ * Copyright (C) 2002,2005 Vladimir Oleynik <dzo at simtreas.ru>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

Modified: trunk/busybox/libbb/bb_xsocket.c
===================================================================
--- trunk/busybox/libbb/bb_xsocket.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/bb_xsocket.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -6,6 +6,7 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
+
 #include <sys/socket.h>
 #include "libbb.h"
 

Modified: trunk/busybox/libbb/concat_path_file.c
===================================================================
--- trunk/busybox/libbb/concat_path_file.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/concat_path_file.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -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,

Modified: trunk/busybox/libbb/concat_subpath_file.c
===================================================================
--- trunk/busybox/libbb/concat_subpath_file.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/concat_subpath_file.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) (C) 2003  Vladimir Oleynik  <dzo at 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.
  */
 
 /*

Modified: trunk/busybox/libbb/default_error_retval.c
===================================================================
--- trunk/busybox/libbb/default_error_retval.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/default_error_retval.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -2,20 +2,7 @@
 /*
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at 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.

Modified: trunk/busybox/libbb/fclose_nonstdin.c
===================================================================
--- trunk/busybox/libbb/fclose_nonstdin.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/fclose_nonstdin.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at 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

Modified: trunk/busybox/libbb/fflush_stdout_and_exit.c
===================================================================
--- trunk/busybox/libbb/fflush_stdout_and_exit.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/fflush_stdout_and_exit.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at 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

Modified: trunk/busybox/libbb/fgets_str.c
===================================================================
--- trunk/busybox/libbb/fgets_str.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/fgets_str.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -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.
  */
 
 

Modified: trunk/busybox/libbb/find_root_device.c
===================================================================
--- trunk/busybox/libbb/find_root_device.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/find_root_device.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen at 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>

Modified: trunk/busybox/libbb/getopt_ulflags.c
===================================================================
--- trunk/busybox/libbb/getopt_ulflags.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/getopt_ulflags.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003-2005  Vladimir Oleynik  <dzo at 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>

Modified: trunk/busybox/libbb/last_char_is.c
===================================================================
--- trunk/busybox/libbb/last_char_is.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/last_char_is.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2001 Larry Doolittle, <ldoolitt at 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>

Modified: trunk/busybox/libbb/llist.c
===================================================================
--- trunk/busybox/libbb/llist.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/llist.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -9,6 +9,7 @@
  *
  * Licensed under the GPL v2, see the file LICENSE in this tarball.
  */
+
 #include <stdlib.h>
 #include "libbb.h"
 

Modified: trunk/busybox/libbb/login.c
===================================================================
--- trunk/busybox/libbb/login.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/login.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,21 +4,9 @@
  *
  * Copyright (C) 2003 Bastian Blank <waldi at 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 at simtreas.ru>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <sys/param.h>  /* MAXHOSTNAMELEN */

Modified: trunk/busybox/libbb/loop.c
===================================================================
--- trunk/busybox/libbb/loop.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/loop.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -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>

Modified: trunk/busybox/libbb/make_directory.c
===================================================================
--- trunk/busybox/libbb/make_directory.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/make_directory.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at 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

Modified: trunk/busybox/libbb/md5.c
===================================================================
--- trunk/busybox/libbb/md5.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/md5.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -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>

Modified: trunk/busybox/libbb/messages.c
===================================================================
--- trunk/busybox/libbb/messages.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/messages.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -3,7 +3,6 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen at codepoet.org>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- *
  */
 
 #include "libbb.h"

Modified: trunk/busybox/libbb/mode_string.c
===================================================================
--- trunk/busybox/libbb/mode_string.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/mode_string.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -5,7 +5,6 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at codepoet.org>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- *
  */
 
 /* Aug 13, 2003

Modified: trunk/busybox/libbb/mtab.c
===================================================================
--- trunk/busybox/libbb/mtab.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/mtab.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen at 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>

Modified: trunk/busybox/libbb/parse_mode.c
===================================================================
--- trunk/busybox/libbb/parse_mode.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/parse_mode.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at 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 */

Modified: trunk/busybox/libbb/parse_number.c
===================================================================
--- trunk/busybox/libbb/parse_number.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/parse_number.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at 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>

Modified: trunk/busybox/libbb/perror_nomsg.c
===================================================================
--- trunk/busybox/libbb/perror_nomsg.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/perror_nomsg.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at 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>

Modified: trunk/busybox/libbb/perror_nomsg_and_die.c
===================================================================
--- trunk/busybox/libbb/perror_nomsg_and_die.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/perror_nomsg_and_die.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at 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>

Modified: trunk/busybox/libbb/pw_encrypt.c
===================================================================
--- trunk/busybox/libbb/pw_encrypt.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/pw_encrypt.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen at 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"

Modified: trunk/busybox/libbb/read_package_field.c
===================================================================
--- trunk/busybox/libbb/read_package_field.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/read_package_field.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -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>

Modified: trunk/busybox/libbb/safe_strtol.c
===================================================================
--- trunk/busybox/libbb/safe_strtol.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/safe_strtol.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen at 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>

Modified: trunk/busybox/libbb/sha1.c
===================================================================
--- trunk/busybox/libbb/sha1.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/sha1.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -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
  *

Modified: trunk/busybox/libbb/simplify_path.c
===================================================================
--- trunk/busybox/libbb/simplify_path.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/simplify_path.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2001  Manuel Novoa III  <mjn3 at 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>

Modified: trunk/busybox/libbb/vherror_msg.c
===================================================================
--- trunk/busybox/libbb/vherror_msg.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/vherror_msg.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen at 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>

Modified: trunk/busybox/libbb/warn_ignoring_args.c
===================================================================
--- trunk/busybox/libbb/warn_ignoring_args.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/warn_ignoring_args.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at 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>

Modified: trunk/busybox/libbb/wfopen_input.c
===================================================================
--- trunk/busybox/libbb/wfopen_input.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/wfopen_input.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at 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

Modified: trunk/busybox/libbb/xgethostbyname.c
===================================================================
--- trunk/busybox/libbb/xgethostbyname.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/xgethostbyname.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2001 Matt Kraai <kraai at 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>

Modified: trunk/busybox/libbb/xgethostbyname2.c
===================================================================
--- trunk/busybox/libbb/xgethostbyname2.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/xgethostbyname2.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -2,22 +2,7 @@
 /*
  * Mini xgethostbyname2 implementation.
  *
- * Copyright (C) 2001 Matt Kraai <kraai at 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>

Modified: trunk/busybox/libbb/xgetlarg.c
===================================================================
--- trunk/busybox/libbb/xgetlarg.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/xgetlarg.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -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>

Modified: trunk/busybox/libbb/xgetularg.c
===================================================================
--- trunk/busybox/libbb/xgetularg.c	2006-07-10 07:41:34 UTC (rev 15673)
+++ trunk/busybox/libbb/xgetularg.c	2006-07-10 11:41:19 UTC (rev 15674)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3 at 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>




More information about the busybox-cvs mailing list