gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Apply patch #5388 with some fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21915 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2005-10-30 09:15:21 +00:00
parent 1c56ffec84
commit 0257194cdc
2 changed files with 59 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-10-30 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSLog.m: Apply patch #5399 from Jeremy Bettis.
Tidy indentation. Fix variable declaration not at start of block
(broke compile for older gcc versions). Avoid repeated system
calls to get process ID.
2005-10-29 Richard Frith-Macdonald <rfm@gnu.org> 2005-10-29 Richard Frith-Macdonald <rfm@gnu.org>
* Tools/AGSHtml.m: Revert last change ... it looked OK but it broke * Tools/AGSHtml.m: Revert last change ... it looked OK but it broke

87
Source/NSLog.m
View file

@ -105,6 +105,9 @@ _NSLog_standard_printf_handler (NSString* message)
NSData *d; NSData *d;
const char *buf; const char *buf;
unsigned len; unsigned len;
#if defined(__WIN32__) || defined(HAVE_SYSLOG)
char *null_terminated_buf;
#endif
static NSStringEncoding enc = 0; static NSStringEncoding enc = 0;
if (enc == 0) if (enc == 0)
@ -129,48 +132,55 @@ _NSLog_standard_printf_handler (NSString* message)
len = [d length]; len = [d length];
} }
#if defined(HAVE_SYSLOG) || defined(__WIN32__) #if defined(__WIN32__)
null_terminated_buf = objc_malloc (sizeof (char) * (len + 1));
strncpy (null_terminated_buf, buf, len);
null_terminated_buf[len] = '\0';
OutputDebugString(null_terminated_buf);
if ((GSUserDefaultsFlag(GSLogSyslog) == YES
|| write(_NSLogDescriptor, buf, len) != (int)len) && !IsDebuggerPresent())
{
static HANDLE eventloghandle = 0;
if (!eventloghandle)
{
eventloghandle = RegisterEventSource(NULL,
[[[NSProcessInfo processInfo] processName] cString]);
}
if (eventloghandle)
{
ReportEvent(eventloghandle, // event log handle
EVENTLOG_WARNING_TYPE, // event type
0, // category zero
0, // event identifier
NULL, // no user security identifier
1, // one substitution string
0, // no data
(LPCSTR*)&null_terminated_buf, // pointer to string array
NULL); // pointer to data
}
}
objc_free (null_terminated_buf);
#else
#if defined(HAVE_SYSLOG)
if (GSUserDefaultsFlag(GSLogSyslog) == YES if (GSUserDefaultsFlag(GSLogSyslog) == YES
|| write(_NSLogDescriptor, buf, len) != (int)len) || write(_NSLogDescriptor, buf, len) != (int)len)
{ {
char *null_terminated_buf = objc_malloc (sizeof (char) * (len + 1)); null_terminated_buf = objc_malloc (sizeof (char) * (len + 1));
strncpy (null_terminated_buf, buf, len); strncpy (null_terminated_buf, buf, len);
null_terminated_buf[len] = '\0'; null_terminated_buf[len] = '\0';
#if defined(__WIN32__)
OutputDebugString(null_terminated_buf);
if (!IsDebuggerPresent())
{
static HANDLE eventloghandle = 0;
if (!eventloghandle)
{
eventloghandle = RegisterEventSource(NULL,
[[[NSProcessInfo processInfo] processName] cString]);
}
if (eventloghandle)
{
ReportEvent(eventloghandle, // event log handle
EVENTLOG_WARNING_TYPE, // event type
0, // category zero
0, // event identifier
NULL, // no user security identifier
1, // one substitution string
0, // no data
&null_terminated_buf, // pointer to string array
NULL); // pointer to data
}
}
#else
syslog(SYSLOGMASK, "%s", null_terminated_buf); syslog(SYSLOGMASK, "%s", null_terminated_buf);
#endif // __WIN32__
objc_free (null_terminated_buf); objc_free (null_terminated_buf);
} }
#else #else
write(_NSLogDescriptor, buf, len); write(_NSLogDescriptor, buf, len);
#endif #endif
#endif // __WIN32__
} }
/** /**
@ -270,17 +280,22 @@ NSLogv (NSString* format, va_list args)
{ {
NSString *prefix; NSString *prefix;
NSString *message; NSString *message;
int pid; static int pid = 0;
CREATE_AUTORELEASE_POOL(arp); CREATE_AUTORELEASE_POOL(arp);
if (_NSLog_printf_handler == NULL) if (_NSLog_printf_handler == NULL)
_NSLog_printf_handler = *_NSLog_standard_printf_handler; {
_NSLog_printf_handler = *_NSLog_standard_printf_handler;
}
if (pid == 0)
{
#if defined(__MINGW32__) #if defined(__MINGW32__)
pid = (int)GetCurrentProcessId(); pid = (int)GetCurrentProcessId();
#else #else
pid = (int)getpid(); pid = (int)getpid();
#endif #endif
}
#ifdef HAVE_SYSLOG #ifdef HAVE_SYSLOG
if (GSUserDefaultsFlag(GSLogSyslog) == YES) if (GSUserDefaultsFlag(GSLogSyslog) == YES)
@ -319,8 +334,10 @@ NSLogv (NSString* format, va_list args)
} }
/* Check if there is already a newline at the end of the format */ /* Check if there is already a newline at the end of the format */
if (![format hasSuffix: @"\n"]) if ([format hasSuffix: @"\n"] == NO)
format = [format stringByAppendingString: @"\n"]; {
format = [format stringByAppendingString: @"\n"];
}
message = [NSString stringWithFormat: format arguments: args]; message = [NSString stringWithFormat: format arguments: args];
prefix = [prefix stringByAppendingString: message]; prefix = [prefix stringByAppendingString: message];