X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgt-info.c;h=976fc54e4f899ada6e27098243d736b37707d60c;hb=2c6fcae14552ab6e7addc82516617a135f86b5ca;hp=019f8ce503acfcf936b4c0f1b2b58aa274e1be5d;hpb=e2de563d1ecb4585ce68521bd42f3ef45ac79f16;p=src%2Fapp-framework-main.git

diff --git a/src/wgt-info.c b/src/wgt-info.c
index 019f8ce..976fc54 100644
--- a/src/wgt-info.c
+++ b/src/wgt-info.c
@@ -1,6 +1,8 @@
 /*
  Copyright 2015 IoT.bzh
 
+ author: José Bollo <jose.bollo@iot.bzh>
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -18,7 +20,7 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <syslog.h>
+
 #include <libxml/tree.h>
 
 #include "verbose.h"
@@ -73,6 +75,48 @@ static xmlChar *optcontent(xmlNodePtr node)
 	return node ? xmlNodeGetContent(node) : NULL;
 }
 
+static char *mkver(char *version)
+{
+	unsigned int lver;
+	char c, *r;
+	if (version) {
+		c = version[lver = 0];
+		while(c && c != ' ' && c != '.')
+			c = version[++lver];
+		if (c == '.') {
+			c = version[++lver];
+			while(c && c != ' ' && c != '.')
+				c = version[++lver];
+		}
+		r = malloc(lver + 1);
+		if (r) {
+			memcpy(r, version, lver);
+			r[lver] = 0;
+			return r;
+		}
+	}
+	return NULL;
+}
+
+static char *mkidaver(char *id, char *ver)
+{
+	size_t lid, lver;
+	char *r;
+	if (id && ver) {
+		lid = strlen(id);
+		lver = strlen(ver);
+		r = malloc(2 + lid + lver);
+		if (r) {
+			memcpy(r, id, lid);
+			r[lid] = '@';
+			memcpy(r + lid + 1, ver, lver);
+			r[lid + lver + 1] = 0;
+			return r;
+		}
+	}
+	return NULL;
+}
+
 static int fill_desc(struct wgt_desc *desc, int want_icons, int want_features, int want_preferences)
 {
 	xmlNodePtr node, pnode;
@@ -89,6 +133,8 @@ static int fill_desc(struct wgt_desc *desc, int want_icons, int want_features, i
 	}
 	desc->id = xmlGetProp(node, wgt_config_string_id);
 	desc->version = xmlGetProp(node, wgt_config_string_version);
+	desc->ver = mkver(desc->version);
+	desc->idaver = mkidaver(desc->id, desc->ver);
 	desc->width = getpropnum(node, wgt_config_string_width, 0);
 	desc->height = getpropnum(node, wgt_config_string_height, 0);
 	desc->viewmodes = xmlGetProp(node, wgt_config_string_viewmodes);
@@ -235,6 +281,8 @@ static void free_desc(struct wgt_desc *desc)
 
 	xmlFree(desc->id);
 	xmlFree(desc->version);
+	free(desc->ver);
+	free(desc->idaver);
 	xmlFree(desc->viewmodes);
 	xmlFree(desc->defaultlocale);
 	xmlFree(desc->name);
@@ -287,9 +335,11 @@ static void dump_desc(struct wgt_desc *desc, FILE *f, const char *prefix)
 	struct wgt_desc_param *param;
 
 	if (desc->id) fprintf(f, "%sid: %s\n", prefix, desc->id);
+	if (desc->version) fprintf(f, "%sversion: %s\n", prefix, desc->version);
+	if (desc->ver) fprintf(f, "%sver: %s\n", prefix, desc->ver);
+	if (desc->idaver) fprintf(f, "%sidaver: %s\n", prefix, desc->idaver);
 	if (desc->width) fprintf(f, "%swidth: %d\n", prefix, desc->width);
 	if (desc->height) fprintf(f, "%sheight: %d\n", prefix, desc->height);
-	if (desc->version) fprintf(f, "%sversion: %s\n", prefix, desc->version);
 	if (desc->viewmodes) fprintf(f, "%sviewmodes: %s\n", prefix, desc->viewmodes);
 	if (desc->defaultlocale) fprintf(f, "%sdefaultlocale: %s\n", prefix, desc->defaultlocale);
 	if (desc->name) fprintf(f, "%sname: %s\n", prefix, desc->name);