summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-28 12:48:37 -0500
committerDan McGee <dan@archlinux.org>2011-04-20 20:10:27 -0500
commit3c5661ec3cd5cdf2f1c3101d90789c83786a6897 (patch)
tree7f23826062a221b5a8d773ee3f47207a6de37339
parent791928dc48bcd94ef5cb57b4da36fb5e398e30da (diff)
downloadpacman-3c5661ec3cd5cdf2f1c3101d90789c83786a6897.tar.xz
Form the signature file location in one place
Since we do this for all cases anyway. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/be_package.c7
-rw-r--r--lib/libalpm/db.c9
-rw-r--r--lib/libalpm/signing.c24
3 files changed, 16 insertions, 24 deletions
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c
index 0c3728f1..8a6ed6c4 100644
--- a/lib/libalpm/be_package.c
+++ b/lib/libalpm/be_package.c
@@ -243,7 +243,6 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full)
/* attempt to stat the package file, ensure it exists */
if(stat(pkgfile, &st) == 0) {
- char *pgpfile;
int sig_ret;
newpkg = _alpm_pkg_new();
@@ -253,13 +252,9 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full)
newpkg->filename = strdup(pkgfile);
newpkg->size = st.st_size;
- /* look around for a PGP signature file; load if available */
- MALLOC(pgpfile, strlen(pkgfile) + 5, RET_ERR(PM_ERR_MEMORY, NULL));
- sprintf(pgpfile, "%s.sig", pkgfile);
/* TODO: do something with ret value */
- sig_ret = _alpm_load_signature(pgpfile, &(newpkg->pgpsig));
+ sig_ret = _alpm_load_signature(pkgfile, &(newpkg->pgpsig));
(void)sig_ret;
- FREE(pgpfile);
} else {
/* couldn't stat the pkgfile, return an error */
RET_ERR(PM_ERR_PKG_OPEN, NULL);
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index cd741891..3808a275 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -322,21 +322,14 @@ const pmpgpsig_t *_alpm_db_pgpsig(pmdb_t *db)
ASSERT(db != NULL, return(NULL));
if(db->pgpsig.rawdata == NULL) {
- size_t len;
const char *dbfile;
- char *sigfile;
int ret;
dbfile = _alpm_db_path(db);
- len = strlen(dbfile) + 5;
- MALLOC(sigfile, len, RET_ERR(PM_ERR_MEMORY, NULL));
- sprintf(sigfile, "%s.sig", dbfile);
/* TODO: do something with ret value */
- ret = _alpm_load_signature(sigfile, &(db->pgpsig));
+ ret = _alpm_load_signature(dbfile, &(db->pgpsig));
(void)ret;
-
- FREE(sigfile);
}
return &(db->pgpsig);
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index 42e8c677..51c4f4ce 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -210,19 +210,22 @@ error:
*
* @return 0 on success, 1 on file not found, -1 on error
*/
-int _alpm_load_signature(const char *sigfile, pmpgpsig_t *pgpsig) {
+int _alpm_load_signature(const char *file, pmpgpsig_t *pgpsig) {
struct stat st;
+ char *sigfile;
+ int ret = -1;
+
+ /* look around for a PGP signature file; load if available */
+ MALLOC(sigfile, strlen(file) + 5, RET_ERR(PM_ERR_MEMORY, -1));
+ sprintf(sigfile, "%s.sig", file);
if(access(sigfile, R_OK) == 0 && stat(sigfile, &st) == 0) {
FILE *f;
size_t bytes_read;
- if(st.st_size > 4096) {
- return -1;
- }
-
- if((f = fopen(sigfile, "rb")) == NULL) {
- return -1;
+ if(st.st_size > 4096 || (f = fopen(sigfile, "rb")) == NULL) {
+ free(sigfile);
+ return ret;
}
CALLOC(pgpsig->rawdata, st.st_size, sizeof(unsigned char),
RET_ERR(PM_ERR_MEMORY, -1));
@@ -231,21 +234,22 @@ int _alpm_load_signature(const char *sigfile, pmpgpsig_t *pgpsig) {
pgpsig->rawlen = bytes_read;
_alpm_log(PM_LOG_DEBUG, "loaded gpg signature file, location %s\n",
sigfile);
+ ret = 0;
} else {
_alpm_log(PM_LOG_WARNING, _("Failed reading PGP signature file %s"),
sigfile);
FREE(pgpsig->rawdata);
- return -1;
}
fclose(f);
} else {
_alpm_log(PM_LOG_DEBUG, "signature file %s not found\n", sigfile);
/* not fatal...we return a different error code here */
- return 1;
+ ret = 1;
}
- return 0;
+ free(sigfile);
+ return ret;
}
/**