logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-Always-use-prototype-for-getopt-and-getenv.patch (2272B)

    

  1. From c83c5ddf95c8fb3f39e03a206d34f46faadb2fe7 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Thu, 2 Apr 2026 17:54:53 -0700
  4. Subject: [PATCH] Always use prototype for getopt and getenv
  6. ---
  7.  src/getopt.c | 15 ++-------------
  8.  src/getopt.h |  7 -------
  9.  2 files changed, 2 insertions(+), 20 deletions(-)
  11. diff --git a/src/getopt.c b/src/getopt.c
  12. index 7a792de8..3673aecf 100644
  13. --- a/src/getopt.c
  14. +++ b/src/getopt.c
  15. @@ -39,6 +39,8 @@ this program.  If not, see <https://www.gnu.org/licenses/>.  */
  16.  #endif
  17.  
  18.  #include <stdio.h>
  19. +#include <stdlib.h>
  20. +#include <unistd.h>
  21.  
  22.  /* Comment out all this code if we are using the GNU C Library, and are not
  23.     actually compiling the library itself.  This code is part of the GNU C
  24. @@ -59,15 +61,6 @@ this program.  If not, see <https://www.gnu.org/licenses/>.  */
  25.  #ifndef ELIDE_CODE
  26.  
  27.  
  28. -/* This needs to come after some library #include
  29. -   to get __GNU_LIBRARY__ defined.  */
  30. -#ifdef	__GNU_LIBRARY__
  31. -/* Don't include stdlib.h for non-GNU C libraries because some of them
  32. -   contain conflicting prototypes for getopt.  */
  33. -# include <stdlib.h>
  34. -# include <unistd.h>
  35. -#endif	/* GNU C library.  */
  36. -
  37.  #ifdef VMS
  38.  # include <unixlib.h>
  39.  # if HAVE_STRING_H - 0
  40. @@ -201,10 +194,6 @@ static char *posixly_correct;
  41.  /* Avoid depending on library functions or files
  42.     whose names are inconsistent.  */
  43.  
  44. -#ifndef getenv
  45. -extern char *getenv ();
  46. -#endif
  47. -
  48.  static char *
  49.  my_index (const char *str, int chr)
  50.  {
  51. diff --git a/src/getopt.h b/src/getopt.h
  52. index df18ceeb..a6cc6217 100644
  53. --- a/src/getopt.h
  54. +++ b/src/getopt.h
  55. @@ -96,14 +96,7 @@ struct option
  56.  #define optional_argument	2
  57.  
  58.  #if defined (__STDC__) && __STDC__
  59. -#ifdef __GNU_LIBRARY__
  60. -/* Many other libraries have conflicting prototypes for getopt, with
  61. -   differences in the consts, in stdlib.h.  To avoid compilation
  62. -   errors, only prototype getopt for the GNU C library.  */
  63.  extern int getopt (int argc, char *const *argv, const char *shortopts);
  64. -#else /* not __GNU_LIBRARY__ */
  65. -extern int getopt ();
  66. -#endif /* __GNU_LIBRARY__ */
  67.  extern int getopt_long (int argc, char *const *argv, const char *shortopts,
  68.  		        const struct option *longopts, int *longind);
  69.  extern int getopt_long_only (int argc, char *const *argv,
  70. -- 
  71. 2.49.0