From owner-svn-src-head@freebsd.org Tue Nov 8 19:33:25 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BEEAC3635A; Tue, 8 Nov 2016 19:33:25 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-qk0-x22f.google.com (mail-qk0-x22f.google.com [IPv6:2607:f8b0:400d:c09::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4362DA6E; Tue, 8 Nov 2016 19:33:25 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: by mail-qk0-x22f.google.com with SMTP id q130so230096250qke.1; Tue, 08 Nov 2016 11:33:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:message-id:mime-version:subject:date:in-reply-to:cc:to :references; bh=dP1BWtCruhfhS6yJpD514SR02rGWj6DKNg1QvgGfg4g=; b=EBavpZ1InN82X29MnZf7qvCKhSpZUpy9AUuVoLRRi6fqgEeGUOW9uqpfSxSMLmzzj/ 9MaN65cP7qQX3ZxKqG8VRswGlUZSES6rbAMLM+lSraekSuTMFl0W4hK9Bjbmgmx2OWkL dSeHKU8RyOqsRUZzA4KBF1yiH1XaLyVwSBEvLuzLxg5cnOFEhw+qxsJVtI5iynkyOEOv pWFGEW958BA/SPxLKCXcY7LhdL9e2nEVmn3o3gR80WfLYwLP6B2fjKKNchiayutG9Xqt 843/dXjmVayWMBpNAMRvUVdMf1YOJUy+/L9B3KoLqpdreFoIAy49/hbS34en5w2Ka42k CUXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:message-id:mime-version:subject:date :in-reply-to:cc:to:references; bh=dP1BWtCruhfhS6yJpD514SR02rGWj6DKNg1QvgGfg4g=; b=FR8Hkmxd8ml1j4xP7i/NLIehrR2B/b18bh+yFLPGGbkKSb1JmLGHvi957mlgrrhNqj wANkJju2Jg3Y0OK9OMDMw7wCOIRdQXkUlb2YlPYGWzSNFSA1cfkdlYZUfJtWG3uBVwze cG2rMOK8j3kzFq7GuvErl/h3vycd93RPMndIHt65MZljS6BtfjyhSNyrQZEZN50WHZO4 tetAUWwG1GjR2oaTjOn/1BANJGte8TUc5AoLj3aYpWpK9gWFIxiLtfNVj4+vU6mLRHPP k8gTRE1vPhU+riwH1Dadd86jDCNPFNg2JbnoXbwwTMH/SScvFtCBk9APLajuvO7tf7B1 nlug== X-Gm-Message-State: ABUngvem659M82UwfiUgJrBCjJJFtifqcsUkMXztFVEEfme2ylDOnzKlageIZtuR/rq7dg== X-Received: by 10.55.104.20 with SMTP id d20mr16068404qkc.126.1478633604307; Tue, 08 Nov 2016 11:33:24 -0800 (PST) Received: from mbp-eth.home ([200.236.233.160]) by smtp.gmail.com with ESMTPSA id n67sm2824763qkf.28.2016.11.08.11.33.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Nov 2016 11:33:23 -0800 (PST) Sender: Renato Botelho From: Renato Botelho Message-Id: Mime-Version: 1.0 (Mac OS X Mail 10.1 \(3251\)) Subject: Re: svn commit: r308443 - head/bin/hostname Date: Tue, 8 Nov 2016 17:33:19 -0200 In-Reply-To: <201611081136.uA8BaXrs073937@repo.freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org To: Marcelo Araujo References: <201611081136.uA8BaXrs073937@repo.freebsd.org> X-Mailer: Apple Mail (2.3251) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Nov 2016 19:33:25 -0000 > On 8 Nov 2016, at 09:36, Marcelo Araujo wrote: >=20 > Author: araujo > Date: Tue Nov 8 11:36:33 2016 > New Revision: 308443 > URL: https://svnweb.freebsd.org/changeset/base/308443 >=20 > Log: > Add -d flag that prints domain only. >=20 > PR: 212875 > Submitted by: Ben RUBSON > Reviewed by: pi >=20 > Modified: > head/bin/hostname/hostname.1 > head/bin/hostname/hostname.c >=20 > Modified: head/bin/hostname/hostname.1 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/bin/hostname/hostname.1 Tue Nov 8 10:10:55 2016 = (r308442) > +++ head/bin/hostname/hostname.1 Tue Nov 8 11:36:33 2016 = (r308443) > @@ -29,7 +29,7 @@ > .\" @(#)hostname.1 8.2 (Berkeley) 4/28/95 > .\" $FreeBSD$ > .\" > -.Dd December 7, 2006 > +.Dd November 9, 2016 > .Dt HOSTNAME 1 > .Os > .Sh NAME > @@ -37,7 +37,8 @@ > .Nd set or print name of current host system > .Sh SYNOPSIS > .Nm > -.Op Fl fs > +.Op Fl f > +.Op Fl s|d > .Op Ar name-of-host > .Sh DESCRIPTION > The > @@ -62,6 +63,8 @@ This is the default behavior. > .It Fl s > Trim off any domain information from the printed > name. > +.It Fl d > +Only print domain information. > .El > .Sh SEE ALSO > .Xr gethostname 3 , >=20 > Modified: head/bin/hostname/hostname.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/bin/hostname/hostname.c Tue Nov 8 10:10:55 2016 = (r308442) > +++ head/bin/hostname/hostname.c Tue Nov 8 11:36:33 2016 = (r308443) > @@ -54,11 +54,12 @@ static void usage(void) __dead2; > int > main(int argc, char *argv[]) > { > - int ch, sflag; > + int ch, sflag, dflag; > char *p, hostname[MAXHOSTNAMELEN]; >=20 > sflag =3D 0; > - while ((ch =3D getopt(argc, argv, "fs")) !=3D -1) > + dflag =3D 0; > + while ((ch =3D getopt(argc, argv, "fsd")) !=3D -1) > switch (ch) { > case 'f': > /* > @@ -70,6 +71,9 @@ main(int argc, char *argv[]) > case 's': > sflag =3D 1; > break; > + case 'd': > + dflag =3D 1; > + break; > case '?': > default: > usage(); > @@ -77,7 +81,7 @@ main(int argc, char *argv[]) > argc -=3D optind; > argv +=3D optind; >=20 > - if (argc > 1) > + if (argc > 1 || (sflag && dflag)) > usage(); >=20 > if (*argv) { > @@ -90,6 +94,10 @@ main(int argc, char *argv[]) > p =3D strchr(hostname, '.'); > if (p !=3D NULL) > *p =3D '\0'; > + } else if (dflag) { > + p =3D strchr(hostname, '.'); > + if (p !=3D NULL) > + strcpy(hostname, ++p); > } > (void)printf("%s\n", hostname); > } > @@ -100,6 +108,6 @@ static void > usage(void) > { >=20 > - (void)fprintf(stderr, "usage: hostname [-fs] [name-of-host]\n"); > + (void)fprintf(stderr, "usage: hostname [-f] [s|d] = [name-of-host]\n"); It=E2=80=99s missing =E2=80=98-=E2=80=98 sign on [s|d] block, what makes = message a bit confused IMO. Maybe [-s|-d] would be more clear. -- Renato Botelho