Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-14 20:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wrong timezone under MacOSX

Browse Source 
SVN revision: 1739
This commit is contained in:
Stefan Ritt 2006-10-20 06:26:47 +00:00
parent b29ce46a9e
commit a8a611f332
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/elogd.c
View File

@ -57,6 +57,10 @@ static const char ELOGID[] = "elogd " VERSION " built " __DATE__ ", " __TIME__;
#define OS_UNIX #define OS_UNIX
#ifdef __APPLE__
#define OS_MACOSX
#endif
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0
@ -547,7 +551,7 @@ static BOOL chkext(const char *str, const char *ext)
return TRUE; return TRUE;
} }
/* workaroud for some gcc versions bug for "%c" format (see strftime(3) */ /* workaround for some gcc versions bug for "%c" format (see strftime(3) */
size_t my_strftime(char *s, size_t max, const char *fmt, const struct tm * tm) size_t my_strftime(char *s, size_t max, const char *fmt, const struct tm * tm)
{ {
return strftime(s, max, fmt, tm); return strftime(s, max, fmt, tm);
@ -584,6 +588,21 @@ int my_read(int fh, void *buffer, unsigned int bytes)
return 0; return 0;
} }
/* workaround for wong timezone under MAX OSX */
long my_timezone()
{
#ifdef OS_MACOSX
time_t tp;
time(&tp);
if (localtime(&tp)->tm_isdst > 0)
return -localtime(&tp)->tm_gmtoff + 3600;
else
return -localtime(&tp)->tm_gmtoff;
#else
return timezone;
#endif
}
/*---- Compose RFC2822 compliant date ---*/ /*---- Compose RFC2822 compliant date ---*/
void get_rfc2822_date(char *date, int size, time_t ltime) void get_rfc2822_date(char *date, int size, time_t ltime)
@ -603,7 +622,7 @@ void get_rfc2822_date(char *date, int size, time_t ltime)
ts = localtime(&now); ts = localtime(&now);
assert(ts); assert(ts);
strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S", ts); strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S", ts);
offset = (-(int) timezone); offset = (-(int) my_timezone());
if (ts->tm_isdst) if (ts->tm_isdst)
offset += 3600; offset += 3600;
snprintf(date, size - 1, "%s %+03d%02d", buf, (int) (offset / 3600), snprintf(date, size - 1, "%s %+03d%02d", buf, (int) (offset / 3600),
@ -1991,11 +2010,11 @@ void compose_email_header(LOGBOOK * lbs, char *subject, char *from, char *to,
ts = localtime(&now); ts = localtime(&now);
assert(ts); assert(ts);
strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S", ts); strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S", ts);
offset = (-(int) timezone); offset = (-(int) my_timezone());
if (ts->tm_isdst) if (ts->tm_isdst)
offset += 3600; offset += 3600;
if (verbose) { if (verbose) {
sprintf(str, "timezone: %d, offset: %d\n", (int) timezone, (int) offset); sprintf(str, "timezone: %d, offset: %d\n", (int) my_timezone(), (int) offset);
efputs(str); efputs(str);
} }
snprintf(mail_text + strlen(mail_text), size - strlen(mail_text) - 1, "Date: %s %+03d%02d\r\n", buf, snprintf(mail_text + strlen(mail_text), size - strlen(mail_text) - 1, "Date: %s %+03d%02d\r\n", buf,
@ -3305,7 +3324,7 @@ time_t date_to_ltime(char *date)
date_zone = 0; date_zone = 0;
date_zone = (abs(date_zone) % 100) * 60 + (date_zone) / 100 * 3600; date_zone = (abs(date_zone) % 100) * 60 + (date_zone) / 100 * 3600;
local_zone = timezone; local_zone = my_timezone();
if (tms.tm_isdst) if (tms.tm_isdst)
local_zone -= 3600; local_zone -= 3600;
@ -16641,7 +16660,7 @@ void show_rss_feed(LOGBOOK * lbs)
ts = localtime(&ltime); ts = localtime(&ltime);
assert(ts); assert(ts);
strftime(str, sizeof(str), "%a, %d %b %Y %H:%M:%S", ts); strftime(str, sizeof(str), "%a, %d %b %Y %H:%M:%S", ts);
offset = (-(int) timezone); offset = (-(int) my_timezone());
snprintf(date, sizeof(date) - 1, "%s %+03d%02d", str, (int) (offset / 3600), snprintf(date, sizeof(date) - 1, "%s %+03d%02d", str, (int) (offset / 3600),
(int) ((abs((int) offset) / 60) % 60)); (int) ((abs((int) offset) / 60) % 60));
getcfg("global", "Language", str, sizeof(str)); getcfg("global", "Language", str, sizeof(str));