コミット: f7c11dcbc54747e375aab66654d9c101669c6996 - vmtui (git)

Virtual machine Management Terminal User Interface

コミットメタ情報

• リビジョン: f7c11dcbc54747e375aab66654d9c101669c6996 (tree)
• 日時: 2023-04-03 22:53:05
• 作者: Koine Yuusuke(koinec) <koinec@user...>
• コミッター: Koine Yuusuke(koinec)

ログメッセージ

Implemented exec. serial console with external terminal.

変更サマリ

• modified: src/localexec.c
• modified: src/tuivmlist_event.c

差分

--- a/src/localexec.c
+++ b/src/localexec.c
@@ -29,6 +29,70 @@
 #include "vmtui.h"
 
 /* ===========================================================================*/
+void
+	LocalExec_Error(
+		char	*pstr_msg,
+		char	*pstr_argv[],
+		int		i_argc,
+		int		i_hvisor,
+		int		i_guest,
+		int		i_err )
+{
+	int		i_len;
+	int		i_remain;
+	int		i_cnt;
+	char	str_buffer[512];
+	char	*pstr_now;
+	char	*pstr_temp	= NULL;
+
+	memset( str_buffer, 0x00, sizeof( str_buffer ) );
+
+	pstr_now	= str_buffer;
+	i_remain	= sizeof( str_buffer );
+
+	for( i_cnt = 0; i_cnt < i_argc; i_cnt++ )	{
+		i_len	= strnlen( pstr_argv[i_cnt], sizeof( str_buffer ) );
+
+		if( (i_cnt + 1) == i_argc )	{
+			pstr_temp	= pstr_argv[i_cnt];
+			while(('\0' != *pstr_temp) && (' ' != *pstr_temp))
+				{ pstr_temp++; }
+
+			if( '\0' != *pstr_temp )	{
+				*pstr_now++	= '\'';
+				i_remain--;
+
+				*pstr_now	= '\0';
+			}
+		}
+
+		strncat( pstr_now, pstr_argv[i_cnt], i_remain );
+		i_remain	-= i_len;
+		pstr_now	+= i_len;
+
+		if( (i_cnt + 1) < i_argc )	{
+			*pstr_now++	= ' ';
+			i_remain--;
+
+			*pstr_now	= '\0';
+		}
+		else	{
+			if( '\0' != *pstr_temp )	{
+				*pstr_now++	= '\'';
+				i_remain--;
+
+				*pstr_now	= '\0';
+			}
+		}
+	}
+
+	ErrInfo_Error( pstr_msg, i_hvisor, i_guest, REQUEST_ID_NONE,
+									errno, i_err, 0x00, str_buffer );
+
+	return;
+}
+
+/* ===========================================================================*/
 int
 	LocalExec_ExecBackgroundCommand(
 		char	*pstr_argv[] )
@@ -256,10 +320,9 @@ int
 		i_remain			-= 4;
 		pstr_now			+= 4;
 
-		// XXX sudo option
-		/*
-		if( 0 < gt_openssh.option.i_len )	{
-			strncpy( str_option, gt_openssh.option.str_option, VMTUI_CMDINFO_MAXLEN_OPTION );
+		// sudo option ---
+		if( 0 < p_hvisor->sudo.option.i_len )	{
+			strncpy( str_option, p_hvisor->sudo.option.str_option, VMTUI_CMDINFO_MAXLEN_OPTION );
 
 			pstr_next	= str_option;
 			while( NULL != (pstr_val = strsep( &pstr_next, " " )))	{
@@ -272,7 +335,6 @@ int
 				}while( '\0' != *pstr_val++ );
 			}
 		}
-		*/
 	}
 
 	strncpy( pstr_now, VMBHYVE_DEFAULT_PATH, VMBHYVE_DEFAULT_PATH_LEN );
@@ -298,16 +360,13 @@ int
 
 	pstr_argv[i_argc]	= NULL;
 
-ErrInfo_DebugMsg( "================================================" );
-
-	{
-		int	i_cnt;
-		for( i_cnt = 0; i_cnt < i_argc; i_cnt++ )	{
-			ErrInfo_DebugMsg( pstr_argv[i_cnt] );
-		}
-	}
-
+	// Exec.
 	i_err	= LocalExec_ExecBackgroundCommand( pstr_argv );
+	if( 0x00 != i_err )	{
+		LocalExec_Error(
+			"Can't exec external serial-console.",
+			pstr_argv, i_argc, i_hvisor, i_guest, i_err );
+	}
 
 	return 0x00;
 }

--- a/src/tuivmlist_event.c
+++ b/src/tuivmlist_event.c
@@ -75,7 +75,7 @@ int
 		int i_hvisor, int i_guest, int i_option )
 {
 	LocalExec_ExecSerialTerminal_External( i_guest, 0x00 );
-	ErrInfo_DebugMsg( "Serial Console" );
+
 	return 0x00;
 }