git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 2/4] compat/regex: move stdlib.h up in inclusion chain

From
Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date
Apr 27, 2020, 14:22 UTC
Message-ID
<8d18c53bc813865a652be148afd2292d75e1b635.1587996766.git.congdanhqx@gmail.com>
In-Reply-To
<cover.1587996765.git.congdanhqx@gmail.com>
In Linux with musl libc, we have this inclusion chain:
compat/regex/regex.c:69
`-> compat/regex/regex_internal.h
   `-> /usr/include/stdlib.h
      `-> /usr/include/features.h
      `-> /usr/include/alloca.h

In that inclusion chain, `<features.h>` claims it's _BSD_SOURCE compatible when it's NOT asked to be either {_POSIX,_GNU,_XOPEN,_BSD}_SOURCE, or __STRICT_ANSI__. And, `<stdlib.h>` will include `<alloca.h>` to be compatible with software written for GNU and BSD. Thus, redefine `alloca` macro, which was defined before at compat/regex/regex.c:66.

Considering this is only compat code, we've taken from other project, it's not our business to decide which source should we adhere to.

Include `<stdlib.h>` early to prevent the redefinition of alloca.
This also remove a potential warning about alloca not defined on:
	#undef alloca
Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
Notes:
    There is another warning about un-match declaration and definition of
    re_string_context_at.
    
    It's arguably, a bug in sparse itself.
    Consider that there's a fix for it in their development version already,
    and, we expect they'll fix the zero-ing pattern in 1/? before enable it again.
    
    There're no point to change that pair of declaration/definition.
    This patch is technically Ramsay's work.
    Since <alloca.h> is likely unportable, my patch will be likely unusable.
    I took Ramsay's work and write the commit message instead.
    I would love to see Ramsay's SoB on reply to this patch.
 compat/regex/regex.c          | 1 +
 compat/regex/regex_internal.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/compat/regex/regex.c b/compat/regex/regex.c
index f3e03a9eab..e6f4a5d177 100644
--- a/compat/regex/regex.c
+++ b/compat/regex/regex.c
@@ -60,6 +60,7 @@
    #undefs RE_DUP_MAX and sets it to the right value.  */
 #include <limits.h>
 #include <stdint.h>
+#include <stdlib.h>
 
 #ifdef GAWK
 #undef alloca
diff --git a/compat/regex/regex_internal.h b/compat/regex/regex_internal.h
index 3ee8aae59d..0bad8b841e 100644
--- a/compat/regex/regex_internal.h
+++ b/compat/regex/regex_internal.h
@@ -23,7 +23,6 @@
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC
-- 
2.26.2.526.g744177e7f7
Previous: Đoàn Trần Công DanhNext: Ramsay Jones
Message 46 of 51 in “fix make sparse warning”
  1. 0/4 fix make sparse warningĐoàn Trần Công Danh, Apr 23, 2020
  2. 1/4 C: s/0/NULL/ for pointer typeĐoàn Trần Công Danh, Apr 23, 2020
  3. Ramsay JonesApr 24, 2020
  4. Junio C HamanoApr 24, 2020
  5. Danh DoanApr 24, 2020
  6. Junio C HamanoApr 24, 2020
  7. Luc Van OostenryckMay 14, 2020
  8. 2/4 compat/regex: silence `make sparse` warningĐoàn Trần Công Danh, Apr 23, 2020
  9. Ramsay JonesApr 24, 2020
  10. Danh DoanApr 24, 2020
  11. 3/4 graph.c: limit linkage of internal variableĐoàn Trần Công Danh, Apr 23, 2020
  12. Ramsay JonesApr 24, 2020
  13. 4/4 progress.c: silence cgcc suggestion about internal linkageĐoàn Trần Công Danh, Apr 23, 2020
  14. Ramsay JonesApr 24, 2020
  15. Jeff KingApr 24, 2020
  16. 5/4 fmt-merge-msg.c: fix `make sparse` on nextĐoàn Trần Công Danh, Apr 23, 2020
  17. Ramsay JonesApr 23, 2020
  18. Danh DoanApr 23, 2020
  19. Ramsay JonesApr 24, 2020
  20. 0/4 Fix Sparse WarningĐoàn Trần Công Danh, Apr 24, 2020
  21. 1/4 test-parse-pathspec-file.c: s/0/NULL/ for pointer typeĐoàn Trần Công Danh, Apr 24, 2020
  22. 2/4 compat/regex: include alloca.h before undef itĐoàn Trần Công Danh, Apr 24, 2020
  23. Ramsay JonesApr 24, 2020
  24. Danh DoanApr 24, 2020
  25. Ramsay JonesApr 24, 2020
  26. Danh DoanApr 24, 2020
  27. Ramsay JonesApr 25, 2020
  28. Danh DoanApr 26, 2020
  29. Danh DoanApr 26, 2020
  30. Ramsay JonesApr 26, 2020
  31. Ramsay JonesApr 26, 2020
  32. Junio C HamanoApr 26, 2020
  33. Danh DoanApr 27, 2020
  34. Ramsay JonesApr 27, 2020
  35. Danh DoanApr 27, 2020
  36. Ramsay JonesApr 27, 2020
  37. 3/4 graph.c: limit linkage of internal variableĐoàn Trần Công Danh, Apr 24, 2020
  38. 4/4 progress.c: silence cgcc suggestion about internal linkageĐoàn Trần Công Danh, Apr 24, 2020
  39. Ramsay JonesApr 24, 2020
  40. Johannes SchindelinApr 25, 2020
  41. Danh DoanApr 26, 2020
  42. Ramsay JonesApr 26, 2020
  43. Johannes SchindelinMay 1, 2020
  44. 0/4 Partial fix `make sparse`Đoàn Trần Công Danh, Apr 27, 2020
  45. 1/4 test-parse-pathspec-file.c: s/0/NULL/ for pointer typeĐoàn Trần Công Danh, Apr 27, 2020
  46. 2/4 compat/regex: move stdlib.h up in inclusion chainĐoàn Trần Công Danh, Apr 27, 2020
  47. Ramsay JonesApr 27, 2020
  48. 3/4 graph.c: limit linkage of internal variableĐoàn Trần Công Danh, Apr 27, 2020
  49. 4/4 progress.c: silence cgcc suggestion about internal linkageĐoàn Trần Công Danh, Apr 27, 2020
  50. Johannes SchindelinMay 1, 2020
  51. Ramsay JonesApr 27, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.