diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-06-03 13:39:07 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-06-03 13:39:07 +0300 |
| commit | a7a9595d9b1885fb57a27b76f15bb9ce09203949 (patch) | |
| tree | 68c4657bb639537729d82702fdbb744ae5566c84 /lib/signature.c | |
| parent | 6f010ec18d7f48b123b96bce77be43f84c8328e0 (diff) | |
| download | librpm-tizen-a7a9595d9b1885fb57a27b76f15bb9ce09203949.tar.gz librpm-tizen-a7a9595d9b1885fb57a27b76f15bb9ce09203949.tar.bz2 librpm-tizen-a7a9595d9b1885fb57a27b76f15bb9ce09203949.zip | |
Rip dosetenv()
- just use regular setenv() instead
- we already carry setenv() in misc/ for platforms that don't have it
Diffstat (limited to 'lib/signature.c')
| -rw-r--r-- | lib/signature.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/signature.c b/lib/signature.c index b3e7f42f0..c507b7cee 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -16,7 +16,6 @@ #include <rpm/rpmts.h> #include "rpmio/digest.h" -#include "lib/misc.h" /* XXX for dosetenv() */ #include "lib/rpmlead.h" #include "lib/signature.h" #include "lib/header_internal.h" @@ -384,11 +383,11 @@ static int makePGPSignature(const char * file, rpmSigTag * sigTagp, (void) dup2(inpipe[0], 3); (void) close(inpipe[1]); - (void) dosetenv("PGPPASSFD", "3", 1); + (void) setenv("PGPPASSFD", "3", 1); if (pgp_path && *pgp_path != '\0') - (void) dosetenv("PGPPATH", pgp_path, 1); + (void) setenv("PGPPATH", pgp_path, 1); - /* dosetenv("PGPPASS", passPhrase, 1); */ + /* setenv("PGPPASS", passPhrase, 1); */ unsetenv("MALLOC_CHECK_"); if ((path = rpmDetectPGPVersion(&pgpVer)) != NULL) { @@ -520,8 +519,8 @@ static int makeGPGSignature(const char * file, rpmSigTag * sigTagp, (void) close(inpipe[1]); if (gpg_path && *gpg_path != '\0') - (void) dosetenv("GNUPGHOME", gpg_path, 1); - (void) dosetenv("LC_ALL", "C", 1); + (void) setenv("GNUPGHOME", gpg_path, 1); + (void) setenv("LC_ALL", "C", 1); unsetenv("MALLOC_CHECK_"); cmd = rpmExpand("%{?__gpg_sign_cmd}", NULL); @@ -845,7 +844,7 @@ static int checkPassPhrase(const char * passPhrase, const rpmSigTag sigTag) { const char *gpg_path = rpmExpand("%{?_gpg_path}", NULL); if (gpg_path && *gpg_path != '\0') - (void) dosetenv("GNUPGHOME", gpg_path, 1); + (void) setenv("GNUPGHOME", gpg_path, 1); cmd = rpmExpand("%{?__gpg_check_password_cmd}", NULL); rc = poptParseArgvString(cmd, NULL, (const char ***)&av); @@ -862,9 +861,9 @@ static int checkPassPhrase(const char * passPhrase, const rpmSigTag sigTag) const char *path; pgpVersion pgpVer; - (void) dosetenv("PGPPASSFD", "3", 1); + (void) setenv("PGPPASSFD", "3", 1); if (pgp_path && *pgp_path != '\0') - xx = dosetenv("PGPPATH", pgp_path, 1); + xx = setenv("PGPPATH", pgp_path, 1); if ((path = rpmDetectPGPVersion(&pgpVer)) != NULL) { switch(pgpVer) { |