From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 08 12:49:55 2014 Received: (at submit) by debbugs.gnu.org; 8 Jan 2014 17:49:55 +0000 Received: from localhost ([127.0.0.1]:43009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1W0xGI-0002lh-Jw for submit@debbugs.gnu.org; Wed, 08 Jan 2014 12:49:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44318) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1W0x9S-0002ZK-4e for submit@debbugs.gnu.org; Wed, 08 Jan 2014 12:42:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0x9L-0004ho-Ph for submit@debbugs.gnu.org; Wed, 08 Jan 2014 12:42:45 -0500 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,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:47610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0x9L-0004hj-MF for submit@debbugs.gnu.org; Wed, 08 Jan 2014 12:42:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0x9G-0006Wj-GJ for bug-gzip@gnu.org; Wed, 08 Jan 2014 12:42:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0x9B-0004gF-Bl for bug-gzip@gnu.org; Wed, 08 Jan 2014 12:42:34 -0500 Received: from pulque.ecks.ca ([208.79.218.152]:44338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0x9B-0004er-7H for bug-gzip@gnu.org; Wed, 08 Jan 2014 12:42:29 -0500 Received: from [IPv6:2001:470:1d:758:1aa9:5ff:fe1c:7b3] (cochimetl.teotlalli.ecks.ca [IPv6:2001:470:1d:758:1aa9:5ff:fe1c:7b3]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pulque.ecks.ca (Postfix) with ESMTPSA id E18B4E8022 for ; Wed, 8 Jan 2014 12:42:12 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ecks.ca; s=pulque; t=1389202933; bh=xlwxSwJtOx/FPsM0yVa60N8bis0RYOaz4qEr6qjRwKs=; h=Date:From:To:Subject; b=Cyjb+PihL+Dvt+FyZq3N5OhASBlA26Q4aZQ6MovQ+adCZML09IBBEqYeEWhXfKa8H QsdehLkwbi1mlVMcliPFt9eS4Nb60kSDhsMHBNAkOb0m43DTi9DgDISfkNA32c/ile R2SKNUSJAB50kt7yXZoWDoZZXp0170VsKCKCKayQ= Message-ID: <52CD8E02.5020801@ecks.ca> Date: Wed, 08 Jan 2014 12:42:26 -0500 From: Eric Benoit User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:27.0) Gecko/20100101 Thunderbird/27.0 MIME-Version: 1.0 To: bug-gzip@gnu.org Subject: gzip: fix to wording with -v and -k options X-Enigmail-Version: 1.7a1pre Content-Type: multipart/mixed; boundary="------------040500040709000003090704" 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: -4.1 (----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Wed, 08 Jan 2014 12:49:48 -0500 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: -4.1 (----) This is a multi-part message in MIME format. --------------040500040709000003090704 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, I noticed that with gzip when using both the -v and -k options, the associated wording doesn't correctly reflect the action of the -k (keep) option. I've attached a trivial patch (against gzip 1.6) to correctly distinguish between having this option set or not. Thanks --------------040500040709000003090704 Content-Type: text/x-patch; name="gzip_distinguish_kept.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gzip_distinguish_kept.patch" diff -ru gzip-1.6/gzip.c gzip-1.6.new/gzip.c --- gzip-1.6/gzip.c 2013-05-28 09:25:19.000000000 -0400 +++ gzip-1.6.new/gzip.c 2014-01-08 12:20:04.443394993 -0500 @@ -899,7 +899,11 @@ display_ratio(bytes_in-(bytes_out-header_bytes), bytes_in, stderr); } if (!test && !to_stdout) { - fprintf(stderr, " -- replaced with %s", ofname); + if (!keep) { + fprintf(stderr, " -- replaced with %s", ofname); + } else { + fprintf(stderr, " -- created %s", ofname); + } } fprintf(stderr, "\n"); } --------------040500040709000003090704-- From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 10 14:08:53 2014 Received: (at 16401-done) by debbugs.gnu.org; 10 Nov 2014 19:08:53 +0000 Received: from localhost ([127.0.0.1]:56295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XnuKb-0002xt-05 for submit@debbugs.gnu.org; Mon, 10 Nov 2014 14:08:53 -0500 Received: from smtp.cs.ucla.edu ([131.179.128.62]:33977) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XnuKY-0002xi-G0 for 16401-done@debbugs.gnu.org; Mon, 10 Nov 2014 14:08:51 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id DB9BDA6003E for <16401-done@debbugs.gnu.org>; Mon, 10 Nov 2014 11:08:49 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u6AdSc-Ny3RI for <16401-done@debbugs.gnu.org>; Mon, 10 Nov 2014 11:08:45 -0800 (PST) Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 9C48BA6004A for <16401-done@debbugs.gnu.org>; Mon, 10 Nov 2014 11:08:45 -0800 (PST) Message-ID: <54610D3D.9050108@cs.ucla.edu> Date: Mon, 10 Nov 2014 11:08:45 -0800 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: 16401-done@debbugs.gnu.org Subject: Re: gzip: fix to wording with -v and -k options Content-Type: multipart/mixed; boundary="------------050306040308010209030002" X-Spam-Score: -2.9 (--) X-Debbugs-Envelope-To: 16401-done 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: -2.9 (--) This is a multi-part message in MIME format. --------------050306040308010209030002 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Thanks, I installed the attached patch and am marking this as done. --------------050306040308010209030002 Content-Type: text/x-patch; name="0001-gzip-adjust-v-output-when-k-is-also-specified.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-gzip-adjust-v-output-when-k-is-also-specified.patch" >From 6ff80bfd55f6308be56014a3b4f00400d8a35023 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 10 Nov 2014 11:02:38 -0800 Subject: [PATCH] gzip: adjust -v output when -k is also specified Problem reported by Eric Benoit in: http://bugs.gnu.org/16401 * gzip.c (treat_file): When keeping a file, don't say it's replaced. * NEWS: Document this. * tests/keep: Test this. --- NEWS | 3 +++ gzip.c | 6 +++--- tests/keep | 7 +++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 3965dd3..643987c 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,9 @@ GNU gzip NEWS -*- outline -*- on some platforms when compiled with optimization. [bug introduced in gzip-1.3.6] + gzip -k -v no longer reports that files are replaced. + [bug present since the beginning] + zgrep no longer malfunctions with a multi-digit context option like -15. Now, it passes that option to grep (equivalent to -C15) just as it does for single-digit options. [bug introduced in gzip-1.3.12] diff --git a/gzip.c b/gzip.c index 713a1c7..1d46cba 100644 --- a/gzip.c +++ b/gzip.c @@ -898,9 +898,9 @@ local void treat_file(iname) } else { display_ratio(bytes_in-(bytes_out-header_bytes), bytes_in, stderr); } - if (!test && !to_stdout) { - fprintf(stderr, " -- replaced with %s", ofname); - } + if (!test && !to_stdout) + fprintf(stderr, " -- %s %s", keep ? "created" : "replaced with", + ofname); fprintf(stderr, "\n"); } } diff --git a/tests/keep b/tests/keep index ea6f667..e2ac5fa 100755 --- a/tests/keep +++ b/tests/keep @@ -41,4 +41,11 @@ for k in --keep ''; do rm -f in.gz || fail=1 done +cp orig in || framework_failure_ +log=$(gzip -kv in 2>&1) || fail=1 +case $log in + *'created in.gz'*) ;; + *) fail=1;; +esac + Exit $fail -- 1.9.3 --------------050306040308010209030002-- From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 10 14:24:11 2014 Received: (at 16401) by debbugs.gnu.org; 10 Nov 2014 19:24:11 +0000 Received: from localhost ([127.0.0.1]:56312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XnuZO-0003aI-U8 for submit@debbugs.gnu.org; Mon, 10 Nov 2014 14:24:11 -0500 Received: from mail-yh0-f50.google.com ([209.85.213.50]:51489) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XnuZL-0003Zu-Qc; Mon, 10 Nov 2014 14:24:08 -0500 Received: by mail-yh0-f50.google.com with SMTP id 29so3672509yhl.23 for ; Mon, 10 Nov 2014 11:24:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=SDc2tZtpuY63el7riz1dzwpxrKMXP7Gq69KrtIWkzhc=; b=MbWew3V7p3DWqJLeYwmr5zMCmPPVdkRTjSjApWS97HSu36PoamI9Lb5f+QRDCMgFG/ ytQXQmac+E03YKUy2LqpI5dPw18NMmQ2L3A9koscQX30RbJnYUb9Q9yuwAuXdPiuolgC HqdFbV30kcPK/svUN8J/2PVg+Bhb2hULWo0u6QDqPwqFkDwEv1yNR24piFm36BWsc7Ds 1Qza1Tn+pODH2SVM3PYEFPSukX+OfFNwDOlBP2i45awKVNB5d8oI8dfhjNXYRWDzuVHn ZXdl/e6PwQMm8tzWrVPVLD6hM/Xf7s6YjAHUIB567KDA5y5gYIXFDaxnmOMhOCz1CZWU n7xA== X-Received: by 10.236.1.70 with SMTP id 46mr32347255yhc.78.1415647447166; Mon, 10 Nov 2014 11:24:07 -0800 (PST) MIME-Version: 1.0 Received: by 10.170.157.9 with HTTP; Mon, 10 Nov 2014 11:23:46 -0800 (PST) In-Reply-To: <54610D3D.9050108@cs.ucla.edu> References: <52CD8E02.5020801@ecks.ca> <54610D3D.9050108@cs.ucla.edu> From: Jim Meyering Date: Mon, 10 Nov 2014 11:23:46 -0800 X-Google-Sender-Auth: -WRp2xJ7zRs7RXofTIzg0pz6kd4 Message-ID: Subject: Re: bug#16401: gzip: fix to wording with -v and -k options To: 16401@debbugs.gnu.org, Paul Eggert , eric@ecks.ca Content-Type: text/plain; charset=ISO-8859-1 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16401 Cc: 16401-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.7 (/) On Mon, Nov 10, 2014 at 11:08 AM, Paul Eggert wrote: > Thanks, I installed the attached patch and am marking this as done. Thanks, Paul. I tweaked NEWS so that it no longer triggers a "make syntax-check" failure. From unknown Sat Aug 16 18:15:28 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 09 Dec 2014 12:24:04 +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