--- embedtools/src/cfexec.c	2017/10/08 21:57:34	1.5.20.1
+++ embedtools/src/cfexec.c	2017/10/08 22:34:41	1.5.20.5
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@aitbg.com>
  *
  * $Author: misho $
- * $Id: cfexec.c,v 1.5.20.1 2017/10/08 21:57:34 misho Exp $
+ * $Id: cfexec.c,v 1.5.20.5 2017/10/08 22:34:41 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -66,8 +66,8 @@ Usage()
 		"\t-d <dev>\tOther device [default=/dev/ufs/elwix]\n"
 		"\t-m <mnt>\tOther mount dir [default=/]\n"
 		"\t-t <sec>\tTimeout for autolock mount dir after seconds [default=300]\n"
-		"\t-L <reason>\tService lock and own RW state of device with reason\n"
-		"\t-U \t\tService unlock and change RO state of device\n"
+		"\t-L <reason>\tService lock and set RW state of device with reason\n"
+		"\t-U \t\tService unlock and set RO state of device\n"
 		"\n", compiled, compiledby, compilehost);
 }
 
@@ -126,18 +126,20 @@ mkevent(struct kevent *chg, struct kevent *evt)
 	}
 	VERB(3) printf("Created lock file %s\n", szSess);
 
-	kq = kqueue();
-	if (kq == -1) {
-		printf("Error:: can`t execute safe mount #%d - %s\n", errno, strerror(errno));
-		close(f);
-		unlink(szSess);
-		return -1;
-	} else {
-		memset(chg, 0, sizeof(struct kevent));
-		memset(evt, 0, sizeof(struct kevent));
+	if (chg && evt) {
+		kq = kqueue();
+		if (kq == -1) {
+			printf("Error:: can`t execute safe mount #%d - %s\n", errno, strerror(errno));
+			close(f);
+			unlink(szSess);
+			return -1;
+		} else {
+			memset(chg, 0, sizeof(struct kevent));
+			memset(evt, 0, sizeof(struct kevent));
 
-		EV_SET(chg, f, EVFILT_VNODE, EV_ADD, NOTE_DELETE | NOTE_RENAME | NOTE_REVOKE, 
-				0, NULL);
+			EV_SET(chg, f, EVFILT_VNODE, EV_ADD, NOTE_DELETE | NOTE_RENAME | NOTE_REVOKE, 
+					0, NULL);
+		}
 	}
 
 	return f;
@@ -158,9 +160,9 @@ static int
 s_unlck()
 {
 	if (access(szSLCK, F_OK))
-		return 1;
+		return 2;
 
-	if (update(MNT_UPDATE | MNT_RDONLY) == -1)
+	if (access(szSess, F_OK) && update(MNT_UPDATE | MNT_RDONLY) == -1)
 		return 8;
 
 	unlink(szSLCK);
@@ -175,14 +177,14 @@ s_lck(const char *reason)
 	char szStr[STRSIZ];
 
 	if (!access(szSLCK, F_OK)) {
-		printf("cfexec:: Service held lock ...\n");
+		printf("cfexec already held service lock ...\n");
 		return 127;
 	}
 
 	f = open(szSLCK, O_CREAT | O_WRONLY | O_TRUNC, 0644);
 	if (f == -1) {
 		printf("Error:: can`t service lock session #%d - %s\n", errno, strerror(errno));
-		return -1;
+		return 4;
 	} else {
 		memset(szStr, 0, sizeof szStr);
 		snprintf(szStr, sizeof szStr, "[%d] - %s", getpid(), reason);
@@ -192,7 +194,7 @@ s_lck(const char *reason)
 
 	if (update(MNT_UPDATE) == -1) {
 		unlink(szSLCK);
-		return 4;
+		return 5;
 	}
 
 	VERB(3) printf("Lock & created service lock file %s\n", szSLCK);
@@ -320,10 +322,10 @@ main(int argc, char **argv)
 				VERB(5) printf("Info(5):: Go safe mount.\n");
 				setsid();
 
-				if (update(MNT_UPDATE) == -1)
+				if ((f = mkevent(&chg, &evt)) == -1)
 					return 4;
 
-				if ((f = mkevent(&chg, &evt)) == -1)
+				if (update(MNT_UPDATE) == -1)
 					return 5;
 
 				if (Timeout) {
@@ -361,14 +363,20 @@ main(int argc, char **argv)
 		sigprocmask(SIG_BLOCK, &sig, &oldsig);
 		*/
 
-		if (update(MNT_UPDATE) == -1)
+		if ((f = mkevent(NULL, NULL)) == -1)
 			return 4;
+		else
+			close(f);
 
+		if (update(MNT_UPDATE) == -1)
+			return 5;
+
 		switch ((pid = vfork())) {
 			case -1:
 				printf("Error:: can`t execute safe mount #%d - %s\n", 
 						errno, strerror(errno));
-				return 5;
+				stat = 3;
+				break;
 			case 0:
 				VERB(5) printf("Go to running process %s\n", *argv);
 				if (chroot(AIT_GET_STR(&Chroot)) == -1) {
@@ -381,17 +389,19 @@ main(int argc, char **argv)
 					/* chdir("/"); */
 					execvp(*argv, argv);
 				}
-				exit(127);
+				_exit(127);
 				break;
 			default:
 				waitpid(pid, &stat, 0);
+				stat = WEXITSTATUS(stat);
 				VERB(3) printf("Return code: %d\n", stat);
-				if (stat == 32512) 
-					stat = 127;
 
 				if (access(szSLCK, F_OK) && update(MNT_UPDATE | MNT_RDONLY) == -1)
-					return 8;
+					stat = 8;
+				break;
 		}
+
+		unlink(szSess);
 	}
 
 	return stat;