summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2020-12-06 06:37:48 (EST)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2020-12-06 06:37:48 (EST)
commit0efbe551f4eabe8d0e9ff4f6545c3cf9299b93d2 (patch)
tree32663987e23cb3a37b8dac572cd4bc6fa7cc37e8
parent8dba02e7f54dc49296e676c7e9b4a8ba48697db2 (diff)
copyright: Merge libbb/platform.c with rest
-rw-r--r--copyright36
1 files changed, 12 insertions, 24 deletions
diff --git a/copyright b/copyright
index a96a076..8cd570b 100644
--- a/copyright
+++ b/copyright
@@ -1951,14 +1951,15 @@ libbb/common_bufsiz.c, libbb/duration.c, libbb/endofname.c,
libbb/get_shell_name.c, libbb/get_volsize.c, libbb/human_readable.c,
libbb/inet_cksum.c, libbb/inet_common.c, libbb/isqrt.c,
libbb/lineedit_ptr_hack.c, libbb/makedev.c, libbb/missing_syscalls.c,
-libbb/nuke_str.c, libbb/print_numbered_lines.c, libbb/printable.c,
-libbb/printable_string.c, libbb/ptr_to_globals.c, libbb/read_key.c, libbb/rtc.c,
-libbb/safe_poll.c, libbb/securetty.c, libbb/selinux_common.c, libbb/signals.c,
-libbb/single_argv.c, libbb/time.c, libbb/ubi.c, libbb/udp_io.c, libbb/unicode.c,
-libbb/update_passwd.c, libbb/utmp.c, libbb/xatonum.c, libbb/xatonum_template.c,
-libbb/xconnect.c, libbb/xfunc_die.c, libbb/xfuncs.c, libbb/xfuncs_printf.c,
-libbb/xgetcwd.c, libbb/xreadlink.c, libbb/xrealloc_vector.c,
-loginutils/deluser.c, mailutils/mail.c, mailutils/mail.h, mailutils/makemime.c,
+libbb/nuke_str.c, libbb/platform.c, libbb/print_numbered_lines.c,
+libbb/printable.c, libbb/printable_string.c, libbb/ptr_to_globals.c,
+libbb/read_key.c, libbb/rtc.c, libbb/safe_poll.c, libbb/securetty.c,
+libbb/selinux_common.c, libbb/signals.c, libbb/single_argv.c, libbb/time.c,
+libbb/ubi.c, libbb/udp_io.c, libbb/unicode.c, libbb/update_passwd.c,
+libbb/utmp.c, libbb/xatonum.c, libbb/xatonum_template.c, libbb/xconnect.c,
+libbb/xfunc_die.c, libbb/xfuncs.c, libbb/xfuncs_printf.c, libbb/xgetcwd.c,
+libbb/xreadlink.c, libbb/xrealloc_vector.c, loginutils/deluser.c,
+mailutils/mail.c, mailutils/mail.h, mailutils/makemime.c,
mailutils/popmaildir.c, mailutils/reformime.c, mailutils/sendmail.c,
miscutils/chat.c, miscutils/flash_lock_unlock.c, miscutils/flashcp.c,
miscutils/hexedit.c, miscutils/inotifyd.c, miscutils/man.c,
@@ -1986,12 +1987,13 @@ util-linux/umount.c, util-linux/volume_id/f2fs.c, util-linux/volume_id/lfs.c,
util-linux/volume_id/squashfs.c, util-linux/volume_id/ubifs.c
--------------------------------------------------------------------------------
-Copyright (C) 1990, 91, 92, 93, 96 Free Software Foundation, Inc.
+Copyright (C) 1990, 91, 92, 93, 96, 2004-2005 Free Software Foundation, Inc.
(C) 1991 Linus Torvalds.
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005 by Theodore Ts'o.
Copyright (C) Andreas Neuper, Sep 1998.
Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+Copyright (c) 1999, 2000 The ht://Dig Group
Copyright (C) 1999,2000,2001 by Lineo, inc. and Mark Whitley
Copyright (C) 1999,2000,2001 by Mark Whitley <markw@codepoet.org>
Copyright (C) 1999 by Lineo, inc. and John Beppu
@@ -2014,6 +2016,7 @@ Copyright (C) 2007 Natanael Copa <natanael.copa@gmail.com>
Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
Copyright (c) 2008 Nuovation System Designs, LLC
Grant Erickson <gerickson@nuovations.com>
+Copyright (C) 2008 by Dan Fandrich <dan@coneharvesters.com>, et. al.
(C) 2009 Stefan Seyfried <seife@sphairon.com>
Copyright (C) 2010 Kevin Cernekee <cernekee@gmail.com>
Copyright (C) 2010 Sergey Naumov <sknaumov@gmail.com>
@@ -2138,21 +2141,6 @@ Licensed under GPLv2, see file LICENSE in this source tree.
On this system, a copy of the GNU General Public License may be found at
<file:///usr/share/common-licenses/GPL-2>.
-libbb/platform.c
-----------------
-
-Copyright (C) 2009 by Dan Fandrich <dan@coneharvesters.com>, et. al.
-
-Licensed under GPLv2, see file LICENSE in this source tree.
-
-Copyright (C) 2005 Free Software Foundation, Inc.
-
-Copyright (c) 1999, 2000 The ht://Dig Group
-Copyright (C) 2004 Free Software Foundation, Inc.
-
-On this system, a copy of the GNU General Public License may be found at
-<file:///usr/share/common-licenses/GPL-2>.
-
miscutils/nandwrite.c
---------------------