Changeset 434 for trunk/user/ksh

Timestamp:

Feb 14, 2018, 3:41:31 PM (7 years ago)

Author:

alain

Message:

blap

File:

• trunk/user/ksh/ksh.c (modified) (4 diffs)

trunk/user/ksh/ksh.c

@@ -297 +297 @@
 static void cmd_load( int argc , char **argv )
 {
-        unsigned int         ret_pid;
-    unsigned int         new_pid;
+        int                  ret;
+    unsigned int         ksh_pid;
         char               * pathname;
     unsigned int         background;
@@ -304 +304 @@
         if( (argc < 2) || (argc > 3) )  
     {
-                printf("  usage: %s pathname [&] \n", argv[0] );
+                printf("  usage: %s pathname [&]\n", argv[0] );
                 return;
         }
@@ -311 +311 @@
 
     if( argc == 3 ) background = (argv[2][0] == '&');
-
-    // fork system call
-        ret_pid = fork();
-
-    if (ret_pid == 0)  // it is the child process 
-    {
-        // exec system call
-        if( exec( pathname , NULL , NULL ) )
+    else            background = 0;
+
+    // get KSH process PID
+    ksh_pid = getpid();
+
+    // KSH process fork CHILD process
+        ret = fork();
+
+    if ( ret < 0 )      // it is a failure reported to parent
+    {
+        printf("  error: ksh process unable to fork\n");
+    }
+    else if (ret == 0)  // it is the CHILD process 
+    {
+        // give back to KSH process the terminal ownership
+        if( background ) fg( ksh_pid );
+
+        // CHILD process exec NEW process
+        ret = exec( pathname , NULL , NULL );
+
+        if( ret )
         {
             printf("  error: new process unable to exec <%s>\n", pathname );
             exit(0);
         }
-
-        // get new process pid
-        new_pid = getpid();
-
-        // give new process terminal ownership
-        if( background == 0 ) fg( new_pid );
         } 
-    else if ( ret_pid < 0 )  // it is a failure reported to parent
-    {
-        printf("  error: unable to fork\n");
-    }
 }   // end cmd_load
 
@@ -624 +627 @@
                 if (!found)
         {
-                        printf("\n  undefined command %s\n", argv[0]);
+                        printf("  undefined command <%s>\n", argv[0]);
                 }
         }