X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6c42153ad9362cc676ea66563bf400d7511b3b68..372d8d466d78a89031d07323b898b4e0703336dc:/sbr/putenv.c

diff --git a/sbr/putenv.c b/sbr/putenv.c
index 649b0152..5266d63e 100644
--- a/sbr/putenv.c
+++ b/sbr/putenv.c
@@ -2,14 +2,13 @@
 /*
  * putenv.c -- (un)set an envariable
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 extern char **environ;
 
@@ -20,17 +19,16 @@ int m_putenv (char *, char *);
 int unputenv (char *);
 static int nvmatch (char *, char *);
 
+/* FIXME: These functions leak memory.  No easy fix since they might not
+ * be malloc'd.  Switch to setenv(3) and unsetenv(3). */
 
 int
 m_putenv (char *name, char *value)
 {
-    register int i;
-    register char **ep, **nep, *cp;
-
-    if (!(cp = malloc ((size_t) (strlen (name) + strlen (value) + 2))))
-	return 1;
+    int i;
+    char **ep, **nep, *cp;
 
-    sprintf (cp, "%s=%s", name, value);
+    cp = concat(name, "=", value, NULL);
 
     for (ep = environ, i = 0; *ep; ep++, i++)
 	if (nvmatch (name, *ep)) {
@@ -38,8 +36,7 @@ m_putenv (char *name, char *value)
 	    return 0;
 	}
 
-    if (!(nep = (char **) malloc ((size_t) ((i + 2) * sizeof(*nep)))))
-	return 1;
+    nep = (char **) mh_xmalloc ((size_t) ((i + 2) * sizeof(*nep)));
 
     for (ep = environ, i = 0; *ep; nep[i++] = *ep++)
 	continue;