Use gnulib module "setenv" instead of "putenv-gnu" (bug #67378).

* bootstrap.conf: Remove "putenv-gnu" from list of imported gnulib modules. Add
"setenv".
* liboctave/wrappers/putenv-wrapper.c, liboctave/wrappers/putenv-wrapper.h:
Remove wrappers for gnulib function.
* liboctave/wrappers/setenv-wrapper.c, liboctave/wrappers/setenv-wrapper.h:
Add wrappers for gnulib function.
* liboctave/wrappers/module.mk: Remove deleted files from build system. Add new
files to build system.
* liboctave/system/oct-sysdep.cc: Remove inclusion of deleted header. Include
new header
(octave::sys::putenv_wrapper): Add check of input parameter on Windows. Use
wrapper to gnulib function setenv on any other platform
(octave::sys::unsetenv_wrapper): Add comment.

Author: mmuetzel

bootstrap.conf

@@ -79,13 +79,13 @@ gnulib_modules="
   opendir
   pipe-posix
   progname
-  putenv-gnu
   raise
   readdir
   readline
   rewinddir
   rmdir
   select
+  setenv
   setlocale
   sigaction
   signal-h

liboctave/system/oct-sysdep.cc

@@ -37,7 +37,7 @@
 #include "localcharset-wrapper.h"
 #include "oct-error.h"
 #include "oct-sysdep.h"
-#include "putenv-wrapper.h"
+#include "setenv-wrapper.h"
 #include "unistd-wrappers.h"
 #include "unsetenv-wrapper.h"
 
@@ -647,16 +647,21 @@ ofstream (const std::string& filename, const std::ios::openmode mode)
 void
 putenv_wrapper (const std::string& name, const std::string& value)
 {
-  std::string new_env = name + "=" + value;
-
-  // FIXME: The malloc leaks memory, but so would a call to setenv.
   // Short of extreme measures to track memory, altering the environment
   // always leaks memory, but the saving grace is that the leaks are small.
 
+#if defined (OCTAVE_USE_WINDOWS_API)
+  // FIXME: The malloc leaks memory, but so would a call to setenv.
+
   // As far as I can see there's no way to distinguish between the
   // various errors; putenv doesn't have errno values.
 
-#if defined (OCTAVE_USE_WINDOWS_API)
+  if (name.find ('=') != std::string::npos)
+    (*current_liboctave_error_handler)
+      ("putenv: name (%s) must not contain '='", name.c_str());
+
+  std::string new_env = name + "=" + value;
+
   std::wstring new_wenv = u8_to_wstring (new_env);
 
   int len = (new_wenv.length () + 1) * sizeof (wchar_t);
@@ -669,14 +674,12 @@ putenv_wrapper (const std::string& name, const std::string& value)
     (*current_liboctave_error_handler)
       ("putenv (%s) failed", new_env.c_str());
 #else
-  int len = new_env.length () + 1;
-
-  char *new_item = static_cast<char *> (std::malloc (len));
-
-  std::strcpy (new_item, new_env.c_str());
-
-  if (octave_putenv_wrapper (new_item) < 0)
-    (*current_liboctave_error_handler) ("putenv (%s) failed", new_item);
+  // FIXME: Using setenv leaks memory, but so would using malloc and putenv.
+ 
+  if (octave_setenv_wrapper (name.c_str (), value.c_str (), 1) < 0)
+    (*current_liboctave_error_handler)
+      ("setenv (%s, %s) failed with error %d", name.c_str (), value.c_str (),
+       errno);
 #endif
 }
 
@@ -699,6 +702,7 @@ unsetenv_wrapper (const std::string& name)
 #if defined (OCTAVE_USE_WINDOWS_API)
   putenv_wrapper (name, "");
 
+  // Also remove variable from environment.
   std::wstring wname = u8_to_wstring (name);
   return (SetEnvironmentVariableW (wname.c_str (), nullptr) ? 0 : -1);
 #else

liboctave/wrappers/module.mk

@@ -20,10 +20,10 @@ NOINSTALL_WRAPPERS_INC = \
   %reldir%/nanosleep-wrapper.h \
   %reldir%/nproc-wrapper.h \
   %reldir%/octave-popen2.h \
-  %reldir%/putenv-wrapper.h \
   %reldir%/pwd-wrappers.h \
   %reldir%/select-wrappers.h \
   %reldir%/set-program-name-wrapper.h \
+  %reldir%/setenv-wrapper.h \
   %reldir%/signal-wrappers.h \
   %reldir%/stat-wrappers.h \
   %reldir%/strcase-wrappers.h \
@@ -66,10 +66,10 @@ WRAPPERS_SRC = \
   %reldir%/nanosleep-wrapper.c \
   %reldir%/nproc-wrapper.c \
   %reldir%/octave-popen2.c \
-  %reldir%/putenv-wrapper.c \
   %reldir%/pwd-wrappers.c \
   %reldir%/select-wrappers.c \
   %reldir%/set-program-name-wrapper.c \
+  %reldir%/setenv-wrapper.c \
   %reldir%/signal-wrappers.c \
   %reldir%/stat-wrappers.c \
   %reldir%/strcase-wrappers.c \

liboctave/wrappers/putenv-wrapper.c renamed to liboctave/wrappers/setenv-wrapper.c

@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////
 //
-// Copyright (C) 2016-2025 The Octave Project Developers
+// Copyright (C) 2025 The Octave Project Developers
 //
 // See the file COPYRIGHT.md in the top-level directory of this
 // distribution or <https://octave.org/copyright/>.
@@ -23,7 +23,7 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-// putenv may be provided by gnulib.  We don't include gnulib headers
+// unsetenv may be provided by gnulib.  We don't include gnulib headers
 // directly in Octave's C++ source files to avoid problems that may be
 // caused by the way that gnulib overrides standard library functions.
 
@@ -33,10 +33,10 @@
 
 #include <stdlib.h>
 
-#include "putenv-wrapper.h"
+#include "setenv-wrapper.h"
 
 int
-octave_putenv_wrapper (char *str)
+octave_setenv_wrapper (const char *envname, const char *envval, int overwrite)
 {
-  return putenv (str);
+  return setenv (envname, envval, overwrite);
 }

liboctave/wrappers/putenv-wrapper.h renamed to liboctave/wrappers/setenv-wrapper.h

@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////
 //
-// Copyright (C) 2016-2025 The Octave Project Developers
+// Copyright (C) 2025 The Octave Project Developers
 //
 // See the file COPYRIGHT.md in the top-level directory of this
 // distribution or <https://octave.org/copyright/>.
@@ -23,14 +23,15 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-#if ! defined (octave_putenv_wrapper_h)
-#define octave_putenv_wrapper_h 1
+#if ! defined (octave_setenv_wrapper_h)
+#define octave_setenv_wrapper_h 1
 
 #if defined (__cplusplus)
 extern "C" {
 #endif
 
-extern OCTAVE_API int octave_putenv_wrapper (char *str);
+extern OCTAVE_API int
+octave_setenv_wrapper (const char *envname, const char *envval, int overwrite);
 
 #if defined (__cplusplus)
 }