Commit: d3f5b7ebf6a3598d003f309691400bbf122550a1 - xyzsh (git)

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

Commit MetaInfo

• Revision: d3f5b7ebf6a3598d003f309691400bbf122550a1 (tree)
• Time: 2012-10-30 16:22:25
• Author: ab25cq <ab25cq@gmai...>
• Commiter: ab25cq

Log Message

Fixed a bug with expanding exvironmet variable on redirects

Change Summary

• modified: CHANGELOG
• modified: Makefile.in
• modified: src/block.c
• modified: src/xyzsh.c
• modified: xyzsh.xyzsh

Incremental Difference

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,10 @@
 
+2012 30th Octorber version 1.1.7
+
+	Fixed a bug with expanding environmet on redirects
+
+	Fixed Makefile.in
+
 2012 30th Octorber version 1.1.6
 
     Made runnable on cygwin

--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,7 @@ clean:
 distclean:
 	rm -fR xyzsh xyzsh.dSYM src/*.o libxyzsh* config.h Makefile xyzsh.exe* config.log config.status *.stackdump autom4te.cache
 
-xyzsh: config.h src/main.c $(LIBXYZSHSO)
+xyzsh: config.h src/main.c $(LIBXYZSHSO) $(LIBXYZSHA)
 	$(CC) -o xyzsh src/main.c $(CFLAGS) -lxyzsh $(LIBS)
 
 ########################################################

--- a/src/block.c
+++ b/src/block.c
@@ -1312,7 +1312,15 @@ BOOL sCommand_expand_env_redirect(sCommand* command, sObject* nextin, sRunInfo*
         int i;
         for(i=0; i<command->mRedirectsNum; i++) {
             char* fname = command->mRedirectsFileNames[i];
-            if(fname[0] == PARSER_MAGIC_NUMBER_ENV) {
+            BOOL env = FALSE;
+            char* p = fname;
+            while(*p) {
+                if(*p == PARSER_MAGIC_NUMBER_ENV) {
+                    env = TRUE;
+                }
+                p++;
+            }
+            if(env) {
                 char* expanded_str;
                 BOOL expand_double_dollar;
                 if(!expand_env_to_command(ALLOC &expanded_str, fname, command, runinfo, nextin, &expand_double_dollar)) {

--- 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.6", 1);
+    setenv("XYZSH_VERSION", "1.1.7", 1);
     setenv("XYZSH_DATAROOTDIR", DATAROOTDIR, 1);
 
     stack_init(1);;

--- a/xyzsh.xyzsh
+++ b/xyzsh.xyzsh
@@ -37,13 +37,15 @@ EOS > ~/.xyzsh/jump
 def menu (
     if(! print ~/.xyzsh/menu | -e) (
         print <<<EOS
+vim ~/.xyzsh/menu
+vim ~/.xyzsh/macro
 ls -al | uc| less
 pwd | scan . | less
 ls | each ( if(|chomp | -d) ( | print ) )
 EOS > ~/.xyzsh/menu
     )
 
-    cat ~/.xyzsh/menu | selector | chomp | eval
+    eval $(cat ~/.xyzsh/menu | selector | chomp)
 )
 
 def macro (