sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

removed need for scandir in client.c

Browse Source 
fixed possible bug with readdirname on systems with NAMELEN != strlen
This commit is contained in:
Andrew Tridgell 0001-01-01 00:00:00 +00:00
parent f8c83ce28b
commit 78f448b7d4
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source/client/client.c
View File

@ -1170,38 +1170,29 @@ static void cmd_select(void)
next_token(NULL,fileselection,NULL,sizeof(fileselection));
}
/****************************************************************************
Recursive file matching function act as find
match must be always set to True when calling this function
****************************************************************************/
static int file_find(struct file_list **list, const char *directory,
const char *expression, BOOL match)
{
struct dirent **namelist;
DIR *dir;
struct file_list *entry;
struct stat statbuf;
int n, ret;
int ret;
char *path;
BOOL isdir;
char *dname;
n = scandir(directory, &namelist, 0, alphasort);
if (n == -1) return -1;
dir = opendir(directory);
if (!dir) return -1;
while (n--) {
int len = NAMLEN(namelist[n]);
char *dname = malloc(len+1);
if (!dname) continue;
memcpy(dname, namelist[n]->d_name, len);
dname[len] = 0;
while ((dname = readdirname(dir))) {
if (!strcmp("..", dname)) continue;
if (!strcmp(".", dname)) continue;
if (asprintf(&path, "%s/%s", directory, dname) <= 0) {
free(dname);
continue;
}
@ -1209,7 +1200,7 @@ static int file_find(struct file_list **list, const char *directory,
if (!match || !ms_fnmatch(expression, dname)) {
if (recurse) {
ret = stat(path, &statbuf);
if (!ret) {
if (ret == 0) {
if (S_ISDIR(statbuf.st_mode)) {
isdir = True;
ret = file_find(list, path, expression, False);
@ -1218,16 +1209,17 @@ static int file_find(struct file_list **list, const char *directory,
DEBUG(0,("file_find: cannot stat file %s\n", path));
}
if (ret) {
if (ret == -1) {
free(path);
free(dname);
return ret;
closedir(dir);
return -1;
}
}
entry = (struct file_list *) malloc(sizeof (struct file_list));
if (!entry) {
DEBUG(0,("Out of memory in file_find\n"));
return -4;
closedir(dir);
return -1;
}
entry->file_path = path;
entry->isdir = isdir;
@ -1235,8 +1227,9 @@ static int file_find(struct file_list **list, const char *directory,
} else {
free(path);
}
free(dname);
}
closedir(dir);
return 0;
}

4
source/lib/util.c
View File

@ -1187,7 +1187,9 @@ char *readdirname(DIR *p)
{
static pstring buf;
memcpy(buf, dname, NAMLEN(ptr)+1);
int len = NAMLEN(ptr);
memcpy(buf, dname, len);
buf[len] = 0;
dname = buf;
}