Split orch.h out

Better define the bits that are private to the lib, private to the C driver,
and common to both.

Signed-off-by: Kyle Evans <[email protected]>

include/orch.h

@@ -18,32 +18,15 @@
 #define	__unused	__attribute__((unused))
 #endif
 
-struct orch_process {
-	int			 cmdsock;
-	pid_t			 pid;
-	int			 status;
-	int			 termctl;
-	bool			 raw;
-	bool			 released;
-	bool			 eof;
-	bool			 buffered;
-};
-
-/* orch.c */
-int orch_spawn(int, const char *[], struct orch_process *);
-
-/* orch_interp.c */
-int orch_interp(const char *, const char *, int, const char * const []);
-
-/* orch_lua.c */
-int luaopen_orch_core(lua_State *);
-
 /* orch_compat.c */
 #ifdef __linux__
-size_t strlcpy(char * __restrict dst, const char * __restrict src, size_t dsize);
-size_t strlcat(char * __restrict dst, const char * __restrict src, size_t dsize);
+size_t strlcpy(char * __restrict, const char * __restrict, size_t);
+size_t strlcat(char * __restrict, const char * __restrict, size_t);
 #endif
 #if defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || \
     defined(__NetBSD__)
-int tcsetsid(int tty, int sess);
+int tcsetsid(int, int);
 #endif
+
+/* orch_lua.c */
+int luaopen_orch_core(lua_State *);

lib/orch_lib.h

@@ -0,0 +1,27 @@
+/*-
+ * Copyright (c) 2024 Kyle Evans <[email protected]>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <sys/types.h>
+
+#include <stdbool.h>
+
+#include <lua.h>
+
+struct orch_process {
+	int			 cmdsock;
+	pid_t			 pid;
+	int			 status;
+	int			 termctl;
+	bool			 raw;
+	bool			 released;
+	bool			 eof;
+	bool			 buffered;
+};
+
+/* orch_spawn.c */
+int orch_spawn(int, const char *[], struct orch_process *);

lib/orch_lua.c

@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include "orch.h"
+#include "orch_lib.h"
 
 #include <lauxlib.h>
 

lib/orch_spawn.c

@@ -15,6 +15,7 @@
 #include <unistd.h>
 
 #include "orch.h"
+#include "orch_lib.h"
 
 #ifdef __OpenBSD__
 #define	POSIX_OPENPT_FLAGS	(O_RDWR | O_NOCTTY)
@@ -24,12 +25,17 @@
 
 extern char **environ;
 
-static void orch_exec(int argc, const char *argv[], int cmdsock);
+/* Parent */
 static int orch_newpt(void);
+
+/* Child */
 static pid_t orch_newsess(void);
-static void orch_usept(pid_t sess, int termctl);
-static void orch_wait(int cmdsock);
-static void orch_release(int cmdsock);
+static void orch_usept(pid_t, int);
+static void orch_exec(int, const char *[], int);
+
+/* Both */
+static void orch_release(int);
+static void orch_wait(int);
 
 int
 orch_spawn(int argc, const char *argv[], struct orch_process *p)

src/orch.c

@@ -9,6 +9,7 @@
 #include <unistd.h>
 
 #include "orch.h"
+#include "orch_bin.h"
 
 #ifndef __dead2
 #define	__dead2	__attribute__((noreturn))

src/orch_bin.h

@@ -0,0 +1,12 @@
+/*-
+ * Copyright (c) 2024 Kyle Evans <[email protected]>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <lua.h>
+
+/* orch_interp.c */
+int orch_interp(const char *, const char *, int, const char * const []);

src/orch_interp.c

@@ -12,6 +12,7 @@
 #include <string.h>
 
 #include "orch.h"
+#include "orch_bin.h"
 
 #include <lauxlib.h>
 #include <lualib.h>