Commit: f0489859cd91b1a948484fbedec1774cc2564887 - procedure (git)

*NIX用コマンドライン手順書自動作成ツール開発

Commit MetaInfo

• Revisión: f0489859cd91b1a948484fbedec1774cc2564887 (tree)
• Tiempo: 2016-09-04 14:19:11
• Autor: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

* Implement: Output Only Command Line String (in ESC code)

Cambiar Resumen

• modified: master.c

Diferencia incremental

--- a/master.c
+++ b/master.c
@@ -100,6 +100,7 @@ int
 	int		i_err;
 	int		i_result;
 	int		i_pos;
+	int		i_pid_grandchild;
 	struct	termios		t_stt;
 	struct	timeval		t_tmval;
 	struct	timeval		*pt_tmval;
@@ -115,7 +116,8 @@ int
 	}
 
 	// Proc. Master-Process ---
-	i_readstdin = 1;
+	i_readstdin			= 1;
+	i_pid_grandchild	= -1;
 	do	{
 		FD_ZERO( &t_rfd );
 		FD_SET( gi_fd_master, &t_rfd );
@@ -154,14 +156,15 @@ int
 					if( 0x0d == str_inbuf[i_pos] )	{ break; }
 				}
 				if( 0 < i_pos )	{
+					// Keyboard input for Terminal ---
+					i_pid_grandchild
+						= CheckGrandchildProcess( gi_pid_child, i_pid_grandchild );
+
 					(void)write( gi_fd_master, str_inbuf, i_pos );
 					i_rdsz_inbuf	-= i_pos;
 				}
 				pstr_in			= (str_inbuf + i_pos);
-				//(void)write( gi_fd_master, str_inbuf, i_rdsz_inbuf );
-				//(void)fwrite(str_inbuf, 1, i_readsz, fscript);
 			}
-
 		}
 
 		if(( 0 < i_fds ) && FD_ISSET( gi_fd_master, &t_rfd )) {
@@ -170,12 +173,20 @@ int
 			if( 0 >= i_rdsz_outbuf )		{ break; }
 
 			(void)write(STDOUT_FILENO, str_outbuf, i_rdsz_outbuf );
-			(void)fwrite( str_outbuf, 1, i_rdsz_outbuf, fscript);
+
+			if( 0 == i_pid_grandchild )	{
+				(void)CmdLine_AddCmdLineString( str_outbuf, i_rdsz_outbuf );
+			}
+
+			//(void)fwrite( str_outbuf, 1, i_rdsz_outbuf, fscript);
 		}
 		fflush(fscript);
 
 		if( 0 < i_rdsz_inbuf )	{
+			i_pid_grandchild	= -0xff;
 			(void)write( gi_fd_master, pstr_in, i_rdsz_inbuf );
+			(void)fprintf( fscript, "**Command: %s\n", CmdLine_GetCmdLineString( NULL ));
+			CmdLine_ClearCmdLineString();
 		}
 
 	} while(1);