X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafm-udb.c;h=be1a5d3179a03e90aecce3bcb9eab7a54221dc0d;hb=3f53c6fff76d6200ebf2165f5d206684a142db35;hp=0a48810694eca6a39f5a057a4150955c5843ac44;hpb=5d7e7dc483a98a31323079953f548648a2c53cda;p=src%2Fapp-framework-main.git

diff --git a/src/afm-udb.c b/src/afm-udb.c
index 0a48810..be1a5d3 100644
--- a/src/afm-udb.c
+++ b/src/afm-udb.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015, 2016, 2017 IoT.bzh
+ Copyright (C) 2015-2018 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -34,7 +34,6 @@
 
 #include "afm-udb.h"
 
-
 static const char x_afm_prefix[] = "X-AFM-";
 static const char service_extension[] = ".service";
 static const char key_unit_path[] = "-unit-path";
@@ -79,6 +78,11 @@ struct afm_updt {
 	struct afm_apps applications;
 };
 
+/*
+ * The default language
+ */
+static char *default_lang;
+
 /*
  * Release the data of the afm_apps object 'apps'.
  */
@@ -113,7 +117,7 @@ static int append_field(
 			array = json_object_new_array();
 			if (!array)
 				goto error;
-			json_object_array_add(array, item);
+			json_object_array_add(array, json_object_get(item));
 			json_object_object_add(object, name, array);
 		}
 		json_object_array_add(array, data);
