提交: 148a5fba9e977e191e6b2bc26e80f4354bfe8855 - xyzsh (git)

シェルスクリプト言語xyzshのソースコード。

Commit MetaInfo

• 修订版: 148a5fba9e977e191e6b2bc26e80f4354bfe8855 (tree)
• 时间: 2012-11-05 11:52:23
• 作者: ab25cq <ab25cq@gmai...>
• Commiter: ab25cq

Log Message

1.1.8a

更改概述

• modified: CHANGELOG
• modified: src/block.c
• modified: src/run.c
• modified: src/xyzsh.c

差异

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
 
+2012 5th Norvember version 1.1.8a
+
+	Fixed errror message.
+
 2012 30th Octorber version 1.1.8
 
 	Added -index option to "add" inner command and "del" inner command.

--- a/src/block.c
+++ b/src/block.c
@@ -1130,7 +1130,7 @@ static BOOL expand_env_to_command(ALLOC char** result, char* str, sCommand* comm
 
                 if(!run(env->mBlock, nextin, nextout, &rcode, runinfo->mCurrentObject, runinfo->mRunningObject))
                 {
-                    err_msg("run time error", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                    err_msg_adding("run time error", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
                     runinfo->mRCode = rcode;
                     FREE(buf.mBuf);
                     return FALSE;

--- a/src/run.c
+++ b/src/run.c
@@ -561,6 +561,22 @@ static BOOL wait_child_program(pid_t pid, pid_t nextin_reader_pid, int nextout2,
                 /// exited normally ///
                 else if(WIFEXITED(status)) {
                     runinfo->mRCode = WEXITSTATUS(status);
+
+                    /// command not found ///
+                    if(runinfo->mRCode == 127) {
+                        if(gAppType == kATConsoleApp) // && nextout2 == 1)
+                        {
+                            if(tcsetpgrp(0, getpgid(0)) < 0) {
+                                perror("tcsetpgrp(xyzsh)");
+                                exit(1);
+                            }
+                        }
+
+                        char buf[BUFSIZ];
+                        snprintf(buf, BUFSIZ, "command not found");
+                        err_msg(buf, runinfo->mSName, runinfo->mSLine, program);
+                        return FALSE;
+                    }
                 }
                 /// stopped from signal ///
                 else if(WIFSTOPPED(status)) {
@@ -644,15 +660,13 @@ static BOOL run_exec_cprog(sCommand* command, char* program, int nextin, int nex
     if(program_at_cd) {
         if(access(program, X_OK) == 0) {
             fprintf(stderr, "This is program at current directory\n");
-            kill(getppid(), SIGUSR1);
-            exit(1);
+            exit(127);
         }
     }
 
     execv(program, command->mArgsRuntime);
     //fprintf(stderr, "exec('%s') error\n", command->mArgsRuntime[0]);  // comment out for try
-    kill(getppid(), SIGUSR1);
-    exit(1);
+    exit(127);
 }
 
 static BOOL run_external_command(char* program, sObject* nextin, sObject* nextout, sRunInfo* runinfo)

--- a/src/xyzsh.c
+++ b/src/xyzsh.c
@@ -112,7 +112,7 @@ static void xyzsh_read_rc()
 
 void xyzsh_init(enum eAppType app_type, BOOL no_runtime_script)
 {
-    setenv("XYZSH_VERSION", "1.1.8", 1);
+    setenv("XYZSH_VERSION", "1.1.8a", 1);
     setenv("XYZSH_DATAROOTDIR", DATAROOTDIR, 1);
 
     stack_init(1);;