From 740d6f5dd60bef72037ed5fcd7b2192af22c2e41 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Sun, 4 Nov 2001 18:26:53 +0000 Subject: a big one: - old mangle code has gone, the new one based on tdb seem resonably ok probably the valid.dat table need to be updated to treat wild chars as invalid ones (work ok without it) - a LOT of new string manipulation function for unicode, they are somewhat tested but a review would not be bad - some new function I will need for the new unix_convert function I'm writing, this will be renamed filename_convert and use only unicode strings. - charconv, I attached a comment, if someone wnat to look if I'm right or just was hacking to late in the night to make a sane one :) of course any bug is my responsibility an will be pleased to see patches if you find any. :-) Simo. (This used to be commit ee19f7efb6ea9216fc91cf112ac1afa691983e9d) --- source3/include/smb.h | 10 ++++++++++ source3/include/smb_macros.h | 1 + 2 files changed, 11 insertions(+) (limited to 'source3/include') diff --git a/source3/include/smb.h b/source3/include/smb.h index 33a33037a8..1cf315c387 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -383,6 +383,16 @@ typedef struct write_cache char *data; } write_cache; +typedef struct +{ + smb_ucs2_t *path; + smb_ucs2_t *name; + smb_ucs2_t *unixname; + smb_ucs2_t *dosname; + SMB_STRUCT_STAT *statinfo; +} smb_filename; + + typedef struct files_struct { struct files_struct *next, *prev; diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 05a358573d..9978a0faa0 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -216,6 +216,7 @@ copy an IP address from one buffer to another ****************************************************************************/ #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. -- cgit