From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15470 invoked by alias); 17 Jun 2012 01:14:47 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 30515 Received: (qmail 21260 invoked from network); 17 Jun 2012 01:14:45 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW,T_DKIM_INVALID autolearn=ham version=3.3.2 Received-SPF: none (ns1.primenet.com.au: domain at secretsauce.net does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=secretsauce.net; h=date:from:to:subject:message-id:mime-version:content-type; s= mesmtp; bh=s1TPLfqmGnZnx9/7rsvEnO8AIGs=; b=MwtYp/6gZh8N322WzAMtr vXcvw7/vMBykPmg/TijgmyiHCcjT6/x/VT2pH1qPopniRuisgpobB2y7wExeyyvB mQuyG9+W+33UsAPNzCpysurn15Z+3y4Z0h3k7AP37arc5phoOnyzUmTjsfzPJbqO yV8uHYTchQ5z+TCxZOY2bQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=date:from:to:subject:message-id :mime-version:content-type; s=smtpout; bh=s1TPLfqmGnZnx9/7rsvEnO 8AIGs=; b=IxHYRm0oYu4vFf9vohYEsiVnaUXf8iGC0cgrZDuTFg4HZEIk8B64MF XWSY3smXCXjSOFBgt/hmozK3WIh/xtnKcJk7wO0T+Nlv4K9ZL6yb5eAletG/MS8t 3XAC7CuyQq5rSnVCLwfk69Ze6uG1GwPEMCgC4Y73hCUg5hO2V5OEc= X-Sasl-enc: iJVBX5LI2863g4inAhBlbQel4lMF6u3/yUUZEF3Qf6za 1339895683 Date: Sat, 16 Jun 2012 18:14:40 -0700 From: Dima Kogan To: zsh-workers@zsh.org Subject: [PATCH] size-sorting globs now work for giant files Message-ID: <20120616181440.54ae2392@shorty.local> X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/rHD2+UiUQTZjgENRbo6YKXt" --MP_/rHD2+UiUQTZjgENRbo6YKXt Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline There was a bug where globs like *(OL[1]) failed to return the largest file if it was larger that 4GB in size. The bug was an improper int -> long cast. Patch attached. dima --MP_/rHD2+UiUQTZjgENRbo6YKXt Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-zsh-glob-sorting-now-works-with-giant-files.patch >>From e0e323f27b48180fe32680e2c6a17930c4e5a7ee Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Sat, 16 Jun 2012 18:04:57 -0700 Subject: [PATCH] zsh glob sorting now works with giant files globs like *(OL[1]) now correctly expand to the largest file even if its size is larger that 4GB --- Src/glob.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Src/glob.c b/Src/glob.c index d3ce733..ca2ffaf 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -997,7 +997,9 @@ gmatchcmp(Gmatch a, Gmatch b) break; } if (r) - return (int) ((s->tp & GS_DESC) ? -r : r); + return (s->tp & GS_DESC) ? + (r < 0L ? 1 : -1) : + (r > 0L ? 1 : -1); } return 0; } -- 1.7.10 --MP_/rHD2+UiUQTZjgENRbo6YKXt--