From 9a3325a56db87cc8c6336225162daefcd190208f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 23 Mar 2011 22:56:54 -0500 Subject: Refactor signature loading code into common function We can use this for both standalone package signatures as well as standalone database signatures. Signed-off-by: Dan McGee --- lib/libalpm/db.c | 64 +++++++++++++------------------------------------------- 1 file changed, 14 insertions(+), 50 deletions(-) (limited to 'lib/libalpm/db.c') diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 2c9b25f3..4bb24a6c 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -365,55 +365,6 @@ pmdb_t *_alpm_db_new(const char *treename, int is_local) return db; } -static int load_pgpsig(pmdb_t *db) { - size_t len; - const char *dbfile; - char *sigfile; - - dbfile = _alpm_db_path(db); - len = strlen(dbfile) + 5; - MALLOC(sigfile, len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(sigfile, "%s.sig", dbfile); - - if(access(sigfile, R_OK) == 0) { - FILE *f; - long bytes; - size_t bytes_read; - f = fopen(sigfile, "rb"); - fseek(f, 0L, SEEK_END); - bytes = ftell(f); - if(bytes == -1) { - _alpm_log(PM_LOG_WARNING, _("Failed reading PGP signature file for %s"), - dbfile); - goto cleanup; - } - fseek(f, 0L, SEEK_SET); - CALLOC(db->pgpsig.rawdata, bytes, sizeof(char), - goto error); - bytes_read = fread(db->pgpsig.rawdata, sizeof(char), bytes, f); - if(bytes_read == (size_t)bytes) { - db->pgpsig.rawlen = bytes; - _alpm_log(PM_LOG_DEBUG, - "loaded database .sig file, location %s\n", sigfile); - } else { - _alpm_log(PM_LOG_WARNING, _("Failed reading PGP signature file for %s"), - dbfile); - } - -cleanup: - fclose(f); - } else { - _alpm_log(PM_LOG_DEBUG, "no database signature file found\n"); - } - - return(0); - -error: - FREE(db->pgpsig.rawdata); - db->pgpsig.rawlen = 0; - return(1); -} - const pmpgpsig_t *_alpm_db_pgpsig(pmdb_t *db) { ALPM_LOG_FUNC; @@ -422,7 +373,20 @@ const pmpgpsig_t *_alpm_db_pgpsig(pmdb_t *db) ASSERT(db != NULL, return(NULL)); if(db->pgpsig.rawdata == NULL) { - load_pgpsig(db); + 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)); + + FREE(sigfile); } return &(db->pgpsig); -- cgit v1.2.3-70-g09d2