d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify file type setting.

Browse Source
This commit is contained in:
kientzle 2008-02-19 05:54:24 +00:00
parent c300e636ea
commit 5b631adaa6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libarchive/archive_read_support_format_ar.c
View File

@ -268,8 +268,7 @@ archive_read_format_ar_read_header(struct archive_read *a,
/* This must come before any call to _read_ahead. */ /* This must come before any call to _read_ahead. */
ar_parse_common_header(ar, entry, h); ar_parse_common_header(ar, entry, h);
archive_entry_copy_pathname(entry, filename); archive_entry_copy_pathname(entry, filename);
archive_entry_set_mode(entry, archive_entry_set_filetype(entry, AE_IFREG);
S_IFREG | (archive_entry_mode(entry) & 0777));
/* Get the size of the filename table. */ /* Get the size of the filename table. */
number = ar_atol10(h + AR_size_offset, AR_size_size); number = ar_atol10(h + AR_size_offset, AR_size_size);
if (number > SIZE_MAX) { if (number > SIZE_MAX) {
@ -375,8 +374,7 @@ archive_read_format_ar_read_header(struct archive_read *a,
/* Parse the time, owner, mode, size fields. */ /* Parse the time, owner, mode, size fields. */
r = ar_parse_common_header(ar, entry, h); r = ar_parse_common_header(ar, entry, h);
/* Force the file type to a regular file. */ /* Force the file type to a regular file. */
archive_entry_set_mode(entry, archive_entry_set_filetype(entry, AE_IFREG);
S_IFREG | (archive_entry_mode(entry) & 0777));
return (r); return (r);
} }