From owner-freebsd-bugs@FreeBSD.ORG Sat Jan 28 13:50:06 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B06E71065673 for ; Sat, 28 Jan 2012 13:50:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 876BA8FC18 for ; Sat, 28 Jan 2012 13:50:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q0SDo6fH017382 for ; Sat, 28 Jan 2012 13:50:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q0SDo60w017379; Sat, 28 Jan 2012 13:50:06 GMT (envelope-from gnats) Resent-Date: Sat, 28 Jan 2012 13:50:06 GMT Resent-Message-Id: <201201281350.q0SDo60w017379@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Klaus Aehlig Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7920B1065670 for ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Gereon Kaiping Subject: bin/164570: [patch] pom(6) wrong usage message X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Klaus Aehlig List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2012 13:50:06 -0000 >Number: 164570 >Category: bin >Synopsis: [patch] pom(6) wrong usage message >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Jan 28 13:50:06 UTC 2012 >Closed-Date: >Last-Modified: >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: >Unformatted: