prefork-interp: break out stabs_same_inode

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/cprogs/prefork-interp.c b/cprogs/prefork-interp.c
index fcb2e97b2f6f37893f93499b6e8580bb260f931a..2a7fdc35c54dd8a24b56316abf94c64be1f1b722 100644 (file)
--- a/cprogs/prefork-interp.c
+++ b/cprogs/prefork-interp.c
@@ -391,8 +391,7 @@ static void watcher_cb_sockpath(uv_fs_event_t *handle, const char *filename,
       if (errno==EINTR) continue;
       diee("stat socket: %s", socket_path);
     }
-    if (!(now_stab.st_dev == initial_stab.st_dev &&
-         now_stab.st_ino == initial_stab.st_ino))
+    if (!stabs_same_inode(&now_stab, &initial_stab))
       _exit(0);
   }
 }

diff --git a/cprogs/prefork.c b/cprogs/prefork.c
index 909d0658ebf7f407f317f32164299b8306ff7101..5c1d5bfb0ece8e402a0fa182623c7914a4fa1f35 100644 (file)
--- a/cprogs/prefork.c
+++ b/cprogs/prefork.c
@@ -71,6 +71,11 @@ void off_ident_addenv(const struct cmdinfo *ci, const char *name) {
   }
 }
 
+bool stabs_same_inode(struct stat *a, struct stat *b) {
+  return (a->st_dev == b->st_dev &&
+         a->st_ino == b->st_ino);
+}
+
 bool find_run_base_var_run(void) {
   struct stat stab;
   char *try;

diff --git a/cprogs/prefork.h b/cprogs/prefork.h
index 4a3f996e362c52cf531a10024df786238cad9798..a046835179a37bd029e5ab85375880fa761301cd 100644 (file)
--- a/cprogs/prefork.h
+++ b/cprogs/prefork.h
@@ -84,5 +84,6 @@ void of_iassign(const struct cmdinfo *ci, const char *val);
 void ident_addstring(const struct cmdinfo *ci, const char *string);
 void off_ident_addenv(const struct cmdinfo *ci, const char *name);
 void ident_addinit(void);
+bool stabs_same_inode(struct stat *a, struct stat *b);
 
 #endif /*PREFORK_H*/