** complete copyright information.
*/
+#include <time.h>
#include <h/mh.h> /* for snprintf() */
-#include <h/nmh.h>
#include <h/tws.h>
-#if !defined(HAVE_STRUCT_TM_TM_GMTOFF) && !defined(HAVE_TZSET)
-# include <sys/timeb.h>
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
-#if !defined(HAVE_STRUCT_TM_TM_GMTOFF) && defined(HAVE_TZSET)
-extern int daylight;
+#if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
extern long timezone;
-extern char *tzname[];
-#endif
-
-#ifndef abs
-# define abs(a) (a >= 0 ? a : -a)
#endif
/*
int shift;
};
-static struct zone zones[] = {
- { "GMT", "BST", 0 },
- { "EST", "EDT", -5 },
- { "CST", "CDT", -6 },
- { "MST", "MDT", -7 },
- { "PST", "PDT", -8 },
-#if 0
-/* RFC1123 specifies do not use military TZs */
- { "A", NULL, -1 },
- { "B", NULL, -2 },
- { "C", NULL, -3 },
- { "D", NULL, -4 },
- { "E", NULL, -5 },
- { "F", NULL, -6 },
- { "G", NULL, -7 },
- { "H", NULL, -8 },
- { "I", NULL, -9 },
- { "K", NULL, -10 },
- { "L", NULL, -11 },
- { "M", NULL, -12 },
- { "N", NULL, 1 },
-#ifndef HUJI
- { "O", NULL, 2 },
-#else
- { "JST", "JDT", 2 },
-#endif
- { "P", NULL, 3 },
- { "Q", NULL, 4 },
- { "R", NULL, 5 },
- { "S", NULL, 6 },
- { "T", NULL, 7 },
- { "U", NULL, 8 },
- { "V", NULL, 9 },
- { "W", NULL, 10 },
- { "X", NULL, 11 },
- { "Y", NULL, 12 },
-#endif
- { NULL, NULL, 0 }
-};
-
static int dmsize[] = {
31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
};
*/
struct tws *
-dlocaltimenow (void)
+dlocaltimenow(void)
{
time_t clock;
- time (&clock);
- return dlocaltime (&clock);
+ time(&clock);
+ return dlocaltime(&clock);
}
*/
struct tws *
-dlocaltime (time_t *clock)
+dlocaltime(time_t *clock)
{
static struct tws tw;
struct tm *tm;
-#if !defined(HAVE_STRUCT_TM_TM_GMTOFF) && !defined(HAVE_TZSET)
- struct timeb tb;
-#endif
-
if (!clock)
return NULL;
- tm = localtime (clock);
+ tm = localtime(clock);
tw.tw_sec = tm->tm_sec;
tw.tw_min = tm->tm_min;
tw.tw_mday = tm->tm_mday;
tw.tw_mon = tm->tm_mon;
- /*
- * tm_year is always "year - 1900".
- * So we correct for this.
- */
+ /* tm_year is always "year - 1900". So we correct for this. */
tw.tw_year = tm->tm_year + 1900;
tw.tw_wday = tm->tm_wday;
tw.tw_yday = tm->tm_yday;
if (tm->tm_isdst) /* if DST is in effect */
tw.tw_zone -= 60; /* reset to normal offset */
#else
-# ifdef HAVE_TZSET
tzset();
tw.tw_zone = -(timezone / 60);
-# else
- ftime (&tb);
- tw.tw_zone = -tb.timezone;
-# endif
#endif
tw.tw_flags &= ~TW_SDAY;
*/
struct tws *
-dgmtime (time_t *clock)
+dgmtime(time_t *clock)
{
static struct tws tw;
struct tm *tm;
if (!clock)
return NULL;
- tm = gmtime (clock);
+ tm = gmtime(clock);
tw.tw_sec = tm->tm_sec;
tw.tw_min = tm->tm_min;
tw.tw_mday = tm->tm_mday;
tw.tw_mon = tm->tm_mon;
- /*
- * tm_year is always "year - 1900"
- * So we correct for this.
- */
+ /* tm_year is always "year - 1900". So we correct for this. */
tw.tw_year = tm->tm_year + 1900;
tw.tw_wday = tm->tm_wday;
tw.tw_yday = tm->tm_yday;
*/
char *
-dctime (struct tws *tw)
+dctime(struct tws *tw)
{
static char buffer[26];
if (!tw)
return NULL;
- snprintf (buffer, sizeof(buffer), "%.3s %.3s %02d %02d:%02d:%02d %.4d\n",
+ snprintf(buffer, sizeof(buffer), "%.3s %.3s %02d %02d:%02d:%02d %.4d\n",
tw_dotw[tw->tw_wday], tw_moty[tw->tw_mon], tw->tw_mday,
tw->tw_hour, tw->tw_min, tw->tw_sec,
tw->tw_year < 100 ? tw->tw_year + 1900 : tw->tw_year);
/*
** Produce a date/time string of the form
**
-** Mon, 16 Jun 1992 15:30:48 -700 (or)
-** Mon, 16 Jun 1992 15:30:48 EDT
+** Mon, 16 Jun 1992 15:30:48 -0700
**
-** for the current time, as specified by rfc822.
-** The first form is required by rfc1123.
+** for the current time, as specified by rfc822 and rfc1123.
*/
-
char *
-dtimenow (int alpha_timezone)
+dtimenow(void)
{
time_t clock;
- time (&clock);
- return dtime (&clock, alpha_timezone);
+ time(&clock);
+ return dtime(&clock);
}
** Using a local calendar time value, produce
** a date/time string of the form
**
-** Mon, 16 Jun 1992 15:30:48 -700 (or)
-** Mon, 16 Jun 1992 15:30:48 EDT
+** Mon, 16 Jun 1992 15:30:48 -0700
**
-** as specified by rfc822. The first form is required
-** by rfc1123 for outgoing messages.
+** as specified by rfc822 and rfc1123.
*/
-
char *
-dtime (time_t *clock, int alpha_timezone)
+dtime(time_t *clock)
{
- if (alpha_timezone)
- /* use alpha-numeric timezones */
- return dasctime (dlocaltime (clock), TW_NULL);
- else
- /* use numeric timezones */
- return dasctime (dlocaltime (clock), TW_ZONE);
+ return dasctime(dlocaltime(clock));
}
**
** as specified by rfc822 and rfc1123.
*/
-
char *
-dasctime (struct tws *tw, int flags)
+dasctime(struct tws *tw)
{
char buffer[80];
static char result[80];
if ((tw->tw_flags & TW_SZONE) == TW_SZNIL)
result[0] = '\0';
else
- snprintf(result, sizeof(result), " %s", dtimezone(tw->tw_zone, tw->tw_flags | flags));
+ snprintf(result, sizeof(result), " %s", dtimezone(tw->tw_zone, tw->tw_flags));
snprintf(buffer, sizeof(buffer), "%02d %s %0*d %02d:%02d:%02d%s",
tw->tw_mday, tw_moty[tw->tw_mon],
tw->tw_hour, tw->tw_min, tw->tw_sec, result);
if ((tw->tw_flags & TW_SDAY) == TW_SEXP)
- snprintf (result, sizeof(result), "%s, %s", tw_dotw[tw->tw_wday], buffer);
+ snprintf(result, sizeof(result), "%s, %s", tw_dotw[tw->tw_wday], buffer);
else
if ((tw->tw_flags & TW_SDAY) == TW_SNIL)
- strncpy (result, buffer, sizeof(result));
+ strncpy(result, buffer, sizeof(result));
else
- snprintf (result, sizeof(result), "%s (%s)", buffer, tw_dotw[tw->tw_wday]);
+ snprintf(result, sizeof(result), "%s (%s)", buffer, tw_dotw[tw->tw_wday]);
return result;
}
/*
-** Get the timezone for given offset
+** Get the timezone for given offset as numeric value.
*/
-
char *
-dtimezone (int offset, int flags)
+dtimezone(int offset, int flags)
{
int hours, mins;
- struct zone *z;
static char buffer[10];
if (offset < 0) {
hours = offset / 60;
}
- if (!(flags & TW_ZONE) && mins == 0) {
-#if defined(HAVE_TZSET) && defined(HAVE_TZNAME)
- tzset();
- return ((flags & TW_DST) ? tzname[1] : tzname[0]);
-#else
- for (z = zones; z->std; z++)
- if (z->shift == hours)
- return (z->dst && (flags & TW_DST) ? z->dst : z->std);
-#endif
- }
-
#ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
if (flags & TW_DST)
hours += 1;
#endif /* ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST */
- snprintf (buffer, sizeof(buffer), "%s%02d%02d",
- offset < 0 ? "-" : "+", abs (hours), abs (mins));
+ snprintf(buffer, sizeof(buffer), "%s%02d%02d",
+ offset < 0 ? "-" : "+", abs(hours), abs(mins));
return buffer;
}
*/
time_t
-dmktime (struct tws *tw)
+dmktime(struct tws *tw)
{
int i, sec, min, hour, mday, mon, year;
time_t result;
year += 100;
for (i = 1970; i < year; i++)
- result += dysize (i);
- if (dysize (year) == 366 && mon >= 3)
+ result += dysize(i);
+ if (dysize(year) == 366 && mon >= 3)
result++;
while (--mon)
result += dmsize[mon - 1];
*/
void
-set_dotw (struct tws *tw)
+set_dotw(struct tws *tw)
{
int month, day, year, century;
*/
void
-twscopy (struct tws *tb, struct tws *tw)
+twscopy(struct tws *tb, struct tws *tw)
{
*tb = *tw; /* struct copy */
-
-#if 0
- tb->tw_sec = tw->tw_sec;
- tb->tw_min = tw->tw_min;
- tb->tw_hour = tw->tw_hour;
- tb->tw_mday = tw->tw_mday;
- tb->tw_mon = tw->tw_mon;
- tb->tw_year = tw->tw_year;
- tb->tw_wday = tw->tw_wday;
- tb->tw_yday = tw->tw_yday;
- tb->tw_zone = tw->tw_zone;
- tb->tw_clock = tw->tw_clock;
- tb->tw_flags = tw->tw_flags;
-#endif
}
*/
int
-twsort (struct tws *tw1, struct tws *tw2)
+twsort(struct tws *tw1, struct tws *tw2)
{
time_t c1, c2;
if (tw1->tw_clock == 0)
- dmktime (tw1);
+ dmktime(tw1);
if (tw2->tw_clock == 0)
- dmktime (tw2);
+ dmktime(tw2);
return ((c1 = tw1->tw_clock) > (c2 = tw2->tw_clock) ? 1
: c1 == c2 ? 0 : -1);
projects / mmh / blobdiff