X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fpkg_parse.c;h=0baa4db396569be816386b50568c57e12d1cd98c;hp=246705e8f2549ae2d2270489dcd7ff880ccaee31;hb=ebdfc128a7bc527c1c960eef6105b1ff91e48bdc;hpb=1e92bab925599c6162c7824d20ec70fca6f9fe59

diff --git a/libopkg/pkg_parse.c b/libopkg/pkg_parse.c
index 246705e..0baa4db 100644
--- a/libopkg/pkg_parse.c
+++ b/libopkg/pkg_parse.c
@@ -1,7 +1,8 @@
 /* pkg_parse.c - the opkg package management system
 
+   Copyright (C) 2009 Ubiq Technologies <graham.gower@gmail.com>
+
    Steven M. Ayer
-   
    Copyright (C) 2002 Compaq Computer Corporation
 
    This program is free software; you can redistribute it and/or
@@ -15,109 +16,54 @@
    General Public License for more details.
 */
 
-#include "includes.h"
-#include <errno.h>
+#include <stdio.h>
 #include <ctype.h>
-   
+#include <unistd.h>
+
 #include "pkg.h"
 #include "opkg_utils.h"
 #include "pkg_parse.h"
+#include "pkg_depends.h"
 #include "libbb/libbb.h"
 
