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

Since I'm not using the public API for writing

Browse Source 
the the pax attributes, I shouldn't try using the public
API for finishing out the attribute entry, either.

This also removes some old dubious state manipulations.
This commit is contained in:
Tim Kientzle 2004-11-15 01:46:33 +00:00
parent 5c79ebdbd7
commit 890e938dc3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libarchive/archive_write_set_format_pax.c
View File

@ -315,7 +315,7 @@ archive_write_pax_header(struct archive *a,
const char *linkname, *p;
const char *hardlink;
const wchar_t *wp, *wp2, *wname_start;
int need_extension, oldstate, r, ret;
int need_extension, r, ret;
struct pax *pax;
const struct stat *st_main, *st_original;
@ -672,17 +672,19 @@ archive_write_pax_header(struct archive *a,
pax->entry_bytes_remaining = archive_strlen(&(pax->pax_header));
pax->entry_padding = 0x1ff & (- pax->entry_bytes_remaining);
oldstate = a->state;
a->state = ARCHIVE_STATE_DATA;
r = (a->compression_write)(a, pax->pax_header.s,
archive_strlen(&(pax->pax_header)));
a->state = oldstate;
if (r != ARCHIVE_OK) {
/* If a write fails, we're pretty much toast. */
return (ARCHIVE_FATAL);
}
archive_write_pax_finish_entry(a);
/* Pad out the end of the entry. */
r = write_nulls(a, pax->entry_padding);
if (r != ARCHIVE_OK) {
/* If a write fails, we're pretty much toast. */
return (ARCHIVE_FATAL);
}
pax->entry_bytes_remaining = pax->entry_padding = 0;
}
/* Write the header for main entry. */