svn commit: trunk/busybox: applets include

[Bernhard Fischer]

On Wed, Sep 20, 2006 at 02:41:14PM -0700, landley at busybox.net wrote:
>Author: landley
>Date: 2006-09-20 14:41:13 -0700 (Wed, 20 Sep 2006)
>New Revision: 16165
>
>Log:
>The Software Freedom Law Center wants us to add a copyright notice to the
>generated binaries, to make copyright enforcement easier.  Our liason with
>them (Bradley Kuhn) suggested the following text:
>
>> Copyright (C) YEAR-2006 ?\194?\160Erik Andersen, Rob Landley, and others.
>> Licensed under GPLv2. ?\194?\160See source distribution for full notice.
>
>And the busybox help message seems the least offensive place to put it.  (At
>some point in the future, I need to strip 128 bytes from the binary to feel
>good about this, though. :)

So how is this better than allowing GPLv3, which, from what i read on
the list, does enforce printing that license notice?

I would also dislike this bloat if the legal foo was potentially
compressed, at least this would add a bit less bloat.

That said, which previous license violations are being dealt with
currently? It's not that there isn't already evidence that several
companies violate our GPL license as can be seen on the shame html
page. What about dealing with those before
a) acting upon a not yet established eventual threat that GPLv>=3 may
impose according to your understanding
b) adding stuff like this for no apparent reason since the code
clearly is GPL already?

highly irritating.
>
>Minor header file cleanup while I was there, since libbb.h already #includes
>most of that stuff...
>
>
>Modified:
>   trunk/busybox/applets/busybox.c
>   trunk/busybox/include/libbb.h
>
>
>Changeset:
>Modified: trunk/busybox/applets/busybox.c
>===================================================================
>--- trunk/busybox/applets/busybox.c	2006-09-20 20:01:29 UTC (rev 16164)
>+++ trunk/busybox/applets/busybox.c	2006-09-20 21:41:13 UTC (rev 16165)
>@@ -2,19 +2,9 @@
> /*
>  * BusyBox' main applet dispatcher.
>  *
>- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
>+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
>  */
> #include "busybox.h"
>-#include <stdio.h>
>-#include <string.h>
>-#include <unistd.h>
>-#include <errno.h>
>-#include <stdlib.h>
>-#if ENABLE_LOCALE_SUPPORT
>-#include <locale.h>
>-#else
>-#define setlocale(x,y)
>-#endif
> 
> const char *bb_applet_name ATTRIBUTE_EXTERNALLY_VISIBLE;
> 
>@@ -128,7 +118,9 @@
> 				output_width -= 20;
> 			} else output_width = 60;
> 
>-			printf("%s\n\n"
>+			printf("%s\n"
>+				   "Copyright (C) 1998-2006  Erik Andersen, Rob Landley, and others.\n"
>+				   "Licensed under GPLv2.  See source distribution for full notice.\n\n"
> 			       "Usage: busybox [function] [arguments]...\n"
> 			       "   or: [function] [arguments]...\n\n"
> 			       "\tBusyBox is a multi-call binary that combines many common Unix\n"
>
>Modified: trunk/busybox/include/libbb.h
>===================================================================
>--- trunk/busybox/include/libbb.h	2006-09-20 20:01:29 UTC (rev 16164)
>+++ trunk/busybox/include/libbb.h	2006-09-20 21:41:13 UTC (rev 16165)
>@@ -2,11 +2,10 @@
> /*
>  * Busybox main internal header file
>  *
>- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
>- *
>  * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
>  * Permission has been granted to redistribute this code under the GPL.
>- *
>+ * 
>+ * Licensed under the GPL version 2, see the file LICENSE in this tarball.
>  */
> #ifndef	__LIBBUSYBOX_H__
> #define	__LIBBUSYBOX_H__    1
>@@ -47,6 +46,8 @@
> 
> #ifdef CONFIG_LOCALE_SUPPORT
> #include <locale.h>
>+#else
>+#define setlocale(x,y)
> #endif
> 
> #include "pwd_.h"
>
>_______________________________________________
>busybox-cvs mailing list
>busybox-cvs at busybox.net
>http://busybox.net/cgi-bin/mailman/listinfo/busybox-cvs