From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 11 09:07:35 2013 Received: (at submit) by debbugs.gnu.org; 11 Oct 2013 13:07:35 +0000 Received: from localhost ([127.0.0.1]:42838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VUcRK-0003Ca-Vp for submit@debbugs.gnu.org; Fri, 11 Oct 2013 09:07:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39455) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VUcRH-0003CQ-0Z for submit@debbugs.gnu.org; Fri, 11 Oct 2013 09:07:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUcR8-0001Lf-6x for submit@debbugs.gnu.org; Fri, 11 Oct 2013 09:07:30 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:37950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUcR8-0001Lb-4C for submit@debbugs.gnu.org; Fri, 11 Oct 2013 09:07:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUcR1-0002N3-GY for bug-coreutils@gnu.org; Fri, 11 Oct 2013 09:07:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUcQv-0001Iu-5T for bug-coreutils@gnu.org; Fri, 11 Oct 2013 09:07:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28770) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUcQu-0001Ie-TO for bug-coreutils@gnu.org; Fri, 11 Oct 2013 09:07:09 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9BD76CA022579 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 11 Oct 2013 09:07:07 -0400 Received: from [10.34.4.187] (unused-4-187.brq.redhat.com [10.34.4.187]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9BD75XB019560 for ; Fri, 11 Oct 2013 09:07:06 -0400 Subject: [PATCH] cp: correct error message for invalid arguments of '--no-preserve' From: Ondrej Vasik To: CoreutilsBugs Content-Type: text/plain; charset="UTF-8" Organization: Red Hat, Inc. Date: Fri, 11 Oct 2013 15:07:04 +0200 Message-ID: <1381496824.9009.56.camel@dhcp-24-196.brq.redhat.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: ovasik@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) * src/cp.c (decode_preserve_arg) : Correct error message for invalid arguments of '--no-preserve'. Reported by M.Vadkerti in rhbz #1018206. --- src/cp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/cp.c b/src/cp.c index e235b32..7bc8630 100644 --- a/src/cp.c +++ b/src/cp.c @@ -854,7 +854,8 @@ decode_preserve_arg (char const *arg, struct cp_options *x, bool on_off) *comma++ = 0; /* process S. */ - val = XARGMATCH ("--preserve", s, preserve_args, preserve_vals); + val = XARGMATCH (on_off ? "--preserve" : "--no-preserve", + s, preserve_args, preserve_vals); switch (val) { case PRESERVE_MODE: -- 1.7.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 11 12:12:14 2013 Received: (at 15588-done) by debbugs.gnu.org; 11 Oct 2013 16:12:14 +0000 Received: from localhost ([127.0.0.1]:43489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VUfK2-0007mZ-Dl for submit@debbugs.gnu.org; Fri, 11 Oct 2013 12:12:14 -0400 Received: from mail1.vodafone.ie ([213.233.128.43]:38649) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VUfK0-0007mQ-Bq for 15588-done@debbugs.gnu.org; Fri, 11 Oct 2013 12:12:13 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApQBAOsiWFJtT4W7/2dsb2JhbAANTIc6uySDA4E5gxkBAQEEIw8BRhALDQsCAgUWCwICCQMCAQIBRRMBBwEBrz91kkmBKY4eBxaCVIE5A55kjQmBPw Received: from unknown (HELO [192.168.1.79]) ([109.79.133.187]) by mail1.vodafone.ie with ESMTP; 11 Oct 2013 17:12:10 +0100 Message-ID: <52582359.4020208@draigBrady.com> Date: Fri, 11 Oct 2013 17:12:09 +0100 From: =?UTF-8?B?UMOhZHJhaWcgQnJhZHk=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: ovasik@redhat.com Subject: Re: bug#15588: [PATCH] cp: correct error message for invalid arguments of '--no-preserve' References: <1381496824.9009.56.camel@dhcp-24-196.brq.redhat.com> In-Reply-To: <1381496824.9009.56.camel@dhcp-24-196.brq.redhat.com> X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 15588-done Cc: 15588-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) On 10/11/2013 02:07 PM, Ondrej Vasik wrote: > * src/cp.c (decode_preserve_arg) : > Correct error message for invalid arguments of '--no-preserve'. > Reported by M.Vadkerti in rhbz #1018206. > --- > src/cp.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/src/cp.c b/src/cp.c > index e235b32..7bc8630 100644 > --- a/src/cp.c > +++ b/src/cp.c > @@ -854,7 +854,8 @@ decode_preserve_arg (char const *arg, struct > cp_options *x, bool on_off) > *comma++ = 0; > > /* process S. */ > - val = XARGMATCH ("--preserve", s, preserve_args, preserve_vals); > + val = XARGMATCH (on_off ? "--preserve" : "--no-preserve", > + s, preserve_args, preserve_vals); > switch (val) > { > case PRESERVE_MODE: > Pushed. thanks! Pádraig. From unknown Mon Jun 23 02:24:43 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 09 Nov 2013 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator