From owner-svn-src-head@FreeBSD.ORG  Mon Feb  2 11:19:57 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 67B9C1065B30;
	Mon,  2 Feb 2009 11:19:57 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4B85A8FC1A;
	Mon,  2 Feb 2009 11:19:57 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n12BJvoI095789;
	Mon, 2 Feb 2009 11:19:57 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n12BJva6095787;
	Mon, 2 Feb 2009 11:19:57 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200902021119.n12BJva6095787@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 2 Feb 2009 11:19:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188006 - in head/usr.bin: basename dirname
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Feb 2009 11:20:15 -0000

Author: rwatson
Date: Mon Feb  2 11:19:56 2009
New Revision: 188006
URL: http://svn.freebsd.org/changeset/base/188006

Log:
  Alow dirname(1) to accept multiple arguments in the same way that
  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

Modified:
  head/usr.bin/basename/basename.1
  head/usr.bin/dirname/dirname.c

Modified: head/usr.bin/basename/basename.1
==============================================================================
--- head/usr.bin/basename/basename.1	Mon Feb  2 11:02:19 2009	(r188005)
+++ head/usr.bin/basename/basename.1	Mon Feb  2 11:19:56 2009	(r188006)
@@ -52,6 +52,7 @@
 .Op Ar ...
 .Nm dirname
 .Ar string
+.Op Ar ...
 .Sh DESCRIPTION
 The
 .Nm

Modified: head/usr.bin/dirname/dirname.c
==============================================================================
--- head/usr.bin/dirname/dirname.c	Mon Feb  2 11:02:19 2009	(r188005)
+++ head/usr.bin/dirname/dirname.c	Mon Feb  2 11:19:56 2009	(r188006)
@@ -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);
 }