GNU logs - #73783, boring messages

Message sent to bug-diffutils@HIDDEN:

Subject: bug#73783: [PATCH] maint: use Gnulib's stat-time over our own version
Resent-From: Collin Funk <collin.funk1@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-diffutils@HIDDEN
Resent-Date: Sun, 13 Oct 2024 04:02:01 +0000
Resent-Message-ID: <handler.73783.B.172879207918401 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 73783 <at> debbugs.gnu.org
From: Collin Funk <collin.funk1@HIDDEN>
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-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 (&current_chunk_size, STAT_BLOCKSIZE (pipestat), 0))
+      || ST_BLKSIZE (pipestat) <= 0
+      || ckd_add (&current_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


--=-=-=--

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Collin Funk <collin.funk1@HIDDEN>
Subject: bug#73783: Acknowledgement ([PATCH] maint: use Gnulib's stat-time
 over our own version)
Message-ID: <handler.73783.B.172879207918401.ack <at> debbugs.gnu.org>
References: <87ed4klki2.fsf@HIDDEN>
X-Gnu-PR-Message: ack 73783
X-Gnu-PR-Package: diffutils
X-Gnu-PR-Keywords: patch
Reply-To: 73783 <at> debbugs.gnu.org
Date: Sun, 13 Oct 2024 04:02:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 bug-diffutils@HIDDEN

If you wish to submit further information on this problem, please
send it to 73783 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
73783: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D73783
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to bug-diffutils@HIDDEN:

Subject: bug#73783: [bug-diffutils] bug#73783: [PATCH] maint: use Gnulib's stat-time over our own version
Resent-From: Jim Meyering <jim@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-diffutils@HIDDEN
Resent-Date: Sun, 13 Oct 2024 21:55:02 +0000
Resent-Message-ID: <handler.73783.B73783.1728856448780 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Collin Funk <collin.funk1@HIDDEN>
Cc: 73783 <at> debbugs.gnu.org
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>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

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.

Last modified: Sun, 12 Jan 2025 05:45:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.