emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-create: when adding entries to archive, copy data with one read().

Browse Source 
(cherry picked from commit 1263e4555a25c4118647104563c92af9bfbe5005)
This commit is contained in:
Juan RP 2012-09-23 02:49:32 +02:00
parent b478f6d774
commit d3bb6fe13e
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bin/xbps-create/main.c
View File

@ -318,7 +318,8 @@ process_entry_file(struct archive *ar, struct xentry *xe, const char *filematch)
{ {
struct archive *ard; struct archive *ard;
struct archive_entry *entry; struct archive_entry *entry;
char buf[BUFSIZ], *p; struct stat st;
char *buf, *p;
int fd; int fd;
size_t len; size_t len;
@ -341,19 +342,28 @@ process_entry_file(struct archive *ar, struct xentry *xe, const char *filematch)
assert(p); assert(p);
if ((fd = open(p, O_RDONLY)) == -1) if ((fd = open(p, O_RDONLY)) == -1)
die("failed to add entry (open) %s %s to archive:", xe->file); die("failed to add entry (open) %s to archive:", xe->file);
if (fstat(fd, &st) == -1)
die("failed to add entry (fstat) %s to archive:", xe->file);
if (st.st_size >= SSIZE_MAX)
die("failed to add entry (SSIZE_MAX) %s to archive:", xe->file);
if ((archive_read_disk_entry_from_file(ard, entry, fd, NULL)) != 0) if ((archive_read_disk_entry_from_file(ard, entry, fd, NULL)) != 0)
die("failed to add entry %s to archive:", xe->file); die("failed to add entry %s to archive:", xe->file);
archive_write_header(ar, entry); archive_write_header(ar, entry);
buf = malloc(st.st_size+1);
while ((len = read(fd, buf, sizeof(buf))) > 0) assert(buf);
archive_write_data(ar, buf, len); len = read(fd, buf, st.st_size);
archive_write_data(ar, buf, len);
free(buf);
free(p); free(p);
close(fd); close(fd);
archive_entry_free(entry); archive_entry_free(entry);
archive_read_close(ard);
archive_read_free(ard); archive_read_free(ard);
} }
@ -668,6 +678,8 @@ main(int argc, char **argv)
process_archive(ar, pkgver, quiet); process_archive(ar, pkgver, quiet);
archive_write_free(ar); archive_write_free(ar);
prop_object_release(pkg_propsd);
prop_object_release(pkg_filesd);
/* /*
* Archive was created successfully; flush data to storage, * Archive was created successfully; flush data to storage,
* set permissions and rename to dest file; from the caller's * set permissions and rename to dest file; from the caller's
@ -694,8 +706,6 @@ main(int argc, char **argv)
free(binpkg); free(binpkg);
free(pkgname); free(pkgname);
close(pkg_fd); close(pkg_fd);
prop_object_release(pkg_propsd);
prop_object_release(pkg_filesd);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }