提交: 219e30081f1c57d0df8328383d59588bedda6b95 - xyzsh (git)

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

Commit MetaInfo

• 修訂: 219e30081f1c57d0df8328383d59588bedda6b95 (tree)
• 時間: 2012-11-08 13:23:09
• 作者: ab25q <ab25cq@gmai...>
• Commiter: ab25q

Log Message

v1.1.8b

Change Summary

• modified: CHANGELOG
• modified: completion.xyzsh
• add: forced_update_display
• modified: src/block.c
• modified: src/cmd_base.c
• modified: src/cmd_curses.c
• modified: src/curses.c
• modified: src/interface.c
• modified: src/main.c
• modified: src/readline.c
• modified: src/run.c
• modified: src/xyzsh.c
• modified: src/xyzsh/xyzsh.h

差異

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,10 @@
 
+2012 8th Norvember version 1.1.8b
+
+    Changed "exit -force" action for mfiler4. 
+
+    Modified job title more better.
+
 2012 5th Norvember version 1.1.8a
 
 	Fixed errror message.

--- a/completion.xyzsh
+++ b/completion.xyzsh
@@ -125,6 +125,6 @@ completion git (
 )
 
 completion kill (
-    ps | selector | split | lines 1 (|print)
+    ps | each ( | sub '^\s+' '' ) | selector | split | lines 0 (|print)
 )
 

--- a/src/block.c
+++ b/src/block.c
@@ -149,6 +149,36 @@ void sCommand_sweep_runtime_info(sCommand* self)
     }
 }
 
