From a9f6623bb332f88f04944fc9f2bf09623f14af97 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 20 Aug 2022 11:39:39 +0100 Subject: [PATCH] prefork-interp: break out stabs_same_inode Signed-off-by: Ian Jackson --- cprogs/prefork-interp.c | 3 +-- cprogs/prefork.c | 5 +++++ cprogs/prefork.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cprogs/prefork-interp.c b/cprogs/prefork-interp.c index fcb2e97..2a7fdc3 100644 --- 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 909d065..5c1d5bf 100644 --- 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 4a3f996..a046835 100644 --- 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*/ -- 2.30.2