Updated sbr functions to include <h/tws.h> instead of <zotnet/tws/tws.h>.

Also, update Makefile to include new functions dtime.c and dtimep.c

diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index b27dda4..a2bc3bd 100644 (file)
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -15,6 +15,7 @@ CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
 INCLUDES = -I.. -I. -I$(top_srcdir)
 
+LEX    = @LEX@
 AWK    = @AWK@
 LORDER = @LORDER@
 TSORT  = @TSORT@
@@ -34,28 +35,28 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
 SIGNAL_H = @SIGNAL_H@
 
 # source for library functions
-SRCS = add.c addrsbr.c ambigsw.c atooi.c brkstring.c           \
-       check_charset.c closefds.c concat.c context_del.c       \
-       context_find.c context_foil.c context_read.c            \
-       context_replace.c context_save.c copy.c                 \
-       copyip.c cpydata.c cpydgst.c discard.c done.c           \
-       error.c fdcompare.c folder_addmsg.c folder_delmsgs.c    \
-       folder_free.c folder_pack.c folder_read.c               \
-       folder_realloc.c gans.c getans.c getanswer.c            \
-       getarguments.c getcpy.c getfolder.c getpass.c           \
-       fmt_addr.c fmt_compile.c fmt_new.c fmt_rfc2047.c        \
-       fmt_scan.c lock_file.c m_atoi.c m_backup.c              \
-       m_convert.c m_draft.c m_getfld.c m_gmprot.c             \
-       m_maildir.c m_name.c m_scratch.c m_tmpfil.c             \
-       makedir.c path.c peekc.c pidwait.c pidstatus.c          \
-       print_help.c print_sw.c print_version.c push.c          \
-       putenv.c pwd.c refile.c remdir.c r1bindex.c             \
-       readconfig.c ruserpass.c seq_add.c seq_bits.c           \
-       seq_del.c seq_getnum.c seq_list.c seq_nameok.c          \
-       seq_print.c seq_read.c seq_save.c seq_setcur.c          \
-       seq_setprev.c seq_setunseen.c showfile.c signals.c      \
-       smatch.c snprintb.c ssequal.c strcasecmp.c              \
-       strindex.c trimcpy.c uprf.c vfgets.c fmt_def.c          \
+SRCS = add.c addrsbr.c ambigsw.c atooi.c brkstring.c                   \
+       check_charset.c closefds.c concat.c context_del.c               \
+       context_find.c context_foil.c context_read.c                    \
+       context_replace.c context_save.c copy.c                         \
+       copyip.c cpydata.c cpydgst.c discard.c done.c dtime.c dtimep.c  \
+       error.c fdcompare.c folder_addmsg.c folder_delmsgs.c            \
+       folder_free.c folder_pack.c folder_read.c                       \
+       folder_realloc.c gans.c getans.c getanswer.c                    \
+       getarguments.c getcpy.c getfolder.c getpass.c                   \
+       fmt_addr.c fmt_compile.c fmt_new.c fmt_rfc2047.c                \
+       fmt_scan.c lock_file.c m_atoi.c m_backup.c                      \
+       m_convert.c m_draft.c m_getfld.c m_gmprot.c                     \
+       m_maildir.c m_name.c m_scratch.c m_tmpfil.c                     \
+       makedir.c path.c peekc.c pidwait.c pidstatus.c                  \
+       print_help.c print_sw.c print_version.c push.c                  \
+       putenv.c pwd.c refile.c remdir.c r1bindex.c                     \
+       readconfig.c ruserpass.c seq_add.c seq_bits.c                   \
+       seq_del.c seq_getnum.c seq_list.c seq_nameok.c                  \
+       seq_print.c seq_read.c seq_save.c seq_setcur.c                  \
+       seq_setprev.c seq_setunseen.c showfile.c signals.c              \
+       smatch.c snprintb.c ssequal.c strcasecmp.c                      \
+       strindex.c trimcpy.c uprf.c vfgets.c fmt_def.c                  \
        m_msgdef.c mf.c
 
 # source for compatibility functions
@@ -64,7 +65,7 @@ COMPAT = snprintf.c strdup.c strerror.c
 OBJS = $(patsubst %.c,%.o,$(SRCS))
 
 # auxiliary files
-AUX = Makefile.in sigmsg.awk
+AUX = Makefile.in sigmsg.awk dtimep.lex
 
 # all files in this directory included in the distribution
 DIST = $(SRCS) $(COMPAT) $(AUX)
@@ -77,6 +78,9 @@ all: libmh.a
 sigmsg.h: sigmsg.awk
        $(AWK) -f $(srcdir)/sigmsg.awk $(SIGNAL_H) > $@
 
+dtimep.c: dtimep.lex
+       $(LEX) -nit $< > $@
+
 pidstatus.o: sigmsg.h
 
 libmh.a: $(OBJS)

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index e857c7d..6baabdc 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -7,7 +7,7 @@
 
 #include <h/mh.h>
 #include <h/addrsbr.h>
-#include <zotnet/tws/tws.h>
+#include <h/tws.h>
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index b8273c9..4f9078a 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
-#include <zotnet/tws/tws.h>
+#include <h/tws.h>
 #include <h/fmt_compile.h>
 
 #ifdef TIME_WITH_SYS_TIME