ObjFW  Diff

Differences From Artifact [bbaed6eb9f]:

To Artifact [4b696ca492]:


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)])







<
|







68
69
70
71
72
73
74

75
76
77
78
79
80
81
82
- (void)OF_setArgumentCount: (int)argc
      andWideArgumentValues: (wchar_t*[])argv;
#endif
- (void)OF_run;
@end

static OFApplication *app = nil;

extern void of_system_info_parse_locale(char*);

static void
atexitHandler(void)
{
	id <OFApplicationDelegate> delegate = [app delegate];

	if ([delegate respondsToSelector: @selector(applicationWillTerminate)])
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
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",







<
<
<
<

|
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<







104
105
106
107
108
109
110




111
112




































113
114
115
116
117
118
119
of_application_main(int *argc, char **argv[], Class cls)
{
	id <OFApplicationDelegate> delegate;
#ifdef OF_WINDOWS
	wchar_t **wargv, **wenvp;
	int wargc, si = 0;
#endif





	of_system_info_parse_locale(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",