Part 1 of merging sbr/norm_charmap.c into sbr/check_charset.c.

[nmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index 1e044f5208369a4ecf2eb9d21f1edd84cf5a20ce..cfbba804b759d77887042fb6cee75ae98d50cd0e 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -27,6 +27,8 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
+#include "../sbr/lock_file.h"
+#include "../sbr/m_mktemp.h"
 
 #include <pwd.h>
 #include <sys/ioctl.h>
@@ -1093,9 +1095,9 @@ usr_pipe (int fd_arg, char *cmd, char *pgm, char **vec, int suppress)
            setpgid ((pid_t) 0, getpid ());     /* put in own process group */
 
            *environ = NULL;
-           m_putenv ("USER", pw->pw_name);
-           m_putenv ("HOME", pw->pw_dir);
-           m_putenv ("SHELL", pw->pw_shell);
+           setenv("USER", pw->pw_name, 1);
+           setenv("HOME", pw->pw_dir, 1);
+           setenv("SHELL", pw->pw_shell, 1);
 
            execvp (pgm, vec);
            _exit (-1);