Changeset 441 for trunk/user/ksh

Timestamp:

May 9, 2018, 3:13:56 PM (6 years ago)

Author:

alain

Message:

Fix a bug in rpc_vmm_get_pte_client() function (bad RPC index).

File:

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

trunk/user/ksh/ksh.c

@@ -395 +395 @@
         int                  ret_exec;           // return value from exec
     unsigned int         ksh_pid;            // KSH process PID
-    unsigned int         new_pid;            // new process PID
-    unsigned int         rcv_pid;            // terminating process PID
         char               * pathname;           // path to .elf file
     unsigned int         background;         // background execution if non zero
@@ -425 +423 @@
     else if (ret_fork == 0)      // it is the CHILD process 
     {
-        // give back to KSH terminal ownership if required
-        if( background ) fg( ksh_pid );
-
         // CHILD process exec NEW process
         ret_exec = exec( pathname , NULL , NULL );
 
+        // this is only executed in case of exec failure
         if( ret_exec )
         {
-            printf("  error: new process unable to exec <%s>\n", pathname );
-            return;
+            printf("  error: child process unable to exec <%s>\n", pathname );
+            exit( 0 );
         }   
         } 
     else                        // it is the parent KSH : ret_fork is the new process PID
     {
-        new_pid = ret_fork;
-
-        // wait new process completion 
-        rcv_pid = wait( &status );
-
-        if( rcv_pid == new_pid )
-        {
-            printf("\n\n   %s normal termination / status = %x\n\n",
-            pathname , (status &0xFF) );
-            return;
-        }
-        else
-        {
-            printf("\n\n   %s abnormal termination / status = %x\n\n",
-            pathname , (status &0xFF) );
-            return;
-        }
+        // give back terminal ownership to KSH if new process created in background /
+        // wait new process completion before returning to command interpreter otherwise
+        if( background )   fg( ksh_pid );
+        else               wait( &status );
+
+        // return to command interpreter
+        return;
     }
 }   // end cmd_load
@@ -758 +744 @@
                                                 printf("# ");
                                         }
+                    else
+                    {
+                        printf("\n# ");
+                    }
                                 }
                                 else if (c == '\t')     // tabulation => do nothing