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

xbps_dictionary_from_archive_entry: simplify and sync zlib code with proplib.

Browse Source
This commit is contained in:
Juan RP 2012-06-20 09:26:00 +02:00
parent 11ca0d481b
commit 54bc92bd97
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/xbps_api.h
View File

@ -56,7 +56,7 @@
*/ */
#define XBPS_PKGINDEX_VERSION "1.5" #define XBPS_PKGINDEX_VERSION "1.5"
#define XBPS_API_VERSION "20120618-1" #define XBPS_API_VERSION "20120620"
#define XBPS_VERSION "0.16" #define XBPS_VERSION "0.16"
/** /**

31
lib/plist_archive_entry.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2008-2011 Juan Romero Pardines. * Copyright (c) 2008-2012 Juan Romero Pardines.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -36,13 +36,13 @@
* Takes a compressed data buffer, decompresses it and returns the * Takes a compressed data buffer, decompresses it and returns the
* new buffer uncompressed if all was right. * new buffer uncompressed if all was right.
*/ */
#define _READ_CHUNK 512 #define _READ_CHUNK 8192
static char * static char *
_xbps_uncompress_plist_data(char *xml, size_t len) _xbps_uncompress_plist_data(char *xml, size_t len)
{ {
z_stream strm; z_stream strm;
unsigned char out[_READ_CHUNK]; unsigned char *out;
char *uncomp_xml = NULL; char *uncomp_xml = NULL;
size_t have; size_t have;
ssize_t totalsize = 0; ssize_t totalsize = 0;
@ -65,12 +65,18 @@ _xbps_uncompress_plist_data(char *xml, size_t len)
strm.next_in = (unsigned char *)xml; strm.next_in = (unsigned char *)xml;
/* Output buffer (uncompressed) */ /* Output buffer (uncompressed) */
uncomp_xml = malloc(_READ_CHUNK); if ((uncomp_xml = malloc(_READ_CHUNK)) == NULL) {
if (uncomp_xml == NULL) {
(void)inflateEnd(&strm); (void)inflateEnd(&strm);
return NULL; return NULL;
} }
/* temp output buffer for inflate */
if ((out = malloc(_READ_CHUNK)) == NULL) {
(void)inflateEnd(&strm);
free(uncomp_xml);
return NULL;
}
/* Inflate the input buffer and copy into 'uncomp_xml' */ /* Inflate the input buffer and copy into 'uncomp_xml' */
do { do {
strm.avail_out = _READ_CHUNK; strm.avail_out = _READ_CHUNK;
@ -84,6 +90,7 @@ _xbps_uncompress_plist_data(char *xml, size_t len)
*/ */
(void)inflateEnd(&strm); (void)inflateEnd(&strm);
free(uncomp_xml); free(uncomp_xml);
free(out);
errno = EAGAIN; errno = EAGAIN;
return NULL; return NULL;
case Z_STREAM_ERROR: case Z_STREAM_ERROR:
@ -93,6 +100,7 @@ _xbps_uncompress_plist_data(char *xml, size_t len)
case Z_VERSION_ERROR: case Z_VERSION_ERROR:
(void)inflateEnd(&strm); (void)inflateEnd(&strm);
free(uncomp_xml); free(uncomp_xml);
free(out);
return NULL; return NULL;
} }
have = _READ_CHUNK - strm.avail_out; have = _READ_CHUNK - strm.avail_out;
@ -103,6 +111,7 @@ _xbps_uncompress_plist_data(char *xml, size_t len)
/* we are done */ /* we are done */
(void)inflateEnd(&strm); (void)inflateEnd(&strm);
free(out);
return uncomp_xml; return uncomp_xml;
} }
@ -132,30 +141,20 @@ xbps_dictionary_from_archive_entry(struct archive *ar,
} }
uncomp_buf = _xbps_uncompress_plist_data(buf, buflen); uncomp_buf = _xbps_uncompress_plist_data(buf, buflen);
free(buf);
if (uncomp_buf == NULL) { if (uncomp_buf == NULL) {
if (errno && errno != EAGAIN) { if (errno && errno != EAGAIN) {
/* Error while decompressing */ /* Error while decompressing */
free(buf);
return NULL; return NULL;
} else if (errno == EAGAIN) { } else if (errno == EAGAIN) {
/* Not a compressed data, try again */ /* Not a compressed data, try again */
errno = 0; errno = 0;
d = prop_dictionary_internalize(buf); d = prop_dictionary_internalize(buf);
free(buf);
} }
} else { } else {
/* We have the uncompressed data */ /* We have the uncompressed data */
d = prop_dictionary_internalize(uncomp_buf); d = prop_dictionary_internalize(uncomp_buf);
free(uncomp_buf); free(uncomp_buf);
free(buf);
} }
if (d == NULL)
return NULL;
else if (prop_object_type(d) != PROP_TYPE_DICTIONARY) {
prop_object_release(d);
return NULL;
}
return d; return d;
} }