system/zsh
system/zsh
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh synced 2024-09-20 00:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

24006: (F) glob qualifier should unmetafy

Browse source
This commit is contained in:
Peter Stephenson 2007-10-22 09:27:03 +00:00
parent 526f86ec15
commit 756cfc08e2
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2007-10-22 Peter Stephenson <pws@csr.com>
* 24006: Src/glob.c: (F) glob qualifier needs to unmetafy.
2007-10-21 Clint Adams <clint@zsh.org>
* 24005: Src/Modules/curses.c: enforce min/max arguments on zcurses

7
Src/glob.c
View file

@ -326,7 +326,8 @@ insert(char *s, int checked)
/* Reject the file if the function returned zero *
* and the sense was positive (sense&1 == 0), or *
* vice versa. */
if ((!((qn->func) (news, bp, qn->data, qn->sdata)) ^ qn->sense) & 1) {
if ((!((qn->func) (news, bp, qn->data, qn->sdata))
^ qn->sense) & 1) {
/* Try next alternative, or return if there are no more */
if (!(qo = qo->or)) {
unqueue_signals();
@ -3254,6 +3255,8 @@ qualnonemptydir(char *name, struct stat *buf, UNUSED(off_t days), UNUSED(char *s
{
DIR *dirh;
struct dirent *de;
int unamelen;
char *uname = unmetafy(dupstring(name), &unamelen);
if (!S_ISDIR(buf->st_mode))
return 0;
@ -3261,7 +3264,7 @@ qualnonemptydir(char *name, struct stat *buf, UNUSED(off_t days), UNUSED(char *s
if (buf->st_nlink > 2)
return 1;
if (!(dirh = opendir(name)))
if (!(dirh = opendir(uname)))
return 0;
while ((de = readdir(dirh))) {