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

Use archive_entry_set_perm instead of archive_entry_set_mode

Browse Source 
This patch fixes FS#12148 ('unstable' regular file).
I also changed the other archive_entry_set_mode usage in add.c to
archive_entry_set_perm.

Since I cannot find any relevant info in libarchive manual, I quote
Tim Kientzle (the author of libarchive) here, and I say thank you for
his help.

*** Tim Kientzle wrote *************************************

This is the problem in libalpm/util.c:

323    if(S_ISREG(st->st_mode)) {
324            archive_entry_set_mode(entry, 0644);
325    } else if(S_ISDIR(st->st_mode)) {
326            archive_entry_set_mode(entry, 0755);
327    }

Your example unstable.db.tar.gz is not empty.  It has
one entry in it, called "./".  That entry is marked
as a directory.  But, when you call archive_entry_set_mode(),
you are changing the file type!  archive_read_extract()
then creates the file /var/unstable as you requested.
(archive_read_extract() will replace an empty directory
with a file.)

You should either set the mode value correctly:

323    if(S_ISREG(st->st_mode)) {
324            archive_entry_set_mode(entry, IFREG | 0644);
325    } else if(S_ISDIR(st->st_mode)) {
326            archive_entry_set_mode(entry, IFDIR | 0755);
327    }

Or use archive_entry_set_perm(), which does not change
the file type:

323    if(S_ISREG(st->st_mode)) {
324            archive_entry_set_perm(entry, 0644);
325    } else if(S_ISDIR(st->st_mode)) {
326            archive_entry_set_perm(entry, 0755);
327    }

************************************************************

Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Nagy Gabor 2009-01-18 20:03:56 +01:00 committed by Dan McGee
parent 1191303f8b
commit 472e51b975
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libalpm/add.c
View File

@ -292,12 +292,12 @@ static int extract_single_file(struct archive *archive,
/* the install script goes inside the db */ /* the install script goes inside the db */
snprintf(filename, PATH_MAX, "%s%s-%s/install", db->path, snprintf(filename, PATH_MAX, "%s%s-%s/install", db->path,
newpkg->name, newpkg->version); newpkg->name, newpkg->version);
archive_entry_set_mode(entry, 0644); archive_entry_set_perm(entry, 0644);
} else if(strcmp(entryname, ".CHANGELOG") == 0) { } else if(strcmp(entryname, ".CHANGELOG") == 0) {
/* the changelog goes inside the db */ /* the changelog goes inside the db */
snprintf(filename, PATH_MAX, "%s%s-%s/changelog", db->path, snprintf(filename, PATH_MAX, "%s%s-%s/changelog", db->path,
newpkg->name, newpkg->version); newpkg->name, newpkg->version);
archive_entry_set_mode(entry, 0644); archive_entry_set_perm(entry, 0644);
} else if(*entryname == '.') { } else if(*entryname == '.') {
/* for now, ignore all files starting with '.' that haven't /* for now, ignore all files starting with '.' that haven't
* already been handled (for future possibilities) */ * already been handled (for future possibilities) */

4
lib/libalpm/util.c
View File

@ -310,9 +310,9 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn)
entryname = archive_entry_pathname(entry); entryname = archive_entry_pathname(entry);
if(S_ISREG(st->st_mode)) { if(S_ISREG(st->st_mode)) {
archive_entry_set_mode(entry, 0644); archive_entry_set_perm(entry, 0644);
} else if(S_ISDIR(st->st_mode)) { } else if(S_ISDIR(st->st_mode)) {
archive_entry_set_mode(entry, 0755); archive_entry_set_perm(entry, 0755);
} }
/* If a specific file was requested skip entries that don't match. */ /* If a specific file was requested skip entries that don't match. */