moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-12 04:15:06 -05:00
Code Issues Releases Wiki Activity

use full path when checking for mountpoints

Browse Source 
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2013-07-04 06:36:20 -04:00 committed by Allan McRae
parent eb19d41d5f
commit 897e2b121a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libalpm/remove.c
View File

@ -267,6 +267,16 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data)
return 0; return 0;
} }
/**
* @brief Test if a directory is being used as a mountpoint.
*
* @param handle context handle
* @param directory path to test, must be absolute and include trailing '/'
* @param stbuf stat result for @a directory, may be NULL
*
* @return 0 if @a directory is not a mountpoint or on error, 1 if @a directory
* is a mountpoint
*/
static int dir_is_mountpoint(alpm_handle_t *handle, const char *directory, static int dir_is_mountpoint(alpm_handle_t *handle, const char *directory,
const struct stat *stbuf) const struct stat *stbuf)
{ {
@ -317,13 +327,14 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file,
return 1; return 1;
} }
snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name);
if(file->name[strlen(file->name) - 1] == '/' && if(file->name[strlen(file->name) - 1] == '/' &&
dir_is_mountpoint(handle, file->name, NULL)) { dir_is_mountpoint(handle, filepath, NULL)) {
/* we do not remove mountpoints */ /* we do not remove mountpoints */
return 1; return 1;
} }
snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name);
/* If we fail write permissions due to a read-only filesystem, abort. /* If we fail write permissions due to a read-only filesystem, abort.
* Assume all other possible failures are covered somewhere else */ * Assume all other possible failures are covered somewhere else */
if(_alpm_access(handle, NULL, filepath, W_OK) == -1) { if(_alpm_access(handle, NULL, filepath, W_OK) == -1) {