From owner-svn-src-head@freebsd.org Mon Aug 10 03:48:27 2015 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 97DB099839E; Mon, 10 Aug 2015 03:48:27 +0000 (UTC) (envelope-from araujobsdport@gmail.com) Received: from mail-ob0-x231.google.com (mail-ob0-x231.google.com [IPv6:2607:f8b0:4003:c01::231]) (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 5A38CEF1; Mon, 10 Aug 2015 03:48:27 +0000 (UTC) (envelope-from araujobsdport@gmail.com) Received: by obbfr1 with SMTP id fr1so78268078obb.1; Sun, 09 Aug 2015 20:48:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=Yt+A2w47IqviO13F3U9ev8VYiBQ39ovqs1xVBEVVv3M=; b=gkfCSSp70T8kWODL6ltJFHQM4GtLTmh1BKesIu31MuxG9y7H7Z0zpJgM8JfCpgudvE okCpasr5fTHYnD3mFN7Jk7UZ7pbYxvH849LllWr3tiWRR0r6H+3PFtP70XWIOGDGRdju I3h933bBI0udjrZ3+7pV9Ah2UGYvYNuHgxZxy5QCh9qaF8pTO9v1JfcofyMPQGACgFEo AizRrcWXteiih7m4WJddqgoddq/mlDsLnljh0ND7gbIwtqcZnt2MHvZ92zO2dgO56Hud w6sO6YgsW+rVztN1P4+zdd6mAYeIhnd+FHHZxbDOxi0efDu2G50hVNyPbU+RJONiRPZ+ VNTQ== MIME-Version: 1.0 X-Received: by 10.182.94.140 with SMTP id dc12mr15168039obb.87.1439178506230; Sun, 09 Aug 2015 20:48:26 -0700 (PDT) Received: by 10.202.11.193 with HTTP; Sun, 9 Aug 2015 20:48:26 -0700 (PDT) Reply-To: araujo@FreeBSD.org In-Reply-To: <20150810131627.F965@besplex.bde.org> References: <201508040234.t742YqQA045448@repo.freebsd.org> <20150810131627.F965@besplex.bde.org> Date: Mon, 10 Aug 2015 11:48:26 +0800 Message-ID: Subject: Re: svn commit: r286266 - head/usr.bin/ypmatch From: Marcelo Araujo To: Bruce Evans Cc: Ed Schouten , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: multipart/mixed; boundary=e89a8fb1f32aa29be4051cecdb5b X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 10 Aug 2015 03:48:27 -0000 --e89a8fb1f32aa29be4051cecdb5b Content-Type: text/plain; charset=UTF-8 Hi bde@ and ed@ I think the patch attached is the latest changes to bring it as it used to be before I synced the code with OpenBSD. Mostly all issues that you both pointed out were addressed. Could you both make a review and point to me if there is any issue still remain? Basically this patch address: - Remove the extra information at the usage(). - Add space between variables on while() and for(). - Remove the extra space in a if statement. - Remove the extra brackets. - s/Reason/reason/g. All the best. 2015-08-10 11:24 GMT+08:00 Bruce Evans : > On Mon, 10 Aug 2015, Marcelo Araujo wrote: > > 2015-08-09 19:51 GMT+08:00 Ed Schouten : >> >> Hi Marcelo, >>> >>> 2015-08-04 4:34 GMT+02:00 Marcelo Araujo : >>> >>>> Sync the code with the OpenBSD version. >>>> >>> >>> That's a shame. It looks like improvements that we made to our version >>> have been undone because of this. >>> ... >>> Though the style(9) conformance of tool wasn't ideal, this change made it >>> worse. >>> >> >> Agree with you! >> >> These tools are original from OpenBSD, I'm trying first to sync the code >> and then will rework them. I will try to send it back to upstream(OpenBSD) >> as soon as I have time. >> > > In fact, the changes were more than half to back out FreeBSD cleanups by > syncing with the 1994 OpenBSD version. The cleanups were small (less > than 50 lines changed), and OpenBSD doesn't seem to have changed much > either. > > Bruce > -- -- Marcelo Araujo (__)araujo@FreeBSD.org \\\'',)http://www.FreeBSD.org \/ \ ^ Power To Server. .\. /_) --e89a8fb1f32aa29be4051cecdb5b Content-Type: text/plain; charset=US-ASCII; name="ypmatch.diff" Content-Disposition: attachment; filename="ypmatch.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_id5dnouh0 SW5kZXg6IHlwbWF0Y2guYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB5cG1hdGNoLmMJKHJldmlzaW9uIDI4NjU2 MikKKysrIHlwbWF0Y2guYwkod29ya2luZyBjb3B5KQpAQCAtNjgsMTIgKzY4LDYgQEAKIAlmcHJp bnRmKHN0ZGVyciwgIiVzXG4lc1xuIiwKIAkgICAgInVzYWdlOiB5cG1hdGNoIFsta3RdIFstZCBk b21haW5uYW1lXSBrZXkgLi4uIG1hcG5hbWUiLAogCSAgICAiICAgICAgIHlwbWF0Y2ggLXgiKTsK LQlmcHJpbnRmKHN0ZGVyciwKLQkgICAgIndoZXJlXG4iCi0JICAgICJcdG1hcG5hbWUgbWF5IGJl IGVpdGhlciBhIG1hcG5hbWUgb3IgYSBuaWNrbmFtZSBmb3IgYSBtYXAuXG4iCi0JICAgICJcdC1r IHByaW50cyBrZXlzIGFzIHdlbGwgYXMgdmFsdWVzLlxuIgotCSAgICAiXHQtdCBpbmhpYml0cyBt YXAgbmlja25hbWUgdHJhbnNsYXRpb24uXG4iCi0JICAgICJcdC14IGR1bXBzIHRoZSBtYXAgbmlj a25hbWUgdHJhbnNsYXRpb24gdGFibGUuXG4iKTsKIAlleGl0KDEpOwogfQogCkBAIC04NywxMCAr ODEsMTAgQEAKIAogCWRvbWFpbm5hbWUgPSBOVUxMOwogCW5vdHJhbnMgPSBrZXkgPSAwOwotCXdo aWxlICgoYz1nZXRvcHQoYXJnYywgYXJndiwgInhkOmt0IikpICE9IC0xKQorCXdoaWxlICgoYyA9 IGdldG9wdChhcmdjLCBhcmd2LCAieGQ6a3QiKSkgIT0gLTEpCiAJCXN3aXRjaCAoYykgewogCQlj YXNlICd4JzoKLQkJCWZvciAoaT0wOyBpPHNpemVvZiB5cGFsaWFzZXMvc2l6ZW9mIHlwYWxpYXNl c1swXTsgaSsrKQorCQkJZm9yIChpID0gMDsgaTxzaXplb2YgeXBhbGlhc2VzL3NpemVvZiB5cGFs aWFzZXNbMF07IGkrKykKIAkJCQlwcmludGYoIlVzZSBcIiVzXCIgZm9yIFwiJXNcIlxuIiwKIAkJ CQkJeXBhbGlhc2VzW2ldLmFsaWFzLAogCQkJCQl5cGFsaWFzZXNbaV0ubmFtZSk7CkBAIC0xMDgs MTYgKzEwMiwxNSBAQAogCQkJdXNhZ2UoKTsKIAkJfQogCi0JaWYgKChhcmdjLW9wdGluZCkgPCAy ICkKKwlpZiAoKGFyZ2Mtb3B0aW5kKSA8IDIpCiAJCXVzYWdlKCk7CiAKLQlpZiAoZG9tYWlubmFt ZSA9PSBOVUxMKSB7CisJaWYgKGRvbWFpbm5hbWUgPT0gTlVMTCkKIAkJeXBfZ2V0X2RlZmF1bHRf ZG9tYWluKCZkb21haW5uYW1lKTsKLQl9CiAKIAlpbm1hcCA9IGFyZ3ZbYXJnYy0xXTsKIAlpZiAo bm90cmFucyA9PSAwKSB7Ci0JCWZvciAoaT0wOyBpPHNpemVvZiB5cGFsaWFzZXMvc2l6ZW9mIHlw YWxpYXNlc1swXTsgaSsrKQorCQlmb3IgKGkgPSAwOyBpPHNpemVvZiB5cGFsaWFzZXMvc2l6ZW9m IHlwYWxpYXNlc1swXTsgaSsrKQogCQkJaWYgKHN0cmNtcChpbm1hcCwgeXBhbGlhc2VzW2ldLmFs aWFzKSA9PSAwKQogCQkJCWlubWFwID0geXBhbGlhc2VzW2ldLm5hbWU7CiAJfQpAQCAtMTM3LDcg KzEzMCw3IEBACiAJCWNhc2UgWVBFUlJfWVBCSU5EOgogCQkJZXJyeCgxLCAibm90IHJ1bm5pbmcg eXBiaW5kIik7CiAJCWRlZmF1bHQ6Ci0JCQllcnJ4KDEsICJjYW4ndCBtYXRjaCBrZXkgJXMgaW4g bWFwICVzLiBSZWFzb246ICVzIiwKKwkJCWVycngoMSwgImNhbid0IG1hdGNoIGtleSAlcyBpbiBt YXAgJXMuIHJlYXNvbjogJXMiLAogCQkJICAgIGlua2V5LCBpbm1hcCwgeXBlcnJfc3RyaW5nKHIp KTsKIAkJCXJ2YWwgPSAxOwogCQkJYnJlYWs7Cg== --e89a8fb1f32aa29be4051cecdb5b--