X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-install.c;h=3f5ab928d53f8ab6861edbda6bf2e0f8b3f2806d;hb=f08784c6e79208558f0caa6e770952879041aca2;hp=0e3025c9a837f5b83b4fa2d0f228acb6f3a01a36;hpb=51c7935c6535ddb5865e6bd67de603326458cedd;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index 0e3025c..3f5ab92 100644
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.c
@@ -51,7 +51,40 @@ static const char* exec_type_strings[] = {
 	"application/vnd.agl.native"
 };
 
-static const char key_http_port[] = "X-AFM--http-port";
+static const char key_afm_prefix[] = "X-AFM-";
+static const char key_http_port[] = "http-port";
+
+/*
+ * normalize unit files: remove comments, remove heading blanks,
+ * make single lines
+ */
+static void normalize_unit_file(char *content)
+{
+	char *read, *write, c;
+
+	read = write = content;
+	c = *read++;
+	while (c) {
+		switch (c) {
+		case '\n':
+		case ' ':
+		case '\t':
+			c = *read++;
+			break;
+		case '#':
+		case ';':
+			do { c = *read++; } while(c && c != '\n');
+			break;
+		default:
+			*write++ = c;
+			do { *write++ = c = *read++; } while(c && c != '\n');
+			if (write - content >= 2 && write[-2] == '\\')
+				(--write)[-1] = ' ';
+			break;
+		}
+	}
+	*write = c;
+}
 
 static int get_port_cb(void *closure, const char *name, const char *path, int isuser)
 {
@@ -65,19 +98,27 @@ static int get_port_cb(void *closure, const char *name, const char *path, int is
 	if (rc < 0)
 		return rc;
 
+	/* normalize the unit file */
+	normalize_unit_file(content);
+
 	/* process the file */
-	iter = strstr(content, key_http_port);
+	iter = strstr(content, key_afm_prefix);
 	while (iter) {
-		iter += sizeof key_http_port - 1;
-		while(*iter && *iter != '=' && *iter != '\n')
+		iter += sizeof key_afm_prefix - 1;
+		if (*iter == '-')
 			iter++;
-		if (*iter == '=') {
-			while(*++iter == ' ');
-			p = atoi(iter);
-			if (p >= 0 && p < 32768)
-				((uint32_t*)closure)[p >> 5] |= (uint32_t)1 << (p & 31);
+		if (!strncmp(iter, key_http_port, sizeof key_http_port - 1)) {
+			iter += sizeof key_http_port - 1;
+			while(*iter && *iter != '=' && *iter != '\n')
+				iter++;
+			if (*iter == '=') {
+				while(*++iter == ' ');
+				p = atoi(iter);
+				if (p >= 0 && p < 32768)
+					((uint32_t*)closure)[p >> 5] |= (uint32_t)1 << (p & 31);
+			}
 		}
-		iter = strstr(iter, key_http_port);
+		iter = strstr(iter, key_afm_prefix);
 	}
 	free(content);
 	return 0;
@@ -95,6 +136,7 @@ static int get_port()
 		if (rc >= 0) {
 			for (rc = 1024 ; rc < 32768 && !~ports[rc >> 5] ; rc += 32);
 			if (rc == 32768) {
+				ERROR("Can't compute a valid port");
 				errno = EADDRNOTAVAIL;
 				rc = -1;
 			} else {
@@ -146,12 +188,13 @@ static int check_temporary_constraints(const struct wgt_desc *desc)
 	result  = check_valid_string(desc->id, "id");
 	result |= check_valid_string(desc->version, "version");
 	result |= check_valid_string(desc->ver, "ver");
-	result |= check_defined(desc->icons, "icon");
 	result |= check_defined(desc->content_src, "content");
+	if (desc->icons)
+		result |= check_defined(desc->icons->src, "icon.src");
 	if (result)
 		return result;
 
-	if (desc->icons->next) {
+	if (desc->icons && desc->icons->next) {
 		ERROR("widget has more than one icon defined (temporary constraints)");
 		errno = EINVAL;
 		result = -1;
@@ -315,6 +358,9 @@ static int install_icon(const struct wgt_desc *desc)
 	char target[PATH_MAX];
 	int rc;
 
+	if (!desc->icons)
+		return 0;
+
 	create_directory(FWK_ICON_DIR, 0755, 1);
 	rc = snprintf(link, sizeof link, "%s/%s", FWK_ICON_DIR, desc->idaver);
 	if (rc >= (int)sizeof link) {
@@ -369,7 +415,7 @@ static int install_security(const struct wgt_desc *desc)
 	}
 	len--;
 	*head++ = '/';
-	icon = desc->icons->src;
+	icon = desc->icons ? desc->icons->src : NULL;
 	lic = (unsigned)strlen(icon);
 	n = file_count();
 	i = 0;
@@ -382,7 +428,7 @@ static int install_security(const struct wgt_desc *desc)
 			goto error2;
 		}
 		strcpy(head, f->name);
-		if (lf <= lic && !memcmp(f->name, icon, lf) && (!f->name[lf] || f->name[lf] == '/'))
+		if (lf <= lic && icon && !memcmp(f->name, icon, lf) && (!f->name[lf] || f->name[lf] == '/'))
 			rc = secmgr_path_public_read_only(path);
 		else
 			rc = secmgr_path_read_only(path);