ICU-57132.0.1.tar.gz

[apple/icu.git] / icuSources / common / cstring.c

diff --git a/icuSources/common/cstring.c b/icuSources/common/cstring.c
index f65c9e083cdffb6d9b47f757df75e5c8a703d281..3af959eb7d0718942851da3e7662a66de420963e 100644 (file)
--- a/icuSources/common/cstring.c
+++ b/icuSources/common/cstring.c
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
 /*
 ******************************************************************************
 *

-*   Copyright (C) 1997-2003, International Business Machines
+*   Copyright (C) 1997-2011, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************


@@ -22,9 +22,11 @@
 
 
 #include <stdlib.h>
 
 
 #include <stdlib.h>

+#include <stdio.h>

 #include "unicode/utypes.h"
 #include "cmemory.h"
 #include "cstring.h"
 #include "unicode/utypes.h"
 #include "cmemory.h"
 #include "cstring.h"

+#include "uassert.h"

 
 /*
  * We hardcode case conversion for invariant characters to match our expectation
 
 /*
  * We hardcode case conversion for invariant characters to match our expectation


@@ -44,6 +46,17 @@
  * and the set of uppercase Latin letters is discontiguous as well.
  */
 
  * and the set of uppercase Latin letters is discontiguous as well.
  */
 

