moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-03-01 01:41:52 -05:00
Code Issues Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Dan McGee 2012-04-12 08:57:26 -05:00
commit d7b728591a
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libalpm/dload.c
View File

@ -335,9 +335,9 @@ static void mask_signal(int signal, void (*handler)(int),
sigaction(signal, &newaction, NULL); sigaction(signal, &newaction, NULL);
} }
static void unmask_signal(int signal, struct sigaction sa) static void unmask_signal(int signal, struct sigaction *sa)
{ {
sigaction(signal, &sa, NULL); sigaction(signal, sa, NULL);
} }
static FILE *create_tempfile(struct dload_payload *payload, const char *localpath) static FILE *create_tempfile(struct dload_payload *payload, const char *localpath)
@ -405,7 +405,8 @@ static int curl_download_internal(struct dload_payload *payload,
RET_ERR(handle, ALPM_ERR_SERVER_BAD_URL, -1); RET_ERR(handle, ALPM_ERR_SERVER_BAD_URL, -1);
} }
if(strlen(payload->remote_name) > 0 && strcmp(payload->remote_name, ".sig") != 0) { if(payload->remote_name && strlen(payload->remote_name) > 0 &&
strcmp(payload->remote_name, ".sig") != 0) {
payload->destfile_name = get_fullpath(localpath, payload->remote_name, ""); payload->destfile_name = get_fullpath(localpath, payload->remote_name, "");
payload->tempfile_name = get_fullpath(localpath, payload->remote_name, ".part"); payload->tempfile_name = get_fullpath(localpath, payload->remote_name, ".part");
if(!payload->destfile_name || !payload->tempfile_name) { if(!payload->destfile_name || !payload->tempfile_name) {
@ -582,8 +583,8 @@ cleanup:
} }
/* restore the old signal handlers */ /* restore the old signal handlers */
unmask_signal(SIGINT, orig_sig_int); unmask_signal(SIGINT, &orig_sig_int);
unmask_signal(SIGPIPE, orig_sig_pipe); unmask_signal(SIGPIPE, &orig_sig_pipe);
/* if we were interrupted, trip the old handler */ /* if we were interrupted, trip the old handler */
if(dload_interrupted) { if(dload_interrupted) {
raise(SIGINT); raise(SIGINT);

4
lib/libalpm/signing.c
View File

@ -208,9 +208,9 @@ static int key_in_keychain(alpm_handle_t *handle, const char *fpr)
} else { } else {
_alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err)); _alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err));
} }
gpgme_key_unref(key);
error: error:
gpgme_key_unref(key);
gpgme_release(ctx); gpgme_release(ctx);
return ret; return ret;
} }
@ -812,7 +812,7 @@ int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier,
_("%s: key \"%s\" is unknown\n"), identifier, name); _("%s: key \"%s\" is unknown\n"), identifier, name);
#ifdef HAVE_LIBGPGME #ifdef HAVE_LIBGPGME
{ {
int answer; int answer = 0;
alpm_pgpkey_t fetch_key; alpm_pgpkey_t fetch_key;
memset(&fetch_key, 0, sizeof(fetch_key)); memset(&fetch_key, 0, sizeof(fetch_key));