put pid in config lock file

1 files changed, 36 insertions, 11 deletions

diff --git a/src/cli_new.c b/src/cli_new.c
index d4380d5..3f64489 100644
--- a/src/cli_new.c
+++ b/src/cli_new.c
@@ -240,19 +240,44 @@ release_config_lock()
 int
 get_config_lock()
 {
-  int fd = open(LOCK_FILE, O_WRONLY | O_CREAT | O_EXCL, 0660);
-  if (fd == -1) {
-    return -1;
-  }
-  if (close(fd) == -1) {
-    release_config_lock();
-    return -1;
-  }
-  if (atexit(release_config_lock) != 0) {
+  int fd = -1;
+  FILE *lfile = NULL;
+  int ret = -1;
+
+  do {
+    /* create lock file */
+    fd = open(LOCK_FILE, O_WRONLY | O_CREAT | O_EXCL, 0660);
+    if (fd == -1) {
+      break;
+    }
+
+    /* write pid into lock file */
+    if ((lfile = fdopen(fd, "w")) == NULL) {
+      break;
+    }
+    if (fprintf(lfile, "%u", getpid()) < 0) {
+      break;
+    }
+    /* fclose also closes fd */
+    if (fclose(lfile) != 0) {
+      break;
+    }
+    /* clean up on exit */
+    if (atexit(release_config_lock) != 0) {
+      break;
+    }
+    ret = 0;
+  } while (0);
+ 
+  if (ret == -1) {
+    if (lfile) {
+      fclose(lfile);
+    } else if (fd != -1) {
+      close(fd);
+    }
     release_config_lock();
-    return -1;
   }
-  return 0;
+  return ret;
 }
 
 void internal_error(int line, char *file)