Restored file execute permissions.

[nmh] / sbr / dtime.c

diff --git a/sbr/dtime.c b/sbr/dtime.c
index 3a51d87ff11145783475c06b76e9ce8b87760c9c..9a1002652c5f6b80363a415653942854da95aa4b 100644 (file)
--- a/sbr/dtime.c
+++ b/sbr/dtime.c
@@ -5,15 +5,21 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>   /* for snprintf() */
-#include <h/nmh.h>
-#include <h/tws.h>
+#include "h/mh.h"
+#include "dtime.h"
+#include "h/nmh.h"
+#include "h/utils.h"
+#include "h/tws.h"

 #include <time.h>
 
 #if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
 extern long timezone;
 #endif
 
 #include <time.h>
 
 #if !defined(HAVE_STRUCT_TM_TM_GMTOFF)
 extern long timezone;
 #endif
 

+/* Size of largest possible int representing a time zone offset in minutes:
+   2,147,483,648 / 60 = 35,791,394 */
+#define DTZ_BUFFER_SIZE (sizeof "+3579139459")
+

 /*
  * The number of days in the year, accounting for leap years
  */
 /*
  * The number of days in the year, accounting for leap years
  */


@@ -117,7 +123,7 @@ dlocaltime (time_t *clock)
 
     tw.tw_clock = *clock;
 
 
     tw.tw_clock = *clock;
 

-    return (&tw);
+    return &tw;

 }
 
 
 }
 
 


@@ -164,7 +170,7 @@ dgmtime (time_t *clock)
 
     tw.tw_clock = *clock;
 
 
     tw.tw_clock = *clock;
 

-    return (&tw);
+    return &tw;

 }
 
 
 }
 
 


@@ -178,15 +184,15 @@ dgmtime (time_t *clock)
 char *
 dctime (struct tws *tw)
 {
 char *
 dctime (struct tws *tw)
 {

-    static char buffer[64];
+    static char buffer[26];

 
     if (!tw)
        return NULL;
 
 
     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 %s\n",

            tw_dotw[tw->tw_wday], tw_moty[tw->tw_mon], tw->tw_mday,
            tw->tw_hour, tw->tw_min, tw->tw_sec,
            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);
+           m_strn(tw->tw_year < 100 ? tw->tw_year + 1900 : tw->tw_year, 4));

 
     return buffer;
 }
 
     return buffer;
 }


@@ -247,7 +253,8 @@ dtime (time_t *clock, int alpha_timezone)
 char *
 dasctime (struct tws *tw, int flags)
 {
 char *
 dasctime (struct tws *tw, int flags)
 {

-    char buffer[80];
+    char buffer[77];
+    char tzbuffer[DTZ_BUFFER_SIZE];

     static char result[80];
     int twf;
 
     static char result[80];
     int twf;
 


@@ -256,14 +263,14 @@ dasctime (struct tws *tw, int flags)
 
     /* Display timezone if known */
     if (tw->tw_flags & TW_SZEXP)
 
     /* Display timezone if known */
     if (tw->tw_flags & TW_SZEXP)

-       snprintf(result, sizeof(result), " %s", dtimezone(tw->tw_zone, tw->tw_flags | flags));
+       snprintf(tzbuffer, sizeof(tzbuffer), " %s", dtimezone(tw->tw_zone, tw->tw_flags | flags));

     else
     else

-       result[0] = '\0';
+       tzbuffer[0] = '\0';

 
     snprintf(buffer, sizeof(buffer), "%02d %s %0*d %02d:%02d:%02d%s",
            tw->tw_mday, tw_moty[tw->tw_mon],
            tw->tw_year < 100 ? 2 : 4, tw->tw_year,
 
     snprintf(buffer, sizeof(buffer), "%02d %s %0*d %02d:%02d:%02d%s",
            tw->tw_mday, tw_moty[tw->tw_mon],
            tw->tw_year < 100 ? 2 : 4, tw->tw_year,

-           tw->tw_hour, tw->tw_min, tw->tw_sec, result);
+           tw->tw_hour, tw->tw_min, tw->tw_sec, tzbuffer);

 
     if ((twf = tw->tw_flags & TW_SDAY)) {
         if (twf == TW_SEXP)
 
     if ((twf = tw->tw_flags & TW_SDAY)) {
         if (twf == TW_SEXP)


@@ -284,14 +291,15 @@ dasctime (struct tws *tw, int flags)
  * return the string representation of the numeric offset.
  */
 
  * return the string representation of the numeric offset.
  */
 

-char *dtimezone(int offset, int flags)
+char *
+dtimezone(int offset, int flags)

 {
 {

-    static char buffer[sizeof "+3579139459"]; /* 2,147,483,648 / 60 = 35,791,394 */
+    static char buffer[DTZ_BUFFER_SIZE];

     bool pos;
     unsigned os, hours, mins;
 
     pos = offset >= 0;
     bool pos;
     unsigned os, hours, mins;
 
     pos = offset >= 0;

-    os = pos ? offset : ~offset + 1;
+    os = pos ? offset : ~offset + 1; /* abs(3) undefined on INT_MIN. */

     hours = os / 60;
     mins = os % 60;
 
     hours = os / 60;
     mins = os % 60;
 


@@ -344,14 +352,17 @@ dmktime (struct tws *tw)
     while (--mon)
        result += dmsize[mon - 1];
     result += mday - 1;
     while (--mon)
        result += dmsize[mon - 1];
     result += mday - 1;

-    result = 24 * result + hour;
-    result = 60 * result + min;
-    result = 60 * result + sec;
+    result *= 24; /* Days to hours. */
+    result += hour;
+    result *= 60; /* Hours to minutes. */
+    result += min;
+    result *= 60; /* Minutes to seconds. */
+    result += sec;

     result -= 60 * tw->tw_zone;
     if (tw->tw_flags & TW_DST)
     result -= 60 * tw->tw_zone;
     if (tw->tw_flags & TW_DST)

-       result -= 60 * 60;
+       result -= 60 * 60; /* One hour. */

 
 

-    return (tw->tw_clock = result);
+    return tw->tw_clock = result;

 }
 
 
 }
 
 


@@ -404,6 +415,6 @@ twsort (struct tws *tw1, struct tws *tw2)
     if (tw2->tw_clock == 0)
        dmktime (tw2);
 
     if (tw2->tw_clock == 0)
        dmktime (tw2);
 

-    return ((c1 = tw1->tw_clock) > (c2 = tw2->tw_clock) ? 1
-           : c1 == c2 ? 0 : -1);
+    return (c1 = tw1->tw_clock) > (c2 = tw2->tw_clock) ? 1
+           : c1 == c2 ? 0 : -1;

 }
 }