From 419e8823e9f67d7b738a676e18595ffb26346b1a Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 11 Dec 1997 11:07:09 +0000
Subject: kanji.c: Patch from Anders Blomdell <anders.blomdell@control.lth.se>
 for problem with kanji sj_strXXX functions. Jeremy. (This used to be commit
 bf48151e6ddfa72303be7eac9e156046d4fb5b5e)

---
 source3/lib/kanji.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'source3/lib/kanji.c')

diff --git a/source3/lib/kanji.c b/source3/lib/kanji.c
index 75d1affb20..f6aace8411 100644
--- a/source3/lib/kanji.c
+++ b/source3/lib/kanji.c
@@ -41,6 +41,9 @@ static char hex_tag = HEXTAG;
 ********************************************************************/
 char *sj_strtok(char *s1, char *s2)
 {
+  if (lp_client_code_page() != KANJI_CODEPAGE) {
+   return strtok(s1, s2);
+  } else {
     static char *s = NULL;
     char *q;
     if (!s1) {
@@ -72,6 +75,7 @@ char *sj_strtok(char *s1, char *s2)
 	return q;
     }
     return NULL;
+  }
 }
 
 /*******************************************************************
@@ -80,6 +84,9 @@ char *sj_strtok(char *s1, char *s2)
 ********************************************************************/
 char *sj_strstr(char *s1, char *s2)
 {
+  if (lp_client_code_page() != KANJI_CODEPAGE) {
+    return strstr(s1, s2);
+  } else {
     int len = strlen ((char *) s2);
     if (!*s2) 
 	return (char *) s1;
@@ -95,6 +102,7 @@ char *sj_strstr(char *s1, char *s2)
 	}
     }
     return 0;
+  }
 }
 
 /*******************************************************************
@@ -103,6 +111,9 @@ char *sj_strstr(char *s1, char *s2)
 ********************************************************************/
 char *sj_strchr (char *s, int c)
 {
+  if (lp_client_code_page() != KANJI_CODEPAGE) {
+    return strchr(s, c);
+  } else {
     for (; *s; ) {
 	if (*s == c)
 	    return (char *) s;
@@ -113,6 +124,7 @@ char *sj_strchr (char *s, int c)
 	}
     }
     return 0;
+  }
 }
 
 /*******************************************************************
@@ -121,6 +133,9 @@ char *sj_strchr (char *s, int c)
 ********************************************************************/
 char *sj_strrchr(char *s, int c)
 {
+  if (lp_client_code_page() != KANJI_CODEPAGE) {
+    return strrchr(s, c);
+  } else {
     char *q;
 
     for (q = 0; *s; ) {
@@ -134,6 +149,7 @@ char *sj_strrchr(char *s, int c)
 	}
     }
     return q;
+  }
 }
 
 /*******************************************************************
-- 
cgit