Ticket #3012: diff-src-folder.diff

apps/terminal/UTF8Char.h

@@ -41 +41 @@
 
     static int32 ByteCount(char firstChar)
     {
-        // Note, this does not recognize invalid chars
-        uint32 c = firstChar;
-        if (c < 0x80)
-            return 1;
-        if (c < 0xe0)
-            return 2;
-        return c < 0xf0 ? 3 : 4;
+        if ((uchar)firstChar < 128) return 1; else
+        if ((uchar)firstChar >= 128 + 64 + 32 + 16) return 4; else
+        if ((uchar)firstChar >= 128 + 64 + 32) return 3; else
+        if ((uchar)firstChar >= 128 + 64) return 2; else
+            return 0; // No valid UTF-8 Byte?
     }
 
     int32 ByteCount() const

bin/coreutils/lib/Jamfile

@@ -94 +94 @@
 #   lstat-stub.c
 #   lstat.c
 #   malloc.c
+    mbchar.c
     mbscasecmp.c
     mbswidth.c
     md5.c
@@ -165 +166 @@
 #   strncasecmp.c
     strndup.c
     strnlen.c
+    strnlen1.c
     strnumcmp.c
 #   strpbrk.c
 #   strstr.c

bin/tar/lib/Jamfile

@@ -45 +45 @@
     imaxtostr.c
     lchown.c
     malloc.c
+    mbchar.c
     mbscasecmp.c
     mempcpy.c
     memrchr.c
@@ -76 +77 @@
     stpcpy.c
     strcasecmp.c
     stripslash.c
+    strnlen1.c
     strncasecmp.c
     strndup.c
     strtol.c