From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 73928 invoked by alias); 28 Nov 2017 14:56:17 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 73854 invoked by uid 89); 28 Nov 2017 14:56:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KB_WAM_FROM_NAME_SINGLEWORD,SPF_HELO_PASS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=H*r:may, H*r:forged, Hx-languages-length:1044, 4214 X-HELO: limerock01.mail.cornell.edu Received: from limerock01.mail.cornell.edu (HELO limerock01.mail.cornell.edu) (128.84.13.241) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 28 Nov 2017 14:56:15 +0000 X-CornellRouted: This message has been Routed already. Received: from authusersmtp.mail.cornell.edu (granite3.serverfarm.cornell.edu [10.16.197.8]) by limerock01.mail.cornell.edu (8.14.4/8.14.4_cu) with ESMTP id vASEuDnC021111; Tue, 28 Nov 2017 09:56:13 -0500 Received: from nothing.nyroc.rr.com (mta-68-175-129-7.twcny.rr.com [68.175.129.7] (may be forged)) (authenticated bits=0) by authusersmtp.mail.cornell.edu (8.14.4/8.12.10) with ESMTP id vASEu4rl023766 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 28 Nov 2017 09:56:12 -0500 From: Ken Brown To: cygwin-apps@cygwin.com Subject: [PATCH setup 2/3] Change the interpretation of '#' in setup.rc Date: Tue, 28 Nov 2017 14:56:00 -0000 Message-Id: <20171128145605.12860-3-kbrown@cornell.edu> In-Reply-To: <20171128145605.12860-1-kbrown@cornell.edu> References: <20171128145605.12860-1-kbrown@cornell.edu> X-PMX-Cornell-Gauge: Gauge=XXXXX X-PMX-CORNELL-AUTH-RESULTS: dkim-out=none; X-IsSubscribed: yes X-SW-Source: 2017-11/txt/msg00121.txt.bz2 '#' was treated as a comment character in all circumstances. Since saved gpg keys contain '#', this caused the "extrakeys" user setting to get truncated. Change this so that '#' only indicates a comment if it's the first non-whitespace character in a line. --- UserSettings.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/UserSettings.cc b/UserSettings.cc index f4917ec..b90d795 100644 --- a/UserSettings.cc +++ b/UserSettings.cc @@ -42,14 +42,14 @@ public: UserSettings *UserSettings::global; +// '#' indicates a comment if it's the first non-whitespace character. static char * trim (char *p) { p += strspn (p, " \t"); - char *q = strchr (p, '#'); - if (q) - *q = '\0'; - for (q = strchr (p, '\0') - 1; q >= p && (*q == ' ' || *q == '\t' || *q == '\r' || *q == '\n'); q--) + if (*p == '#') + *p = '\0'; + for (char *q = strchr (p, '\0') - 1; q >= p && (*q == ' ' || *q == '\t' || *q == '\r' || *q == '\n'); q--) *q = '\0'; return p; } -- 2.15.0