diff options
| author | Rob Landley <rob@landley.net> | 2006-09-20 21:41:13 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-09-20 21:41:13 +0000 |
| commit | eb84a42fdd1d1c2e228dcd691a67b8ad5eeda026 (patch) | |
| tree | 0669d5a1cd4e78c17134396a03145ba40a6f16f1 | |
| parent | 94b383d4196f06e3de2f83631b7f9bb45780606d (diff) | |
| download | busybox-eb84a42fdd1d1c2e228dcd691a67b8ad5eeda026.tar.gz | |
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 Erik Andersen, Rob Landley, and others.
> Licensed under GPLv2. See 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. :)
Minor header file cleanup while I was there, since libbb.h already #includes
most of that stuff...
| -rw-r--r-- | applets/busybox.c | 16 | ||||
| -rw-r--r-- | include/libbb.h | 7 |
2 files changed, 8 insertions, 15 deletions
diff --git a/applets/busybox.c b/applets/busybox.c index a92ddbd0e..53eb363ac 100644 --- a/applets/busybox.c +++ b/applets/busybox.c @@ -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 @@ int busybox_main(int argc, char **argv) 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" diff --git a/include/libbb.h b/include/libbb.h index 86e88bf89..29df2c269 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -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" |