X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafm-urun.c;h=882d44c90eac9a33a3e27f7f750fc34e18b0ad0a;hb=44c70fd80a3ff8931aa97555ceaf5ed578e4f8be;hp=36f40b21a0c84210a54b50aae7bfd117795eb116;hpb=bd910c758e234e165f6a3239c14e77f53d1fc480;p=src%2Fapp-framework-main.git

diff --git a/src/afm-urun.c b/src/afm-urun.c
index 36f40b2..882d44c 100644
--- a/src/afm-urun.c
+++ b/src/afm-urun.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015, 2016, 2017 IoT.bzh
+ Copyright (C) 2015-2018 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -40,7 +40,7 @@ static const char key_unit_d_path[] = "-unit-dpath-";
 
 /**************** get appli basis *********************/
 
-static int get_basis(struct json_object *appli, int *isuser, const char **dpath, int load, int uid)
+static int get_basis(struct json_object *appli, int *isuser, const char **dpath, int uid)
 {
 	char userid[40];
 	char *dp, *arodot, *nun;
@@ -76,12 +76,6 @@ static int get_basis(struct json_object *appli, int *isuser, const char **dpath,
 			return 0;
 	}
 
-	/* not here. load it? */
-	if (!load) {
-		errno = ENOENT;
-		goto error;
-	}
-
 	/* get uname */
 	if (!j_read_string_at(appli, "unit-name", &uname)) {
 		ERROR("'unit-name' missing in appli description %s", json_object_get_string(appli));
@@ -246,7 +240,7 @@ int afm_urun_once(struct json_object *appli, int uid)
 	int rc, isuser;
 
 	/* retrieve basis */
-	rc = get_basis(appli, &isuser, &udpath, 1, uid);
+	rc = get_basis(appli, &isuser, &udpath, uid);
 	if (rc < 0)
 		goto error;
 
@@ -274,13 +268,13 @@ int afm_urun_once(struct json_object *appli, int uid)
 	}
 
 	rc = systemd_unit_pid_of_dpath(isuser, udpath);
-	if (rc < 0) {
+	if (rc <= 0) {
 		j_read_string_at(appli, "unit-scope", &uscope);
 		j_read_string_at(appli, "unit-name", &uname);
 		ERROR("can't getpid of %s unit %s for uid %d: %m", uscope, uname, uid);
 		goto error;
 	}
-		
+
 	return rc;
 
 error:
@@ -352,7 +346,7 @@ struct json_object *afm_urun_list(struct afm_udb *db, int uid)
 	n = json_object_array_length(apps);
 	for (i = 0 ; i < n ; i++) {
 		appli = json_object_array_get_idx(apps, i);
-		if (appli && get_basis(appli, &isuser, &udpath, 0, uid) >= 0) {
+		if (appli && get_basis(appli, &isuser, &udpath, uid) >= 0) {
 			pid = systemd_unit_pid_of_dpath(isuser, udpath);
 			if (pid > 0 && j_read_string_at(appli, "id", &id)) {
 				state = systemd_unit_state_of_dpath(isuser, udpath);
@@ -404,12 +398,12 @@ struct json_object *afm_urun_state(struct afm_udb *db, int runid, int uid)
 		for (i = 0 ; i < n ; i++) {
 			appli = json_object_array_get_idx(apps, i);
 			if (appli
-			 && get_basis(appli, &isuser, &udpath, 0, uid) >= 0
+			 && get_basis(appli, &isuser, &udpath, uid) >= 0
 			 && !strcmp(dpath, udpath)
 			 && j_read_string_at(appli, "id", &id)) {
 				pid = systemd_unit_pid_of_dpath(isuser, udpath);
 				state = systemd_unit_state_of_dpath(isuser, dpath);
-				if (state == SysD_State_Active)
+				if (pid > 0 && state == SysD_State_Active)
 					result = mkstate(id, runid, pid, state);
 				goto end;
 			}
@@ -418,7 +412,7 @@ struct json_object *afm_urun_state(struct afm_udb *db, int runid, int uid)
 		WARNING("searched runid %d of dpath %s isn't an applications", runid, dpath);
 end:
 		json_object_put(apps);
-		free(dpath);	
+		free(dpath);
 	}
 
 	return result;
@@ -439,10 +433,14 @@ int afm_urun_search_runid(struct afm_udb *db, const char *id, int uid)
 		NOTICE("Unknown appid %s", id);
 		errno = ENOENT;
 		pid = -1;
-	} else if (get_basis(appli, &isuser, &udpath, 0, uid) < 0) {
+	} else if (get_basis(appli, &isuser, &udpath, uid) < 0) {
 		pid = -1;
 	} else {
 		pid = systemd_unit_pid_of_dpath(isuser, udpath);
+		if (pid == 0) {
+			errno = ESRCH;
+			pid = -1;
+		}
 	}
 	return pid;
 }