summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-03-16 21:59:11 +0000
committerJeremy Allison <jra@samba.org>2004-03-16 21:59:11 +0000
commitacad182a3f13e55c2156994e599eb0b1e0f1960e (patch)
treee058a2438cfcb514a1ae10db090af5d5d05bff08
parentc340b2e5e49c14c2e8377234b399f0682c7e3d5a (diff)
downloadsamba-acad182a3f13e55c2156994e599eb0b1e0f1960e.tar.gz
samba-acad182a3f13e55c2156994e599eb0b1e0f1960e.tar.bz2
samba-acad182a3f13e55c2156994e599eb0b1e0f1960e.zip
Add function next_mb_char_size() that returns a size_t of the number of
bytes in the mb character at a pointer. Will be useful in fixing check_path_syntax() to not use a "blacklist". Also re-added my (C) to reply.c. I mean, really - I've been adding code to the file for over 10 years and I recognise many of the fuctions as mine ! :-). Jeremy. (This used to be commit d2b2a39fd2f2e06cc4aebf081876985f0b28b477)
-rw-r--r--source3/lib/charcnv.c24
-rw-r--r--source3/smbd/reply.c1
2 files changed, 25 insertions, 0 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index b06d869bcc..9ec6e73970 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -1313,3 +1313,27 @@ size_t align_string(const void *base_ptr, const char *p, int flags)
}
return 0;
}
+
+/****************************************************************
+ Calculate the size (in bytes) of the next multibyte character in
+ our internal character set. Note that p must be pointing to a
+ valid mb char, not within one.
+****************************************************************/
+
+size_t next_mb_char_size(const char *s)
+{
+ size_t i;
+
+ if (!(*s & 0x80))
+ return 1; /* ascii. */
+
+ for ( i = 1; i <=4; i++ ) {
+ smb_ucs2_t uc;
+ if (convert_string(CH_UNIX, CH_UCS2, s, i, &uc, 2, False) == 2) {
+ return i;
+ }
+ }
+ /* We're hosed - we don't know how big this is... */
+ DEBUG(10,("next_mb_char_size: unknown size at string %s\n", s));
+ return 1;
+}
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 48894308d1..c470d15645 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3,6 +3,7 @@
Main SMB reply routines
Copyright (C) Andrew Tridgell 1992-1998
Copyright (C) Andrew Bartlett 2001
+ Copyright (C) Jeremy Allison 1992-2004.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by