Commit: 1c4e0445bf74fb453ac931d0af2b961723e72e66 - procedure (git)

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

Commit MetaInfo

• Revision: 1c4e0445bf74fb453ac931d0af2b961723e72e66 (tree)
• Zeit: 2016-10-04 21:03:51
• Autor: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

* Implement: Implement Check & Block nested-boot.

Ändern Zusammenfassung

• modified: Makefile
• modified: config.h
• modified: depend_freebsd.c
• modified: depend_freebsd.h
• modified: master.c
• modified: procedure.c
• modified: procedure.h
• add: test_dependos.c
• modified: test_procedure.c
• modified: test_procedure.h

Diff

--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,8 @@ TEST_FLAGS_LIB = -L/usr/local/lib -lcunit
 TEST_TARGET = test_procedure
 TEST_OBJS = test_procedure.o \
 			test_cmdline.o \
-			test_outbuffer.o
+			test_outbuffer.o \
+			test_dependos.o
 TEST_HEADERS = test_procedure.h
 
 
@@ -92,6 +93,9 @@ test_cmdline.o: test_cmdline.c $(HEADERS) $(TEST_HEADERS)
 test_outbuffer.o: test_outbuffer.c $(HEADERS) $(TEST_HEADERS)
 	$(CC) -c -o test_outbuffer.o $(FLAGS_DEBUG) $(CFLAGS) $(TEST_FLAGS_COMPILE) \
 				test_outbuffer.c
+test_dependos.o: test_dependos.c $(HEADERS) $(TEST_HEADERS)
+	$(CC) -c -o test_dependos.o $(FLAGS_DEBUG) $(CFLAGS) $(TEST_FLAGS_COMPILE) \
+				test_dependos.c
 
 $(TEST_TARGET): $(TEST_OBJS) $(OBJS_PARTS)
 	$(CC) -o $(TEST_TARGET) $(FLAGS_DEBUG) $(TEST_FLAGS_LIB) $(FLAGS_LIB) \

--- a/config.h
+++ b/config.h
@@ -35,6 +35,7 @@ PrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcE*/
 
 #define	OUTPUT_RINGBUFFER_SIZE	4096
 #define	DEFAULT_OUTPUT_FILENAME	"procedure.txt"
+#define	PROCEDURE_COMMAND_NAME	"procedure"
 
 #endif
 

--- a/depend_freebsd.c
+++ b/depend_freebsd.c
@@ -38,6 +38,7 @@ PrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcE*/
 #include<sys/user.h>
 #include<limits.h>
 #include<kvm.h>
+#include<libgen.h>
 
 static	kvm_t   *pt_kd	= NULL;
 
@@ -129,6 +130,60 @@ goto_CheckGrandchildProcess:
 /*===========================================================================*/
 PROCEDURE_DEPEND_FREEBSD_EXTERN
 int
