diff options
author | Erik Andersen <andersen@codepoet.org> | 2000-04-13 05:18:56 +0400 |
---|---|---|
committer | Erik Andersen <andersen@codepoet.org> | 2000-04-13 05:18:56 +0400 |
commit | 61677feff7f549a48267c2c0c50a7420de6e2599 (patch) | |
tree | 1ea829e51641647a35c552e289f4482ab9f5db27 /coreutils | |
parent | 62dc17a3b100496a5c7433cc598d674e244cb6f8 (diff) |
Upates to include copyright 2000 to everything
-Erik
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/basename.c | 7 | ||||
-rw-r--r-- | coreutils/cat.c | 2 | ||||
-rw-r--r-- | coreutils/chroot.c | 2 | ||||
-rw-r--r-- | coreutils/dd.c | 10 | ||||
-rw-r--r-- | coreutils/df.c | 10 | ||||
-rw-r--r-- | coreutils/du.c | 4 | ||||
-rw-r--r-- | coreutils/head.c | 4 | ||||
-rw-r--r-- | coreutils/ln.c | 3 | ||||
-rw-r--r-- | coreutils/mkdir.c | 3 | ||||
-rw-r--r-- | coreutils/rm.c | 2 | ||||
-rw-r--r-- | coreutils/rmdir.c | 2 | ||||
-rw-r--r-- | coreutils/sort.c | 4 | ||||
-rw-r--r-- | coreutils/tee.c | 4 | ||||
-rw-r--r-- | coreutils/touch.c | 2 | ||||
-rw-r--r-- | coreutils/uniq.c | 4 |
15 files changed, 33 insertions, 30 deletions
diff --git a/coreutils/basename.c b/coreutils/basename.c index 1db885f62..06e27663f 100644 --- a/coreutils/basename.c +++ b/coreutils/basename.c @@ -2,7 +2,7 @@ /* * Mini basename implementation for busybox * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify @@ -26,13 +26,16 @@ extern int basename_main(int argc, char **argv) { - char* s; + char* s, *s1; if ((argc < 2) || (**(argv + 1) == '-')) { usage("basename [file ...]\n"); } argv++; + s1=*argv+strlen(*argv)-1; + if (*s1 == '/') + *s1 = '\0'; s = strrchr(*argv, '/'); printf("%s\n", (s)? s + 1 : *argv); exit(TRUE); diff --git a/coreutils/cat.c b/coreutils/cat.c index 58a1b0f54..f7a6bfa7b 100644 --- a/coreutils/cat.c +++ b/coreutils/cat.c @@ -2,7 +2,7 @@ /* * Mini Cat implementation for busybox * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify diff --git a/coreutils/chroot.c b/coreutils/chroot.c index 3622c26dc..63fa4d146 100644 --- a/coreutils/chroot.c +++ b/coreutils/chroot.c @@ -3,7 +3,7 @@ * Mini chroot implementation for busybox * * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify diff --git a/coreutils/dd.c b/coreutils/dd.c index 9c7d872b1..303500008 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c @@ -2,13 +2,13 @@ /* * Mini dd implementation for busybox * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999, 2000 by Lineo, inc. * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> - * based in part on code taken from sash. * - * Copyright (c) 1999 by David I. Bell - * Permission is granted to use, distribute, or modify this source, - * provided that this copyright notice remains intact. + * Based in part on code taken from sash. + * Copyright (c) 1999 by David I. Bell + * Permission is granted to use, distribute, or modify this source, + * provided that this copyright notice remains intact. * * Permission to distribute this code under the GPL has been granted. * diff --git a/coreutils/df.c b/coreutils/df.c index 331ef2d49..c38720454 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -2,7 +2,7 @@ /* * Mini df implementation for busybox * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> * based on original code by (I think) Bruce Perens <bruce@pixar.com>. * @@ -28,9 +28,8 @@ #include <sys/stat.h> #include <sys/vfs.h> -static const char df_usage[] = "df [filesystem ...]\n" - - "\n" "\tPrint the filesystem space used and space available.\n"; +static const char df_usage[] = "df [filesystem ...]\n\n" + "Print the filesystem space used and space available.\n"; extern const char mtab_file[]; /* Defined in utility.c */ @@ -76,6 +75,9 @@ extern int df_main(int argc, char **argv) struct mntent *mountEntry; int status; + if (**(argv + 1) == '-') { + usage(df_usage); + } while (argc > 1) { if ((mountEntry = findMountPoint(argv[1], mtab_file)) == 0) { fprintf(stderr, "%s: can't find mount point.\n", argv[1]); diff --git a/coreutils/du.c b/coreutils/du.c index b6ebaca7a..874538015 100644 --- a/coreutils/du.c +++ b/coreutils/du.c @@ -3,7 +3,7 @@ * Mini du implementation for busybox * * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by John Beppu <beppu@lineo.com> * * This program is free software; you can redistribute it and/or modify @@ -182,7 +182,7 @@ int du_main(int argc, char **argv) exit(0); } -/* $Id: du.c,v 1.16 2000/03/04 21:19:32 erik Exp $ */ +/* $Id: du.c,v 1.17 2000/04/13 01:18:56 erik Exp $ */ /* Local Variables: c-file-style: "linux" diff --git a/coreutils/head.c b/coreutils/head.c index 82a73de2a..3db64b3bc 100644 --- a/coreutils/head.c +++ b/coreutils/head.c @@ -3,7 +3,7 @@ * Mini head implementation for busybox * * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by John Beppu <beppu@lineo.com> * * This program is free software; you can redistribute it and/or modify @@ -109,4 +109,4 @@ int head_main(int argc, char **argv) exit(0); } -/* $Id: head.c,v 1.8 2000/02/08 19:58:47 erik Exp $ */ +/* $Id: head.c,v 1.9 2000/04/13 01:18:56 erik Exp $ */ diff --git a/coreutils/ln.c b/coreutils/ln.c index c54026c62..4be60624e 100644 --- a/coreutils/ln.c +++ b/coreutils/ln.c @@ -2,8 +2,7 @@ /* * Mini ln implementation for busybox * - * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c index 70fdbdfb5..b0a2d57d6 100644 --- a/coreutils/mkdir.c +++ b/coreutils/mkdir.c @@ -2,8 +2,7 @@ /* * Mini mkdir implementation for busybox * - * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify diff --git a/coreutils/rm.c b/coreutils/rm.c index 683bf8bdf..0cd795661 100644 --- a/coreutils/rm.c +++ b/coreutils/rm.c @@ -3,7 +3,7 @@ * Mini rm implementation for busybox * * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c index f49569749..1d88de322 100644 --- a/coreutils/rmdir.c +++ b/coreutils/rmdir.c @@ -3,7 +3,7 @@ * Mini rmdir implementation for busybox * * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify diff --git a/coreutils/sort.c b/coreutils/sort.c index e6894f6c3..6ee6f207e 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c @@ -3,7 +3,7 @@ * Mini sort implementation for busybox * * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by John Beppu <beppu@lineo.com> * * This program is free software; you can redistribute it and/or modify @@ -320,4 +320,4 @@ int sort_main(int argc, char **argv) exit(0); } -/* $Id: sort.c,v 1.12 2000/03/04 21:19:32 erik Exp $ */ +/* $Id: sort.c,v 1.13 2000/04/13 01:18:56 erik Exp $ */ diff --git a/coreutils/tee.c b/coreutils/tee.c index 018fe117b..95b75edd7 100644 --- a/coreutils/tee.c +++ b/coreutils/tee.c @@ -3,7 +3,7 @@ * Mini tee implementation for busybox * * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by John Beppu <beppu@lineo.com> * * This program is free software; you can redistribute it and/or modify @@ -131,4 +131,4 @@ int tee_main(int argc, char **argv) exit(0); } -/* $Id: tee.c,v 1.8 2000/03/23 01:09:18 erik Exp $ */ +/* $Id: tee.c,v 1.9 2000/04/13 01:18:56 erik Exp $ */ diff --git a/coreutils/touch.c b/coreutils/touch.c index a0f21acdd..f8972dcf6 100644 --- a/coreutils/touch.c +++ b/coreutils/touch.c @@ -3,7 +3,7 @@ * Mini touch implementation for busybox * * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify diff --git a/coreutils/uniq.c b/coreutils/uniq.c index 1e41eaacd..2eedb886d 100644 --- a/coreutils/uniq.c +++ b/coreutils/uniq.c @@ -3,7 +3,7 @@ * Mini uniq implementation for busybox * * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000 by Lineo, inc. * Written by John Beppu <beppu@lineo.com> * * This program is free software; you can redistribute it and/or modify @@ -190,4 +190,4 @@ int uniq_main(int argc, char **argv) exit(0); } -/* $Id: uniq.c,v 1.7 2000/02/08 19:58:47 erik Exp $ */ +/* $Id: uniq.c,v 1.8 2000/04/13 01:18:56 erik Exp $ */ |