+U_CAPI UBool U_EXPORT2
+uprv_isASCIILetter(char c) {
+#if U_CHARSET_FAMILY==U_EBCDIC_FAMILY
+    return
+        ('a'<=c && c<='i') || ('j'<=c && c<='r') || ('s'<=c && c<='z') ||
+        ('A'<=c && c<='I') || ('J'<=c && c<='R') || ('S'<=c && c<='Z');
+#else
+    return ('a'<=c && c<='z') || ('A'<=c && c<='Z');
+#endif
+}
+

 U_CAPI char U_EXPORT2
 uprv_toupper(char c) {
 #if U_CHARSET_FAMILY==U_EBCDIC_FAMILY
 U_CAPI char U_EXPORT2
 uprv_toupper(char c) {
 #if U_CHARSET_FAMILY==U_EBCDIC_FAMILY


@@ -58,6 +71,17 @@ uprv_toupper(char c) {
     return c;
 }
 
     return c;
 }
 

+
+#if 0
+/*
+ * Commented out because cstring.h defines uprv_tolower() to be
+ * the same as either uprv_asciitolower() or uprv_ebcdictolower()
+ * to reduce the amount of code to cover with tests.
+ *
+ * Note that this uprv_tolower() definition is likely to work for most
+ * charset families, not just ASCII and EBCDIC, because its #else branch
+ * is written generically.
+ */

 U_CAPI char U_EXPORT2
 uprv_tolower(char c) {
 #if U_CHARSET_FAMILY==U_EBCDIC_FAMILY
 U_CAPI char U_EXPORT2
 uprv_tolower(char c) {
 #if U_CHARSET_FAMILY==U_EBCDIC_FAMILY


@@ -71,6 +95,26 @@ uprv_tolower(char c) {
 #endif
     return c;
 }
 #endif
     return c;
 }

+#endif
+
+U_CAPI char U_EXPORT2
+uprv_asciitolower(char c) {
+    if(0x41<=c && c<=0x5a) {
+        c=(char)(c+0x20);
+    }
+    return c;
+}
+
+U_CAPI char U_EXPORT2
+uprv_ebcdictolower(char c) {
+    if( (0xc1<=(uint8_t)c && (uint8_t)c<=0xc9) ||
+        (0xd1<=(uint8_t)c && (uint8_t)c<=0xd9) ||
+        (0xe2<=(uint8_t)c && (uint8_t)c<=0xe9)
+    ) {
+        c=(char)(c-0x40);
+    }
+    return c;
+}

 
 
 U_CAPI char* U_EXPORT2
 
 
 U_CAPI char* U_EXPORT2


@@ -104,44 +148,76 @@ T_CString_toUpperCase(char* str)
 /*
  * Takes a int32_t and fills in  a char* string with that number "radix"-based.
  * Does not handle negative values (makes an empty string for them).
 /*
  * Takes a int32_t and fills in  a char* string with that number "radix"-based.
  * Does not handle negative values (makes an empty string for them).

- * Writes at most 11 chars ("2147483647" plus NUL).
- * Returns the length of the string.
+ * Writes at most 12 chars ("-2147483647" plus NUL).
+ * Returns the length of the string (not including the NUL).

  */
 U_CAPI int32_t U_EXPORT2
  */
 U_CAPI int32_t U_EXPORT2

-T_CString_integerToString(char* buffer, int32_t i, int32_t radix)
+T_CString_integerToString(char* buffer, int32_t v, int32_t radix)

 {
 {

-  int32_t length;
-  int32_t num;
-  int8_t digit;
-  char temp;
-
-  if(i<0) {
-    *buffer = 0;
-    return 0;
-  }
-
-  length = 0;
-  while (i>=radix)
-    {
-      num = i/radix;
-      digit = (int8_t)(i - num*radix);
-      buffer[length++] = (char)(T_CString_itosOffset(digit));
-      i = num;
+    char      tbuf[30];
+    int32_t   tbx    = sizeof(tbuf);
+    uint8_t   digit;
+    int32_t   length = 0;
+    uint32_t  uval;
+    
+    U_ASSERT(radix>=2 && radix<=16);
+    uval = (uint32_t) v;
+    if(v<0 && radix == 10) {
+        /* Only in base 10 do we conside numbers to be signed. */
+        uval = (uint32_t)(-v); 
+        buffer[length++] = '-';

     }
     }

-
-  buffer[length] = (char)(T_CString_itosOffset(i));
-  buffer[++length] = '\0';
+    
+    tbx = sizeof(tbuf)-1;
+    tbuf[tbx] = 0;   /* We are generating the digits backwards.  Null term the end. */
+    do {
+        digit = (uint8_t)(uval % radix);
+        tbuf[--tbx] = (char)(T_CString_itosOffset(digit));
+        uval  = uval / radix;
+    } while (uval != 0);
+    
+    /* copy converted number into user buffer  */
+    uprv_strcpy(buffer+length, tbuf+tbx);
+    length += sizeof(tbuf) - tbx -1;
+    return length;
+}

 
 
 
 

-  /* Reverses the string, swap digits at buffer[0]..buffer[num] */
-  num = length - 1;
-  for (i = 0; i < num; ++i, --num) {
-    temp = buffer[num];
-    buffer[num] = buffer[i];
-    buffer[i] = temp;
-  }

 
 

-  return length;
+/*
+ * Takes a int64_t and fills in  a char* string with that number "radix"-based.
+ * Writes at most 21: chars ("-9223372036854775807" plus NUL).
+ * Returns the length of the string, not including the terminating NULL.
+ */
+U_CAPI int32_t U_EXPORT2
+T_CString_int64ToString(char* buffer, int64_t v, uint32_t radix)
+{
+    char      tbuf[30];
+    int32_t   tbx    = sizeof(tbuf);
+    uint8_t   digit;
+    int32_t   length = 0;
+    uint64_t  uval;
+    
+    U_ASSERT(radix>=2 && radix<=16);
+    uval = (uint64_t) v;
+    if(v<0 && radix == 10) {
+        /* Only in base 10 do we conside numbers to be signed. */
+        uval = (uint64_t)(-v); 
+        buffer[length++] = '-';
+    }
+    
+    tbx = sizeof(tbuf)-1;
+    tbuf[tbx] = 0;   /* We are generating the digits backwards.  Null term the end. */
+    do {
+        digit = (uint8_t)(uval % radix);
+        tbuf[--tbx] = (char)(T_CString_itosOffset(digit));
+        uval  = uval / radix;
+    } while (uval != 0);
+    
+    /* copy converted number into user buffer  */
+    uprv_strcpy(buffer+length, tbuf+tbx);
+    length += sizeof(tbuf) - tbx -1;
+    return length;

 }
 
 
 }
 
 


@@ -149,12 +225,12 @@ U_CAPI int32_t U_EXPORT2
 T_CString_stringToInteger(const char *integerString, int32_t radix)
 {
     char *end;
 T_CString_stringToInteger(const char *integerString, int32_t radix)
 {
     char *end;

-    return strtoul(integerString, &end, radix);
+    return uprv_strtoul(integerString, &end, radix);

 
 }
 
 }

-    
+

 U_CAPI int U_EXPORT2
 U_CAPI int U_EXPORT2

-T_CString_stricmp(const char *str1, const char *str2) {
+uprv_stricmp(const char *str1, const char *str2) {

     if(str1==NULL) {
         if(str2==NULL) {
             return 0;
     if(str1==NULL) {
         if(str2==NULL) {
             return 0;


@@ -193,7 +269,7 @@ T_CString_stricmp(const char *str1, const char *str2) {
 }
 
 U_CAPI int U_EXPORT2
 }
 
 U_CAPI int U_EXPORT2

-T_CString_strnicmp(const char *str1, const char *str2, uint32_t n) {
+uprv_strnicmp(const char *str1, const char *str2, uint32_t n) {

     if(str1==NULL) {
         if(str2==NULL) {
             return 0;
     if(str1==NULL) {
         if(str2==NULL) {
             return 0;


@@ -235,7 +311,7 @@ T_CString_strnicmp(const char *str1, const char *str2, uint32_t n) {
 
 U_CAPI char* U_EXPORT2
 uprv_strdup(const char *src) {
 
 U_CAPI char* U_EXPORT2
 uprv_strdup(const char *src) {

-    size_t len = strlen(src) + 1;
+    size_t len = uprv_strlen(src) + 1;

     char *dup = (char *) uprv_malloc(len);
 
     if (dup) {
     char *dup = (char *) uprv_malloc(len);
 
     if (dup) {


@@ -244,3 +320,20 @@ uprv_strdup(const char *src) {
 
     return dup;
 }
 
     return dup;
 }

+
+U_CAPI char* U_EXPORT2
+uprv_strndup(const char *src, int32_t n) {
+    char *dup;
+
+    if(n < 0) {
+        dup = uprv_strdup(src);
+    } else {
+        dup = (char*)uprv_malloc(n+1);
+        if (dup) { 
+            uprv_memcpy(dup, src, n);
+            dup[n] = 0;
+        }
+    }
+
+    return dup;
+}