From owner-freebsd-bugs@FreeBSD.ORG Fri May 2 14:10:01 2008 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 8C06E1065678 for ; Fri, 2 May 2008 14:10:01 +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 6C5448FC1C for ; Fri, 2 May 2008 14:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m42EA1UK076435 for ; Fri, 2 May 2008 14:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m42EA1T8076434; Fri, 2 May 2008 14:10:01 GMT (envelope-from gnats) Resent-Date: Fri, 2 May 2008 14:10:01 GMT Resent-Message-Id: <200805021410.m42EA1T8076434@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, Jaakko Heinonen Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FE061065682 for ; Fri, 2 May 2008 14:02:04 +0000 (UTC) (envelope-from jaakko@saunalahti.fi) Received: from gw02.mail.saunalahti.fi (gw02.mail.saunalahti.fi [195.197.172.116]) by mx1.freebsd.org (Postfix) with ESMTP id A01E08FC27 for ; Fri, 2 May 2008 14:02:03 +0000 (UTC) (envelope-from jaakko@saunalahti.fi) Received: from ws64.jh.dy.fi (a91-153-116-146.elisa-laajakaista.fi [91.153.116.146]) by gw02.mail.saunalahti.fi (Postfix) with ESMTP id 412DF1391EF for ; Fri, 2 May 2008 17:01:58 +0300 (EEST) Received: from ws64.jh.dy.fi (localhost [127.0.0.1]) by ws64.jh.dy.fi (8.14.2/8.14.2) with ESMTP id m42E1rLr001618 for ; Fri, 2 May 2008 17:01:53 +0300 (EEST) (envelope-from jaakko@ws64.jh.dy.fi) Received: (from jaakko@localhost) by ws64.jh.dy.fi (8.14.2/8.14.2/Submit) id m42E1raj001617; Fri, 2 May 2008 17:01:53 +0300 (EEST) (envelope-from jaakko) Message-Id: <200805021401.m42E1raj001617@ws64.jh.dy.fi> Date: Fri, 2 May 2008 17:01:53 +0300 (EEST) From: Jaakko Heinonen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: bin/123329: [patch] usage strings for fifolog_create(1) and fifolog_writer(1) 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: Fri, 02 May 2008 14:10:01 -0000 >Number: 123329 >Category: bin >Synopsis: [patch] usage strings for fifolog_create(1) and fifolog_writer(1) >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: Fri May 02 14:10:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Jaakko Heinonen >Release: FreeBSD 8.0-CURRENT i386 >Organization: >Environment: System: FreeBSD x 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Thu May 1 15:28:32 EEST 2008 x i386 >Description: fifolog_create(1) and fifolog_writer(1) print empty usage strings if they are invoked without parameters. >How-To-Repeat: $ fifolog_create fifolog_create: Usage $ fifolog_writer fifolog_writer: Usage $ fifolog_reader >From 0 Thu Jan 1 02:00:00 1970 To 1209736020 Fri May 2 16:47:00 2008 fifolog_reader: Usage: fifolog_reader [options] fifolog After applying the patch: $ fifolog_create Usage: fifolog_create [-l record-size] [-r record-count] [-s size] file $ fifolog_writer Usage: fifolog_writer [-w write-rate] [-s sync-rate] [-z compression] file $ fifolog_reader Usage: fiforead [options] fifofile -b -B -e -E -o -R # match regexp -t # format timestamps as %Y%m%d%H%M%S -T >Fix: This patch also changes them to return EX_USAGE when usage is displayed and fifolog_reader doesn't display times when argv[0] == NULL. --- fifolog-usage.diff begins here --- Index: fifolog_create/fifolog_create.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/fifolog/fifolog_create/fifolog_create.c,v retrieving revision 1.1 diff -p -u -r1.1 fifolog_create.c --- fifolog_create/fifolog_create.c 9 Mar 2008 19:14:36 -0000 1.1 +++ fifolog_create/fifolog_create.c 2 May 2008 13:50:14 -0000 @@ -27,6 +27,8 @@ */ #include +#include +#include #include #include #include @@ -36,6 +38,14 @@ #define DEF_RECSIZE 512 #define DEF_RECCNT (24 * 60 * 60) +static void +usage(void) +{ + fprintf(stderr, "Usage: fifolog_create [-l record-size] " + "[-r record-count] [-s size] file\n"); + exit(EX_USAGE); +} + int main(int argc, char * const *argv) { @@ -63,13 +73,13 @@ main(int argc, char * const *argv) err(1, "Couldn't parse -s argument"); break; default: - errx(1, "Usage"); + usage(); } } argc -= optind; argv += optind; if (argc != 1) - errx(1, "Usage"); + usage(); if (size != 0 && reccnt != 0 && recsize != 0) { /* N N N */ if (size != reccnt * recsize) Index: fifolog_reader/fifolog_reader.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c,v retrieving revision 1.2 diff -p -u -r1.2 fifolog_reader.c --- fifolog_reader/fifolog_reader.c 31 Mar 2008 13:56:15 -0000 1.2 +++ fifolog_reader/fifolog_reader.c 2 May 2008 13:50:14 -0000 @@ -33,6 +33,7 @@ #include #include #include +#include #include #include "libfifolog.h" @@ -87,7 +88,7 @@ Usage(void) "\t-t # format timestamps as %%Y%%m%%d%%H%%M%%S\n" "\t-T \n" ); - exit (2); + exit (EX_USAGE); } int @@ -149,13 +150,14 @@ main(int argc, char * const *argv) } } + if (argv[0] == NULL) + Usage(); + fprintf(stderr, "From\t%jd %s", (intmax_t)opt_B, ctime(&opt_B)); fprintf(stderr, "To\t%jd %s", (intmax_t)opt_E, ctime(&opt_E)); if (opt_B >= opt_E) errx(1, "Begin time not before End time"); - if (argv[0] == NULL) - errx(1, "Usage: %s [options] fifolog", progname); fl = fifolog_reader_open(argv[0]); if (!strcmp(opt_o, "-")) Index: fifolog_writer/fifolog_writer.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c,v retrieving revision 1.1 diff -p -u -r1.1 fifolog_writer.c --- fifolog_writer/fifolog_writer.c 9 Mar 2008 19:14:36 -0000 1.1 +++ fifolog_writer/fifolog_writer.c 2 May 2008 13:50:14 -0000 @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -38,6 +39,14 @@ #include "libfifolog.h" +static void +usage(void) +{ + fprintf(stderr, "Usage: fifolog_writer [-w write-rate] [-s sync-rate] " + "[-z compression] file\n"); + exit(EX_USAGE); +} + int main(int argc, char * const *argv) { @@ -62,19 +71,19 @@ main(int argc, char * const *argv) z_opt = strtoul(optarg, NULL, 0); break; default: - errx(1, "Usage"); + usage(); } } argc -= optind; argv += optind; if (argc != 1) - errx(1, "Usage"); + usage(); if (z_opt > 9) - errx(1, "Usage"); + usage(); if (w_opt > s_opt) - errx(1, "Usage"); + usage(); f = fifolog_write_new(); assert(f != NULL); --- fifolog-usage.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: