From: Denis Vlasenko Date: Sun, 7 Dec 2008 00:52:58 +0000 (-0000) Subject: Fix forgotten license comments X-Git-Tag: 1_14_0~403 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=db12d1d733ab7de0c5f4cda261eb79fd334a4ed9;p=oweals%2Fbusybox.git Fix forgotten license comments --- diff --git a/applets/usage.c b/applets/usage.c index a35817f9f..1e038b367 100644 --- a/applets/usage.c +++ b/applets/usage.c @@ -1,4 +1,9 @@ /* vi: set sw=4 ts=4: */ +/* + * Copyright (C) 2008 Denys Vlasenko. + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. + */ #include /* Just #include "autoconf.h" doesn't work for builds in separate diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index 863c6efcd..336418061 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c @@ -6,6 +6,8 @@ * * Loads the console font, and possibly the corresponding screen map(s). * (Adapted for busybox by Matej Vela.) + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" #include diff --git a/coreutils/length.c b/coreutils/length.c index c7523a02a..43a0f5988 100644 --- a/coreutils/length.c +++ b/coreutils/length.c @@ -1,4 +1,7 @@ /* vi: set sw=4 ts=4: */ +/* + * Licensed under GPLv2, see file LICENSE in this tarball for details. + */ /* BB_AUDIT SUSv3 N/A -- Apparently a busybox (obsolete?) extension. */ diff --git a/e2fsprogs/e2fs_lib.c b/e2fsprogs/e2fs_lib.c index 839109e3f..3e8d95687 100644 --- a/e2fsprogs/e2fs_lib.c +++ b/e2fsprogs/e2fs_lib.c @@ -2,8 +2,7 @@ /* * See README for additional information * - * This file can be redistributed under the terms of the GNU Library General - * Public License + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c index cb454560a..3c6cafbd3 100644 --- a/e2fsprogs/fsck.c +++ b/e2fsprogs/fsck.c @@ -20,10 +20,7 @@ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, * 2001, 2002, 2003, 2004, 2005 by Theodore Ts'o. * - * %Begin-Header% - * This file may be redistributed under the terms of the GNU Public - * License. - * %End-Header% + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ /* All filesystem specific hooks have been removed. diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c index cc273536f..98e4e38fe 100644 --- a/e2fsprogs/old_e2fsprogs/fsck.c +++ b/e2fsprogs/old_e2fsprogs/fsck.c @@ -20,10 +20,7 @@ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, * 2001, 2002, 2003, 2004, 2005 by Theodore Ts'o. * - * %Begin-Header% - * This file may be redistributed under the terms of the GNU Public - * License. - * %End-Header% + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c index 6ffad3513..a1327437d 100644 --- a/e2fsprogs/old_e2fsprogs/mke2fs.c +++ b/e2fsprogs/old_e2fsprogs/mke2fs.c @@ -5,8 +5,7 @@ * Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, * 2003, 2004, 2005 by Theodore Ts'o. * - * This file may be redistributed under the terms of the GNU Public - * License. + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ /* Usage: mke2fs [options] device diff --git a/e2fsprogs/old_e2fsprogs/tune2fs.c b/e2fsprogs/old_e2fsprogs/tune2fs.c index b7a1b21eb..1d39ed1b0 100644 --- a/e2fsprogs/old_e2fsprogs/tune2fs.c +++ b/e2fsprogs/old_e2fsprogs/tune2fs.c @@ -8,10 +8,7 @@ * * Copyright 1995, 1996, 1997, 1998, 1999, 2000 by Theodore Ts'o. * - * %Begin-Header% - * This file may be redistributed under the terms of the GNU Public - * License. - * %End-Header% + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ /* diff --git a/e2fsprogs/old_e2fsprogs/util.c b/e2fsprogs/old_e2fsprogs/util.c index ce49db96a..7ab6591d5 100644 --- a/e2fsprogs/old_e2fsprogs/util.c +++ b/e2fsprogs/old_e2fsprogs/util.c @@ -4,10 +4,7 @@ * * Copyright 1995, 1996, 1997, 1998, 1999, 2000 by Theodore Ts'o. * - * %Begin-Header% - * This file may be redistributed under the terms of the GNU Public - * License. - * %End-Header% + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include diff --git a/libbb/crc32.c b/libbb/crc32.c index 42079b9c5..36ac86042 100644 --- a/libbb/crc32.c +++ b/libbb/crc32.c @@ -12,6 +12,8 @@ * * endian = 1: big-endian * endian = 0: little-endian + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/libbb/create_icmp6_socket.c b/libbb/create_icmp6_socket.c index 20655170e..91e478ec8 100644 --- a/libbb/create_icmp6_socket.c +++ b/libbb/create_icmp6_socket.c @@ -4,6 +4,8 @@ * * create raw socket for icmp (IPv6 version) protocol * and drop root privileges if running setuid + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/libbb/create_icmp_socket.c b/libbb/create_icmp_socket.c index 1fa016ab8..d75f8452d 100644 --- a/libbb/create_icmp_socket.c +++ b/libbb/create_icmp_socket.c @@ -4,6 +4,8 @@ * * create raw socket for icmp protocol * and drop root privileges if running setuid + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/libbb/crypt_make_salt.c b/libbb/crypt_make_salt.c index 393eba5f9..14bb0ddc9 100644 --- a/libbb/crypt_make_salt.c +++ b/libbb/crypt_make_salt.c @@ -6,6 +6,7 @@ * * Lifted from loginutils/passwd.c by Thomas Lundquist * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/libbb/human_readable.c b/libbb/human_readable.c index 61c856750..05e7d86ec 100644 --- a/libbb/human_readable.c +++ b/libbb/human_readable.c @@ -24,6 +24,8 @@ * * Some code to omit the decimal point and tenths digit is sketched out * and "#if 0"'d below. + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/libbb/inet_common.c b/libbb/inet_common.c index 966a021e5..fa4d8672f 100644 --- a/libbb/inet_common.c +++ b/libbb/inet_common.c @@ -5,7 +5,7 @@ * * Heavily modified by Manuel Novoa III Mar 12, 2001 * - * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/libbb/rtc.c b/libbb/rtc.c index 222d977ca..51834f8f9 100644 --- a/libbb/rtc.c +++ b/libbb/rtc.c @@ -1,5 +1,7 @@ /* * Common RTC functions + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/libbb/selinux_common.c b/libbb/selinux_common.c index 5fdbe9d58..275a761d2 100644 --- a/libbb/selinux_common.c +++ b/libbb/selinux_common.c @@ -3,6 +3,8 @@ * -- common SELinux utility functions * * Copyright 2007 KaiGai Kohei + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" #include diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c index 88bc28ca9..565dd3702 100644 --- a/libbb/update_passwd.c +++ b/libbb/update_passwd.c @@ -7,6 +7,8 @@ * /etc/shadow) for a given user and password. * * Moved from loginutils/passwd.c by Alexander Shishkin + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/libbb/xatonum_template.c b/libbb/xatonum_template.c index 2360ae88a..5e0bb59e6 100644 --- a/libbb/xatonum_template.c +++ b/libbb/xatonum_template.c @@ -1,3 +1,7 @@ +/* + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. + */ /* You need to define the following (example): diff --git a/libbb/xconnect.c b/libbb/xconnect.c index d48c50339..5be83241b 100644 --- a/libbb/xconnect.c +++ b/libbb/xconnect.c @@ -4,6 +4,7 @@ * * Connect to host at port using address resolution from getaddrinfo * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include diff --git a/libbb/xgetcwd.c b/libbb/xgetcwd.c index eefe1d660..10febe32d 100644 --- a/libbb/xgetcwd.c +++ b/libbb/xgetcwd.c @@ -5,7 +5,9 @@ * Written by David MacKenzie . * * Special function for busybox written by Vladimir Oleynik -*/ + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. + */ #include "libbb.h" diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c index 2cfc5751c..6bff4beae 100644 --- a/libbb/xreadlink.c +++ b/libbb/xreadlink.c @@ -1,7 +1,9 @@ /* vi: set sw=4 ts=4: */ /* - * xreadlink.c - safe implementation of readlink. - * Returns a NULL on failure... + * xreadlink.c - safe implementation of readlink. + * Returns a NULL on failure... + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c index 4eec02b78..47212e18a 100644 --- a/loginutils/cryptpw.c +++ b/loginutils/cryptpw.c @@ -6,6 +6,8 @@ * * Cooked from passwd.c by Thomas Lundquist * mkpasswd compatible options added by Bernhard Reutner-Fischer + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c index e0710dc4a..b10bff651 100644 --- a/networking/udhcp/arpping.c +++ b/networking/udhcp/arpping.c @@ -4,6 +4,8 @@ * * Mostly stolen from: dhcpcd - DHCP client daemon * by Yoichi Hariguchi + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c index 0b97d76a5..4f7b52056 100644 --- a/networking/udhcp/files.c +++ b/networking/udhcp/files.c @@ -2,6 +2,8 @@ /* * files.c -- DHCP server file manipulation * * Rewrite by Russ Dill July 2001 + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c index ff52da9fb..a981db0d7 100644 --- a/networking/udhcp/leases.c +++ b/networking/udhcp/leases.c @@ -2,6 +2,8 @@ /* * leases.c -- tools to manage DHCP leases * Russ Dill July 2001 + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "common.h" diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c index 6bf99e2b9..2c27e7033 100644 --- a/networking/udhcp/options.c +++ b/networking/udhcp/options.c @@ -2,6 +2,8 @@ /* * options.c -- DHCP server option packet tools * Rewrite by Russ Dill July 2001 + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "common.h" diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c index 1a6f7e6a0..e2c8e6ead 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c @@ -1,4 +1,10 @@ /* vi: set sw=4 ts=4: */ +/* + * packet.c -- packet ops + * Rewrite by Russ Dill July 2001 + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. + */ #include #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION diff --git a/networking/udhcp/static_leases.c b/networking/udhcp/static_leases.c index 43f1c9825..7540f7f5e 100644 --- a/networking/udhcp/static_leases.c +++ b/networking/udhcp/static_leases.c @@ -5,6 +5,7 @@ * * Wade Berrier September 2004 * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "common.h" diff --git a/networking/wget.c b/networking/wget.c index 3f80d615e..b40a1ac15 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -4,6 +4,7 @@ * * Chip Rosenthal Covad Communications * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/procps/fuser.c b/procps/fuser.c index d2ac9ebfc..7297bfe66 100644 --- a/procps/fuser.c +++ b/procps/fuser.c @@ -4,8 +4,7 @@ * * Copyright 2004 Tony J. White * - * May be distributed under the conditions of the - * GNU Library General Public License + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/procps/top.c b/procps/top.c index c8a9539d6..8c58b909d 100644 --- a/procps/top.c +++ b/procps/top.c @@ -4,7 +4,7 @@ * * This is written specifically for the linux /proc//stat(m) * files format. - + * * This reads the PIDs of all processes and their status and shows * the status of processes (first ones that fit to screen) at given * intervals. @@ -22,16 +22,13 @@ * - CPU where Process was last seen running * (to see effect of sched_setaffinity() etc) * - CPU Time Split (idle/IO/wait etc) PER CPU - */ - -/* Original code Copyrights */ -/* + * * Copyright (c) 1992 Branko Lankester * Copyright (c) 1992 Roger Binns * Copyright (C) 1994-1996 Charles L. Blake. * Copyright (C) 1992-1998 Michael K. Johnson - * May be distributed under the conditions of the - * GNU Library General Public License + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/selinux/chcon.c b/selinux/chcon.c index 80a030fde..55c2522f6 100644 --- a/selinux/chcon.c +++ b/selinux/chcon.c @@ -4,6 +4,8 @@ * Port to busybox: KaiGai Kohei * * Copyright (C) 2006 - 2007 KaiGai Kohei + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include #include diff --git a/selinux/getenforce.c b/selinux/getenforce.c index 21075cfd8..3d3eef14c 100644 --- a/selinux/getenforce.c +++ b/selinux/getenforce.c @@ -4,6 +4,7 @@ * Based on libselinux 1.33.1 * Port to BusyBox Hiroshi Shinji * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/selinux/getsebool.c b/selinux/getsebool.c index ea080d483..b761b72eb 100644 --- a/selinux/getsebool.c +++ b/selinux/getsebool.c @@ -4,6 +4,7 @@ * Based on libselinux 1.33.1 * Port to BusyBox Hiroshi Shinji * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/selinux/load_policy.c b/selinux/load_policy.c index b7a5c6eef..4bc873e81 100644 --- a/selinux/load_policy.c +++ b/selinux/load_policy.c @@ -1,6 +1,8 @@ /* * load_policy * Author: Yuichi Nakamura + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/selinux/matchpathcon.c b/selinux/matchpathcon.c index 5cfd52aba..1532429b6 100644 --- a/selinux/matchpathcon.c +++ b/selinux/matchpathcon.c @@ -3,6 +3,7 @@ * based on libselinux-1.32 * Port to busybox: KaiGai Kohei * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/selinux/runcon.c b/selinux/runcon.c index a9471ef0c..e94ff1454 100644 --- a/selinux/runcon.c +++ b/selinux/runcon.c @@ -25,6 +25,8 @@ * * Port to busybox: KaiGai Kohei * - based on coreutils-5.97 (in Fedora Core 6) + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include #include diff --git a/selinux/selinuxenabled.c b/selinux/selinuxenabled.c index ea233d891..1cf93c3f3 100644 --- a/selinux/selinuxenabled.c +++ b/selinux/selinuxenabled.c @@ -4,6 +4,7 @@ * Based on libselinux 1.33.1 * Port to BusyBox Hiroshi Shinji * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/selinux/sestatus.c b/selinux/sestatus.c index eca557e4c..216629615 100644 --- a/selinux/sestatus.c +++ b/selinux/sestatus.c @@ -4,6 +4,8 @@ * Ported to busybox: KaiGai Kohei * * Copyright (C) KaiGai Kohei + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/selinux/setenforce.c b/selinux/setenforce.c index 198324c91..a2d04288b 100644 --- a/selinux/setenforce.c +++ b/selinux/setenforce.c @@ -4,6 +4,7 @@ * Based on libselinux 1.33.1 * Port to BusyBox Hiroshi Shinji * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/selinux/setsebool.c b/selinux/setsebool.c index 83e70e2d5..b615ce783 100644 --- a/selinux/setsebool.c +++ b/selinux/setsebool.c @@ -4,6 +4,8 @@ * NOTE: -P option requires libsemanage, so this feature is * omitted in this version * Yuichi Nakamura + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c index 094d620ee..3831ab44e 100644 --- a/util-linux/fdformat.c +++ b/util-linux/fdformat.c @@ -1,7 +1,8 @@ /* vi: set sw=4 ts=4: */ -/* fdformat.c - Low-level formats a floppy disk - Werner Almesberger */ - -/* 5 July 2003 -- modified for Busybox by Erik Andersen +/* fdformat.c - Low-level formats a floppy disk - Werner Almesberger + * 5 July 2003 -- modified for Busybox by Erik Andersen + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ #include "libbb.h" diff --git a/util-linux/fdisk_aix.c b/util-linux/fdisk_aix.c index 83be8a8f9..2c0d2a6ac 100644 --- a/util-linux/fdisk_aix.c +++ b/util-linux/fdisk_aix.c @@ -1,8 +1,8 @@ #if ENABLE_FEATURE_AIX_LABEL /* * Copyright (C) Andreas Neuper, Sep 1998. - * This file may be redistributed under - * the terms of the GNU Public License. + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ typedef struct { diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c index c50ee9b16..ea5cd3c17 100644 --- a/util-linux/fdisk_osf.c +++ b/util-linux/fdisk_osf.c @@ -1,4 +1,3 @@ -#if ENABLE_FEATURE_OSF_LABEL /* * Copyright (c) 1987, 1988 Regents of the University of California. * All rights reserved. @@ -32,6 +31,7 @@ * SUCH DAMAGE. */ +#if ENABLE_FEATURE_OSF_LABEL #ifndef BSD_DISKMAGIC #define BSD_DISKMAGIC ((uint32_t) 0x82564557) diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c index 5a86a6848..51cf30c98 100644 --- a/util-linux/fdisk_sgi.c +++ b/util-linux/fdisk_sgi.c @@ -1,13 +1,13 @@ -#if ENABLE_FEATURE_SGI_LABEL - -#define SGI_DEBUG 0 - /* * Copyright (C) Andreas Neuper, Sep 1998. - * This file may be modified and redistributed under - * the terms of the GNU Public License. + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ +#if ENABLE_FEATURE_SGI_LABEL + +#define SGI_DEBUG 0 + #define SGI_VOLHDR 0x00 /* 1 and 2 were used for drive types no longer supported by SGI */ #define SGI_SWAP 0x03 diff --git a/util-linux/fdisk_sun.c b/util-linux/fdisk_sun.c index d1a436b4a..9cdf869e9 100644 --- a/util-linux/fdisk_sun.c +++ b/util-linux/fdisk_sun.c @@ -1,3 +1,17 @@ +/* + * fdisk_sun.c + * + * I think this is mostly, or entirely, due to + * Jakub Jelinek (jj@sunsite.mff.cuni.cz), July 1996 + * + * Merged with fdisk for other architectures, aeb, June 1998. + * + * Sat Mar 20 EST 1999 Arnaldo Carvalho de Melo + * Internationalization + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. + */ + #if ENABLE_FEATURE_SUN_LABEL #define SUNOS_SWAP 3 @@ -13,19 +27,6 @@ #define SCSI_IOCTL_GET_IDLUN 0x5382 -/* - * fdisksunlabel.c - * - * I think this is mostly, or entirely, due to - * Jakub Jelinek (jj@sunsite.mff.cuni.cz), July 1996 - * - * Merged with fdisk for other architectures, aeb, June 1998. - * - * Sat Mar 20 EST 1999 Arnaldo Carvalho de Melo - * Internationalization - */ - - static int sun_other_endian; static int scsi_disk; static int floppy; diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index 3f7fb4bef..2666132f9 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -2,8 +2,9 @@ /* * mkfs.c - make a linux (minix) file-system. * - * (C) 1991 Linus Torvalds. This file may be redistributed as per - * the Linux copyright. + * (C) 1991 Linus Torvalds. + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ /* diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c index a9766caaa..6c399c746 100644 --- a/util-linux/rtcwake.c +++ b/util-linux/rtcwake.c @@ -3,6 +3,8 @@ * * This version was taken from util-linux and scrubbed down for busybox. * + * Licensed under GPLv2, see file LICENSE in this tarball for details. + * * This uses cross-platform Linux interfaces to enter a system sleep state, * and leave it no later than a specified time. It uses any RTC framework * driver that supports standard driver model wakeup flags.