d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Alow dirname(1) to accept multiple arguments in the same way that

Browse Source 
basename(1) does.

(Two different PRs contained identical patches, both cited below)

PR:		121520, 86148
Submitted by:	Ighighi <ighighi at gmail dot com>
Submitted by:	Leif Neland <leif at neland dot dk>
MFC after:	3 days
This commit is contained in:
Robert Watson 2009-02-02 11:19:56 +00:00
parent a52e28c7dd
commit 75d7ed1ed6
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.bin/basename/basename.1
View File

@ -52,6 +52,7 @@
.Op Ar ...
.Nm dirname
.Ar string
.Op Ar ...
.Sh DESCRIPTION
The
.Nm

13
usr.bin/dirname/dirname.c
View File

@ -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);
}