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

smbclient: Slightly simplify do_list()

Browse Source 
Nonrecursive listing is just a special case of recursive
listing. do_list_helper() checks that.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2020-06-05 07:58:35 +02:00 committed by Jeremy Allison
parent d71564e07f
commit a10dbe1745
1 changed files with 52 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
source3/client/client.c
View File

@ -878,85 +878,65 @@ NTSTATUS do_list(const char *mask,
do_list_dirs = dirs; do_list_dirs = dirs;
do_list_fn = fn; do_list_fn = fn;
if (rec) { init_do_list_queue();
init_do_list_queue(); add_to_do_list_queue(mask);
add_to_do_list_queue(mask);
while (!do_list_queue_empty()) { while (!do_list_queue_empty()) {
/* /*
* Need to copy head so that it doesn't become * Need to copy head so that it doesn't become
* invalid inside the call to cli_list. This * invalid inside the call to cli_list. This
* would happen if the list were expanded * would happen if the list were expanded
* during the call. * during the call.
* Fix from E. Jay Berkenbilt (ejb@ql.org) * Fix from E. Jay Berkenbilt (ejb@ql.org)
*/ */
char *head = talloc_strdup(ctx, do_list_queue_head()); char *head = talloc_strdup(ctx, do_list_queue_head());
if (!head) { if (!head) {
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
}
/* check for dfs */
status = cli_resolve_path(ctx, "",
popt_get_cmdline_auth_info(),
cli, head, &targetcli, &targetpath);
if (!NT_STATUS_IS_OK(status)) {
d_printf("do_list: [%s] %s\n", head,
nt_errstr(status));
remove_do_list_queue_head();
continue;
}
status = cli_list(targetcli, targetpath, attribute,
do_list_helper, targetcli);
if (!NT_STATUS_IS_OK(status)) {
d_printf("%s listing %s\n",
nt_errstr(status), targetpath);
ret_status = status;
}
remove_do_list_queue_head();
if ((! do_list_queue_empty()) && (fn == display_finfo)) {
char *next_file = do_list_queue_head();
char *save_ch = 0;
if ((strlen(next_file) >= 2) &&
(next_file[strlen(next_file) - 1] == '*') &&
(next_file[strlen(next_file) - 2] == CLI_DIRSEP_CHAR)) {
save_ch = next_file +
strlen(next_file) - 2;
*save_ch = '\0';
if (showacls) {
/* cwd is only used if showacls is on */
client_set_cwd(next_file);
}
}
if (!showacls) /* don't disturbe the showacls output */
d_printf("\n%s\n",next_file);
if (save_ch) {
*save_ch = CLI_DIRSEP_CHAR;
}
}
TALLOC_FREE(head);
TALLOC_FREE(targetpath);
} }
} else {
/* check for dfs */ /* check for dfs */
status = cli_resolve_path(ctx, "", status = cli_resolve_path(ctx, "",
popt_get_cmdline_auth_info(), cli, mask, popt_get_cmdline_auth_info(),
&targetcli, &targetpath); cli, head, &targetcli, &targetpath);
if (NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
status = cli_list(targetcli, targetpath, attribute, d_printf("do_list: [%s] %s\n", head,
do_list_helper, targetcli); nt_errstr(status));
if (!NT_STATUS_IS_OK(status)) { remove_do_list_queue_head();
d_printf("%s listing %s\n", continue;
nt_errstr(status), targetpath); }
ret_status = status;
} status = cli_list(targetcli, targetpath, attribute,
TALLOC_FREE(targetpath); do_list_helper, targetcli);
} else { if (!NT_STATUS_IS_OK(status)) {
d_printf("do_list: [%s] %s\n", mask, nt_errstr(status)); d_printf("%s listing %s\n",
nt_errstr(status), targetpath);
ret_status = status; ret_status = status;
} }
remove_do_list_queue_head();
if ((! do_list_queue_empty()) && (fn == display_finfo)) {
char *next_file = do_list_queue_head();
char *save_ch = 0;
if ((strlen(next_file) >= 2) &&
(next_file[strlen(next_file) - 1] == '*') &&
(next_file[strlen(next_file) - 2] == CLI_DIRSEP_CHAR)) {
save_ch = next_file +
strlen(next_file) - 2;
*save_ch = '\0';
if (showacls) {
/* cwd is only used if showacls is on */
client_set_cwd(next_file);
}
}
if (!showacls) /* don't disturbe the showacls output */
d_printf("\n%s\n",next_file);
if (save_ch) {
*save_ch = CLI_DIRSEP_CHAR;
}
}
TALLOC_FREE(head);
TALLOC_FREE(targetpath);
} }
in_do_list = 0; in_do_list = 0;