-const char errlog_rcs[] = "$Id: errlog.c,v 1.20 2001/09/16 23:04:34 jongfoster Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.21 2001/10/25 03:40:47 david__schmidt Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
*
* Revisions :
* $Log: errlog.c,v $
+ * Revision 1.21 2001/10/25 03:40:47 david__schmidt
+ * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
+ * threads to call select() simultaneously. So, it's time to do a real, live,
+ * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__
+ * (native). Both versions will work, but using __OS2__ offers multi-threading.
+ *
* Revision 1.20 2001/09/16 23:04:34 jongfoster
* Fixing a warning
*
{
va_list ap;
char *outbuf= NULL;
+ char *outbuf_save = NULL;
char * src = fmt;
int outc = 0;
long this_thread = 1; /* was: pthread_t this_thread;*/
this_thread = ptib -> tib_ptib2 -> tib2_ultid;
#endif /* def FEATURE_PTHREAD */
- outbuf = (char*)malloc(BUFFER_SIZE);
+ outbuf_save = outbuf = (char*)malloc(BUFFER_SIZE);
assert(outbuf);
+
+ {
+ /*
+ * Write timestamp into tempbuf.
+ *
+ * Complex because not all OSs have tm_gmtoff or
+ * the %z field in strftime()
+ */
+ time_t now;
+ struct tm *tm_now;
+ time (&now);
+ tm_now = localtime (&now);
+ strftime (outbuf, BUFFER_SIZE-6, "%b %d %H:%M:%S ", tm_now);
+ outbuf += strlen( outbuf );
+ }
switch (loglevel)
{
case LOG_LEVEL_ERROR:
{
logfp = stderr;
}
- fputs(outbuf, logfp);
+ fputs(outbuf_save, logfp);
/* FIXME RACE HAZARD: should end critical section error_log_use here */
- fatal_error(outbuf);
+ fatal_error(outbuf_save);
/* Never get here */
break;
logfp = stderr;
}
- fputs(outbuf, logfp);
+ fputs(outbuf_save, logfp);
if (loglevel == LOG_LEVEL_FATAL)
{
- fatal_error(outbuf);
+ fatal_error(outbuf_save);
/* Never get here */
}
#if defined(_WIN32) && !defined(_WIN_CONSOLE)
/* Write to display */
- LogPutString(outbuf);
+ LogPutString(outbuf_save);
#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
}
-const char parsers_rcs[] = "$Id: parsers.c,v 1.39 2001/10/26 17:40:04 oes Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.40 2001/10/26 20:13:09 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/parsers.c,v $
*
* Revisions :
* $Log: parsers.c,v $
+ * Revision 1.40 2001/10/26 20:13:09 jongfoster
+ * ctype.h is needed in Windows, too.
+ *
* Revision 1.39 2001/10/26 17:40:04 oes
* Introduced get_header_value()
* Removed http->user_agent, csp->referrer and csp->accept_types
char *server_set_cookie(const struct parsers *v, const char *s, struct client_state *csp)
{
#ifdef FEATURE_COOKIE_JAR
+
+ /*
+ * Write timestamp into outbuf.
+ *
+ * Complex because not all OSs have tm_gmtoff or
+ * the %z field in strftime()
+ */
+ char tempbuf[ BUFFER_SIZE ];
+ time_t now;
+ struct tm *tm_now;
+ time (&now);
+ tm_now = localtime (&now);
+ strftime (tempbuf, BUFFER_SIZE-6, "%b %d %H:%M:%S ", tm_now);
+
if (csp->config->jar)
{
- fprintf(csp->config->jar, "%s\t%s\n", csp->http->host, (s + v->len + 1));
+ fprintf(csp->config->jar, "%s %s\t%s\n", tempbuf, csp->http->host, (s + v->len + 1));
}
#endif /* def FEATURE_COOKIE_JAR */