diff options
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/Modules/.distfiles | 2 | ||||
| -rw-r--r-- | Src/builtin.c | 1 | ||||
| -rw-r--r-- | Src/exec.c | 3 | ||||
| -rw-r--r-- | Src/glob.c | 6 | ||||
| -rw-r--r-- | Src/init.c | 7 | ||||
| -rw-r--r-- | Src/zsh.h | 6 |
6 files changed, 6 insertions, 19 deletions
diff --git a/Src/Modules/.distfiles b/Src/Modules/.distfiles index 730aeeecc..5bb3f6ef6 100644 --- a/Src/Modules/.distfiles +++ b/Src/Modules/.distfiles @@ -9,6 +9,6 @@ DISTFILES_SRC=' parameter.mdd parameter.c stat.mdd stat.c zftp.mdd zftp.c + zprof.mdd zprof.c zutil.mdd zutil.c - zpty.mdd zpty.c ' diff --git a/Src/builtin.c b/Src/builtin.c index 8d56dd4d2..a373d9dd2 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -3219,7 +3219,6 @@ zexit(int val, int from_signal) } if (sigtrapped[SIGEXIT]) dotrap(SIGEXIT); - runhookdef(EXITHOOK, NULL); if (mypid != getpid()) _exit(val); else diff --git a/Src/exec.c b/Src/exec.c index 6c7892318..ac0288be0 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -2519,7 +2519,8 @@ getoutput(char *cmd, int qt) wc_code(pc[2]) == WC_PIPE && WC_PIPE_TYPE(pc[2]) == WC_PIPE_END && wc_code(pc[3]) == WC_REDIR && WC_REDIR_TYPE(pc[3]) == READ && !pc[4] && - wc_code(pc[6]) == WC_SIMPLE && !WC_SIMPLE_ARGC(pc[6])) { + wc_code(pc[6]) == WC_SIMPLE && !WC_SIMPLE_ARGC(pc[6]) && + wc_code(pc[7]) == WC_END) { /* $(< word) */ int stream; char *s = dupstring(ecrawstr(prog, pc + 5)); diff --git a/Src/glob.c b/Src/glob.c index fc2c64cfd..73a752536 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -41,13 +41,13 @@ typedef struct gmatch *Gmatch; struct gmatch { - off_t size ALIGN64; - off_t _size ALIGN64; char *name; + off_t size ALIGN64; long atime; long mtime; long ctime; long links; + off_t _size ALIGN64; long _atime; long _mtime; long _ctime; @@ -102,10 +102,10 @@ typedef struct stat *Statptr; /* This makes the Ultrix compiler happy. Go figu typedef int (*TestMatchFunc) _((char *, struct stat *, off_t, char *)); struct qual { - off_t data ALIGN64; /* Argument passed to function */ struct qual *next; /* Next qualifier, must match */ struct qual *or; /* Alternative set of qualifiers to match */ TestMatchFunc func; /* Function to call to test match */ + off_t data ALIGN64; /* Argument passed to function */ int sense; /* Whether asserting or negating */ int amc; /* Flag for which time to test (a, m, c) */ int range; /* Whether to test <, > or = (as per signum) */ diff --git a/Src/init.c b/Src/init.c index 4aa268f0d..20e996fdd 100644 --- a/Src/init.c +++ b/Src/init.c @@ -89,11 +89,6 @@ mod_export int (*getkeyptr) _((int)); mod_export int alloc_stackp; #endif -/**/ -mod_export struct hookdef zshhooks[] = { - HOOKDEF("exit", NULL, HOOKF_ALL), -}; - /* keep executing lists until EOF found */ /**/ @@ -565,8 +560,6 @@ setupvals(void) # endif #endif - addhookdefs(argzero, zshhooks, sizeof(zshhooks)/sizeof(*zshhooks)); - init_eprog(); getkeyptr = NULL; diff --git a/Src/zsh.h b/Src/zsh.h index 54141d2b7..15b01a0db 100644 --- a/Src/zsh.h +++ b/Src/zsh.h @@ -1649,9 +1649,3 @@ typedef unsigned char * (*ZleReadFn) _((char *, char *, int)); /***************************************/ #define mod_export - -/***************************************/ -/* Hooks in core. */ -/***************************************/ - -#define EXITHOOK (zshhooks + 0) |