projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This is mmh-0.3
[mmh]
/
sbr
/
dtime.c
diff --git
a/sbr/dtime.c
b/sbr/dtime.c
index
48e13db
..
47ae79e
100644
(file)
--- a/
sbr/dtime.c
+++ b/
sbr/dtime.c
@@
-6,19
+6,14
@@
** complete copyright information.
*/
** complete copyright information.
*/
+#include <time.h>
#include <h/mh.h> /* for snprintf() */
#include <h/mh.h> /* for snprintf() */
-#include <h/nmh.h>
#include <h/tws.h>
#include <h/tws.h>
-#include <time.h>
#if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
extern long timezone;
#endif
#if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
extern long timezone;
#endif
-#ifndef abs
-# define abs(a) (a >= 0 ? a : -a)
-#endif
-
/*
** The number of days in the year, accounting for leap years
*/
/*
** The number of days in the year, accounting for leap years
*/
@@
-94,10
+89,7
@@
dlocaltime(time_t *clock)
tw.tw_mday = tm->tm_mday;
tw.tw_mon = tm->tm_mon;
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;
tw.tw_year = tm->tm_year + 1900;
tw.tw_wday = tm->tm_wday;
tw.tw_yday = tm->tm_yday;
@@
-149,10
+141,7
@@
dgmtime(time_t *clock)
tw.tw_mday = tm->tm_mday;
tw.tw_mon = tm->tm_mon;
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;
tw.tw_year = tm->tm_year + 1900;
tw.tw_wday = tm->tm_wday;
tw.tw_yday = tm->tm_yday;
@@
-201,20
+190,17
@@
dctime(struct tws *tw)
/*
** Produce a date/time string of the form
**
/*
** 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 *
char *
-dtimenow(int alpha_timezone)
+dtimenow(void)
{
time_t clock;
time(&clock);
{
time_t clock;
time(&clock);
- return dtime(&clock, alpha_timezone);
+ return dtime(&clock);
}
}
@@
-222,22
+208,14
@@
dtimenow(int alpha_timezone)
** Using a local calendar time value, produce
** a date/time string of the form
**
** 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 *
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));
}
}
@@
-249,9
+227,8
@@
dtime(time_t *clock, int alpha_timezone)
**
** as specified by rfc822 and rfc1123.
*/
**
** as specified by rfc822 and rfc1123.
*/
-
char *
char *
-dasctime(struct tws *tw, int flags)
+dasctime(struct tws *tw)
{
char buffer[80];
static char result[80];
{
char buffer[80];
static char result[80];
@@
-263,7
+240,7
@@
dasctime(struct tws *tw, int flags)
if ((tw->tw_flags & TW_SZONE) == TW_SZNIL)
result[0] = '\0';
else
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],
snprintf(buffer, sizeof(buffer), "%02d %s %0*d %02d:%02d:%02d%s",
tw->tw_mday, tw_moty[tw->tw_mon],
@@
-283,9
+260,8
@@
dasctime(struct tws *tw, int flags)
/*
/*
-** Get the timezone for given offset
+** Get the timezone for given offset as numeric value.
*/
*/
-
char *
dtimezone(int offset, int flags)
{
char *
dtimezone(int offset, int flags)
{
@@
-300,11
+276,6
@@
dtimezone(int offset, int flags)
hours = offset / 60;
}
hours = offset / 60;
}
- if (!(flags & TW_ZONE) && mins == 0) {
- tzset();
- return ((flags & TW_DST) ? tzname[1] : tzname[0]);
- }
-
#ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
if (flags & TW_DST)
hours += 1;
#ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
if (flags & TW_DST)
hours += 1;