Overview
Comment: | Get native8BitEncoding from locale |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
f12cecf014c3b5115673b36c50550039 |
User & Date: | js on 2017-01-08 02:38:36 |
Other Links: | manifest | tags |
Context
2017-01-08
| ||
03:45 | Parse locale to get {language,territory,encoding} check-in: d6de0a1b71 user: js tags: trunk | |
02:38 | Get native8BitEncoding from locale check-in: f12cecf014 user: js tags: trunk | |
01:45 | Update Xcode project to Xcode 8.2 check-in: d55e95f217 user: js tags: trunk | |
Changes
Modified configure.ac from [26942c5c25] to [4adbe6b80f].
︙ | ︙ | |||
878 879 880 881 882 883 884 | AC_MSG_RESULT(no) ]) OBJCFLAGS="$old_OBJCFLAGS" ]) AC_CHECK_FUNCS([sysconf gmtime_r localtime_r nanosleep fcntl]) | | | 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 | AC_MSG_RESULT(no) ]) OBJCFLAGS="$old_OBJCFLAGS" ]) AC_CHECK_FUNCS([sysconf gmtime_r localtime_r nanosleep fcntl]) AC_CHECK_HEADERS(langinfo.h xlocale.h) AC_CHECK_FUNCS([strtod_l strtof_l vasprintf_l]) AC_CHECK_FUNC(pipe, [ AC_DEFINE(OF_HAVE_PIPE, 1, [Whether we have pipe()]) ]) AC_ARG_ENABLE(sockets, |
︙ | ︙ |
Modified src/OFApplication.m from [669a08ac5c] to [bbaed6eb9f].
︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | #include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <locale.h> #include <signal.h> #import "OFApplication.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFSystemInfo.h" #import "OFRunLoop.h" #import "OFRunLoop+Private.h" #import "OFThread.h" #import "OFThread+Private.h" #if defined(OF_MAC_OS_X) # include <crt_externs.h> #elif defined(OF_WINDOWS) # include <windows.h> extern int _CRT_glob; | > > > > > > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | #include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #ifdef HAVE_LANGINFO_H # include <langinfo.h> #endif #include <locale.h> #include <signal.h> #import "OFApplication.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFSystemInfo.h" #import "OFRunLoop.h" #import "OFRunLoop+Private.h" #import "OFThread.h" #import "OFThread+Private.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" #if defined(OF_MAC_OS_X) # include <crt_externs.h> #elif defined(OF_WINDOWS) # include <windows.h> extern int _CRT_glob; |
︙ | ︙ | |||
62 63 64 65 66 67 68 69 70 71 72 73 74 75 | - (void)OF_setArgumentCount: (int)argc andWideArgumentValues: (wchar_t*[])argv; #endif - (void)OF_run; @end static OFApplication *app = nil; static void atexitHandler(void) { id <OFApplicationDelegate> delegate = [app delegate]; if ([delegate respondsToSelector: @selector(applicationWillTerminate)]) | > > | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | - (void)OF_setArgumentCount: (int)argc andWideArgumentValues: (wchar_t*[])argv; #endif - (void)OF_run; @end static OFApplication *app = nil; extern of_string_encoding_t of_system_info_native_8bit_encoding; extern OFString *of_system_info_decimal_point; static void atexitHandler(void) { id <OFApplicationDelegate> delegate = [app delegate]; if ([delegate respondsToSelector: @selector(applicationWillTerminate)]) |
︙ | ︙ | |||
97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 | of_application_main(int *argc, char **argv[], Class cls) { id <OFApplicationDelegate> delegate; #ifdef OF_WINDOWS wchar_t **wargv, **wenvp; int wargc, si = 0; #endif setlocale(LC_ALL, ""); if ([cls isSubclassOfClass: [OFApplication class]]) { fprintf(stderr, "FATAL ERROR:\n Class %s is a subclass of " "class OFApplication, but class\n %s was specified as " "application delegate!\n Most likely, you wanted to " "subclass OFObject instead or specified\n the wrong class " "with OF_APPLICATION_DELEGATE().\n", class_getName(cls), class_getName(cls)); | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 | of_application_main(int *argc, char **argv[], Class cls) { id <OFApplicationDelegate> delegate; #ifdef OF_WINDOWS wchar_t **wargv, **wenvp; int wargc, si = 0; #endif #ifdef HAVE_LANGINFO_H char *codeset, *lowerCodeset; size_t codesetLen; #endif setlocale(LC_ALL, ""); #ifdef HAVE_LANGINFO_H codeset = nl_langinfo(CODESET); codesetLen = strlen(codeset); if (SIZE_MAX - codesetLen < 1) @throw [OFOutOfRangeException exception]; if ((lowerCodeset = malloc(codesetLen + 1)) == NULL) @throw [OFOutOfMemoryException exceptionWithRequestedSize: codesetLen + 1]; for (size_t i = 0; i < codesetLen; i++) lowerCodeset[i] = of_ascii_tolower(codeset[i]); if (strcmp(lowerCodeset, "utf8") == 0 || strcmp(lowerCodeset, "utf-8") == 0) of_system_info_native_8bit_encoding = OF_STRING_ENCODING_UTF_8; else if (strcmp(lowerCodeset, "ascii") == 0 || strcmp(lowerCodeset, "us-ascii") == 0) of_system_info_native_8bit_encoding = OF_STRING_ENCODING_ASCII; else if (strcmp(lowerCodeset, "iso8859-1") == 0 || strcmp(lowerCodeset, "iso-8859-1") == 0) of_system_info_native_8bit_encoding = OF_STRING_ENCODING_ISO_8859_1; else if (strcmp(lowerCodeset, "iso8859-15") == 0 || strcmp(lowerCodeset, "iso-8859-15") == 0) of_system_info_native_8bit_encoding = OF_STRING_ENCODING_ISO_8859_15; free(lowerCodeset); #endif of_system_info_decimal_point = [[OFString alloc] initWithCString: localeconv()->decimal_point encoding: of_system_info_native_8bit_encoding]; if ([cls isSubclassOfClass: [OFApplication class]]) { fprintf(stderr, "FATAL ERROR:\n Class %s is a subclass of " "class OFApplication, but class\n %s was specified as " "application delegate!\n Most likely, you wanted to " "subclass OFObject instead or specified\n the wrong class " "with OF_APPLICATION_DELEGATE().\n", class_getName(cls), class_getName(cls)); |
︙ | ︙ |
Modified src/OFSystemInfo.m from [c6d392a88f] to [13b78669de].
︙ | ︙ | |||
20 21 22 23 24 25 26 | /* Work around __block being used by glibc */ #include <stdlib.h> /* include any libc header to get the libc defines */ #ifdef __GLIBC__ # undef __USE_XOPEN #endif | < | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | /* Work around __block being used by glibc */ #include <stdlib.h> /* include any libc header to get the libc defines */ #ifdef __GLIBC__ # undef __USE_XOPEN #endif #include <unistd.h> #include "platform.h" #ifdef OF_MAC_OS_X # include <sys/sysctl.h> #endif |
︙ | ︙ | |||
62 63 64 65 66 67 68 69 70 71 72 73 74 75 | struct x86_regs { uint32_t eax, ebx, ecx, edx; }; #endif static size_t pageSize; static size_t numberOfCPUs; #if defined(OF_X86_64) || defined(OF_X86) static OF_INLINE struct x86_regs OF_CONST_FUNC x86_cpuid(uint32_t eax, uint32_t ecx) { struct x86_regs regs; | > > > > | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | struct x86_regs { uint32_t eax, ebx, ecx, edx; }; #endif static size_t pageSize; static size_t numberOfCPUs; of_string_encoding_t of_system_info_native_8bit_encoding = OF_STRING_ENCODING_UTF_8; OFString *of_system_info_decimal_point = @"."; #if defined(OF_X86_64) || defined(OF_X86) static OF_INLINE struct x86_regs OF_CONST_FUNC x86_cpuid(uint32_t eax, uint32_t ecx) { struct x86_regs regs; |
︙ | ︙ | |||
142 143 144 145 146 147 148 | + (size_t)numberOfCPUs { return numberOfCPUs; } + (of_string_encoding_t)native8BitEncoding { | < | | | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 | + (size_t)numberOfCPUs { return numberOfCPUs; } + (of_string_encoding_t)native8BitEncoding { return of_system_info_native_8bit_encoding; } + (OFString*)decimalPoint { return of_system_info_decimal_point; } + (OFString*)userDataPath { #if defined(OF_MAC_OS_X) || defined(OF_IOS) void *pool = objc_autoreleasePoolPush(); char pathC[PATH_MAX]; |
︙ | ︙ |