From aehlig@linta.de  Sat Jan 28 13:49:33 2012
Return-Path: <aehlig@linta.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7920B1065670
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 28 Jan 2012 13:49:33 +0000 (UTC)
	(envelope-from aehlig@linta.de)
Received: from linta.de (isilmar-3.linta.de [188.40.101.200])
	by mx1.freebsd.org (Postfix) with ESMTP id BE7138FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 28 Jan 2012 13:49:32 +0000 (UTC)
Received: (qmail 8540 invoked by uid 10); 28 Jan 2012 13:22:50 -0000
Received: from curry.linta.de by isilmar.linta.de with BSMTP; 28 Jan 2012 13:22:50 -0000
Received: by curry.linta.de (Postfix, from userid 1001)
	id 6A5FB1CC1D; Sat, 28 Jan 2012 14:22:36 +0100 (CET)
Message-Id: <20120128132236.6A5FB1CC1D@curry.linta.de>
Date: Sat, 28 Jan 2012 14:22:36 +0100 (CET)
From: Klaus Aehlig <aehlig@linta.de>
Reply-To: Klaus Aehlig <aehlig@linta.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Gereon Kaiping <kta1c10!gereon@linta.de>
Subject: [patch] pom(6) wrong usage message
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         164570
>Category:       bin
>Synopsis:       [patch] pom(6) wrong usage message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    maxim
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 28 13:50:06 UTC 2012
>Closed-Date:    Thu Aug 30 07:41:55 UTC 2012
>Last-Modified:  Thu Aug 30 07:41:55 UTC 2012
>Originator:     Klaus Aehlig
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD curry.linta.de 8.2-STABLE FreeBSD 8.2-STABLE #15: Thu Jan 12 01:30:10 CET 2012 root@curry.linta.de:/usr/obj/usr/src/sys/CURRY amd64

>Description:
	For incorrect non-option arguments, pom(6) displays the first argument
	instead of the program name in the usage-message
>How-To-Repeat:
	$ pom 1970.01.01
	Usage: 1970.01.01 [-p] [-d yyyy.mm.dd] [-t hh:mm:ss]

	Would have expected

	Usage: pom [-p] [-d yyyy.mm.dd] [-t hh:mm:ss]

	or similar.

>Fix:

	use the following patch

--- patch-pom.c begins here ---
--- pom.c.orig	2012-01-28 14:01:25.000000000 +0100
+++ pom.c	2012-01-28 14:06:12.000000000 +0100
@@ -90,6 +90,7 @@
 	double days, today, tomorrow;
 	int ch, cnt, pflag = 0;
 	char *odate = NULL, *otime = NULL;
+	char *progname = argv[0];
 
 	while ((ch = getopt(argc, argv, "d:pt:")) != -1)
 		switch (ch) {
@@ -103,14 +104,14 @@
 			otime = optarg;
 			break;
 		default:
-			usage(argv[0]);
+			usage(progname);
 		}
 
         argc -= optind;
 	argv += optind;
 
 	if (argc)
-		usage(argv[0]);
+		usage(progname);
 
 	/* Adjust based on users preferences */
 	time(&tt);
--- patch-pom.c ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: maxim 
State-Changed-When: Sat Jan 28 15:30:02 UTC 2012 
State-Changed-Why:  
Fixed in HEAD.  Thanks for the patch. 


Responsible-Changed-From-To: freebsd-bugs->maxim 
Responsible-Changed-By: maxim 
Responsible-Changed-When: Sat Jan 28 15:30:02 UTC 2012 
Responsible-Changed-Why:  
MFC reminder. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/164570: commit references a PR
Date: Sat, 28 Jan 2012 15:29:56 +0000 (UTC)

 Author: maxim
 Date: Sat Jan 28 15:29:43 2012
 New Revision: 230644
 URL: http://svn.freebsd.org/changeset/base/230644
 
 Log:
   o Preserve argv[0] to use it later in usage().
   
   PR:		bin/164570
   Submitted by:	Klaus Aehlig
   MFC after:	1 week
 
 Modified:
   head/games/pom/pom.c
 
 Modified: head/games/pom/pom.c
 ==============================================================================
 --- head/games/pom/pom.c	Sat Jan 28 14:00:21 2012	(r230643)
 +++ head/games/pom/pom.c	Sat Jan 28 15:29:43 2012	(r230644)
 @@ -86,6 +86,7 @@ main(int argc, char **argv)
  	double days, today, tomorrow;
  	int ch, cnt, pflag = 0;
  	char *odate = NULL, *otime = NULL;
 +	char *progname = argv[0];
  
  	while ((ch = getopt(argc, argv, "d:pt:")) != -1)
  		switch (ch) {
 @@ -99,14 +100,14 @@ main(int argc, char **argv)
  			otime = optarg;
  			break;
  		default:
 -			usage(argv[0]);
 +			usage(progname);
  		}
  
          argc -= optind;
  	argv += optind;
  
  	if (argc)
 -		usage(argv[0]);
 +		usage(progname);
  
  	/* Adjust based on users preferences */
  	time(&tt);
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: maxim 
State-Changed-When: Thu Aug 30 07:41:32 UTC 2012 
State-Changed-Why:  
Already fixed in stable/9. 

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