From 13e14a6bfd9f29cbfeab0c5161d2a994f97532e7 Mon Sep 17 00:00:00 2001
From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>
Date: Thu, 26 Mar 2026 12:53:53 +0100
Subject: Update/gnulib 2026 03 (#2247)

* Sync with the 202601-stable Gnulib code (4a3650d887)

* Ignore more deps stuff in gnulib

* Remove autogenerated gnulib files

* Ignore more gnulib generated headers
---
 gl/getdelim.c | 111 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 59 insertions(+), 52 deletions(-)

(limited to 'gl/getdelim.c')

diff --git a/gl/getdelim.c b/gl/getdelim.c
index 2576d376..21f3abc2 100644
--- a/gl/getdelim.c
+++ b/gl/getdelim.c
@@ -1,5 +1,5 @@
 /* getdelim.c --- Implementation of replacement getdelim function.
-   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2025 Free Software
+   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2026 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -62,10 +62,13 @@ alloc_failed (void)
 ssize_t
 getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
 {
-  ssize_t result;
-  size_t cur_len = 0;
-
-  if (lineptr == NULL || n == NULL || fp == NULL)
+  if (lineptr == NULL || n == NULL
+      /* glibc already declares this function as __nonnull ((4)).
+         Avoid a gcc warning "‘nonnull’ argument ‘fp’ compared to NULL".  */
+#if !(__GLIBC__ >= 2)
+      || fp == NULL
+#endif
+     )
     {
       errno = EINVAL;
       return -1;
@@ -73,6 +76,8 @@ getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
 
   flockfile (fp);
 
+  ssize_t result;
+
   if (*lineptr == NULL || *n == 0)
     {
       char *new_lineptr;
@@ -87,54 +92,56 @@ getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
       *lineptr = new_lineptr;
     }
 
-  for (;;)
-    {
-      int i;
-
-      i = getc_maybe_unlocked (fp);
-      if (i == EOF)
-        {
-          result = -1;
+  {
+    size_t cur_len = 0;
+    for (;;)
+      {
+        int i;
+
+        i = getc_maybe_unlocked (fp);
+        if (i == EOF)
+          {
+            result = -1;
+            break;
+          }
+
+        /* Make enough space for len+1 (for final NUL) bytes.  */
+        if (cur_len + 1 >= *n)
+          {
+            size_t needed_max =
+              SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
+            size_t needed = 2 * *n + 1;   /* Be generous. */
+
+            if (needed_max < needed)
+              needed = needed_max;
+            if (cur_len + 1 >= needed)
+              {
+                result = -1;
+                errno = EOVERFLOW;
+                goto unlock_return;
+              }
+
+            char *new_lineptr = (char *) realloc (*lineptr, needed);
+            if (new_lineptr == NULL)
+              {
+                alloc_failed ();
+                result = -1;
+                goto unlock_return;
+              }
+
+            *lineptr = new_lineptr;
+            *n = needed;
+          }
+
+        (*lineptr)[cur_len] = i;
+        cur_len++;
+
+        if (i == delimiter)
           break;
-        }
-
-      /* Make enough space for len+1 (for final NUL) bytes.  */
-      if (cur_len + 1 >= *n)
-        {
-          size_t needed_max =
-            SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
-          size_t needed = 2 * *n + 1;   /* Be generous. */
-          char *new_lineptr;
-
-          if (needed_max < needed)
-            needed = needed_max;
-          if (cur_len + 1 >= needed)
-            {
-              result = -1;
-              errno = EOVERFLOW;
-              goto unlock_return;
-            }
-
-          new_lineptr = (char *) realloc (*lineptr, needed);
-          if (new_lineptr == NULL)
-            {
-              alloc_failed ();
-              result = -1;
-              goto unlock_return;
-            }
-
-          *lineptr = new_lineptr;
-          *n = needed;
-        }
-
-      (*lineptr)[cur_len] = i;
-      cur_len++;
-
-      if (i == delimiter)
-        break;
-    }
-  (*lineptr)[cur_len] = '\0';
-  result = cur_len ? cur_len : result;
+      }
+    (*lineptr)[cur_len] = '\0';
+    result = cur_len ? cur_len : result;
+  }
 
  unlock_return:
   funlockfile (fp); /* doesn't set errno */
-- 
cgit v1.2.3-74-g34f1