From owner-svn-src-all@freebsd.org Wed May 22 15:11:21 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21F7C15AE188; Wed, 22 May 2019 15:11:21 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-it1-x134.google.com (mail-it1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B0F0E8A11A; Wed, 22 May 2019 15:11:20 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-it1-x134.google.com with SMTP id t184so4115188itf.2; Wed, 22 May 2019 08:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=jmYyRyRUtdQaPcewqV8dUTpRK7hF3QR35AzpkB0zo/8=; b=lU3crDl6ABlm4wQmN3RmitNrBWe7oohiIVkSv17Tw3m6D4FghrV3ibrLC0ld6kkMrb pde9Zid69n8nJBa5NY00lTPN9x+jEQ3h54ceDMUzLDnwAga/d2BQXI0VN+6y2RNAkMBU zU5LYk+PelBqoqfx/qQGIvIkX4/zXwSPBboBpp+yugBmo9EPq1F6TZG71TnXHV0C5Iay uf0cOrxcnTCPFDYzbON+oLf2/ALNgaEA3wRMgsVkiiYkyj0zT+8VBBVKu7MNwBCPH6V9 SyJUG9Sv5GyCie/DxK3KEtslSdZ5Uzu+htm4/vJONx6ggnKxDIoj+ITnK6C3IVTvnxbS ICtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=jmYyRyRUtdQaPcewqV8dUTpRK7hF3QR35AzpkB0zo/8=; b=H5lSMsQaqfslodx9Woa2xIp+0ofm3w5LtPR6rSd/RdkY83ZJH2OmAQzreEnVF/6+tB MZ1c+20953DJy3WXN7XS7U1n+nFYIG6tg0Xk1aLHsoro/+HI/OZrcFG5Det+ZFbf5V6c h7FsNz4ufH/wLFQSVtr6GDNYdOtDUpohv/aP4OCl1eQEOqVGBBYWHeC3QEzvaGx4XIdA WdXDXXH73Yd1f8bxKGrZgKcyw+gjeQgh9+tph0WL9PN+dtUSI4NVAU5ooYC7dp0LrcDD EbDdI1MFw4OaXN8HWIeU6VtM1HjsEd9DU+1WZN9bHgHPFYxY/mY6YKk3JOlAZDN12bAK Kp/A== X-Gm-Message-State: APjAAAXuwK0RZottlsI5N1/gcKzEP0KLtC16sb553pmXrTKdlZmiGAFT ezKBxdX+xDG6GPhF8avI8Lx1W2Rq X-Google-Smtp-Source: APXvYqwqoPUlvuNu021HKpSrE8FZfi9r/LsimGnuQgH5XW7cCGwJZC8HlOp95y+VZfh+RiY7ifHXRw== X-Received: by 2002:a24:834b:: with SMTP id d72mr8310547ite.109.1558537879502; Wed, 22 May 2019 08:11:19 -0700 (PDT) Received: from spy (cs-auth-dc-129-97-60-193.dynamic.uwaterloo.ca. [129.97.60.193]) by smtp.gmail.com with ESMTPSA id d71sm3073380itc.18.2019.05.22.08.11.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 May 2019 08:11:18 -0700 (PDT) Sender: Mark Johnston Date: Wed, 22 May 2019 11:11:16 -0400 From: Mark Johnston To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r348090 - in head/libexec/bootpd: . bootpgw Message-ID: <20190522151116.GB5125@spy> References: <201905220413.x4M4DvBm057783@repo.freebsd.org> <201905220425.x4M4PNCB082699@gndrsh.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201905220425.x4M4PNCB082699@gndrsh.dnsmgr.net> User-Agent: Mutt/1.11.4 (2019-03-13) X-Rspamd-Queue-Id: B0F0E8A11A X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 May 2019 15:11:21 -0000 On Tue, May 21, 2019 at 09:25:23PM -0700, Rodney W. Grimes wrote: > > Author: markj > > Date: Wed May 22 04:13:57 2019 > > New Revision: 348090 > > URL: https://svnweb.freebsd.org/changeset/base/348090 > > > > Log: > > Marginally improve usage() message style in bootpd. > > > > - Remove an extra space after "usage:". > > - Avoid lines exceeding 80 columns. > > > > Based on notes from rgrimes. > > Thanks, but you missed an important aspect of those notes, > see inline below. > > > > > MFC with: r348066 > > Event: Waterloo Hackathon 2019 > > > > Modified: > > head/libexec/bootpd/bootpd.c > > head/libexec/bootpd/bootpgw/bootpgw.c > > > > Modified: head/libexec/bootpd/bootpd.c > > ============================================================================== > > --- head/libexec/bootpd/bootpd.c Wed May 22 04:10:24 2019 (r348089) > > +++ head/libexec/bootpd/bootpd.c Wed May 22 04:13:57 2019 (r348090) > > @@ -587,8 +587,8 @@ PRIVATE void > > usage() > > { > > fprintf(stderr, > > - "usage: bootpd [-a] [-i | -s] [-c chdir-path] [-d level] [-h hostname] [-t timeout]\n"); > > - fprintf(stderr, " [bootptab [dumpfile]]\n"); > > + "usage: bootpd [-a] [-i | -s] [-c chdir-path] [-d level] [-h hostname]\n" > > + " [-t timeout] [bootptab [dumpfile]]\n"); > > fprintf(stderr, "\t -a\tdon't modify ARP table\n"); > > fprintf(stderr, "\t -c n\tset current directory\n"); > > fprintf(stderr, "\t -d n\tset debug level\n"); > > These 3 printf's are now miss aligned and contain a \t that should not be there: > there may be more, I am only look at what is in context here. > - fprintf(stderr, "\t -a\tdon't modify ARP table\n"); > - fprintf(stderr, "\t -c n\tset current directory\n"); > - fprintf(stderr, "\t -d n\tset debug level\n"); > + fprintf(stderr, " -a\tdon't modify ARP table\n"); > + fprintf(stderr, " -c n\tset current directory\n"); > + fprintf(stderr, " -d n\tset debug level\n"); They were seemingly misaligned before too. Before: usage: bootpd [-i | -s] [-c chdir-path] [-d level] [-h hostname] [-t timeout] [bootptab [dumpfile]] -c n set current directory -d n set debug level -h n set the hostname to listen on -i force inetd mode (run as child of inetd) -s force standalone mode (run without inetd) -t n set inetd exit timeout to n minutes After: usage: bootpd [-a] [-i | -s] [-c chdir-path] [-d level] [-h hostname] [-t timeout] [bootptab [dumpfile]] -a don't modify ARP table -c n set current directory -d n set debug level -h n set the hostname to listen on -i force inetd mode (run as child of inetd) -s force standalone mode (run without inetd) -t n set inetd exit timeout to n minutes To be honest I have no desire to spend more time on bootpd than I already have. You are welcome to improve the usage formatting if you like.