Put DEC timestamp handling in separate file.

Author: larsbrinkhoff

Makefile

@@ -71,7 +71,7 @@ tape-dir: tape-dir.o $(OBJS) libwords.a
 tito: tito.o $(OBJS) libwords.a
 	$(CC) $(CFLAGS) $^ -o $@
 
-dart: dart.o $(OBJS) libwords.a
+dart: dart.o dec.o $(OBJS) libwords.a
 	$(CC) $(CFLAGS) $^ -o $@
 
 dumper: dumper.o $(OBJS) libwords.a

dart.c

@@ -55,26 +55,16 @@ static int tape_frames;
 static int tape_bpw; /* Tape frames per word. */
 static int tape_bpi;
 
-/* Convert a WAITS date to year, month, day. */
-static void
-compute_date (word_t date, int *year, int *month, int *day)
-{
-  *day = date % 31;
-  *month = (date / 31) % 12;
-  *year = (date / 31 / 12) + 1964;
-}
-
 /* Convert a WAITS date to a struct timeval. */
 static void
 unix_time (struct timeval *tv, word_t date, word_t minutes)
 {
   struct tm tm;
-  compute_date (date, &tm.tm_year, &tm.tm_mon, &tm.tm_mday);
+  timestamp_from_dec (&tm, date);
   tm.tm_sec = 0;
   tm.tm_min = minutes % 60;
   tm.tm_hour = minutes / 60;
   tm.tm_mday++;
-  tm.tm_year -= 1900;
   tm.tm_isdst = 0;
   tv->tv_sec = mktime (&tm);
   tv->tv_usec = 0;
@@ -84,11 +74,8 @@ unix_time (struct timeval *tv, word_t date, word_t minutes)
 static void
 print_timestamp (FILE *f, word_t date, word_t minutes)
 {
-  int year, month, day;
-  compute_date (date, &year, &month, &day);
-  fprintf (f, "%4d-%02d-%02d %02lld:%02lld",
-	   year, month + 1, day + 1,
-	   minutes / 60, minutes % 60);
+  print_dec_timestamp (f, date);
+  fprintf (f, " %02lld:%02lld", minutes / 60, minutes % 60);
 }
 
 /* Convert a Unix time_t to WAITS date and time. */

dec.c

@@ -0,0 +1,29 @@
+#include <string.h>
+#include "dis.h"
+
+/* Convert a DEC timestamp to year, month, day. */
+static void
+dec_date (word_t timestamp, int *year, int *month, int *day)
+{
+  *day = timestamp % 31;
+  *month = (timestamp / 31) % 12;
+  *year = (timestamp / 31 / 12) + 1964;
+}
+
+/* Print DEC timestamp. */
+void
+print_dec_timestamp (FILE *f, word_t timestamp)
+{
+  int year, month, day;
+  dec_date (timestamp, &year, &month, &day);
+  fprintf (f, "%4d-%02d-%02d", year, month + 1, day + 1);
+}
+
+/* Convert a DEC timesamp date to a struct tm. */
+void
+timestamp_from_dec (struct tm *tm, word_t timestamp)
+{
+  memset (tm, 0, sizeof (struct tm));
+  dec_date (timestamp, &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
+  tm->tm_year -= 1900;
+}

dis.h

@@ -16,6 +16,7 @@
 #ifndef DIS_H
 #define DIS_H
 
+#include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -148,6 +149,8 @@ extern void	squoze_to_ascii (word_t squoze, char *ascii);
 extern void	print_date (FILE *, word_t t);
 extern void	print_time (FILE *, word_t t);
 extern void	print_datime (FILE *, word_t t);
+extern void	print_dec_timestamp (FILE *f, word_t timestamp);
+extern void	timestamp_from_dec (struct tm *tm, word_t timestamp);
 extern int	byte_size (int, int *);
 extern void	scramble (int decrypt, int verbose, word_t password,
 		          const word_t *input, word_t *output, int count);