+	CheckParentProcess(
+			int		i_pid_now,
+			char	*pstr_sameprocname )
+{
+	int		i_pid_result	= 0x00;
+	int		i_pid_parent;
+	int		i_nentries;
+	int		i_what;
+	int		i_flags;
+	struct	kinfo_proc	*pt_kproc;
+	char	str_cmdname[MAXPATHLEN + 8];
+
+	if(( NULL == pstr_sameprocname ) || ( 0 >= i_pid_now ))		{
+		i_pid_result	= -0x01;
+		goto	goto_CheckParentProcess;
+	}
+
+	if( '\0' == *pstr_sameprocname )	{
+		i_pid_result	= -0x02;
+		goto	goto_CheckParentProcess;
+	}
+
+	i_pid_parent	= i_pid_now;
+
+	while( 1 < i_pid_parent )	{
+		i_flags		= i_pid_parent;
+		i_what		= KERN_PROC_PID;
+		i_nentries	= 0;
+	
+		pt_kproc	= kvm_getprocs( pt_kd, i_what, i_flags, &i_nentries );
+		if( NULL == pt_kproc )	{
+			i_pid_result	= -0x03;
+			goto	goto_CheckParentProcess;
+		}
+
+		i_pid_parent	= (int)(pt_kproc->ki_ppid);
+
+		basename_r( pt_kproc->ki_comm, str_cmdname );
+
+		if( !strncmp( str_cmdname, pstr_sameprocname, MAXPATHLEN ) )	{
+			i_pid_result	= i_pid_parent;
+			goto	goto_CheckParentProcess;
+		} 
+	}
+
+
+goto_CheckParentProcess:
+    return i_pid_result;
+}
+
+
+/*===========================================================================*/
+PROCEDURE_DEPEND_FREEBSD_EXTERN
+int
 	GetMaxArgSize( void )
 {
 	int		i_mib[2];

--- a/depend_freebsd.h
+++ b/depend_freebsd.h
@@ -48,6 +48,8 @@ PROCEDURE_DEPEND_FREEBSD_EXTERN
 PROCEDURE_DEPEND_FREEBSD_EXTERN
 	int CheckGrandchildProcess( int i_pid_child, int i_pid_grandchild );
 PROCEDURE_DEPEND_FREEBSD_EXTERN
+	int CheckParentProcess( int i_pid_now, char *pstr_sameprocname );
+PROCEDURE_DEPEND_FREEBSD_EXTERN
 	int GetMaxArgSize( void );
 
 #endif

--- a/master.c
+++ b/master.c
@@ -164,6 +164,7 @@ int
 				}
 				if( 0 < i_pos )	{
 					// Keyboard input for Terminal ---
+
 					i_pid_grandchild
 						= CheckGrandchildProcess( gi_pid_child, i_pid_grandchild );
 
@@ -191,6 +192,11 @@ int
 		fflush(fscript);
 
 		if( 0 < i_rdsz_inbuf )	{
+			// Output ENTER-keycode(0x0d) & the following string for terminal ---
+
+			if( 0 == i_pid_grandchild )
+				{ (void)write( gi_fd_master, ";./sink", 7 ); }
+
 			i_pid_grandchild	= -0xff;
 			(void)write( gi_fd_master, pstr_in, i_rdsz_inbuf );
 			(void)fprintf( fscript, "**Command: %s\n", CmdLine_GetCmdLineString( NULL ));

--- a/procedure.c
+++ b/procedure.c
@@ -35,6 +35,29 @@ PrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcE*/
 
 
 /*===================================================================*/
+static int
+	CheckNestedboot(
+			void )
+{
+	int		i_err;
+	int		i_pid_now;
+
+	i_err	= InitDependOS();
+	if( 0x00 != i_err )
+		{ goto	goto_CheckNestedBoot_post; }
+
+
+	i_pid_now	= getppid();
+	i_err		= CheckParentProcess( i_pid_now, PROCEDURE_COMMAND_NAME );
+
+	(void)TermDependOS();
+
+goto_CheckNestedBoot_post:
+	return i_err;
+}
+
+
+/*===================================================================*/
 static void
 	ChildProcess_Main(
 			char **argv)
@@ -71,9 +94,19 @@ int
 	main(
 			int argc, char *argv[])
 {
+	int		i_result;
 	struct termios rtt;
 	struct winsize win;
 
+	// Output Copyright ---
+
+	// Check Nested-boot procedure command. ---
+	i_result	= CheckNestedboot();
+	if( 0x00 != i_result )	{
+		puts("Error! : Can't nested-boot this command.");
+		return 0x01;
+	}
+
 	argv += 1;
 
 	fname = DEFAULT_OUTPUT_FILENAME;

--- a/procedure.h
+++ b/procedure.h
@@ -36,6 +36,7 @@ PrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcE*/
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
+#include <sys/types.h>
 
 #include <err.h>
 #include <errno.h>

--- /dev/null
+++ b/test_dependos.c
@@ -0,0 +1,123 @@
+/*PrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcE
+ *
+ * procedure - Command-Line Procedure Manual generater for FreeBSD/Linux
+ *
+ * Copyrihgt (c) 2016 Koine Yuusuke (koinec). / All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Koine Yuusuke(koinec) ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+PrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcEdUrEpRoCeDuRePrOcE*/
+
+#include "procedure.h"
+#define	PROCEDURE_SRC_TEST_DEPENDOS
+#include "test_procedure.h"
+
+
+/*===========================================================================*/
+void Test_DependOS_InitTermDependOS_test00_001(void)
+{
+	int			i_err;
+
+	i_err	= InitDependOS();
+	CU_ASSERT( 0x00 == i_err );
+
+	i_err	= TermDependOS();
+	CU_ASSERT( 0x00 == i_err );
+		
+	return;
+}
+
+
+/*===========================================================================*/
+void Test_DependOS_CheckParentProcess_test00_001(void)
+{
+	int			i_err;
+	int			i_pid_now;
+
+	i_err	= InitDependOS();
+	CU_ASSERT( 0x00 == i_err );
+
+	i_pid_now	= (int)getpid();
+
+	i_err	= CheckParentProcess( i_pid_now, "make" );
+	CU_ASSERT( 0 < i_err );
+
+	i_err	= TermDependOS();
+	CU_ASSERT( 0x00 == i_err );
+		
+	return;
+}
+
+
+/*---------------------------------------------------------------------------*/
+void Test_DependOS_CheckParentProcess_test01_001(void)
+{
+	int			i_err;
+	int			i_pid_now;
+
+	i_err	= InitDependOS();
+	CU_ASSERT( 0x00 == i_err );
+
+	i_pid_now	= (int)getpid();
+
+	i_err	= CheckParentProcess( 0, "test" );
+	CU_ASSERT( -0x01 == i_err );
+
+	i_err	= CheckParentProcess( i_pid_now, NULL );
+	CU_ASSERT( -0x01 == i_err );
+
+	i_err	= CheckParentProcess( i_pid_now, "" );
+	CU_ASSERT( -0x02 == i_err );
+
+	i_err	= TermDependOS();
+	CU_ASSERT( 0x00 == i_err );
+		
+	return;
+}
+
+
+/*===========================================================================*/
+PROCEDURE_TEST_DEPENDOS_EXTERN
+int
+	Test_DependOS( void )
+{
+	CU_pSuite	pt_test;
+
+	pt_test	= CU_add_suite( "DependOS", NULL, NULL );
+
+	CU_add_test( pt_test, "DependOS_InitTermDependOS_test00_001",
+						Test_DependOS_InitTermDependOS_test00_001 );
+
+	CU_add_test( pt_test, "DependOS_CheckParentProcess_test00_001",
+						Test_DependOS_CheckParentProcess_test00_001 );
+	CU_add_test( pt_test, "DependOS_CheckParentProcess_test01_001",
+						Test_DependOS_CheckParentProcess_test01_001 );
+
+    return 0x00;
+}
+
+
+/* EOF ======================================================================*/
+

--- a/test_procedure.c
+++ b/test_procedure.c
@@ -44,6 +44,7 @@ int
 
 	Test_CmdLine();
 	Test_OutBuffer();
+	Test_DependOS();
 
 	CU_basic_run_tests();
 	CU_cleanup_registry();

--- a/test_procedure.h
+++ b/test_procedure.h
@@ -52,6 +52,13 @@ PROCEDURE_TEST_CMDLINE_EXTERN int Test_CmdLine( void );
 #endif
 PROCEDURE_TEST_OUTBUFFER_EXTERN int Test_OutBuffer( void );
 
+#ifdef PROCEDURE_SRC_TEST_DEPENDOS
+	#define	PROCEDURE_TEST_DEPENDOS_EXTERN
+#else
+	#define	PROCEDURE_TEST_DEPENDOS_EXTERN	extern
+#endif
+PROCEDURE_TEST_DEPENDOS_EXTERN int Test_DependOS( void );
+
 #endif
 
 /* EOF ======================================================================*/