From f79ff0842ef7ecf146e5987a7d02b35dfe3e5b8e Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 5 Jul 2006 18:38:37 +0000 Subject: fixup my copyright notice, trim stale remnants of older notices which I had clearly run search/replace on that were cluttering things up. --- libc/stdlib/div.c | 24 ++++-------------------- libc/stdlib/rand.c | 28 ++++++++-------------------- libc/sysdeps/linux/arm/vfork.S | 7 ++----- libc/unistd/getlogin.c | 7 ++----- libcrypt/crypt.c | 6 +----- libutil/logwtmp.c | 25 ++++++------------------- test/args/arg_test.c | 5 +---- test/assert/assert.c | 7 ++----- test/ctype/ctype.c | 5 +---- test/signal/signal.c | 3 --- test/testsuite.h | 9 +++------ test/unistd/clone.c | 5 +---- test/unistd/fork.c | 5 +---- test/unistd/getcwd.c | 5 +---- test/unistd/vfork.c | 4 +--- 15 files changed, 34 insertions(+), 111 deletions(-) diff --git a/libc/stdlib/div.c b/libc/stdlib/div.c index 7ca9a2244..6c595959e 100644 --- a/libc/stdlib/div.c +++ b/libc/stdlib/div.c @@ -1,24 +1,8 @@ /* vi: set sw=4 ts=4: */ -/* div for uClibc - * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen - * Copyright (C) 2000,2001 by Erik Andersen - * Written by Erik Andersen - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library 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 Library General Public License - * for more details. - * - * You should have received a copy of the GNU Library 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 - * +/* + * div for uClibc + * Copyright (C) 2000-2006 by Erik Andersen + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ #include diff --git a/libc/stdlib/rand.c b/libc/stdlib/rand.c index cdf58ecc7..03323f501 100644 --- a/libc/stdlib/rand.c +++ b/libc/stdlib/rand.c @@ -1,28 +1,16 @@ -/* rand.c - * - * Written by Erik Andersen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 675 Mass Ave, - * Cambridge, MA 02139, USA. */ +/* vi: set sw=4 ts=4: */ +/* + * rand for uClibc + * Copyright (C) 2000-2006 by Erik Andersen + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + */ #include libc_hidden_proto(random) -int rand (void) +int rand (void) { - return((int)random()); + return((int)random()); } diff --git a/libc/sysdeps/linux/arm/vfork.S b/libc/sysdeps/linux/arm/vfork.S index 5092023a8..e9f63d46e 100644 --- a/libc/sysdeps/linux/arm/vfork.S +++ b/libc/sysdeps/linux/arm/vfork.S @@ -1,10 +1,7 @@ /* vi: set sw=4 ts=4: */ -/* vfork for uClibc - * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen +/* + * vfork for uClibc * Copyright (C) 2000-2006 by Erik Andersen - * Written by Erik Andersen - * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ diff --git a/libc/unistd/getlogin.c b/libc/unistd/getlogin.c index ece855e2e..42438b327 100644 --- a/libc/unistd/getlogin.c +++ b/libc/unistd/getlogin.c @@ -1,10 +1,7 @@ /* vi: set sw=4 ts=4: */ -/* getlogin for uClibc - * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen +/* + * getlogin for uClibc * Copyright (C) 2000-2006 by Erik Andersen - * Written by Erik Andersen - * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ diff --git a/libcrypt/crypt.c b/libcrypt/crypt.c index a64b4a556..5d8215fac 100644 --- a/libcrypt/crypt.c +++ b/libcrypt/crypt.c @@ -1,13 +1,9 @@ /* vi: set sw=4 ts=4: */ /* * crypt() for uClibc - * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen - * Copyright (C) 2000-2006 Erik Andersen - * + * Copyright (C) 2000-2006 by Erik Andersen * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -/* Written by Erik Andersen */ #define __FORCE_GLIBC #include diff --git a/libutil/logwtmp.c b/libutil/logwtmp.c index c6a8530ca..85b770c18 100644 --- a/libutil/logwtmp.c +++ b/libutil/logwtmp.c @@ -1,22 +1,9 @@ -/* wtmp support rubbish (i.e. complete crap) - - Written by Erik Andersen - - The GNU C Library is free software - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ +/* vi: set sw=4 ts=4: */ +/* + * wtmp support rubbish (i.e. complete crap) + * Copyright (C) 2000-2006 by Erik Andersen + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + */ #include #include diff --git a/test/args/arg_test.c b/test/args/arg_test.c index 1e9bc7fce..86f31575a 100644 --- a/test/args/arg_test.c +++ b/test/args/arg_test.c @@ -1,10 +1,7 @@ /* vi: set sw=4 ts=4: */ /* * Test application for argc and argv handling - * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen * Copyright (C) 2000-2006 by Erik Andersen - * Written by Erik Andersen * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ @@ -27,7 +24,7 @@ int main(int argc, char **argv) } } #endif - + printf("argc=%d\n", argc); for(i=0;i - * Written by Erik Andersen + * Copyright (C) 2000-2006 by Erik Andersen * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ @@ -25,7 +22,7 @@ void aborthandler(int junk) int main( int argc, char **argv) { signal(SIGABRT, aborthandler); - + init_testsuite("Testing functions defined in assert.h:\n\t"); got_abort=0; diff --git a/test/ctype/ctype.c b/test/ctype/ctype.c index 72c164664..352b2d2c8 100644 --- a/test/ctype/ctype.c +++ b/test/ctype/ctype.c @@ -1,10 +1,7 @@ /* vi: set sw=4 ts=4: */ /* * Test application for functions defined in ctype.h - * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen - * Copyright (C) 2000,2001 by Erik Andersen - * Written by Erik Andersen + * Copyright (C) 2000-2006 by Erik Andersen * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ diff --git a/test/signal/signal.c b/test/signal/signal.c index b26c74dad..6e6f04a7a 100644 --- a/test/signal/signal.c +++ b/test/signal/signal.c @@ -1,10 +1,7 @@ /* vi: set sw=4 ts=4: */ /* * signal testing function for uClibc - * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen * Copyright (C) 2000-2006 by Erik Andersen - * Written by Erik Andersen * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ diff --git a/test/testsuite.h b/test/testsuite.h index 79b6a1adf..c45876831 100644 --- a/test/testsuite.h +++ b/test/testsuite.h @@ -1,10 +1,7 @@ /* vi: set sw=4 ts=4: */ /* * Some simple macros for use in test applications. - * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen * Copyright (C) 2000-2006 by Erik Andersen - * Written by Erik Andersen * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ @@ -32,13 +29,13 @@ void error_msg(int result, int line, const char* file, const char* command) printf("\nFAILED TEST %lu: \n\t%s\n", (unsigned long)test_number, command); printf("AT LINE: %d, FILE: %s\n\n", line, file); -} +} void success_msg(int result, const char* command) { #if 0 printf("passed test: %s == 0\n", command); -#endif +#endif } void done_testing(void) @@ -99,5 +96,5 @@ void init_testsuite(const char* testname) } while (0) #define STR_CMD(cmd) cmd - + #endif /* TESTSUITE_H */ diff --git a/test/unistd/clone.c b/test/unistd/clone.c index a8d4a6106..bc08c94bf 100644 --- a/test/unistd/clone.c +++ b/test/unistd/clone.c @@ -1,10 +1,7 @@ /* vi: set sw=4 ts=4: */ /* * clone test for uClibc - * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen * Copyright (C) 2000-2006 by Erik Andersen - * Written by Erik Andersen * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ @@ -36,7 +33,7 @@ int clone_main(void *arg) return input + 20; } -int main(void) +int main(void) { int clone1, clone2, clone3; char clone1_stack[8192], clone2_stack[8192], clone3_stack[8192]; diff --git a/test/unistd/fork.c b/test/unistd/fork.c index 6f46dac48..b163c0ef9 100644 --- a/test/unistd/fork.c +++ b/test/unistd/fork.c @@ -1,10 +1,7 @@ /* vi: set sw=4 ts=4: */ /* * fork test for uClibc - * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen * Copyright (C) 2000-2006 by Erik Andersen - * Written by Erik Andersen * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ @@ -26,7 +23,7 @@ void child_handler(int sig) fprintf(stderr, "I got a SIGCHLD\n"); } -int main(void) +int main(void) { pid_t pid1, pid2, pid3; int status, result, wpid; diff --git a/test/unistd/getcwd.c b/test/unistd/getcwd.c index 21986cf82..bcecec7be 100644 --- a/test/unistd/getcwd.c +++ b/test/unistd/getcwd.c @@ -1,10 +1,7 @@ /* vi: set sw=4 ts=4: */ /* * fork test for uClibc - * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen * Copyright (C) 2000-2006 by Erik Andersen - * Written by Erik Andersen * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ @@ -13,7 +10,7 @@ #include #include -int main(void) +int main(void) { char *foo; char junk[12]; diff --git a/test/unistd/vfork.c b/test/unistd/vfork.c index 639e46663..295583945 100644 --- a/test/unistd/vfork.c +++ b/test/unistd/vfork.c @@ -1,9 +1,7 @@ /* vi: set sw=4 ts=4: */ /* * vfork test for uClibc - * * Copyright (C) 2000-2006 by Erik Andersen - * Written by Erik Andersen * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ @@ -15,7 +13,7 @@ #include -int main(void) +int main(void) { pid_t pid; int status, wpid; -- cgit v1.2.3