From owner-freebsd-bugs@FreeBSD.ORG Sun May 27 07:10:03 2007 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 43B8F16A468 for ; Sun, 27 May 2007 07:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 2693813C45E for ; Sun, 27 May 2007 07:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l4R7A2jT052997 for ; Sun, 27 May 2007 07:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l4R7A26s052996; Sun, 27 May 2007 07:10:02 GMT (envelope-from gnats) Resent-Date: Sun, 27 May 2007 07:10:02 GMT Resent-Message-Id: <200705270710.l4R7A26s052996@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, Ighighi Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5E4BD16A400 for ; Sun, 27 May 2007 07:09:55 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.freebsd.org (Postfix) with ESMTP id 4FCCF13C447 for ; Sun, 27 May 2007 07:09:55 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l4R79tSZ065636 for ; Sun, 27 May 2007 07:09:55 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id l4R79tli065635; Sun, 27 May 2007 07:09:55 GMT (envelope-from nobody) Message-Id: <200705270709.l4R79tli065635@www.freebsd.org> Date: Sun, 27 May 2007 07:09:55 GMT From: Ighighi To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: bin/113049: [PATCH]: make quot(8) use getopt(3) and show usage() if no arguments X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 May 2007 07:10:03 -0000 >Number: 113049 >Category: bin >Synopsis: [PATCH]: make quot(8) use getopt(3) and show usage() if no arguments >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun May 27 07:10:02 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Ighighi >Release: 6.2-STABLE >Organization: >Environment: FreeBSD orion 6.2-STABLE FreeBSD 6.2-STABLE #0: Thu May 24 09:18:16 VET 2007 root@orion:/usr/obj/usr/src/sys/CUSTOM i386 >Description: This patch adds getopt(3) support for quot(8) and to display usage with no arguments present. >How-To-Repeat: >Fix: Patch attached with submission follows: --- src/usr.sbin/quot/quot.c.orig Sat Oct 14 23:28:54 2006 +++ src/usr.sbin/quot/quot.c Sun May 27 02:48:20 2007 @@ -616,42 +616,48 @@ char dev[MNAMELEN + 1]; char *nm; int cnt; + int ch; + + if (argc == 1) + usage(); func = douser; #ifndef COMPAT header = getbsize(&headerlen,&blocksize); #endif - while (--argc > 0 && **++argv == '-') { - while (*++*argv) { - switch (**argv) { - case 'n': - func = donames; - break; - case 'c': - func = dofsizes; - break; - case 'a': - all = 1; - break; - case 'f': - count = 1; - break; - case 'h': - estimate = 1; - break; + + while ((ch = getopt(argc, argv, "acfhknv")) != -1) { + switch (ch) { + case 'a': + all = 1; + break; + case 'c': + func = dofsizes; + break; + case 'f': + count = 1; + break; + case 'h': + estimate = 1; + break; #ifndef COMPAT - case 'k': - blocksize = 1024; - break; + case 'k': + blocksize = 1024; + break; #endif /* COMPAT */ - case 'v': - unused = 1; - break; - default: - usage(); - } + case 'n': + func = donames; + break; + case 'v': + unused = 1; + break; + default: + usage(); } } + argc -= optind; + argv += optind; + if (all) { cnt = getmntinfo(&mp,MNT_NOWAIT); for (; --cnt >= 0; mp++) { >Release-Note: >Audit-Trail: >Unformatted: