#include "nssm.h"\r
\r
+#define NSSM_ERROR_BUFSIZE 65535\r
+unsigned long tls_index;\r
+\r
/* Convert error code to error string - must call LocalFree() on return value */\r
char *error_string(unsigned long error) {\r
- static char message[65535];\r
- if (! FormatMessage(FORMAT_MESSAGE_FROM_HMODULE, 0, NSSM_MESSAGE_DEFAULT, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), message, sizeof(message), 0)) return 0;\r
- return message;\r
+ /* Thread-safe buffer */\r
+ char *error_message = (char *) TlsGetValue(tls_index);\r
+ if (! error_message) {\r
+ error_message = (char *) LocalAlloc(LPTR, NSSM_ERROR_BUFSIZE);\r
+ if (! error_message) return "<out of memory for error message>";\r
+ TlsSetValue(tls_index, (void *) error_message);\r
+ }\r
+\r
+ if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char *) error_message, NSSM_ERROR_BUFSIZE, 0)) {\r
+ if (_snprintf(error_message, NSSM_ERROR_BUFSIZE, "system error %lu", error) < 0) return 0;\r
+ }\r
+ return error_message;\r
}\r
\r
/* Log a message to the Event Log */\r
-void eventprintf(unsigned short type, unsigned long id, char *format, ...) {\r
- char message[4096];\r
- char *strings[2];\r
- int n, size;\r
+void log_event(unsigned short type, unsigned long id, ...) {\r
va_list arg;\r
+ int count;\r
+ char *s;\r
+ char *strings[6];\r
\r
- /* Construct the message */\r
- size = sizeof(message);\r
- va_start(arg, format);\r
- n = _vsnprintf(message, size, format, arg);\r
- va_end(arg);\r
-\r
- /* Check success */\r
- if (n < 0 || n >= size) return;\r
-\r
- /* Construct strings array */\r
- strings[0] = message;\r
- strings[1] = 0;\r
- \r
/* Open event log */\r
HANDLE handle = RegisterEventSource(0, TEXT(NSSM));\r
if (! handle) return;\r
\r
/* Log it */\r
- if (! ReportEvent(handle, type, 0, id, 0, 1, 0, (const char **) strings, 0)) {\r
- printf("ReportEvent(): %s\n", error_string(GetLastError()));\r
- }\r
+ count = 0;\r
+ va_start(arg, id);\r
+ while ((s = va_arg(arg, char *))) strings[count++] = s;\r
+ va_end(arg);\r
+ ReportEvent(handle, type, 0, id, 0, count, 0, (const char **) strings, 0);\r
\r
/* Close event log */\r
DeregisterEventSource(handle);\r