wdvi

commit 9894ac621463db25fa634bddbd3200cdcec48d57
parent b5fc480b547cdab6c622398134a6b59e2eadb8dd
Author: Kyle Milz <krwmilz@gmail.com>
Date:   Sat, 11 Mar 2023 19:10:36 +0000

replace xputenv() with setenv()

Diffstat:
M
popups.c
 | 
5
+++--
M
util.c
 | 
12
------------
M
util.h
 | 
1
-

3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/popups.c b/popups.c
@@ -51,7 +51,7 @@ IN THE SOFTWARE.
 #include "events.h"	/* handle_messages(), mane, struct xio */
 #include "popups.h"
 #include "xdvi.h"
-#include "util.h"	/* prep_fd(), xfopen(), xputenv() */
+#include "util.h"	/* prep_fd(), xfopen() */
 
 
 #ifdef EWOULDBLOCK
@@ -1316,7 +1316,8 @@ print_do_it()
 		    *p = '\0';
 		    if (envval != NULL)
 			strcpy(p, envval);
-		    xputenv(dep->envname, dep->envval);
+		    if (setenv(dep->envname, dep->envval, 1) == -1)
+			err(1, "setenv");
 		}
 	    }
 	    for (dep = dvips_envs; dep < dvips_envs + XtNumber(dvips_envs);
diff --git a/util.c b/util.c
@@ -132,18 +132,6 @@ alloc_bitmap(struct bitmap *bitmap)
 
 
 /*
- *	Put a variable in the environment or abort on error.
- */
-void
-xputenv(const char *var, const char *value)
-{
-	if (setenv(var, value, True) != 0)
-	    err(1, "setenv");
-	return;
-}
-
-
-/*
  *	Open a file in the given mode.
  */
 
diff --git a/util.h b/util.h
@@ -22,7 +22,6 @@ void	 prep_fd(int, Boolean);
 
 FILE	*xfopen(const char *, const char *);
 int	 xpipe(int *);
-void	 xputenv(const char *, const char *);
 
 void	*xmalloc(size_t);
 void	*xrealloc(void *, size_t);