xnu-1228.5.18.tar.gz

[apple/xnu.git] / bsd / hfs / hfscommon / Unicode / UnicodeWrappers.c

diff --git a/bsd/hfs/hfscommon/Unicode/UnicodeWrappers.c b/bsd/hfs/hfscommon/Unicode/UnicodeWrappers.c
index 0476bd12f9ae2264b1a98d82d48cbfdcf28ce282..4436f0146d4c032b0728718a16fff1e3c73d6112 100644 (file)
--- a/bsd/hfs/hfscommon/Unicode/UnicodeWrappers.c
+++ b/bsd/hfs/hfscommon/Unicode/UnicodeWrappers.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -31,6 +31,8 @@
        Contains:       Wrapper routines for Unicode conversion and comparison.
 
 */
        Contains:       Wrapper routines for Unicode conversion and comparison.
 
 */

+
+#if HFS

 #include <sys/param.h>
 #include <sys/utfconv.h>
 
 #include <sys/param.h>
 #include <sys/utfconv.h>
 


@@ -51,14 +53,14 @@ enum {
                                 ((c) >= 0x30 && (c) <= 0x39))
 
 
                                 ((c) >= 0x30 && (c) <= 0x39))
 
 

-#define IsHexDigit(c)          (((c) >= (UInt8) '0' && (c) <= (UInt8) '9') || \
-                                ((c) >= (UInt8) 'A' && (c) <= (UInt8) 'F'))
+#define IsHexDigit(c)          (((c) >= (u_int8_t) '0' && (c) <= (u_int8_t) '9') || \
+                                ((c) >= (u_int8_t) 'A' && (c) <= (u_int8_t) 'F'))

 
 
 static void    GetFilenameExtension( ItemCount length, ConstUniCharArrayPtr unicodeStr, char* extStr );
 
 
 
 
 static void    GetFilenameExtension( ItemCount length, ConstUniCharArrayPtr unicodeStr, char* extStr );
 
 

-static UInt32  HexStringToInteger( UInt32 length, const UInt8 *hexStr );
+static u_int32_t       HexStringToInteger( u_int32_t length, const u_int8_t *hexStr );

 
 
 /*
 
 
 /*


@@ -67,10 +69,10 @@ static UInt32       HexStringToInteger( UInt32 length, const UInt8 *hexStr );
 static void
 GetFilenameExtension(ItemCount length, ConstUniCharArrayPtr unicodeStr, char * extStr)
 {
 static void
 GetFilenameExtension(ItemCount length, ConstUniCharArrayPtr unicodeStr, char * extStr)
 {

-       UInt32  i;
+       u_int32_t       i;

        UniChar c;
        UniChar c;

-       UInt16  extChars;       /* number of extension chars (excluding dot) */
-       UInt16  maxExtChars;
+       u_int16_t       extChars;       /* number of extension chars (excluding dot) */
+       u_int16_t       maxExtChars;

        Boolean foundExtension;
 
        extStr[0] = '\0';       /* assume there's no extension */
        Boolean foundExtension;
 
        extStr[0] = '\0';       /* assume there's no extension */


@@ -105,11 +107,11 @@ GetFilenameExtension(ItemCount length, ConstUniCharArrayPtr unicodeStr, char * e
        
        /* if we found one then copy it */
        if ( foundExtension ) {
        
        /* if we found one then copy it */
        if ( foundExtension ) {

-               UInt8 *extStrPtr = extStr;
+               u_int8_t *extStrPtr = (u_int8_t *)extStr;

                const UniChar *unicodeStrPtr = &unicodeStr[i];
                
                for ( i = 0; i <= extChars; ++i )
                const UniChar *unicodeStrPtr = &unicodeStr[i];
                
                for ( i = 0; i <= extChars; ++i )

-                       *(extStrPtr++) = (UInt8) *(unicodeStrPtr++);
+                       *(extStrPtr++) = (u_int8_t) *(unicodeStrPtr++);

                extStr[extChars + 1] = '\0';    /* terminate extension + dot */
        }
 }
                extStr[extChars + 1] = '\0';    /* terminate extension + dot */
        }
 }


