From 68be9a820059ee96dd26c527efd7c14e679d3f2c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 15 Nov 2007 14:19:52 -0800 Subject: More pstring removal. This one was tricky. I had to add one horror (pstring_clean_name()) which will have to remain until I've removed all pstrings from the client code. Jeremy. (This used to be commit 1ea3ac80146b83c2522b69e7747c823366a2b47d) --- source3/client/smbctool.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'source3/client/smbctool.c') diff --git a/source3/client/smbctool.c b/source3/client/smbctool.c index e7ac80222c..b563a33f66 100644 --- a/source3/client/smbctool.c +++ b/source3/client/smbctool.c @@ -367,7 +367,7 @@ static int do_cd(char *newdir) all_string_sub(cur_dir, "/./", "/", 0); /* Format the directory in a libmsmbclient friendly way */ - clean_name(cur_dir); + pstring_clean_name(cur_dir); all_string_sub(cur_dir, "/./", "/", 0); pstrcpy(targetpath, "smb:"); pstrcat(targetpath, service); @@ -1129,7 +1129,7 @@ static int cmd_more(void) unlink(lname); return 1; } - clean_name(rname); + pstring_clean_name(rname); rc = do_get(rname, lname, False); @@ -2677,7 +2677,7 @@ static int cmd_reget(void) return 1; } pstrcpy(local_name, p); - clean_name(remote_name); + pstring_clean_name(remote_name); next_token_nr(NULL, local_name, NULL, sizeof(local_name)); @@ -2715,7 +2715,7 @@ static int cmd_reput(void) else pstrcat(remote_name, local_name); - clean_name(remote_name); + pstring_clean_name(remote_name); return do_put(remote_name, local_name, True); } @@ -3549,7 +3549,7 @@ static int do_message_op(void) POPT_COMMON_CREDENTIALS POPT_TABLEEND }; - + TALLOC_CTX *frame = talloc_stackframe(); #ifdef KANJI pstrcpy(term_code, KANJI); @@ -3766,5 +3766,6 @@ static int do_message_op(void) return 1; } + TALLOC_FREE(frame); return rc; } -- cgit