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

extract_single_file: consolidate symlink cases

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-03-10 15:34:52 -04:00 committed by Allan McRae
parent c91d948486
commit bc3e73fc8f
2 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/libalpm/add.c
View File

@ -197,30 +197,25 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
* to get 'right'. Here are the possibilities, with the filesystem * to get 'right'. Here are the possibilities, with the filesystem
* on the left and the package on the top: * on the left and the package on the top:
* (F=file, N=node, S=symlink, D=dir) * (F=file, N=node, S=symlink, D=dir)
* | F/N | S | D * | F/N | D
* non-existent | 1 | 2 | 3 * non-existent | 1 | 2
* F/N | 4 | 5 | 6 * F/N | 3 | 4
* S | 7 | 8 | 9 * D | 5 | 6
* D | 10 | 11 | 12
* *
* 1,2,3- extract, no magic necessary. lstat (_alpm_lstat) will fail here. * 1,2- extract, no magic necessary. lstat (_alpm_lstat) will fail here.
* 4,5,6,7,8- conflict checks should have caught this. either overwrite * 3,4- conflict checks should have caught this. either overwrite
* or backup the file. * or backup the file.
* 9- follow the symlink, hopefully it is a directory, check it. * 5- file replacing directory- don't allow it.
* 10- file replacing directory- don't allow it. * 6- skip extraction, dir already exists.
* 11- don't extract symlink- a dir exists here. we don't want links to
* links, etc.
* 12- skip extraction, dir already exists.
*/ */
/* do both a lstat and a stat, so we can see what symlinks point to */ struct stat lsbuf;
struct stat lsbuf, sbuf; if(_alpm_lstat(filename, &lsbuf) != 0) {
if(_alpm_lstat(filename, &lsbuf) != 0 || stat(filename, &sbuf) != 0) { /* cases 1,2: file doesn't exist, skip all backup checks */
/* cases 1,2,3: couldn't stat an existing file, skip all backup checks */
} else { } else {
if(S_ISDIR(lsbuf.st_mode)) { if(S_ISDIR(lsbuf.st_mode)) {
if(S_ISDIR(entrymode)) { if(S_ISDIR(entrymode)) {
/* case 12: existing dir, ignore it */ /* case 6: existing dir, ignore it */
if(lsbuf.st_mode != entrymode) { if(lsbuf.st_mode != entrymode) {
/* if filesystem perms are different than pkg perms, warn user */ /* if filesystem perms are different than pkg perms, warn user */
mode_t mask = 07777; mode_t mask = 07777;
@ -237,33 +232,18 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
archive_read_data_skip(archive); archive_read_data_skip(archive);
return 0; return 0;
} else { } else {
/* case 10/11: trying to overwrite dir with file/symlink, don't allow it */ /* case 5: trying to overwrite dir with file, don't allow it */
_alpm_log(handle, ALPM_LOG_ERROR, _("extract: not overwriting dir with file %s\n"), _alpm_log(handle, ALPM_LOG_ERROR, _("extract: not overwriting dir with file %s\n"),
filename); filename);
archive_read_data_skip(archive); archive_read_data_skip(archive);
return 1; return 1;
} }
} else if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(entrymode)) { } else if(S_ISDIR(entrymode)) {
/* case 9: existing symlink, dir in package */ /* case 4: trying to overwrite file with dir */
if(S_ISDIR(sbuf.st_mode)) {
/* the symlink on FS is to a directory, so we'll use it */
_alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping symlink overwrite of %s\n",
filename);
archive_read_data_skip(archive);
return 0;
} else {
/* this is BAD. symlink was not to a directory */
_alpm_log(handle, ALPM_LOG_ERROR, _("extract: symlink %s does not point to dir\n"),
filename);
archive_read_data_skip(archive);
return 1;
}
} else if(S_ISREG(lsbuf.st_mode) && S_ISDIR(entrymode)) {
/* case 6: trying to overwrite file with dir */
_alpm_log(handle, ALPM_LOG_DEBUG, "extract: overwriting file with dir %s\n", _alpm_log(handle, ALPM_LOG_DEBUG, "extract: overwriting file with dir %s\n",
filename); filename);
} else if(S_ISREG(entrymode)) { } else {
/* case 4,7: */ /* case 3: */
/* if file is in NoUpgrade, don't touch it */ /* if file is in NoUpgrade, don't touch it */
if(alpm_list_find(handle->noupgrade, entryname, _alpm_fnmatch)) { if(alpm_list_find(handle->noupgrade, entryname, _alpm_fnmatch)) {
notouch = 1; notouch = 1;
@ -286,8 +266,6 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
} }
} }
} }
/* else if(S_ISLNK(entrymode)) */
/* case 5,8: don't need to do anything special */
} }
/* we need access to the original entryname later after calls to /* we need access to the original entryname later after calls to

3
test/pacman/tests/upgrade045.py
View File

@ -14,4 +14,5 @@ self.args = "-U %s" % p1.filename()
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=foo|1.0-2") self.addrule("PKG_VERSION=foo|1.0-2")
self.addrule("FILE_EXIST=etc/foo.cfg") self.addrule("LINK_EXIST=etc/foo.cfg")
self.addrule("FILE_EXIST=etc/foo.cfg.pacnew")