diff options
author | Axel Beckert <abe@deuxchevaux.org> | 2012-01-22 16:22:20 +0100 |
---|---|---|
committer | Axel Beckert <abe@deuxchevaux.org> | 2012-01-22 16:22:20 +0100 |
commit | dbd9bc55f629891c29373398120d8af7e2c44732 (patch) | |
tree | 7a4f6a02ad876cdd236dbe6a8d68e172dc50a9e4 /Src/glob.c | |
parent | 1a3a8694a6eae1e140d746e4c21769cdd56971c0 (diff) | |
parent | 09532a70ead07a600a3d2258837d6e3fe943f2fd (diff) | |
download | zsh-dbd9bc55f629891c29373398120d8af7e2c44732.tar.gz zsh-dbd9bc55f629891c29373398120d8af7e2c44732.zip |
Merge branch 'upstream' into debian
Diffstat (limited to 'Src/glob.c')
-rw-r--r-- | Src/glob.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Src/glob.c b/Src/glob.c index cf4a5a537..076d0392a 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -422,13 +422,13 @@ insert(char *s, int checked) matchptr->_ctime = buf2.st_ctime; matchptr->_links = buf2.st_nlink; #ifdef GET_ST_ATIME_NSEC - matchptr->_ansec = GET_ST_ATIME_NSEC(buf); + matchptr->_ansec = GET_ST_ATIME_NSEC(buf2); #endif #ifdef GET_ST_MTIME_NSEC - matchptr->_mnsec = GET_ST_MTIME_NSEC(buf); + matchptr->_mnsec = GET_ST_MTIME_NSEC(buf2); #endif #ifdef GET_ST_CTIME_NSEC - matchptr->_cnsec = GET_ST_CTIME_NSEC(buf); + matchptr->_cnsec = GET_ST_CTIME_NSEC(buf2); #endif } matchptr++; @@ -1530,6 +1530,8 @@ zglob(LinkList list, LinkNode np, int nountok) g_units = TT_MONTHS, ++s; else if (*s == 's') g_units = TT_SECONDS, ++s; + else if (*s == 'd') + ++s; } /* See if it's greater than, equal to, or less than */ if ((g_range = *s == '+' ? 1 : *s == '-' ? -1 : 0)) |