+void sStatment_sweep_runtime_info(sStatment* self)
+{
+    int j;
+    for(j=0; j<self->mCommandsNum; j++) {
+        sCommand* command = self->mCommands + j;
+        
+        int i;
+        for(i=0; i<command->mArgsNumRuntime; i++) {
+            FREE(command->mArgsRuntime[i]);
+        }
+        command->mArgsNumRuntime = 0;
+
+        for(i=0; i<XYZSH_OPTION_MAX; i++) {
+            if(command->mOptions[i].mKey) { FREE(command->mOptions[i].mKey); }
+            if(command->mOptions[i].mArg) { FREE(command->mOptions[i].mArg); }
+        }
+
+        memset(command->mOptions, 0, sizeof(option_hash_it)*XYZSH_OPTION_MAX);
+
+        if(command->mRedirectsFileNamesRuntime) {
+            for(i=0; i<command->mRedirectsNum; i++) {
+                FREE(command->mRedirectsFileNamesRuntime[i]);
+            }
+            FREE(command->mRedirectsFileNamesRuntime);
+
+            command->mRedirectsFileNamesRuntime = NULL;
+        }
+    }
+}
+
 void sCommand_add_redirect_to_command(sCommand* self, MANAGED char* name, int redirect)
 {
     if(self->mRedirectsNum >= self->mRedirectsSize) {

--- a/src/cmd_base.c
+++ b/src/cmd_base.c
@@ -32,7 +32,7 @@ BOOL cmd_jobs(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
     int i;
     for(i=0; i<vector_count(gJobs); i++) {
         sObject* job = vector_item(gJobs, i);
-        int size = snprintf(buf, BUFSIZ, "[%d] name: %s pid&pgrp: %d", i+1, SJOB(job).mName, SJOB(job).mPGroup);
+        int size = snprintf(buf, BUFSIZ, "[%d] %s (pgrp: %d)", i+1, SJOB(job).mName, SJOB(job).mPGroup);
         if(!fd_write(nextout, buf, size)) {
             err_msg("signal interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
             runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
@@ -82,8 +82,6 @@ BOOL cmd_exit(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
     sCommand* command = runinfo->mCommand;
     
     if(sCommand_option_item(command, "-force")) {
-        xyzsh_kill_all_jobs();
-
         runinfo->mRCode = RCODE_EXIT;
     }
     else {

--- a/src/cmd_curses.c
+++ b/src/cmd_curses.c
@@ -127,9 +127,7 @@ BOOL cmd_selector(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
         fd_split(nextin, lf);
 
         if(vector_count(SFD(nextin).fdbuf.mLines) > 0) {
-#if !defined(__FREEBSD__)
             msave_screen();
-#endif
             msave_ttysettings();
             minitscr();
 
@@ -235,9 +233,7 @@ BOOL cmd_selector(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                 }
                 else if(key == 'q' || key == 3 | key == 27 || key == 7) {
                     mendwin();
-#if !defined(__FREEBSD__)
                     mrestore_screen();
-#endif
                     mrestore_ttysettings();
                     FREE(markfiles);
                     return FALSE;
@@ -329,9 +325,7 @@ BOOL cmd_selector(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             FREE(markfiles);
 
             mendwin();
-#if !defined(__FREEBSD__)
             mrestore_screen();
-#endif
             mrestore_ttysettings();
         }
         else {
@@ -409,9 +403,7 @@ BOOL cmd_p(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
         fd_split(nextin2, lf);
 
         msave_ttysettings();
-#if !defined(__FREEBSD__)
         msave_screen();
-#endif
         minitscr();
 
         const int maxx = mgetmaxx();
@@ -517,9 +509,7 @@ BOOL cmd_p(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             else if(key == 'q' || key == 3 | key == 27 || key == 7) {
                 err_msg("p: canceled", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
                 mendwin();
-#if !defined(__FREEBSD__)
                 mrestore_screen();
-#endif
                 mrestore_ttysettings();
                 FREE(markfiles);
                 return FALSE;
@@ -571,9 +561,7 @@ BOOL cmd_p(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
         FREE(markfiles);
 
         mendwin();
-#if !defined(__FREEBSD__)
         mrestore_screen();
-#endif
         mrestore_ttysettings();
     }
 
@@ -971,9 +959,7 @@ BOOL cmd_fselector(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 
     if(vector_count(v) > 0) {
         msave_ttysettings();       // 端末の設定の保存
-#if !defined(__FREEBSD__)
         msave_screen();
-#endif
         minitscr();
 
         const int maxx = mgetmaxx();
@@ -1107,9 +1093,7 @@ BOOL cmd_fselector(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             else if(key == 'q' || key == 3 | key == 27 || key == 7) {
                 err_msg("canceled", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
                 mendwin();
-#if !defined(__FREEBSD__)
                 mrestore_screen();
-#endif
                 mrestore_ttysettings();    // 端末の設定の復帰
                 int i;
                 for(i=0; i<vector_count(v); i++) {
@@ -1170,9 +1154,7 @@ BOOL cmd_fselector(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 //mclear();
 //mrefresh();
         mendwin();
-#if !defined(__FREEBSD__)
         mrestore_screen();
-#endif
         mrestore_ttysettings();    // 端末の設定の復帰
 
         if(vector_count(mark_files) == 0) {

--- a/src/curses.c
+++ b/src/curses.c
@@ -386,9 +386,6 @@ void mclear_online(int y)
     mmvprintw(y, 0, space);
 }
 
-
-
-
 void mmove(int y, int x)
 {
     gX = x;
@@ -1895,18 +1892,32 @@ int mis_raw_mode()
 
 void msave_screen()
 {
+#if defined(__FREEBSD__)
+#else
     char* str = tigetstr("smcup");
     if(str) {
         ttywrite(str);
     }
+    str = tigetstr("sc");
+    if(str) {
+        ttywrite(str);
+    }
+#endif
 }
 
 void mrestore_screen()
 {
+#if defined(__FREEBSD__)
+#else
     char* str = tigetstr("rmcup");
     if(str) {
         ttywrite(str);
     }
+    str = tigetstr("rc");
+    if(str) {
+        ttywrite(str);
+    }
+#endif
 }
 
 

--- a/src/interface.c
+++ b/src/interface.c
@@ -158,11 +158,12 @@ static void readline_insert_text(char* cmdline, int cursor_point)
 
     rl_point = n;
 
+/*
 #if defined(__FREEBSD__)
-//extern int rl_reset_terminal PARAMS((const char *));
-    mclear_immediately();
+    puts("");
     rl_forced_update_display();
 #endif
+*/
 }
 
 static char* gCmdLine;

--- a/src/main.c
+++ b/src/main.c
@@ -38,7 +38,6 @@ int main(int argc, char** argv)
         }
     }
 
-
     if(optc) {
         xyzsh_init(kATOptC, no_runtime_script);
         xyzsh_opt_c(optc, argv, argc);
@@ -51,6 +50,7 @@ int main(int argc, char** argv)
         setenv("XYZSH_RUNNING_AS_INTRACTIVE_MODE", "1", 1);
         xyzsh_init(kATConsoleApp, no_runtime_script);
         xyzsh_readline_interface("", -1, argv, argc);
+        xyzsh_kill_all_jobs();
     }
 
     xyzsh_final();

--- a/src/readline.c
+++ b/src/readline.c
@@ -802,11 +802,8 @@ BOOL cmd_readline_insert_text(sObject* nextin, sObject* nextout, sRunInfo* runin
 
     if(runinfo->mFilter) {
         (void)rl_insert_text(SFD(nextin).fdbuf.mBuf);
-#if defined(__FREEBSD__)
-//extern int rl_reset_terminal PARAMS((const char *));
-    mclear_immediately();
-    rl_forced_update_display();
-#endif
+        puts("");
+        rl_forced_update_display();
 
         runinfo->mRCode = 0;
     }
@@ -829,10 +826,8 @@ BOOL cmd_readline_delete_text(sObject* nextin, sObject* nextout, sRunInfo* runin
         if(rl_point < 0) {
             rl_point = 0;
         }
-#if defined(__FREEBSD__)
-    mclear_immediately();
-    rl_forced_update_display();
-#endif
+        puts("");
+        rl_forced_update_display();
 
         runinfo->mRCode = 0;
     }
@@ -912,15 +907,13 @@ static int readline_macro(int count, int key)
     }
 
     rl_insert_text(SFD(nextout2).fdbuf.mBuf);
-#if defined(__FREEBSD__)
-    mclear_immediately();
+    puts("");
     rl_forced_update_display();
-#endif
-
     stack_end_stack();
 
     return 0;
 }
+
 static int skip_quoted(const char *s, int i, char q)
 {
    while(s[i] && s[i]!=q) 

--- a/src/run.c
+++ b/src/run.c
@@ -429,6 +429,34 @@ static void nextin_writer(pid_t pid, sObject* nextin, int* pipeinfds, int* pipeo
     *nextin_reader_pid = pid2;
 }
 
+void make_job_title(sStatment* statment, sCommand* command_, char* title, int title_num)
+{
+    title[0] = 0;
+
+    int i;
+    for(i=0; i<statment->mCommandsNum; i++) {
+        sCommand* command = statment->mCommands + i;
+
+        int j;
+        for(j=0; j<command->mArgsNumRuntime; j++) {
+            char* arg = command->mArgsRuntime[j];
+
+            xstrncat(title, arg, BUFSIZ);
+            if(j+1 < command->mArgsNumRuntime) {
+                xstrncat(title, " ", BUFSIZ);
+            }
+        }
+
+        if(command == command_) {
+            break;
+        }
+
+        if(i+1 < statment->mCommandsNum) {
+            xstrncat(title, "|", BUFSIZ);
+        }
+    }
+}
+
 static BOOL wait_child_program(pid_t pid, pid_t nextin_reader_pid, int nextout2, sRunInfo* runinfo, char* program)
 {
     if(nextin_reader_pid != -1) {
@@ -522,14 +550,9 @@ static BOOL wait_child_program(pid_t pid, pid_t nextin_reader_pid, int nextout2,
             struct termios tty;
             tcgetattr(STDIN_FILENO, &tty);
 
-            sStatment* statment = runinfo->mStatment;
             char title[BUFSIZ];
-            title[0] = 0;
-            int i;
-            for(i=0; i<statment->mCommandsNum; i++) {
-                xstrncat(title, statment->mCommands[i].mArgsRuntime[0], BUFSIZ);
-                xstrncat(title, " ", BUFSIZ);
-            }
+            make_job_title(runinfo->mStatment, runinfo->mCommand, title, BUFSIZ);
+
             sObject* job = JOB_NEW_GC(title, pid, tty);
         }
 
@@ -586,14 +609,9 @@ static BOOL wait_child_program(pid_t pid, pid_t nextin_reader_pid, int nextout2,
                     struct termios tty;
                     tcgetattr(STDIN_FILENO, &tty);
 
-                    sStatment* statment = runinfo->mStatment;
                     char title[BUFSIZ];
-                    title[0] = 0;
-                    int i;
-                    for(i=0; i<statment->mCommandsNum; i++) {
-                        xstrncat(title, statment->mCommands[i].mArgsRuntime[0], BUFSIZ);
-                        xstrncat(title, " ", BUFSIZ);
-                    }
+                    make_job_title(runinfo->mStatment, runinfo->mCommand, title, BUFSIZ);
+
                     sObject* job = JOB_NEW_GC(title, pid, tty);
                 }
 
@@ -1152,6 +1170,15 @@ static void redirect_finish(int opend_fd)
 
 static BOOL statment_tree(sStatment* statment, sObject* pipein, sObject* pipeout, sRunInfo* runinfo, sObject* current_object)
 {
+    /// error check ///
+    if(statment->mFlags & STATMENT_BACKGROUND) {
+        if(gAppType == kATOptC) {
+            err_msg("can't make a job background on script mode. you can make a job background on interactive shell", runinfo->mSName, runinfo->mSLine, NULL);
+            return FALSE;
+        }
+    }
+
+    /// head of statment ///
     sObject* nextin;
     if(statment->mFlags & STATMENT_CONTEXTPIPE) {
         /// read stdin ///
@@ -1218,6 +1245,7 @@ static BOOL statment_tree(sStatment* statment, sObject* pipein, sObject* pipeout
         nextin = pipein;
     }
 
+    /// command loop ///
     int i;
     for(i=0; i<statment->mCommandsNum; i++) {
         sCommand* command = runinfo->mCommand = statment->mCommands + i;
@@ -1409,7 +1437,6 @@ static BOOL statment_tree(sStatment* statment, sObject* pipein, sObject* pipeout
                     }
                 }
             }
-            sCommand_sweep_runtime_info(command);
         }
 
         if(opened_fd != -1) redirect_finish(opened_fd);
@@ -1422,6 +1449,8 @@ static BOOL statment_tree(sStatment* statment, sObject* pipein, sObject* pipeout
         }
     }
 
+    sStatment_sweep_runtime_info(statment);
+
     /// reverse the return code ///
     if(statment->mFlags & STATMENT_REVERSE) {
         runinfo->mRCode = !runinfo->mRCode;

--- 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.8a", 1);
+    setenv("XYZSH_VERSION", "1.1.8b", 1);
     setenv("XYZSH_DATAROOTDIR", DATAROOTDIR, 1);
 
     stack_init(1);;

--- a/src/xyzsh/xyzsh.h
+++ b/src/xyzsh/xyzsh.h
@@ -764,6 +764,7 @@ BOOL sCommand_put_option_with_argument(sCommand* self, MANAGED char* key, MANAGE
 BOOL sCommand_expand_env(sCommand* command, sObject* object, sObject* nextin, sObject* nextout, sRunInfo* runinfo);
 BOOL sCommand_expand_env_redirect(sCommand* command, sObject* nextin, sRunInfo* runinfo);
 void sCommand_sweep_runtime_info(sCommand* command);
+void sStatment_sweep_runtime_info(sStatment* self);
 
 extern sObject* gMemChecker;