--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-27  Bruno Haible  <bruno@clisp.org>
+
+	* modules/xsetenv: New module.
+	* MODULES.html.sh (func_all_modules): Add it.
+
 2003-01-23  Bruno Haible  <bruno@clisp.org>
 
 	* modules/minmax: New module.

--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1481,7 +1481,7 @@
   func_begin_table
   func_module putenv
   func_module setenv
-  #func_module xsetenv
+  func_module xsetenv
   func_end_table
 
   element="Character handling <ctype.h>"

--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-27  Bruno Haible  <bruno@clisp.org>
+
+	* xsetenv.h: New file, from GNU gettext.
+	* xsetenv.c: New file, from GNU gettext.
+
 2003-01-23  Bruno Haible  <bruno@clisp.org>
 
 	* minmax.h: New file, from GNU gettext, with comments from Paul Eggert.

new file mode 100644
--- /dev/null
+++ b/lib/xsetenv.c
@@ -0,0 +1,41 @@
+/* Setting environment variables, with out-of-memory checking.
+   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification.  */
+#include "xsetenv.h"
+
+#include "setenv.h"
+#include "error.h"
+#include "exit.h"
+#include "gettext.h"
+
+#define _(str) gettext (str)
+
+
+/* Set NAME to VALUE in the environment.
+   If REPLACE is nonzero, overwrite an existing value.
+   With error checking.  */
+void
+xsetenv (const char *name, const char *value, int replace)
+{
+  if (setenv (name, value, replace) < 0)
+    error (EXIT_FAILURE, 0, _("memory exhausted"));
+}

new file mode 100644
--- /dev/null
+++ b/lib/xsetenv.h
@@ -0,0 +1,32 @@
+/* Setting environment variables, with out-of-memory checking.
+   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Get unsetenv().  It can be used without error checking.  */
+#include "setenv.h"
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* Set NAME to VALUE in the environment.
+   If REPLACE is nonzero, overwrite an existing value.
+   With error checking.  */
+extern void xsetenv (const char *name, const char *value, int replace);
+
+#ifdef	__cplusplus
+}
+#endif

new file mode 100644
--- /dev/null
+++ b/modules/xsetenv
@@ -0,0 +1,25 @@
+Description:
+xsetenv() function: set an environment variable, with out-of-memory checking.
+unsetenv() function: remove an environment variable.
+
+Files:
+lib/xsetenv.h
+lib/xsetenv.c
+
+Depends-on:
+setenv
+error
+exit
+gettext
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += xsetenv.h xsetenv.c
+
+Include:
+"xsetenv.h"
+
+Maintainer:
+Bruno Haible
+