Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2011-07-06 18:26:56 +0200
committerDan McGee <dan@archlinux.org>2011-07-18 10:44:28 -0500
commitdad96ccce2eea8b171cd2d14ec20b8185f0009a8 (patch)
tree70f8c007e16370b2fef1f97fc5a6ccec6158da06
parent89c070b263a9e1e4e0734b25c8bc33367a34e504 (diff)
replace access() calls for debug info where applicable
Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/remove.c2
-rw-r--r--lib/libalpm/signing.c4
-rw-r--r--lib/libalpm/trans.c3
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index c2a8ad2c..2c5d98cb 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -205,7 +205,7 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file,
}
/* If we fail write permissions due to a read-only filesystem, abort.
* Assume all other possible failures are covered somewhere else */
- if(access(filepath, W_OK) == -1) {
+ if(_alpm_access(handle, NULL, filepath, W_OK) == -1) {
if(errno != EACCES && errno != ETXTBSY && access(filepath, F_OK) == 0) {
/* only return failure if the file ACTUALLY exists and we can't write to
* it - ignore "chmod -w" simple permission failures */
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index 819e5f54..275851c2 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -225,7 +225,7 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
unsigned char *decoded_sigdata = NULL;
FILE *file = NULL, *sigfile = NULL;
- if(!path || access(path, R_OK) != 0) {
+ if(!path || _alpm_access(handle, NULL, path, R_OK) != 0) {
RET_ERR(handle, ALPM_ERR_NOT_A_FILE, -1);
}
@@ -239,7 +239,7 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
CALLOC(sigpath, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1));
snprintf(sigpath, len, "%s.sig", path);
- if(!access(sigpath, R_OK) == 0) {
+ if(!_alpm_access(handle, NULL, sigpath, R_OK) == 0) {
/* sigcount is 0 */
}
}
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index 6cea9b7c..1bab830d 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -288,8 +288,7 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn,
int clean_tmpdir = 0;
int retval = 0;
- if(access(installfn, R_OK)) {
- /* not found */
+ if(_alpm_access(handle, NULL, installfn, R_OK) != 0) {
_alpm_log(handle, ALPM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn);
return 0;
}