@@ -119,13 +121,13 @@ GetFilenameExtension(ItemCount length, ConstUniCharArrayPtr unicodeStr, char * e
 /*
  * Count filename extension characters (if any)
  */
 /*
  * Count filename extension characters (if any)
  */

-static UInt32
-CountFilenameExtensionChars( const unsigned char * filename, UInt32 length )
+static u_int32_t
+CountFilenameExtensionChars( const unsigned char * filename, u_int32_t length )

 {
 {

-       UInt32  i;
+       u_int32_t       i;

        UniChar c;
        UniChar c;

-       UInt32  extChars;       /* number of extension chars (excluding dot) */
-       UInt16  maxExtChars;
+       u_int32_t       extChars;       /* number of extension chars (excluding dot) */
+       u_int16_t       maxExtChars;

        Boolean foundExtension;
 
        if ( length < 3 )
        Boolean foundExtension;
 
        if ( length < 3 )


@@ -144,7 +146,7 @@ CountFilenameExtensionChars( const unsigned char * filename, UInt32 length )
                c = filename[i--];
 
                /* look for leading dot */
                c = filename[i--];
 
                /* look for leading dot */

-               if ( c == (UInt8) '.' ) {
+               if ( c == (u_int8_t) '.' )      {

                        if ( extChars > 0 )     /* cannot end with a dot */
                                return (extChars);
 
                        if ( extChars > 0 )     /* cannot end with a dot */
                                return (extChars);
 


@@ -165,11 +167,11 @@ CountFilenameExtensionChars( const unsigned char * filename, UInt32 length )
  * extract the file id from a mangled name
  */
 HFSCatalogNodeID
  * extract the file id from a mangled name
  */
 HFSCatalogNodeID

-GetEmbeddedFileID(const unsigned char * filename, UInt32 length, UInt32 *prefixLength)
+GetEmbeddedFileID(const unsigned char * filename, u_int32_t length, u_int32_t *prefixLength)

 {
        short   extChars;
        short   i;
 {
        short   extChars;
        short   i;

-       UInt8   c;
+       u_int8_t        c;

 
        *prefixLength = 0;
 
 
        *prefixLength = 0;
 


@@ -211,13 +213,13 @@ GetEmbeddedFileID(const unsigned char * filename, UInt32 length, UInt32 *prefixL
 
 
 
 
 
 

-static UInt32
-HexStringToInteger(UInt32 length, const UInt8 *hexStr)
+static u_int32_t
+HexStringToInteger(u_int32_t length, const u_int8_t *hexStr)

 {
 {

-       UInt32          value;
-       UInt32          i;
-       UInt8           c;
-       const UInt8     *p;
+       u_int32_t               value;
+       u_int32_t               i;
+       u_int8_t                c;
+       const u_int8_t  *p;

 
        value = 0;
        p = hexStr;
 
        value = 0;
        p = hexStr;


@@ -227,7 +229,7 @@ HexStringToInteger(UInt32 length, const UInt8 *hexStr)
 
                if (c >= '0' && c <= '9') {
                        value = value << 4;
 
                if (c >= '0' && c <= '9') {
                        value = value << 4;

-                       value += (UInt32) c - (UInt32) '0';
+                       value += (u_int32_t) c - (u_int32_t) '0';

                } else if (c >= 'A' && c <= 'F') {
                        value = value << 4;
                        value += 10 + ((unsigned int) c - (unsigned int) 'A');
                } else if (c >= 'A' && c <= 'F') {
                        value = value << 4;
                        value += 10 + ((unsigned int) c - (unsigned int) 'A');


@@ -248,12 +250,12 @@ HexStringToInteger(UInt32 length, const UInt8 *hexStr)
  *             return   0 if equal
  *
  */
  *             return   0 if equal
  *
  */

-SInt32 FastRelString( ConstStr255Param str1, ConstStr255Param str2 )
+int32_t        FastRelString( ConstStr255Param str1, ConstStr255Param str2 )

 {
 {

-       UInt16*                 compareTable;
-       SInt32                  bestGuess;
-       UInt8                   length, length2;
-       UInt8                   delta;
+       u_int16_t*              compareTable;
+       int32_t                 bestGuess;
+       u_int8_t                length, length2;
+       u_int8_t                delta;

 
        delta = 0;
        length = *(str1++);
 
        delta = 0;
        length = *(str1++);


@@ -272,18 +274,18 @@ SInt32    FastRelString( ConstStr255Param str1, ConstStr255Param str2 )
                length = length2;
        }
 
                length = length2;
        }
 

-       compareTable = (UInt16*) gCompareTable;
+       compareTable = (u_int16_t*) gCompareTable;

 
        while (length--)
        {
 
        while (length--)
        {

-               UInt8   aChar, bChar;
+               u_int8_t        aChar, bChar;

 
                aChar = *(str1++);
                bChar = *(str2++);
                
                if (aChar != bChar)             //      If they don't match exacly, do case conversion
                {       
 
                aChar = *(str1++);
                bChar = *(str2++);
                
                if (aChar != bChar)             //      If they don't match exacly, do case conversion
                {       

-                       UInt16  aSortWord, bSortWord;
+                       u_int16_t       aSortWord, bSortWord;

 
                        aSortWord = compareTable[aChar];
                        bSortWord = compareTable[bChar];
 
                        aSortWord = compareTable[aChar];
                        bSortWord = compareTable[bChar];


@@ -362,14 +364,14 @@ SInt32    FastRelString( ConstStr255Param str1, ConstStr255Param str2 )
 //                     return 1;
 //
 
 //                     return 1;
 //
 

-SInt32 FastUnicodeCompare ( register ConstUniCharArrayPtr str1, register ItemCount length1,
+int32_t FastUnicodeCompare ( register ConstUniCharArrayPtr str1, register ItemCount length1,

                                                        register ConstUniCharArrayPtr str2, register ItemCount length2)
 {
                                                        register ConstUniCharArrayPtr str2, register ItemCount length2)
 {

-       register UInt16         c1,c2;
-       register UInt16         temp;
-       register UInt16*        lowerCaseTable;
+       register u_int16_t              c1,c2;
+       register u_int16_t              temp;
+       register u_int16_t*     lowerCaseTable;

 
 

-       lowerCaseTable = (UInt16*) gLowerCaseTable;
+       lowerCaseTable = (u_int16_t*) gLowerCaseTable;

 
        while (1) {
                /* Set default values for c1, c2 in case there are no more valid chars */
 
        while (1) {
                /* Set default values for c1, c2 in case there are no more valid chars */


@@ -428,7 +430,7 @@ ConvertUnicodeToUTF8Mangled(ByteCount srcLen, ConstUniCharArrayPtr srcStr, ByteC
        char fileIDStr[15];
        char extStr[15];
 
        char fileIDStr[15];
        char extStr[15];
 

-       sprintf(fileIDStr, "#%X", cnid);
+       snprintf(fileIDStr, sizeof(fileIDStr), "#%X", cnid);

        GetFilenameExtension(srcLen/sizeof(UniChar), srcStr, extStr);
 
        /* remove extension chars from source */
        GetFilenameExtension(srcLen/sizeof(UniChar), srcStr, extStr);
 
        /* remove extension chars from source */


@@ -437,10 +439,29 @@ ConvertUnicodeToUTF8Mangled(ByteCount srcLen, ConstUniCharArrayPtr srcStr, ByteC
 
        (void) utf8_encodestr(srcStr, srcLen, dstStr, &utf8len, subMaxLen, ':', 0);
 
 
        (void) utf8_encodestr(srcStr, srcLen, dstStr, &utf8len, subMaxLen, ':', 0);
 

-       strcat(dstStr, fileIDStr);
-       strcat(dstStr, extStr);
+       strlcat((char *)dstStr, fileIDStr, maxDstLen);
+       strlcat((char *)dstStr, extStr, maxDstLen);

        *actualDstLen = utf8len + (strlen(extStr) + strlen(fileIDStr));
 
        return noErr;
 }
 
        *actualDstLen = utf8len + (strlen(extStr) + strlen(fileIDStr));
 
        return noErr;
 }
 

+#else /* not HFS - temp workaround until 4277828 is fixed */
+/* stubs for exported routines that aren't present when we build kernel without HFS */
+
+#include <sys/types.h>
+
+int32_t FastUnicodeCompare( void * str1, u_int32_t length1, void * str2, u_int32_t length2 );
+
+
+int32_t FastUnicodeCompare( __unused void * str1, 
+                                                       __unused u_int32_t length1, 
+                                                       __unused void * str2, 
+                                                       __unused u_int32_t length2 )
+{
+       return( 0 );
+}
+
+
+#endif /* HFS */
+