-static int
-is_field(char *type, const char *line)
-{
-	if (!strncmp(line, type, strlen(type)))
-		return 1;
-	return 0;
-}
-
-static char *
-parse_simple(char *type, const char *line)
-{
-	return trim_xstrdup(line + strlen(type) + 1);
-}
-
-/*
- * Parse a comma separated string into an array.
- */
-static char **
-parse_comma_separated(const char *raw, int *count)
-{
-	char **depends = NULL;
-	const char *start, *end;
-	int line_count = 0;
-
-	/* skip past the "Field:" marker */
-	while (*raw && *raw != ':')
-		raw++;
-	raw++;
-
-	if (line_is_blank(raw)) {
-		*count = line_count;
-		return NULL;
-	}
-
-	while (*raw) {
-		depends = xrealloc(depends, sizeof(char *) * (line_count + 1));
-	
-		while (isspace(*raw))
-			raw++;
+#include "file_util.h"
+#include "parse_util.h"
 
-		start = raw;
-		while (*raw != ',' && *raw)
-			raw++;
-		end = raw;
-
-		while (end > start && isspace(*end))
-			end--;
-
-		depends[line_count] = xstrndup(start, end-start);
-
-        	line_count++;
-		if (*raw == ',')
-		    raw++;
-	}
-
-	*count = line_count;
-	return depends;
-}
-
-static void
-parse_status(pkg_t *pkg, const char *sstr)
+static void parse_status(pkg_t * pkg, const char *sstr)
 {
 	char sw_str[64], sf_str[64], ss_str[64];
 
-	if (sscanf(sstr, "Status: %63s %63s %63s",
-				sw_str, sf_str, ss_str) != 3) {
-		fprintf(stderr, "%s: failed to parse Status line for %s\n",
-				__FUNCTION__, pkg->name);
+	if (sscanf(sstr, "Status: %63s %63s %63s", sw_str, sf_str, ss_str) != 3) {
+		opkg_msg(ERROR, "Failed to parse Status line for %s\n",
+			 pkg->name);
 		return;
 	}
 
 	pkg->state_want = pkg_state_want_from_str(sw_str);
-	pkg->state_flag = pkg_state_flag_from_str(sf_str);
+	pkg->state_flag |= pkg_state_flag_from_str(sf_str);
 	pkg->state_status = pkg_state_status_from_str(ss_str);
 }
 
-static void
-parse_conffiles(pkg_t *pkg, const char *cstr)
+static void parse_conffiles(pkg_t * pkg, const char *cstr)
 {
-	char file_name[1024], md5sum[35];
+	conffile_list_t *cl;
+	char file_name[1024], md5sum[85];
 
-	if (sscanf(cstr, "%1023s %34s", file_name, md5sum) != 2) {
-		fprintf(stderr, "%s: failed to parse Conffiles line for %s\n",
-				__FUNCTION__, pkg->name);
+	if (sscanf(cstr, "%1023s %84s", file_name, md5sum) != 2) {
+		opkg_msg(ERROR, "Failed to parse Conffiles line for %s\n",
+			 pkg->name);
 		return;
 	}
 
-	conffile_list_append(&pkg->conffiles, file_name, md5sum);
+	cl = pkg_get_ptr(pkg, PKG_CONFFILES);
+
+	if (cl)
+		conffile_list_append(cl, file_name, md5sum);
 }
 
-int
-parse_version(pkg_t *pkg, const char *vstr)
+int parse_version(pkg_t * pkg, const char *vstr)
 {
-	char *colon;
+	char *colon, *dup, *rev;
 
 	if (strncmp(vstr, "Version:", 8) == 0)
 		vstr += 8;
@@ -128,39 +74,149 @@ parse_version(pkg_t *pkg, const char *vstr)
 	colon = strchr(vstr, ':');
 	if (colon) {
 		errno = 0;
-		pkg->epoch = strtoul(vstr, NULL, 10);
+		pkg_set_int(pkg, PKG_EPOCH, strtoul(vstr, NULL, 10));
 		if (errno) {
-			fprintf(stderr, "%s: %s: invalid epoch: %s\n",
-				__FUNCTION__, pkg->name, strerror(errno));
+			opkg_perror(ERROR, "%s: invalid epoch", pkg->name);
 		}
 		vstr = ++colon;
-	} else {
-		pkg->epoch= 0;
 	}
 
-	pkg->version= xstrdup(vstr);
-	pkg->revision = strrchr(pkg->version,'-');
 
-	if (pkg->revision)
-		*pkg->revision++ = '\0';
+	dup = xstrdup(vstr);
+	rev = strrchr(dup, '-');
+
+	if (rev) {
+		*rev++ = '\0';
+		pkg_set_string(pkg, PKG_REVISION, rev);
+	}
+
+	pkg_set_string(pkg, PKG_VERSION, dup);
+	free(dup);
 
 	return 0;
 }
 
-static int
-pkg_parse_line(pkg_t *pkg, const char *line, uint mask)
+static char *parse_architecture(pkg_t *pkg, const char *str)
 {
+	const char *s = str;
+	const char *e;
+
+	while (isspace(*s))
+		s++;
+
+	e = s + strlen(s);
+
+	while (e > s && isspace(*e))
+		e--;
+
+	return pkg_set_architecture(pkg, s, e - s);
+}
+
+static void parse_alternatives(pkg_t *pkg, char *list)
+{
+	char *item, *tok;
+	struct pkg_alternatives *pkg_alts;
+	struct pkg_alternative **alts;
+	int nalts;
+
+	pkg_alts = pkg_get_ptr(pkg, PKG_ALTERNATIVES);
+	if (!pkg_alts) {
+		nalts = 0;
+		alts = NULL;
+	} else {
+		nalts = pkg_alts->nalts;
+		alts = pkg_alts->alts;
+	}
+
+	for (item = strtok_r(list, ",", &tok);
+			item;
+			item = strtok_r(NULL, ",", &tok)) {
+		enum pkg_alternative_field i;
+		char *val, *tok1;
+		/* the assignment was intended to quash the -Wmaybe-uninitialized warnings */
+		int prio = prio;
+		char *path = path, *altpath = altpath;
+
+		for (i = PAF_PRIO, val = strtok_r(item, ":", &tok1);
+				val && i < __PAF_MAX;
+				val = strtok_r(NULL, ":", &tok1), i++) {
+			switch (i) {
+				case PAF_PRIO:
+					prio = atoi(val);
+					break;
+				case PAF_PATH:
+					path = val;
+					break;
+				case PAF_ALTPATH:
+					altpath = val;
+					break;
+				default:
+					break;
+			}
+		}
+		if (!val && i == __PAF_MAX) {
+			char *_path, *_altpath;
+			struct pkg_alternative *alt;
+
+			/*
+			 * - path must be absolute
+			 * - altpath must be non-empty
+			 */
+			if (path[0] != '/' || !altpath[0])
+				continue;
+
+			alt = calloc_a(sizeof(*alt),
+					&_path, strlen(path) + 1,
+					&_altpath, strlen(altpath) + 1);
+			if (!alt)
+				continue;
+			strcpy(_path, path);
+			strcpy(_altpath, altpath);
+			alt->prio = prio;
+			alt->path = _path;
+			alt->altpath = _altpath;
+			alts = xrealloc(alts, sizeof(*alts) * (nalts + 1));
+			alts[nalts++] = alt;
+		}
+	}
+
+	if (nalts > 0) {
+		if (!pkg_alts)
+			pkg_alts = xmalloc(sizeof(*pkg_alts));
+		pkg_alts->nalts = nalts;
+		pkg_alts->alts = alts;
+		pkg_set_ptr(pkg, PKG_ALTERNATIVES, pkg_alts);
+	}
+}
+
+int pkg_parse_line(void *ptr, char *line, uint mask)
+{
+	pkg_t *pkg = (pkg_t *) ptr;
+	abstract_pkg_t *ab_pkg = NULL;
+	conffile_list_t *cl;
+
 	/* these flags are a bit hackish... */
 	static int reading_conffiles = 0, reading_description = 0;
+	static char *description = NULL;
+	int ret = 0;
+
+	/* Exclude globally masked fields. */
+	mask |= conf->pfm;
+
+	/* Flip the semantics of the mask. */
+	mask ^= PFM_ALL;
 
 	switch (*line) {
 	case 'A':
-		if ((mask & PFM_ARCHITECTURE ) && is_field("Architecture", line))
-			pkg->architecture = parse_simple("Architecture", line);
-		else if ((mask & PFM_AUTO_INSTALLED) && is_field("Auto-Installed", line)) {
+		if ((mask & PFM_ALTERNATIVES) && is_field("Alternatives", line))
+			parse_alternatives(pkg, line + strlen("Alternatives") + 1);
+		else if ((mask & PFM_ARCHITECTURE) && is_field("Architecture", line))
+			parse_architecture(pkg, line + strlen("Architecture") + 1);
+		else if ((mask & PFM_AUTO_INSTALLED)
+			   && is_field("Auto-Installed", line)) {
 			char *tmp = parse_simple("Auto-Installed", line);
 			if (strcmp(tmp, "yes") == 0)
-			    pkg->auto_installed = 1;
+				pkg->auto_installed = 1;
 			free(tmp);
 		}
 		break;
@@ -169,24 +225,29 @@ pkg_parse_line(pkg_t *pkg, const char *line, uint mask)
 		if ((mask & PFM_CONFFILES) && is_field("Conffiles", line)) {
 			reading_conffiles = 1;
 			reading_description = 0;
+
+			cl = xcalloc(1, sizeof(*cl));
+			conffile_list_init(cl);
+			pkg_set_ptr(pkg, PKG_CONFFILES, cl);
+
 			goto dont_reset_flags;
-	    	}
-		else if ((mask & PFM_CONFLICTS) && is_field("Conflicts", line))
-			pkg->conflicts_str = parse_comma_separated(line, &pkg->conflicts_count);
+		} else if ((mask & PFM_CONFLICTS)
+			   && is_field("Conflicts", line))
+			parse_deplist(pkg, CONFLICTS, line + strlen("Conflicts") + 1);
 		break;
 
 	case 'D':
 		if ((mask & PFM_DESCRIPTION) && is_field("Description", line)) {
-			pkg->description = parse_simple("Description", line);
+			description = parse_simple("Description", line);
 			reading_conffiles = 0;
 			reading_description = 1;
 			goto dont_reset_flags;
 		} else if ((mask & PFM_DEPENDS) && is_field("Depends", line))
-			pkg->depends_str = parse_comma_separated(line, &pkg->depends_count);
+			parse_deplist(pkg, DEPEND, line + strlen("Depends") + 1);
 		break;
 
 	case 'E':
-		if((mask & PFM_ESSENTIAL) && is_field("Essential", line)) {
+		if ((mask & PFM_ESSENTIAL) && is_field("Essential", line)) {
 			char *tmp = parse_simple("Essential", line);
 			if (strcmp(tmp, "yes") == 0)
 				pkg->essential = 1;
@@ -195,71 +256,74 @@ pkg_parse_line(pkg_t *pkg, const char *line, uint mask)
 		break;
 
 	case 'F':
-		if((mask & PFM_FILENAME) && is_field("Filename", line))
-			pkg->filename = parse_simple("Filename", line);
+		if ((mask & PFM_FILENAME) && is_field("Filename", line))
+			pkg_set_string(pkg, PKG_FILENAME, line + strlen("Filename") + 1);
 		break;
 
 	case 'I':
-		if ((mask && PFM_INSTALLED_SIZE) && is_field("Installed-Size", line))
-			pkg->installed_size = parse_simple("Installed-Size", line);
-		else if ((mask && PFM_INSTALLED_TIME) && is_field("Installed-Time", line)) {
-			char *tmp = parse_simple("Installed-Time", line);
-			pkg->installed_time = strtoul(tmp, NULL, 0);
-			free (tmp);
-		}	    
+		if ((mask & PFM_INSTALLED_SIZE)
+		    && is_field("Installed-Size", line)) {
+			pkg_set_int(pkg, PKG_INSTALLED_SIZE, strtoul(line + strlen("Installed-Size") + 1, NULL, 0));
+		} else if ((mask & PFM_INSTALLED_TIME)
+			   && is_field("Installed-Time", line)) {
+			pkg_set_int(pkg, PKG_INSTALLED_TIME, strtoul(line + strlen("Installed-Time") + 1, NULL, 0));
+		}
 		break;
 
 	case 'M':
-		if (mask && PFM_MD5SUM) {
-			if (is_field("MD5sum:", line))
-				pkg->md5sum = parse_simple("MD5sum", line);
-			/* The old opkg wrote out status files with the wrong
-			* case for MD5sum, let's parse it either way */
-			else if (is_field("MD5Sum:", line))
-				pkg->md5sum = parse_simple("MD5Sum", line);
-		} else if((mask & PFM_MAINTAINER) && is_field("Maintainer", line))
-			pkg->maintainer = parse_simple("Maintainer", line);
+		if ((mask & PFM_MD5SUM) && (is_field("MD5sum:", line) || is_field("MD5Sum:", line)))
+			pkg_set_md5(pkg, line + strlen("MD5sum") + 1);
+		else if ((mask & PFM_MAINTAINER)
+			 && is_field("Maintainer", line))
+			pkg_set_string(pkg, PKG_MAINTAINER, line + strlen("Maintainer") + 1);
 		break;
 
 	case 'P':
-		if ((mask & PFM_PACKAGE) && is_field("Package", line)) 
+		if ((mask & PFM_PACKAGE) && is_field("Package", line)) {
 			pkg->name = parse_simple("Package", line);
+			ab_pkg = abstract_pkg_fetch_by_name(pkg->name);
+
+			if (ab_pkg && (ab_pkg->state_flag & SF_NEED_DETAIL)) {
+				if (!(pkg->state_flag & SF_NEED_DETAIL)) {
+					opkg_msg(DEBUG, "propagating abpkg flag to pkg %s\n", pkg->name);
+					pkg->state_flag |= SF_NEED_DETAIL;
+				}
+			}
+		}
 		else if ((mask & PFM_PRIORITY) && is_field("Priority", line))
-			pkg->priority = parse_simple("Priority", line);
+			pkg_set_string(pkg, PKG_PRIORITY, line + strlen("Priority") + 1);
 		else if ((mask & PFM_PROVIDES) && is_field("Provides", line))
-			pkg->provides_str = parse_comma_separated(line, &pkg->provides_count);
-		else if ((mask & PFM_PRE_DEPENDS) && is_field("Pre-Depends", line))
-			pkg->pre_depends_str = parse_comma_separated(line, &pkg->pre_depends_count);
+			parse_providelist(pkg, line + strlen("Provides") + 1);
+		else if ((mask & PFM_PRE_DEPENDS)
+			 && is_field("Pre-Depends", line))
+			parse_deplist(pkg, PREDEPEND, line + strlen("Pre-Depends") + 1);
 		break;
 
 	case 'R':
 		if ((mask & PFM_RECOMMENDS) && is_field("Recommends", line))
-			pkg->recommends_str = parse_comma_separated(line, &pkg->recommends_count);
+			parse_deplist(pkg, RECOMMEND, line + strlen("Recommends") + 1);
 		else if ((mask & PFM_REPLACES) && is_field("Replaces", line))
-			pkg->replaces_str = parse_comma_separated(line, &pkg->replaces_count);
-
+			parse_replacelist(pkg, line + strlen("Replaces") + 1);
 		break;
 
 	case 'S':
 		if ((mask & PFM_SECTION) && is_field("Section", line))
-			pkg->section = parse_simple("Section", line);
-#ifdef HAVE_SHA256
+			pkg_set_string(pkg, PKG_SECTION, line + strlen("Section") + 1);
 		else if ((mask & PFM_SHA256SUM) && is_field("SHA256sum", line))
-			pkg->sha256sum = parse_simple("SHA256sum", line);
-#endif
-		else if ((mask & PFM_SIZE) && is_field("Size", line))
-			pkg->size = parse_simple("Size", line);
-		else if ((mask & PFM_SOURCE) && is_field("Source", line))
-			pkg->source = parse_simple("Source", line);
+			pkg_set_sha256(pkg, line + strlen("SHA256sum") + 1);
+		else if ((mask & PFM_SIZE) && is_field("Size", line)) {
+			pkg_set_int(pkg, PKG_SIZE, strtoul(line + strlen("Size") + 1, NULL, 0));
+		} else if ((mask & PFM_SOURCE) && is_field("Source", line))
+			pkg_set_string(pkg, PKG_SOURCE, line + strlen("Source") + 1);
 		else if ((mask & PFM_STATUS) && is_field("Status", line))
 			parse_status(pkg, line);
 		else if ((mask & PFM_SUGGESTS) && is_field("Suggests", line))
-			pkg->suggests_str = parse_comma_separated(line, &pkg->suggests_count);
+			parse_deplist(pkg, SUGGEST, line + strlen("Suggests") + 1);
 		break;
 
 	case 'T':
 		if ((mask & PFM_TAGS) && is_field("Tags", line))
-			pkg->tags = parse_simple("Tags", line);
+			pkg_set_string(pkg, PKG_TAGS, line + strlen("Tags") + 1);
 		break;
 
 	case 'V':
@@ -269,129 +333,61 @@ pkg_parse_line(pkg_t *pkg, const char *line, uint mask)
 
 	case ' ':
 		if ((mask & PFM_DESCRIPTION) && reading_description) {
-			pkg->description = xrealloc(pkg->description,
-						strlen(pkg->description)
-						+ 1 + strlen(line) + 1);
-			strcat(pkg->description, "\n");
-			strcat(pkg->description, (line));
+			size_t len = (description ? strlen(description) : 0)
+				+ (isatty(1) ? 1 : 0) + strlen(line) + 1;
+
+			description = description ? xrealloc(description, len)
+				: xcalloc(len, 1);
+
+			if (isatty(1))
+				strcat(description, "\n");
+
+			strcat(description, line);
 			goto dont_reset_flags;
-		} else if ((mask && PFM_CONFFILES) && reading_conffiles) {
+		} else if ((mask & PFM_CONFFILES) && reading_conffiles) {
 			parse_conffiles(pkg, line);
 			goto dont_reset_flags;
 		}
-		break;
 
+		/* FALLTHROUGH */
 	default:
 		/* For package lists, signifies end of package. */
-		if(line_is_blank(line))
-			return 1;
-	}
-
-	reading_description = 0;
-	reading_conffiles = 0;
-
-dont_reset_flags:
-
-	return 0;
-}
-
-int
-pkg_parse_from_stream_nomalloc(pkg_t *pkg, FILE *fp, uint mask,
-						char **buf0, size_t buf0len)
-{
-	int ret, lineno;
-	char *buf, *nl;
-	size_t buflen;
-
-	lineno = 1;
-	ret = 0;
-
-	buflen = buf0len;
-	buf = *buf0;
-	buf[0] = '\0';
-
-	while (1) {
-		if (fgets(buf, buflen, fp) == NULL) {
-			if (ferror(fp)) {
-				fprintf(stderr, "%s: fgets: %s\n",
-					__FUNCTION__, strerror(errno));
-				ret = -1;
-			} else if (strlen(*buf0) == buflen-1) {
-				fprintf(stderr, "%s: missing new line character"
-						" at end of file!\n",
-					__FUNCTION__);
-				pkg_parse_line(pkg, *buf0, mask);
-			}
+		if (line_is_blank(line)) {
+			ret = 1;
 			break;
 		}
+	}
 
-		nl = strchr(buf, '\n');
-		if (nl == NULL) {
-			if (strlen(buf) < buflen-1) {
-				/*
-				 * Line could be exactly buflen-1 long and
-				 * missing a newline, but we won't know until
-				 * fgets fails to read more data.
-				 */
-				fprintf(stderr, "%s: missing new line character"
-						" at end of file!\n",
-					__FUNCTION__);
-				pkg_parse_line(pkg, *buf0, mask);
-				break;
-			}
-			if (buf0len >= EXCESSIVE_LINE_LEN) {
-				fprintf(stderr, "%s: excessively long line at "
-					"%d. Corrupt file?\n",
-					__FUNCTION__, lineno);
-				ret = -1;
-				break;
-			}
-
-			/*
-			 * Realloc and move buf past the data already read.
-			 * |<--------------- buf0len ----------------->|
-			 * |                     |<------- buflen ---->|
-			 * |---------------------|---------------------|
-			 * buf0                   buf
-			 */
-			buflen = buf0len;
-			buf0len *= 2;
-			*buf0 = xrealloc(*buf0, buf0len);
-			buf = *buf0 + buflen -1;
-
-			continue;
-		}
-
-		*nl = '\0';
-
-		lineno++;
-
-		if (pkg_parse_line(pkg, *buf0, mask))
-			break;
+	if (reading_description && description) {
+		pkg_set_string(pkg, PKG_DESCRIPTION, description);
+		free(description);
+		reading_description = 0;
+		description = NULL;
+	}
 
-		buf = *buf0;
-		buflen = buf0len;
-		buf[0] = '\0';
-	};
+	reading_conffiles = 0;
 
-	if (pkg->name == NULL) {
-		/* probably just a blank line */
-		ret = EINVAL;
-	}
+dont_reset_flags:
 
 	return ret;
 }
 
-int
-pkg_parse_from_stream(pkg_t *pkg, FILE *fp, uint mask)
+int pkg_parse_from_stream(pkg_t * pkg, FILE * fp, uint mask)
 {
 	int ret;
 	char *buf;
 	const size_t len = 4096;
 
 	buf = xmalloc(len);
-	ret = pkg_parse_from_stream_nomalloc(pkg, fp, mask, &buf, len);
+	ret =
+	    parse_from_stream_nomalloc(pkg_parse_line, pkg, fp, mask, &buf,
+				       len);
 	free(buf);
 
+	if (pkg->name == NULL) {
+		/* probably just a blank line */
+		ret = 1;
+	}
+
 	return ret;
 }