From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 12 Oct 2024 13:27:46 +0000 (+0000)
Subject: jail: Drop the interactive helper function
X-Git-Tag: 0.9.30~1086
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a03a6573bd8c8ce0dad94ac9c161d27dee43602f;p=pakfire.git

jail: Drop the interactive helper function

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

diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c
index 017dc6eb9..3b92aa966 100644
--- a/src/libpakfire/jail.c
+++ b/src/libpakfire/jail.c
@@ -1574,20 +1574,6 @@ int pakfire_jail_communicate(
 		stdin_callback, stdin_data, stdout_callback, stdout_data, NULL);
 }
 
-static int pakfire_jail_exec_interactive(
-		struct pakfire_jail* jail, const char* argv[], int flags) {
-	int r;
-
-	flags |= PAKFIRE_JAIL_INTERACTIVE;
-
-	// Setup interactive stuff
-	r = pakfire_jail_setup_interactive_env(jail);
-	if (r)
-		return r;
-
-	return pakfire_jail_exec(jail, argv, flags, NULL);
-}
-
 int pakfire_jail_exec_script(struct pakfire_jail* jail,
 		const char* script,
 		const size_t size,
@@ -1715,8 +1701,13 @@ int pakfire_jail_shell(struct pakfire_jail* jail) {
 		"/bin/bash", "--login", NULL,
 	};
 
+	// Setup interactive stuff
+	r = pakfire_jail_setup_interactive_env(jail);
+	if (r)
+		return r;
+
 	// Execute /bin/bash
-	r = pakfire_jail_exec_interactive(jail, argv, 0);
+	r = pakfire_jail_exec(jail, argv, PAKFIRE_JAIL_INTERACTIVE, NULL);
 
 	// Raise any errors
 	if (r < 0)