diff options
| author | Jeremy Allison <jra@samba.org> | 1997-09-11 20:17:32 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-09-11 20:17:32 +0000 |
| commit | 30416c0b8a0f54f6cc1179c2e00860eaf5f58401 (patch) | |
| tree | 09137fd9f782aaf0df42e59aff10953ed95bed32 /source3/include | |
| parent | 77df5c87c69ea7f929df211c41da522248d73cfc (diff) | |
| download | samba-30416c0b8a0f54f6cc1179c2e00860eaf5f58401.tar.gz samba-30416c0b8a0f54f6cc1179c2e00860eaf5f58401.tar.bz2 samba-30416c0b8a0f54f6cc1179c2e00860eaf5f58401.zip | |
charcnv.c client.c clitar.c kanji.c kanji.h loadparm.c
mangle.c smb.h util.c:
Big merge to allow KANJI support to be in the main
binary without explicitly compiling with it.
locking.c: Fix for smbstatus not being able to read files.
namepacket.c: Removed unneccesary debug statement.
trans2.c: Added Luke's proposed fix (ifdefed out until further testing).
nmblookup.c: Fixed bug where query fails and status is done on bogus IP.
Jeremy (jallison@whistle.com)
(This used to be commit 9196255022ae8c51b527412747b324819bea2c13)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/kanji.h | 9 | ||||
| -rw-r--r-- | source3/include/smb.h | 8 |
2 files changed, 5 insertions, 12 deletions
diff --git a/source3/include/kanji.h b/source3/include/kanji.h index 865ac3b2c9..1d2359baa9 100644 --- a/source3/include/kanji.h +++ b/source3/include/kanji.h @@ -27,8 +27,6 @@ #ifndef _KANJI_H_ #define _KANJI_H_ -#ifdef KANJI - /* FOR SHIFT JIS CODE */ #define is_shift_jis(c) \ ((0x81 <= ((unsigned char) (c)) && ((unsigned char) (c)) <= 0x9f) \ @@ -110,9 +108,6 @@ extern char* (*_dos_to_unix) (const char *str, BOOL overwrite); extern char* (*_unix_to_dos) (const char *str, BOOL overwrite); -#define unix_to_dos (*_unix_to_dos) -#define dos_to_unix (*_dos_to_unix) - extern char *sj_strtok (char *s1, const char *s2); extern char *sj_strchr (const char *s, int c); extern char *sj_strrchr (const char *s, int c); @@ -137,11 +132,7 @@ extern char *sj_strstr (const char *s1, const char *s2); int interpret_coding_system (char *str, int def); -#else - #define unix_to_dos(x,y) unix2dos_format(x,y) #define dos_to_unix(x,y) dos2unix_format(x,y) -#endif /* not KANJI */ - #endif /* _KANJI_H_ */ diff --git a/source3/include/smb.h b/source3/include/smb.h index b55c180f36..47fbf32f83 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -926,14 +926,16 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; #endif +/* Defines needed for multi-codepage support. */ +#define KANJI_CODEPAGE 932 + #ifdef KANJI -/* Default client code page - 932 - Japanese */ -#define DEFAULT_CLIENT_CODE_PAGE 932 +/* Default client code page - Japanese */ +#define DEFAULT_CLIENT_CODE_PAGE KANJI_CODEPAGE #else /* KANJI */ /* Default client code page - 850 - Western European */ #define DEFAULT_CLIENT_CODE_PAGE 850 #endif /* KANJI */ - /* Size of buffer to use when moving files across filesystems. */ #define COPYBUF_SIZE (8*1024) |