diff options
| -rw-r--r-- | source4/client/client.c | 9 | ||||
| -rw-r--r-- | source4/include/smb_macros.h | 13 |
2 files changed, 8 insertions, 14 deletions
diff --git a/source4/client/client.c b/source4/client/client.c index 33d3e695f2..45aac0444b 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -259,6 +259,13 @@ static int cmd_pwd(const char **cmd_ptr) return 0; } +/* + convert a string to dos format +*/ +static void dos_format(char *s) +{ + string_replace(s, '/', '\\'); +} /**************************************************************************** change directory - inner section @@ -858,7 +865,7 @@ static void do_mget(file_info *finfo) pstrcat(cur_dir,finfo->name); pstrcat(cur_dir,"\\"); - unix_format(finfo->name); + string_replace(finfo->name, '\\', '/'); if (lowercase) strlower(finfo->name); diff --git a/source4/include/smb_macros.h b/source4/include/smb_macros.h index bbf904fbfa..84978f4f70 100644 --- a/source4/include/smb_macros.h +++ b/source4/include/smb_macros.h @@ -162,17 +162,4 @@ copy an IP address from one buffer to another #define SERVER_HAS_UNIX_CIFS(c) (cli_state_has_unix_cifs(c)) -/**************************************************************************** - Make a filename into unix format. -****************************************************************************/ - -#define unix_format(fname) string_replace(fname,'\\','/') -#define unix_format_w(fname) string_replace_w(fname, UCS2_CHAR('\\'), UCS2_CHAR('/')) - -/**************************************************************************** - Make a file into DOS format. -****************************************************************************/ - -#define dos_format(fname) string_replace(fname,'/','\\') - #endif /* _SMB_MACROS_H */ |