projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| 6d1e99c9 JR |
1 | diff -urN rpm-5.4.10/rpmdb/signature.c rpm-5.4.12/rpmdb/signature.c |
| 2 | --- rpm-5.4.10/rpmdb/signature.c 2012-04-17 01:43:35.000000000 +0200 | |
| 3 | +++ rpm-5.4.12/rpmdb/signature.c 2013-06-28 18:42:13.000000000 +0200 | |
| 4 | @@ -12,7 +12,6 @@ | |
| 5 | #include <rpmmacro.h> /* XXX for rpmGetPath() */ | |
| 6 | #include <rpmhkp.h> | |
| 7 | #include <rpmku.h> | |
| 8 | -#include <argv.h> | |
| 9 | ||
| 10 | #include <rpmtag.h> | |
| 11 | #include "rpmdb.h" | |
| 12 | @@ -503,7 +504,7 @@ | |
| 13 | ||
| 14 | if (!(pid = fork())) { | |
| 15 | const char * cmd; | |
| 16 | - ARGV_t av; | |
| 17 | + char *const *av; | |
| 18 | int fdno; | |
| 19 | ||
| 20 | xx = close(STDIN_FILENO); | |
| 21 | @@ -528,16 +529,13 @@ | |
| 22 | (void) setenv("GNUPGHOME", gpg_path, 1); | |
| 23 | ||
| 24 | cmd = rpmExpand("%{?__gpg_check_password_cmd}", NULL); | |
| 25 | - rc = argvSplit(&av, cmd, NULL); | |
| 26 | + rc = poptParseArgvString(cmd, NULL, (const char ***)&av); | |
| 27 | if (!rc) | |
| 28 | - rc = execve(av[0], (char *const *)av+1, environ); | |
| 29 | + rc = execve(av[0], av+1, environ); | |
| 30 | ||
| 31 | rpmlog(RPMLOG_ERR, _("Could not exec %s: %s\n"), "gpg", | |
| 32 | strerror(errno)); | |
| 33 | - cmd = _free(cmd); | |
| 34 | - gpg_path = _free(gpg_path); | |
| 35 | } | |
| 36 | - av = argvFree(av); | |
| 37 | } | |
| 38 | ||
| 39 | pw = rpmkuPassPhrase(passPhrase); |