From c3caab7f1feb1052e6a83af9bb3a40af4c7afa95 Mon Sep 17 00:00:00 2001 From: ewt Date: Tue, 24 Dec 1996 14:02:21 +0000 Subject: [PATCH] use doputenv() and dosetenv() CVS patchset: 1252 CVS date: 1996/12/24 14:02:21 --- lib/signature.c | 12 ++++++------ lib/uninstall.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/signature.c b/lib/signature.c index 12c175c..6aeeeca 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -203,11 +203,11 @@ static int makePGPSignature(char *file, void **sig, int_32 *size, close(0); dup2(inpipe[0], 3); close(inpipe[1]); - setenv("PGPPASSFD", "3", 1); + dosetenv("PGPPASSFD", "3", 1); if (rpmGetVar(RPMVAR_PGP_PATH)) { - setenv("PGPPATH", rpmGetVar(RPMVAR_PGP_PATH), 1); + dosetenv("PGPPATH", rpmGetVar(RPMVAR_PGP_PATH), 1); } - /* setenv("PGPPASS", passPhrase, 1); */ + /* dosetenv("PGPPASS", passPhrase, 1); */ execlp("pgp", "pgp", "+batchmode=on", "+verbose=0", "+armor=off", name, "-sb", file, sigfile, @@ -377,7 +377,7 @@ static int verifyPGPSignature(char *datafile, void *sig, close(outpipe[0]); dup2(outpipe[1], 1); if (rpmGetVar(RPMVAR_PGP_PATH)) { - setenv("PGPPATH", rpmGetVar(RPMVAR_PGP_PATH), 1); + dosetenv("PGPPATH", rpmGetVar(RPMVAR_PGP_PATH), 1); } execlp("pgp", "pgp", "+batchmode=on", "+verbose=0", @@ -459,9 +459,9 @@ static int checkPassPhrase(char *passPhrase) dup2(fd, 1); } dup2(passPhrasePipe[0], 3); - setenv("PGPPASSFD", "3", 1); + dosetenv("PGPPASSFD", "3", 1); if (rpmGetVar(RPMVAR_PGP_PATH)) { - setenv("PGPPATH", rpmGetVar(RPMVAR_PGP_PATH), 1); + dosetenv("PGPPATH", rpmGetVar(RPMVAR_PGP_PATH), 1); } execlp("pgp", "pgp", "+batchmode=on", "+verbose=0", diff --git a/lib/uninstall.c b/lib/uninstall.c index 1b04d10..388662f 100644 --- a/lib/uninstall.c +++ b/lib/uninstall.c @@ -344,7 +344,7 @@ int runScript(char * prefix, Header h, int tag, int arg, int norunScripts) { shell as stdin */ if (!(child = fork())) { if (installPrefixEnv) { - putenv(installPrefixEnv); + doputenv(installPrefixEnv); } lseek(fd, 0, SEEK_SET); -- 2.7.4