From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 19 Dec 2023 17:27:30 +0000 (+0000)
Subject: jail: Move struct declarations out of the large struct
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fpakfire.git;a=commitdiff_plain;h=dcdda2922aa40d4fb9e47373df8682a274c5de0b

jail: Move struct declarations out of the large struct

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c
index f3b15c5e..2cb4fd56 100644
--- a/src/libpakfire/jail.c
+++ b/src/libpakfire/jail.c
@@ -82,6 +82,33 @@ static const struct environ {
 	{ NULL, NULL },
 };
 
+struct pakfire_log_buffer {
+	char data[BUFFER_SIZE];
+	size_t used;
+};
+
+enum pakfire_jail_pty_flags {
+	PAKFIRE_JAIL_PTY_READY_TO_READ  = (1 << 0),
+	PAKFIRE_JAIL_PTY_READY_TO_WRITE = (1 << 1),
+};
+
+struct pakfire_jail_pty_stdio {
+	// File Descriptor
+	int fd;
+
+	// Buffer
+	struct pakfire_log_buffer buffer;
+
+	// Terminal Attributes
+	struct termios attrs;
+
+	// File Descriptor Flags
+	int fdflags;
+
+	// IO Flags
+	enum pakfire_jail_pty_flags flags;
+};
+
 struct pakfire_jail_mountpoint {
 	char source[PATH_MAX];
 	char target[PATH_MAX];
@@ -114,11 +141,6 @@ struct pakfire_jail {
 	unsigned int num_mountpoints;
 };
 
-struct pakfire_log_buffer {
-	char data[BUFFER_SIZE];
-	size_t used;
-};
-
 struct pakfire_jail_exec {
 	int flags;
 
@@ -170,26 +192,14 @@ struct pakfire_jail_exec {
 		// The path to the console
 		char console[PATH_MAX];
 
-		// The master fd
+		// The master device
 		struct pakfire_jail_pty_master {
 			int fd;
-
-			enum pakfire_jail_pty_flags {
-				PAKFIRE_JAIL_PTY_READY_TO_READ  = (1 << 0),
-				PAKFIRE_JAIL_PTY_READY_TO_WRITE = (1 << 1),
-			} flags;
-		} master;
-
-		// Standard Input
-		struct pakfire_jail_pty_stdio {
-			int fd;
-			struct pakfire_log_buffer buffer;
-			struct termios attrs;
-			int fdflags;
 			enum pakfire_jail_pty_flags flags;
-		} stdin;
+		} master;
 
-		// Standard Output
+		// Standard Input/Output
+		struct pakfire_jail_pty_stdio stdin;
 		struct pakfire_jail_pty_stdio stdout;
 	} pty;
 };