pkgtools

commit b05eb025f74807146bf6a7246a24bbdb017366b8
parent 8ef9a698eb59a049030c2173ca71303f76017053
Author: sin <sin@2f30.org>
Date:   Tue, 24 Jun 2014 16:41:02 +0100

Add pkgentry_{new,free}()

Diffstat:
M
pkg.c
 | 
39
++++++++++++++++++++++++---------------
M
pkg.h
 | 
2
++

2 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/pkg.c b/pkg.c
@@ -49,12 +49,7 @@ pkg_load(struct db *db, const char *file)
 			return NULL;
 		}
 
-		pe = emalloc(sizeof(*pe));
-		estrlcpy(path, db->prefix, sizeof(path));
-		estrlcat(path, "/", sizeof(path));
-		estrlcat(path, buf, sizeof(path));
-		estrlcpy(pe->path, path, sizeof(pe->path));
-		estrlcpy(pe->rpath, buf, sizeof(pe->rpath));
+		pe = pkgentry_new(db, buf);
 		TAILQ_INSERT_TAIL(&pkg->pe_head, pe, entry);
 	}
 	free(buf);
@@ -124,12 +119,7 @@ pkg_load_file(struct db *db, const char *file)
 		if (tmp[0] == '\0')
 			continue;
 
-		pe = emalloc(sizeof(*pe));
-		estrlcpy(path, db->prefix, sizeof(path));
-		estrlcat(path, "/", sizeof(path));
-		estrlcat(path, tmp, sizeof(path));
-		estrlcpy(pe->path, path, sizeof(pe->path));
-		estrlcpy(pe->rpath, tmp, sizeof(pe->rpath));
+		pe = pkgentry_new(db, tmp);
 		TAILQ_INSERT_TAIL(&pkg->pe_head, pe, entry);
 	}
 
@@ -303,7 +293,6 @@ pkg_collisions(struct pkg *pkg)
 	return ok;
 }
 
-/* Create a new package instance */
 struct pkg *
 pkg_new(const char *path, const char *name, const char *version)
 {
@@ -320,7 +309,6 @@ pkg_new(const char *path, const char *name, const char *version)
 	return pkg;
 }
 
-/* Release package instance */
 void
 pkg_free(struct pkg *pkg)
 {
@@ -328,9 +316,30 @@ pkg_free(struct pkg *pkg)
 
 	for (pe = TAILQ_FIRST(&pkg->pe_head); pe; pe = tmp) {
 		tmp = TAILQ_NEXT(pe, entry);
-		free(pe);
+		pkgentry_free(pe);
 	}
 	free(pkg->name);
 	free(pkg->version);
 	free(pkg);
 }
+
+struct pkgentry *
+pkgentry_new(struct db *db, const char *file)
+{
+	struct pkgentry *pe;
+	char path[PATH_MAX];
+
+	pe = emalloc(sizeof(*pe));
+	estrlcpy(path, db->prefix, sizeof(path));
+	estrlcat(path, "/", sizeof(path));
+	estrlcat(path, file, sizeof(path));
+	estrlcpy(pe->path, path, sizeof(pe->path));
+	estrlcpy(pe->rpath, file, sizeof(pe->rpath));
+	return pe;
+}
+
+void
+pkgentry_free(struct pkgentry *pe)
+{
+	free(pe);
+}
diff --git a/pkg.h b/pkg.h
@@ -89,6 +89,8 @@ int pkg_remove(struct db *, struct pkg *);
 int pkg_collisions(struct pkg *);
 struct pkg *pkg_new(const char *, const char *, const char *);
 void pkg_free(struct pkg *);
+struct pkgentry *pkgentry_new(struct db *, const char *);
+void pkgentry_free(struct pkgentry *);
 
 /* reject.c */
 void rej_free(struct db *);