@@ -225,7 +229,6 @@ static int addunit(
 {
 	struct json_object *priv, *pub, *id;
 	const char *strid;
-	char *un = NULL;
 	size_t len;
 
 	/* create the application structure */
@@ -241,26 +244,13 @@ static int addunit(
 	len = strlen(unitname);
 	assert(len >= (sizeof service_extension - 1));
 	assert(!memcmp(&unitname[len - (sizeof service_extension - 1)], service_extension, sizeof service_extension));
-	if (unitname[len - sizeof service_extension] == '@') {
-		char buffer[40];
-		size_t l = (size_t)snprintf(buffer, sizeof buffer, "%d", (int)getuid());
-		un = malloc(len + l + 1);
-		if (!un)
-			goto error;
-		memcpy(&un[0], unitname, len - (sizeof service_extension - 1));
-		if (l)
-			memcpy(&un[len - (sizeof service_extension - 1)], buffer, l);
-		memcpy(&un[len - (sizeof service_extension - 1) + l], service_extension, sizeof service_extension);
-	}
 
 	/* adds the values */
 	if (add_fields_of_content(priv, pub, content, length)
 	 || add_field(priv, pub, key_unit_path, unitpath)
-	 || add_field(priv, pub, key_unit_name, un ? : unitname)
+	 || add_field(priv, pub, key_unit_name, unitname)
 	 || add_field(priv, pub, key_unit_scope, isuser ? scope_user : scope_system))
 		goto error;
-	free(un);
-	un = NULL;
 
 	/* get the id */
 	if (!json_object_object_get_ex(pub, key_id, &id)) {
@@ -279,7 +269,6 @@ static int addunit(
 	return 0;
 
 error:
-	free(un);
 	json_object_put(pub);
 	json_object_put(priv);
 	return -1;
@@ -296,7 +285,7 @@ static int read_unit_file(const char *path, char **content, size_t *length)
 	/* read the file */
 	rc = getfile(path, content, length);
 	if (rc >= 0) {
-		/* removes any comment and join lines */
+		/* removes any comment and join continued lines */
 		st = 0;
 		read = write = *content;
 		for (;;) {
@@ -305,6 +294,7 @@ static int read_unit_file(const char *path, char **content, size_t *length)
 				break;
 			switch (st) {
 			case 0:
+				/* state 0: begin of a line */
 				if (c == ';' || c == '#') {
 					st = 3; /* removes lines starting with ; or # */
 					break;
@@ -315,6 +305,7 @@ enter_state_1:
 				st = 1;
 				/*@fallthrough@*/
 			case 1:
+				/* state 1: emitting a normal line */
 				if (c == '\\')
 					st = 2;
 				else {
@@ -324,12 +315,14 @@ enter_state_1:
 				}
 				break;
 			case 2:
+				/* state 2: character after '\' */
 				if (c == '\n')
 					c = ' ';
 				else
 					*write++ = '\\';
 				goto enter_state_1;
 			case 3:
+				/* state 3: inside a comment, wait its end */
 				if (c == '\n')
 					st = 0;
 				break;
@@ -367,12 +360,14 @@ static int update_cb(void *closure, const char *name, const char *path, int isus
 	/* reads the file */
 	rc = read_unit_file(path, &content, &length);
 	if (rc < 0)
-		return rc;
+		return 0;
 
 	/* process the file */
 	rc = addunit(&updt->applications, isuser, path, name, content, length);
+	/* TODO: if (rc < 0)
+		ERROR("Ignored boggus unit %s (error: %m)", path); */
 	free(content);
-	return rc;
+	return 0;
 }
 
 /*
@@ -470,22 +465,29 @@ int afm_udb_update(struct afm_udb *afudb)
 	tmp = afudb->applications;
 	afudb->applications = updt.applications;
 	apps_put(&tmp);
-	afm_udb_addref(afudb);
+	afm_udb_unref(afudb);
 	return 0;
 
 error:
 	apps_put(&updt.applications);
-	afm_udb_addref(afudb);
+	afm_udb_unref(afudb);
 	return -1;
 }
 
+void afm_udb_set_default_lang(const char *lang)
+{
+	char *oldval = default_lang;
+	default_lang = lang ? strdup(lang) : NULL;
+	free(oldval);
+}
+
 /*
  * Get the list of the applications private data of the afm_udb object 'afudb'.
  * The list is returned as a JSON-array that must be released using
  * 'json_object_put'.
  * Returns NULL in case of error.
  */
-struct json_object *afm_udb_applications_private(struct afm_udb *afudb)
+struct json_object *afm_udb_applications_private(struct afm_udb *afudb, int uid)
 {
 	return json_object_get(afudb->applications.prvarr);
 }
@@ -496,7 +498,7 @@ struct json_object *afm_udb_applications_private(struct afm_udb *afudb)
  * 'json_object_put'.
  * Returns NULL in case of error.
  */
-struct json_object *afm_udb_applications_public(struct afm_udb *afudb)
+struct json_object *afm_udb_applications_public(struct afm_udb *afudb, int uid, const char *lang)
 {
 	return json_object_get(afudb->applications.pubarr);
 }
@@ -506,7 +508,7 @@ struct json_object *afm_udb_applications_public(struct afm_udb *afudb)
  * It returns a JSON-object that must be released using 'json_object_put'.
  * Returns NULL in case of error.
  */
-static struct json_object *get_no_case(struct json_object *object, const char *id)
+static struct json_object *get_no_case(struct json_object *object, const char *id, int uid, const char *lang)
 {
 	struct json_object *result;
 	struct json_object_iter i;
@@ -528,9 +530,9 @@ static struct json_object *get_no_case(struct json_object *object, const char *i
  * It returns a JSON-object that must be released using 'json_object_put'.
  * Returns NULL in case of error.
  */
-struct json_object *afm_udb_get_application_private(struct afm_udb *afudb, const char *id)
+struct json_object *afm_udb_get_application_private(struct afm_udb *afudb, const char *id, int uid)
 {
-	return get_no_case(afudb->applications.prvobj, id);
+	return get_no_case(afudb->applications.prvobj, id, uid, NULL);
 }
 
 /*
@@ -539,9 +541,9 @@ struct json_object *afm_udb_get_application_private(struct afm_udb *afudb, const
  * Returns NULL in case of error.
  */
 struct json_object *afm_udb_get_application_public(struct afm_udb *afudb,
-							const char *id)
+							const char *id, int uid, const char *lang)
 {
-	return get_no_case(afudb->applications.pubobj, id);
+	return get_no_case(afudb->applications.pubobj, id, uid, lang);
 }