This commit was generated by cvs2svn to compensate for changes in r30,

which included commits to RCS files with non-trunk default branches.
(This used to be commit 3a69cffb062d4f1238b8cae10481c1f2ea4d3d8b)

1 files changed, 313 insertions, 0 deletions

diff --git a/source4/libcli/clilist.c b/source4/libcli/clilist.c
new file mode 100644
index 0000000000..620e4382f4
--- /dev/null
+++ b/source4/libcli/clilist.c
@@ -0,0 +1,313 @@
+/* 
+   Unix SMB/CIFS implementation.
+   client directory list routines
+   Copyright (C) Andrew Tridgell 1994-2003
+   Copyright (C) James Myers 2003 <myersjj@samba.org>
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+struct search_private {
+	file_info *dirlist;
+	TALLOC_CTX *mem_ctx;
+	int dirlist_len;
+	int ff_searchcount;  /* total received in 1 server trip */
+	int total_received;  /* total received all together */
+	int info_level;
+	DATA_BLOB status;	/* used for old-style search */
+};
+
+
+/****************************************************************************
+ Interpret a long filename structure.
+****************************************************************************/
+static BOOL interpret_long_filename(int level,
+				    union smb_search_data *info,
+				    file_info *finfo)
+{
+	file_info finfo2;
+
+	if (!finfo) finfo = &finfo2;
+	ZERO_STRUCTP(finfo);
+	
+	finfo->size = info->both_directory_info.size;
+	finfo->ctime = nt_time_to_unix(&info->both_directory_info.create_time);
+	finfo->atime = nt_time_to_unix(&info->both_directory_info.access_time);
+	finfo->mtime = nt_time_to_unix(&info->both_directory_info.write_time);
+	finfo->mode = info->both_directory_info.attrib; /* 32 bit->16 bit attrib */
+	if (info->both_directory_info.short_name.s) {
+		strncpy(finfo->short_name, info->both_directory_info.short_name.s, 
+			sizeof(finfo->short_name)-1);
+	}
+	finfo->name = info->both_directory_info.name.s;
+	return True;
+}
+
+/* callback function used for trans2 search */
+static BOOL cli_list_new_callback(void *private, union smb_search_data *file)
+{
+	struct search_private *state = (struct search_private*) private;
+	file_info *tdl;
+ 
+	/* add file info to the dirlist pool */
+	tdl = talloc_realloc(state->mem_ctx, state->dirlist,
+			state->dirlist_len + sizeof(struct file_info));
+
+	if (!tdl) {
+		return False;
+	}
+	state->dirlist = tdl;
+	state->dirlist_len += sizeof(struct file_info);
+
+	interpret_long_filename(state->info_level, file, &state->dirlist[state->total_received]);
+
+	state->total_received++;
+	state->ff_searchcount++;
+	
+	return True;
+}
+
+int cli_list_new(struct cli_state *cli, const char *Mask, uint16 attribute, 
+		 void (*fn)(file_info *, const char *, void *), void *caller_state)
+{
+	union smb_search_first first_parms;
+	union smb_search_next next_parms;
+	struct search_private state;  /* for callbacks */
+	int received = 0;
+	BOOL first = True;
+	int num_received = 0;
+	int max_matches = 512;
+	char *mask;
+	int ff_eos = 0, i, ff_searchcount;
+	int ff_dir_handle=0;
+	int level;
+
+	/* initialize state for search */
+	state.dirlist = NULL;
+	state.mem_ctx = talloc_init("cli_list_new");
+	state.dirlist_len = 0;
+	state.total_received = 0;
+	
+	mask = talloc_strdup(state.mem_ctx, Mask);
+
+	if (cli->transport->negotiate.capabilities & CAP_NT_SMBS) {
+		level = RAW_SEARCH_BOTH_DIRECTORY_INFO;
+	} else {
+		level = RAW_SEARCH_STANDARD;
+	}
+
+	while (1) {
+		state.ff_searchcount = 0;
+		if (first) {
+			NTSTATUS status;
+
+			first_parms.t2ffirst.level = level;
+			first_parms.t2ffirst.in.max_count = max_matches;
+			first_parms.t2ffirst.in.search_attrib = attribute;
+			first_parms.t2ffirst.in.pattern = mask;
+			first_parms.t2ffirst.in.flags = FLAG_TRANS2_FIND_CLOSE_IF_END;
+			first_parms.t2ffirst.in.storage_type = 0;
+			
+			status = smb_raw_search_first(cli->tree, 
+						      state.mem_ctx, &first_parms,
+						      (void*)&state, cli_list_new_callback);
+			if (!NT_STATUS_IS_OK(status)) {
+				talloc_destroy(state.mem_ctx);
+				return -1;
+			}
+		
+			ff_dir_handle = first_parms.t2ffirst.out.handle;
+			ff_searchcount = first_parms.t2ffirst.out.count;
+			ff_eos = first_parms.t2ffirst.out.end_of_search;
+			
+			received = first_parms.t2ffirst.out.count;
+			if (received <= 0) break;
+			if (ff_eos) break;
+			first = False;
+		} else {
+			NTSTATUS status;
+
+			next_parms.t2fnext.level = level;
+			next_parms.t2fnext.in.max_count = max_matches;
+			next_parms.t2fnext.in.last_name = mask;
+			next_parms.t2fnext.in.handle = ff_dir_handle;
+			next_parms.t2fnext.in.resume_key = 0;
+			next_parms.t2fnext.in.flags = FLAG_TRANS2_FIND_CONTINUE | FLAG_TRANS2_FIND_CLOSE_IF_END;
+			
+			status = smb_raw_search_next(cli->tree, 
+						     state.mem_ctx,
+						     &next_parms,
+						     (void*)&state, 
+						     cli_list_new_callback);
+			
+			if (!NT_STATUS_IS_OK(status)) {
+				return -1;
+			}
+			ff_searchcount = next_parms.t2fnext.out.count;
+			ff_eos = next_parms.t2fnext.out.end_of_search;
+			received = next_parms.t2fnext.out.count;
+			if (received <= 0) break;
+			if (ff_eos) break;
+		}
+		
+		num_received += received;
+	}
+
+	for (i=0;i<state.total_received;i++) {
+		fn(&state.dirlist[i], Mask, caller_state);
+	}
+
+	talloc_destroy(state.mem_ctx);
+
+	return state.total_received;
+}
+
+/****************************************************************************
+ Interpret a short filename structure.
+ The length of the structure is returned.
+****************************************************************************/
+static BOOL interpret_short_filename(int level,
+				union smb_search_data *info,
+				file_info *finfo)
+{
+	file_info finfo2;
+
+	if (!finfo) finfo = &finfo2;
+	ZERO_STRUCTP(finfo);
+	
+	finfo->ctime = info->search.write_time;
+	finfo->atime = info->search.write_time;
+	finfo->mtime = info->search.write_time;
+	finfo->size = info->search.size;
+	finfo->mode = info->search.attrib;
+	finfo->name = info->search.name;
+	return True;
+}
+
+/* callback function used for smb_search */
+static BOOL cli_list_old_callback(void *private, union smb_search_data *file)
+{
+	struct search_private *state = (struct search_private*) private;
+	file_info *tdl;
+	
+	/* add file info to the dirlist pool */
+	tdl = talloc_realloc(state->mem_ctx, state->dirlist,
+			state->dirlist_len + sizeof(struct file_info));
+
+	if (!tdl) {
+		return False;
+	}
+	state->dirlist = tdl;
+	state->dirlist_len += sizeof(struct file_info);
+
+	interpret_short_filename(state->info_level, file, &state->dirlist[state->total_received]);
+
+	state->total_received++;
+	state->ff_searchcount++;
+	state->status = file->search.search_id; /* return resume info */
+	
+	return True;
+}
+
+int cli_list_old(struct cli_state *cli, const char *Mask, uint16 attribute, 
+		 void (*fn)(file_info *, const char *, void *), void *caller_state)
+{
+	union smb_search_first first_parms;
+	union smb_search_next next_parms;
+	struct search_private state;  /* for callbacks */
+	const int num_asked = 500;
+	int received = 0;
+	BOOL first = True;
+	int num_received = 0;
+	char *mask;
+	int i;
+
+	/* initialize state for search */
+	state.dirlist = NULL;
+	state.mem_ctx = talloc_init("cli_list_old");
+	state.dirlist_len = 0;
+	state.total_received = 0;
+	
+	mask = talloc_strdup(state.mem_ctx, Mask);
+  
+	while (1) {
+		state.ff_searchcount = 0;
+		if (first) {
+			NTSTATUS status;
+
+			first_parms.search_first.level = RAW_SEARCH_SEARCH;
+			first_parms.search_first.in.max_count = num_asked;
+			first_parms.search_first.in.search_attrib = attribute;
+			first_parms.search_first.in.pattern = mask;
+			
+			status = smb_raw_search_first(cli->tree, state.mem_ctx, 
+							   &first_parms,
+							   (void*)&state, 
+							   cli_list_old_callback);
+			if (!NT_STATUS_IS_OK(status)) {
+				talloc_destroy(state.mem_ctx);
+				return -1;
+			}
+		
+			received = first_parms.search_first.out.count;
+			if (received <= 0) break;
+			first = False;
+		} else {
+			NTSTATUS status;
+
+			next_parms.search_next.level = RAW_SEARCH_SEARCH;
+			next_parms.search_next.in.max_count = num_asked;
+			next_parms.search_next.in.search_attrib = attribute;
+			next_parms.search_next.in.search_id = state.status;
+			
+			status = smb_raw_search_next(cli->tree, state.mem_ctx,
+							  &next_parms,
+							  (void*)&state, 
+							  cli_list_old_callback);
+			
+			if (!NT_STATUS_IS_OK(status)) {
+				talloc_destroy(state.mem_ctx);
+				return -1;
+			}
+			received = next_parms.search_next.out.count;
+			if (received <= 0) break;
+		}
+		
+		num_received += received;
+	}
+
+	for (i=0;i<state.total_received;i++) {
+		fn(&state.dirlist[i], Mask, caller_state);
+	}
+
+	talloc_destroy(state.mem_ctx);
+
+	return state.total_received;
+}
+
+/****************************************************************************
+ Do a directory listing, calling fn on each file found.
+ This auto-switches between old and new style.
+****************************************************************************/
+
+int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, 
+	     void (*fn)(file_info *, const char *, void *), void *state)
+{
+	if (cli->transport->negotiate.protocol <= PROTOCOL_LANMAN1)
+		return cli_list_old(cli, Mask, attribute, fn, state);
+	return cli_list_new(cli, Mask, attribute, fn, state);
+}