Received: (at 73783) by debbugs.gnu.org; 13 Oct 2024 21:54:08 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Oct 13 17:54:08 2024 Received: from localhost ([127.0.0.1]:58754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t06XP-0000CU-Ng for submit <at> debbugs.gnu.org; Sun, 13 Oct 2024 17:54:08 -0400 Received: from mail-pj1-f43.google.com ([209.85.216.43]:55513) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <meyering@HIDDEN>) id 1t06XO-0000CM-F4 for 73783 <at> debbugs.gnu.org; Sun, 13 Oct 2024 17:54:07 -0400 Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2e2e6a1042dso2510461a91.2 for <73783 <at> debbugs.gnu.org>; Sun, 13 Oct 2024 14:53:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728856429; x=1729461229; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9QoM7dhPSSyIwBxmsr37LCPPX0E2KwVCBp39c13kRyc=; b=UjW0g2irRK+gM3i4zQ+JoDdDluR0A26jCcf05vjFM+75ywBbnz7anOI81og14dpm/m w4ofra+Zm5Z2YsDjsh9YHYafZ4y4sU5jwEI/C5C0fGSe9GTkfskNi/Z2lRxVquH5lnPJ 11DZZ6kkwFthNhFHWiv1j9fmKzI1hqH2MAGBpjuQw2iNmitbs56IEW82JR5mUAJUIHgs w1RfFHqTadvmm/mgHH1FjZ50tbf5Jzwt3Oaxe941U/EVPQ/9KG34kcGlRKAaUYXmVc/f JbIDoPyIQr0PibSQXgdzo7WhGLXvu58GKWcT3gCHVWGbJ0KPT+CeucyqsB2JABcjA0iQ VLUg== X-Gm-Message-State: AOJu0YwH+L1nIZY7Vgg4+H+Ieee5hEu8oZ40l8psltIjxWPOI0VGMGej KgDYwfRyqtmYdL0bOpXz505OYJTIcOd6ECOtN5TevA9+Mq/O9OlCFuhy3QsAIzlMwc/30v7I05t ZR68LbuOH6aik7x53PfbQOg4cguo= X-Google-Smtp-Source: AGHT+IHZ5rUbJOQ1XGECgHPS+Dh+noHbjnL69LfGtUKc946d1NzzX4eB2zqe/04mxJhLNf8LlMl4PouXPP9LFen/zSY= X-Received: by 2002:a17:90a:dd86:b0:2e0:99bc:6907 with SMTP id 98e67ed59e1d1-2e3152c8361mr7882705a91.15.1728856429299; Sun, 13 Oct 2024 14:53:49 -0700 (PDT) MIME-Version: 1.0 References: <87ed4klki2.fsf@HIDDEN> In-Reply-To: <87ed4klki2.fsf@HIDDEN> From: Jim Meyering <jim@HIDDEN> Date: Sun, 13 Oct 2024 14:53:36 -0700 Message-ID: <CA+8g5KFT1NUHDvYpWRaqqJ8qTP4ZTe5026D62CDyfLRZXzNn-A@HIDDEN> Subject: Re: [bug-diffutils] bug#73783: [PATCH] maint: use Gnulib's stat-time over our own version To: Collin Funk <collin.funk1@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 73783 Cc: 73783 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.7 (/) On Sat, Oct 12, 2024 at 9:02=E2=80=AFPM Collin Funk <collin.funk1@HIDDEN= > wrote: > Simple patch attached. Gnulib's ST_BLKSIZE has a bit more complete > checks to estimate block size than what Diffutils uses. Thanks! Pushed.
bug-diffutils@HIDDEN:bug#73783; Package diffutils.
Full text available.
Received: (at submit) by debbugs.gnu.org; 13 Oct 2024 04:01:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Oct 13 00:01:19 2024
Received: from localhost ([127.0.0.1]:49811 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1szpnD-0004mi-0e
for submit <at> debbugs.gnu.org; Sun, 13 Oct 2024 00:01:19 -0400
Received: from lists.gnu.org ([209.51.188.17]:48926)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <collin.funk1@HIDDEN>) id 1szpnB-0004ma-73
for submit <at> debbugs.gnu.org; Sun, 13 Oct 2024 00:01:17 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <collin.funk1@HIDDEN>)
id 1szpmv-0006Xy-A6
for bug-diffutils@HIDDEN; Sun, 13 Oct 2024 00:01:01 -0400
Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <collin.funk1@HIDDEN>)
id 1szpmt-0003q9-5l
for bug-diffutils@HIDDEN; Sun, 13 Oct 2024 00:01:00 -0400
Received: by mail-pl1-x62c.google.com with SMTP id
d9443c01a7336-20cb47387ceso10871475ad.1
for <bug-diffutils@HIDDEN>; Sat, 12 Oct 2024 21:00:57 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1728792056; x=1729396856; darn=gnu.org;
h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc
:subject:date:message-id:reply-to;
bh=T9WhDfQ12j/CSy24U/+DKZdXhcKikiDyxs46sGusuMc=;
b=XzJ7UE7/E5NHpsfbpIhoHx1umr0iH3A1xIm96ONSseV59fEACcRL3jzP9Rrm79dtM7
VlxigOhsNY+SqE07I7MTA7/v9Whazvsbkw0//VPNnRwKx/t1an5mDFPkOMDkIzoueunM
7BJCeHRJaPh00Jf5s4h6wl/ZOWodfVKrEQYyYtSEC4vRZQylo7uPUdTOxyhumVlPQE64
wrjuLXtw95wayJEbU6vY5qazLd+5M6byxF8xnGdC6nJU80aghWRviVmKcqCHRKboQfco
bHWW3SjALFxquiNpkiwJslMCYS39b/cdKKTFbptFQkBRuFjS5/pu69BjN33eHgszz8rU
WZHA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1728792056; x=1729396856;
h=mime-version:user-agent:message-id:date:subject:to:from
:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=T9WhDfQ12j/CSy24U/+DKZdXhcKikiDyxs46sGusuMc=;
b=FK6Xt3Do3R2UA2tp4TV3YvCZobFXbs+RFa3kkPMSF3j7GJJ2ZdEK/8w9lq9jFkFVag
pmesJY1f2kivFZY3UIYmxv3K8MVLvmY12ezfxpk9lPn8BuSlQ6ilMjRxarW3O8f1m/Pv
Lfun/J6LZhplZpIPa6J1+FICpqCqMyZx8Oa2+YoTkh3+gCQOYPMR4I62AShlRFH4Hj3y
arqeGb0LBWIbhuiHtdfymVKNxdEJLIedlpgas/4QjUa/JxlURx/HJ1sjt1aBn3fkoprR
f4uJX/gbPfkUVhC0OKATJiOSQ03XG++64n96YuQaeNjstsTEkK4dqDAk+0iuXsmcpNDe
lXuQ==
X-Gm-Message-State: AOJu0YwM6h4jgpgz/OWMfP666cIbF4pGGH9vwx5VNurlpUyGZQeifK4Y
IvG9PZXnatVPvvMXH5dMHFvKtLs0vxNr/ECL2Xh1UKraKEEC8jVhEnrrZw==
X-Google-Smtp-Source: AGHT+IGHNLFAAQtj+aqVxAYYgHxpUl0/8C+Hysc4dPtyJFXtPn/kd8rqRn2qvOZXEr6Vd8TA3h/L9Q==
X-Received: by 2002:a17:902:ecc1:b0:20c:bffe:e1e5 with SMTP id
d9443c01a7336-20cbffee323mr67405645ad.19.1728792055638;
Sat, 12 Oct 2024 21:00:55 -0700 (PDT)
Received: from fedora (static-198-54-134-108.cust.tzulo.com. [198.54.134.108])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-20c8c0e74a0sm44012415ad.146.2024.10.12.21.00.54
for <bug-diffutils@HIDDEN>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 12 Oct 2024 21:00:54 -0700 (PDT)
From: Collin Funk <collin.funk1@HIDDEN>
To: bug-diffutils@HIDDEN
Subject: [PATCH] maint: use Gnulib's stat-time over our own version
Date: Sat, 12 Oct 2024 21:00:53 -0700
Message-ID: <87ed4klki2.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Received-SPF: pass client-ip=2607:f8b0:4864:20::62c;
envelope-from=collin.funk1@HIDDEN; helo=mail-pl1-x62c.google.com
X-Spam_score_int: -17
X-Spam_score: -1.8
X-Spam_bar: -
X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.1 (-)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.1 (--)
--=-=-=
Content-Type: text/plain
Hi,
Simple patch attached. Gnulib's ST_BLKSIZE has a bit more complete
checks to estimate block size than what Diffutils uses.
Collin
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
filename=0001-maint-use-Gnulib-s-stat-time-over-our-own-version.patch
From 9a69d9e871f6ec5ade2f193ec6edae883ba3afe9 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@HIDDEN>
Date: Sat, 12 Oct 2024 20:53:15 -0700
Subject: [PATCH] maint: use Gnulib's stat-time over our own version
* bootstrap.conf (gnulib_modules): Add stat-time.
* configure.ac: Remove check for the st_blksize in struct stat.
* src/system.h: Include stat-time.h.
(STAT_BLOCKSIZE): Remove definition.
* src/analyze.c (diff_2_files):
* src/cmp.c (main):
* src/diff3.c (read_diff):
* src/io.c (sip): Use ST_BLKSIZE instead of STAT_BLOCKSIZE.
---
bootstrap.conf | 1 +
configure.ac | 1 -
src/analyze.c | 4 ++--
src/cmp.c | 4 ++--
src/diff3.c | 4 ++--
src/io.c | 4 ++--
src/system.h | 9 +--------
7 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 08dc2ba..32ad185 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -102,6 +102,7 @@ signal
sigprocmask
stat
stat-macros
+stat-size
stat-time
stdbool
stdc_bit_width
diff --git a/configure.ac b/configure.ac
index 8904d28..48a14eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,7 +145,6 @@ AC_DEFINE([DEFAULT_EDITOR_PROGRAM], ["ed"],
AC_PATH_PROG([PR_PROGRAM], [pr], [""])
AC_DEFINE_UNQUOTED([PR_PROGRAM], ["$PR_PROGRAM"], [Name of "pr" program.])
-AC_CHECK_MEMBERS([struct stat.st_blksize])
AC_CHECK_MEMBERS([struct stat.st_rdev])
AC_HEADER_DIRENT
AC_HEADER_SYS_WAIT
diff --git a/src/analyze.c b/src/analyze.c
index d517a96..55f6e1b 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -480,8 +480,8 @@ diff_2_files (struct comparison *cmp)
/* Allocate same-sized buffers for both files. */
idx_t lcm_max = IDX_MAX - 1, blksize[2];
for (int f = 0; f < 2; f++)
- if (STAT_BLOCKSIZE (cmp->file[f].stat) < 0
- || ckd_add (&blksize[f], STAT_BLOCKSIZE (cmp->file[f].stat), 0))
+ if (ST_BLKSIZE (cmp->file[f].stat) < 0
+ || ckd_add (&blksize[f], ST_BLKSIZE (cmp->file[f].stat), 0))
blksize[f] = 0;
idx_t buffer_size =
buffer_lcm (sizeof (word),
diff --git a/src/cmp.c b/src/cmp.c
index 9a8bfc4..32efcc3 100644
--- a/src/cmp.c
+++ b/src/cmp.c
@@ -370,8 +370,8 @@ main (int argc, char **argv)
idx_t blksize[2];
for (int f = 0; f < 2; f++)
- if (STAT_BLOCKSIZE (stat_buf[0]) < 0
- || ckd_add (&blksize[f], STAT_BLOCKSIZE (stat_buf[0]), 0))
+ if (ST_BLKSIZE (stat_buf[0]) < 0
+ || ckd_add (&blksize[f], ST_BLKSIZE (stat_buf[0]), 0))
blksize[f] = 0;
buf_size = buffer_lcm (blksize[0], blksize[1], IDX_MAX - sizeof (word));
diff --git a/src/diff3.c b/src/diff3.c
index 19aa317..571992e 100644
--- a/src/diff3.c
+++ b/src/diff3.c
@@ -1166,8 +1166,8 @@ read_diff (char const *filea,
struct stat pipestat;
idx_t current_chunk_size;
if (fstat (fd, &pipestat) < 0
- || STAT_BLOCKSIZE (pipestat) <= 0
- || ckd_add (¤t_chunk_size, STAT_BLOCKSIZE (pipestat), 0))
+ || ST_BLKSIZE (pipestat) <= 0
+ || ckd_add (¤t_chunk_size, ST_BLKSIZE (pipestat), 0))
current_chunk_size = 8 * 1024;
char *diff_result = ximalloc (current_chunk_size);
idx_t total = 0;
diff --git a/src/io.c b/src/io.c
index 51eb169..3bf27c2 100644
--- a/src/io.c
+++ b/src/io.c
@@ -128,8 +128,8 @@ sip (struct file_data *current, bool skip_test)
else
{
idx_t blksize;
- if (STAT_BLOCKSIZE (current->stat) < 0
- || ckd_add (&blksize, STAT_BLOCKSIZE (current->stat), 0))
+ if (ST_BLKSIZE (current->stat) < 0
+ || ckd_add (&blksize, ST_BLKSIZE (current->stat), 0))
blksize = 0;
current->bufsize = buffer_lcm (sizeof (word), blksize, IDX_MAX);
current->buffer = ximalloc (current->bufsize);
diff --git a/src/system.h b/src/system.h
index 1259a68..7bc778b 100644
--- a/src/system.h
+++ b/src/system.h
@@ -26,17 +26,10 @@
#include <sys/stat.h>
#include <stat-macros.h>
+#include <stat-size.h>
#include <stat-time.h>
#include <timespec.h>
-#ifndef STAT_BLOCKSIZE
-# if HAVE_STRUCT_STAT_ST_BLKSIZE
-# define STAT_BLOCKSIZE(s) ((s).st_blksize)
-# else
-# define STAT_BLOCKSIZE(s) (8 * 1024)
-# endif
-#endif
-
#include <unistd.h>
#include <fcntl.h>
--
2.47.0
--=-=-=--
Collin Funk <collin.funk1@HIDDEN>:bug-diffutils@HIDDEN.
Full text available.bug-diffutils@HIDDEN:bug#73783; Package diffutils.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.