diff options
| author | Jeremy Allison <jra@samba.org> | 2001-03-26 23:13:02 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-03-26 23:13:02 +0000 |
| commit | 1452c2d8c4a2124e4c97bb51a1e58bcfda620ef0 (patch) | |
| tree | c988c7a9424838a16e0d49bf37c8eb37922921c0 /source3/include | |
| parent | 4e35283a8b2c4b816b7aec821c719378a1ef10a6 (diff) | |
| download | samba-1452c2d8c4a2124e4c97bb51a1e58bcfda620ef0.tar.gz samba-1452c2d8c4a2124e4c97bb51a1e58bcfda620ef0.tar.bz2 samba-1452c2d8c4a2124e4c97bb51a1e58bcfda620ef0.zip | |
Fix from Ryo Kawahara <rkawa@lbe.co.jp> to make SWAT correctly write and smb.conf
file in utf8.
Jeremy.
(This used to be commit 42052d6079479452aa43eb37ad3d679d28337779)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/kanji.h | 2 | ||||
| -rw-r--r-- | source3/include/proto.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source3/include/kanji.h b/source3/include/kanji.h index f5e198c2ee..58774a699d 100644 --- a/source3/include/kanji.h +++ b/source3/include/kanji.h @@ -166,6 +166,7 @@ extern char *(*multibyte_strstr)(const char *s1, const char *s2); extern char *(*multibyte_strtok)(char *s1, const char *s2); extern char *(*_dos_to_unix)(char *str, BOOL overwrite); extern char *(*_unix_to_dos)(char *str, BOOL overwrite); +extern char *(*_dos_to_dos)(char *str, BOOL overwrite); extern BOOL (*is_multibyte_char)(char c); extern int (*_skip_multibyte_char)(char c); @@ -175,6 +176,7 @@ extern int (*_skip_multibyte_char)(char c); #define strtok(s1, s2) ((*multibyte_strtok)((s1), (s2))) #define dos_to_unix(x,y) ((*_dos_to_unix)((x), (y))) #define unix_to_dos(x,y) ((*_unix_to_dos)((x), (y))) +#define dos_to_dos(x,y) ((*_dos_to_dos)((x), (y))) #define skip_multibyte_char(c) ((*_skip_multibyte_char)((c))) #endif /* _KANJI_C_ */ diff --git a/source3/include/proto.h b/source3/include/proto.h index 4fb816d70d..e2d31fa19a 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -366,6 +366,7 @@ int sys_dlclose (void *handle); TALLOC_CTX *talloc_init(void); void *talloc(TALLOC_CTX *t, size_t size); +void *talloc_realloc(TALLOC_CTX *t, void *ptr, size_t size); void talloc_destroy_pool(TALLOC_CTX *t); void talloc_destroy(TALLOC_CTX *t); size_t talloc_pool_size(TALLOC_CTX *t); @@ -1820,8 +1821,8 @@ BOOL lp_load(char *pszFname, BOOL global_only, BOOL save_defaults, BOOL add_ipc); void lp_resetnumservices(void); int lp_numservices(void); -void lp_dump(FILE * f, BOOL show_defaults, int maxtoprint); -void lp_dump_one(FILE * f, BOOL show_defaults, int snum); +void lp_dump(FILE *f, BOOL show_defaults, int maxtoprint, char *(*dos_to_ext)(char *, BOOL)); +void lp_dump_one(FILE * f, BOOL show_defaults, int snum, char *(*dos_to_ext)(char *, BOOL)); int lp_servicenumber(char *pszServiceName); char *volume_label(int snum); int lp_server_role(void); |