mirror of
https://github.com/samba-team/samba.git
synced 2025-01-19 10:03:58 +03:00
return . and .. first in readdir - this fixes masktest on IRIX which
returns . then single letter files then .. then all other files. (This used to be commit d4d9361eec11f50c780ed4c79bc9775ac24d8c0e)
This commit is contained in:
parent
73c45a4a6f
commit
1783dcd2f1
@ -729,10 +729,22 @@ void *OpenDir(connection_struct *conn, char *name, BOOL use_veto)
|
|||||||
dirp->pos = dirp->numentries = dirp->mallocsize = 0;
|
dirp->pos = dirp->numentries = dirp->mallocsize = 0;
|
||||||
dirp->data = dirp->current = NULL;
|
dirp->data = dirp->current = NULL;
|
||||||
|
|
||||||
while ((n = vfs_readdirname(conn, p)))
|
while (True)
|
||||||
{
|
{
|
||||||
int l;
|
int l;
|
||||||
|
|
||||||
|
if (used == 0) {
|
||||||
|
n = ".";
|
||||||
|
} else if (used == 2) {
|
||||||
|
n = "..";
|
||||||
|
} else {
|
||||||
|
n = vfs_readdirname(conn, p);
|
||||||
|
if (n == NULL)
|
||||||
|
break;
|
||||||
|
if ((strcmp(".",n) == 0) ||(strcmp("..",n) == 0))
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
l = strlen(n)+1;
|
l = strlen(n)+1;
|
||||||
|
|
||||||
/* If it's a vetoed file, pretend it doesn't even exist */
|
/* If it's a vetoed file, pretend it doesn't even exist */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user