summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2009-02-07 11:27:35 +0000
committerRobert Watson <rwatson@FreeBSD.org>2009-02-07 11:27:35 +0000
commit75b76418f23497322f5811ce92d1ca971abb80f9 (patch)
tree2c0c2179e64fa21407003ab8bc1f2daae51b8d2f /usr.bin
parentf5443e972fbebc09aaa74bb7908b1fd911daf441 (diff)
Notes
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/basename/basename.11
-rw-r--r--usr.bin/dirname/dirname.c13
2 files changed, 9 insertions, 5 deletions
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index b2ad95d8bdfb..05900fa82b2b 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -52,6 +52,7 @@
.Op Ar ...
.Nm dirname
.Ar string
+.Op Ar ...
.Sh DESCRIPTION
The
.Nm
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index 3018f2f6f00c..93b135de2167 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -66,12 +66,15 @@ main(int argc, char **argv)
argc -= optind;
argv += optind;
- if (argc != 1)
+ if (argc < 1)
usage();
- if ((p = dirname(*argv)) == NULL)
- err(1, "%s", *argv);
- (void)printf("%s\n", p);
+ while (argc--) {
+ if ((p = dirname(*argv)) == NULL)
+ err(1, "%s", *argv);
+ argv++;
+ (void)printf("%s\n", p);
+ }
exit(0);
}
@@ -79,6 +82,6 @@ void
usage(void)
{
- (void)fprintf(stderr, "usage: dirname string\n");
+ (void)fprintf(stderr, "usage: dirname string [...]\n");
exit(1);
}