dcbaker
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid copying memory, do a single duplication

feature/tap-sh
Baptiste Daroussin 2012-08-14 17:13:28 +02:00
parent 28396110aa
commit 0ab3b32255
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dependency.c
View File

@ -37,15 +37,15 @@ typedef enum {
#define DEBUG_PARSE 0 #define DEBUG_PARSE 0
static inline pkg_dependency_t * static inline pkg_dependency_t *
pkg_dependency_add(pkg_dependency_t *head, const char *package, const char *version, pkg_comparator_t compare) pkg_dependency_add(pkg_dependency_t *head, const char *package, size_t package_sz, const char *version, size_t version_sz, pkg_comparator_t compare)
{ {
pkg_dependency_t *dep; pkg_dependency_t *dep;
dep = calloc(sizeof(pkg_dependency_t), 1); dep = calloc(sizeof(pkg_dependency_t), 1);
dep->package = strdup(package); dep->package = strndup(package, package_sz);
if (version != NULL) if (version_sz != 0)
dep->version = strdup(version); dep->version = strndup(version, version_sz);
dep->compare = compare; dep->compare = compare;
@ -105,12 +105,11 @@ pkg_dependency_parse_str(pkg_dependency_t *deplist_head, const char *depends)
pkg_dependency_t *deplist = NULL; pkg_dependency_t *deplist = NULL;
pkg_comparator_t compare = PKG_ANY; pkg_comparator_t compare = PKG_ANY;
char buf[PKG_BUFSIZE]; char buf[PKG_BUFSIZE];
char package[PKG_BUFSIZE]; size_t package_sz, version_sz;
char version[PKG_BUFSIZE];
char *start = buf; char *start = buf;
char *ptr = buf; char *ptr = buf;
char *vstart = NULL; char *vstart = NULL;
/* char *package = NULL, *version = NULL;*/ char *package = NULL, *version = NULL;
strlcpy(buf, depends, sizeof buf); strlcpy(buf, depends, sizeof buf);
strlcat(buf, " ", sizeof buf); strlcat(buf, " ", sizeof buf);
@ -157,8 +156,8 @@ pkg_dependency_parse_str(pkg_dependency_t *deplist_head, const char *depends)
while (PKG_MODULE_SEPARATOR(*iter)) while (PKG_MODULE_SEPARATOR(*iter))
iter++; iter++;
strlcpy(package, iter, sizeof package); package = iter;
package[ptr - iter] = '\0'; package_sz = ptr - iter;
#if DEBUG_PARSE #if DEBUG_PARSE
fprintf(error_msgout, "Found package: %s\n", package); fprintf(error_msgout, "Found package: %s\n", package);
#endif #endif
@ -167,7 +166,7 @@ pkg_dependency_parse_str(pkg_dependency_t *deplist_head, const char *depends)
if (state == OUTSIDE_MODULE) if (state == OUTSIDE_MODULE)
{ {
deplist = pkg_dependency_add(deplist, package, NULL, compare); deplist = pkg_dependency_add(deplist, package, package_sz, NULL, 0, compare);
if (deplist_head == NULL) if (deplist_head == NULL)
deplist_head = deplist; deplist_head = deplist;
@ -238,14 +237,14 @@ pkg_dependency_parse_str(pkg_dependency_t *deplist_head, const char *depends)
case INSIDE_VERSION: case INSIDE_VERSION:
if (PKG_MODULE_SEPARATOR(*ptr) || *(ptr + 1) == '\0') if (PKG_MODULE_SEPARATOR(*ptr) || *(ptr + 1) == '\0')
{ {
strlcpy(version, vstart, sizeof version); version = vstart;
version[ptr - vstart] = '\0'; version_sz = ptr - vstart;
state = OUTSIDE_MODULE; state = OUTSIDE_MODULE;
#if DEBUG_PARSE #if DEBUG_PARSE
fprintf(error_msgout, "Found version: %s\n", version); fprintf(error_msgout, "Found version: %s\n", version);
#endif #endif
deplist = pkg_dependency_add(deplist, package, version, compare); deplist = pkg_dependency_add(deplist, package, package_sz, version, version_sz, compare);
if (deplist_head == NULL) if (deplist_head == NULL)
deplist_head = deplist; deplist_head = deplist;