From onoe@duplo.sm.sony.co.jp  Tue Sep  5 07:02:41 2000
Return-Path: <onoe@duplo.sm.sony.co.jp>
Received: from duplo.sm.sony.co.jp (duplo.sm.sony.co.jp [133.138.10.36])
	by hub.freebsd.org (Postfix) with ESMTP id C5D5D37B422
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Sep 2000 07:02:40 -0700 (PDT)
Received: (from onoe@localhost)
	by duplo.sm.sony.co.jp (8.11.0/8.9.3) id e85E2fk00786;
	Tue, 5 Sep 2000 23:02:41 +0900 (JST)
	(envelope-from onoe)
Message-Id: <200009051402.e85E2fk00786@duplo.sm.sony.co.jp>
Date: Tue, 5 Sep 2000 23:02:41 +0900 (JST)
From: Atsushi Onoe <onoe@duplo.sm.sony.co.jp>
Reply-To: onoe@sm.sony.co.jp
To: FreeBSD-gnats-submit@freebsd.org
Subject: basename(1) ignores suffix argument
X-Send-Pr-Version: 3.2

>Number:         21061
>Category:       bin
>Synopsis:       basename(1) ignores suffix argument
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    des
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 05 07:10:01 PDT 2000
>Closed-Date:    Wed Sep 6 09:59:28 PDT 2000
>Last-Modified:  Wed Sep 06 09:59:54 PDT 2000
>Originator:     Atsushi Onoe
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Sony Corporation
>Environment:

FreeBSD duplo.sm.sony.co.jp 5.0-CURRENT FreeBSD 5.0-CURRENT #4: Tue Sep  5 22:16:21 JST 2000     onoe@duplo.sm.sony.co.jp:/work/freebsd/src/sys/compile/DUPLO  i386

>Description:

	As a result of recent change to basename(1) simply to use basename(3),
	basename(1) no longer delete suffix from the first argument.

>How-To-Repeat:

	% basename foo.c .c
	foo.c
	<should be 'foo'>

>Fix:

	back out rev. 1.4

>Release-Note:
>Audit-Trail:

From: Atsushi Onoe <onoe@sm.sony.co.jp>
To: FreeBSD-gnats-submit@FreeBSD.ORG
Cc:  
Subject: Re: bin/21061: basename(1) ignores suffix argument
Date: Tue, 5 Sep 2000 23:15:38 +0900 (JST)

 > From: Atsushi Onoe <onoe@duplo.sm.sony.co.jp>
 
 Sorry, I've mailed with wrong address.
 
 Atsushi Onoe <onoe@sm.sony.co.jp>
 
Responsible-Changed-From-To: freebsd-bugs->des 
Responsible-Changed-By: sheldonh 
Responsible-Changed-When: Tue Sep 5 07:28:35 PDT 2000 
Responsible-Changed-Why:  
Over to DES, so that he can review the patch I'm about to send. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=21061 

From: Sheldon Hearn <sheldonh@uunet.co.za>
To: onoe@duplo.sm.sony.co.jp
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: bin/21061: basename(1) ignores suffix argument 
Date: Tue, 05 Sep 2000 16:29:38 +0200

 On Tue, 05 Sep 2000 23:02:41 +0900, Atsushi Onoe wrote:
 
 > >Number:         21061
 > >Category:       bin
 > >Synopsis:       basename(1) ignores suffix argument
 
 Try this.  The code that DES replaced has not been reinstated verbatim
 because of style bugs.
 
 Ciao,
 Sheldon.
 
 Index: basename.c
 ===================================================================
 RCS file: /home/ncvs/src/usr.bin/basename/basename.c,v
 retrieving revision 1.4
 diff -u -d -r1.4 basename.c
 --- basename.c	2000/09/03 17:09:41	1.4
 +++ basename.c	2000/09/05 14:26:00
 @@ -43,6 +43,7 @@
  static const char sccsid[] = "@(#)basename.c	8.4 (Berkeley) 5/4/95";
  #endif /* not lint */
  
 +#include <err.h>
  #include <libgen.h>
  #include <stdio.h>
  #include <unistd.h>
 @@ -54,7 +55,8 @@
  	int argc;
  	char **argv;
  {
 -	int ch;
 +	int ch, stringlen, off, suffixlen;
 +	char *p;
  
  	while ((ch = getopt(argc, argv, "")) != -1)
  		switch(ch) {
 @@ -68,7 +70,19 @@
  	if (argc != 1 && argc != 2)
  		usage();
  
 -	(void)printf("%s\n", basename(*argv));
 +	if ((p = basename(*argv)) == NULL)
 +		err(1, "%s", *argv);
 +	if (*++argv) {
 +		stringlen = strlen(p);
 +		suffixlen = strlen(*argv);
 +
 +		if (suffixlen < stringlen) {
 +			off = stringlen - suffixlen;
 +			if (!strcmp(p + off, *argv))
 +				p[off] = '\0';
 +		}
 +	}
 +	(void)printf("%s\n", p);
  	exit(0);
  }
  
 
State-Changed-From-To: open->closed 
State-Changed-By: sheldonh 
State-Changed-When: Wed Sep 6 09:59:28 PDT 2000 
State-Changed-Why:  
Fixed today: 

1.5       +9 -2      src/usr.bin/basename/basename.c 
1.7       +6 -2      src/usr.bin/dirname/dirname.c 


http://www.freebsd.org/cgi/query-pr.cgi?pr=21061 
>Unformatted:
