# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1416808165 -32400
# Node ID 76d91e545ea854b3f903a135e82fd6f6ec83ccd3
# Parent  07f8972434be45d8db88df321017441c4496b334
addrsbr and dtimep fix

diff -r 07f8972434be -r 76d91e545ea8 sbr/addrsbr.c
--- a/sbr/addrsbr.c	Wed Nov 12 02:46:27 2014 +0900
+++ b/sbr/addrsbr.c	Mon Nov 24 14:49:25 2014 +0900
@@ -583,11 +583,11 @@
 #ifndef	BANG
 	if (mp -> m_type != UUCPHOST) {
 	   if (mp->m_host) 
-	    (void) sprintf (addr, "%s%s@%s" ,
-		 mp -> m_path , mp -> m_mbox, mp -> m_host);
+                (void) sprintf (addr, "%s%s@%s" ,
+		  mp -> m_path ? mp -> m_path : "" , mp -> m_mbox, mp -> m_host);
            else
 	    (void) sprintf (addr, "%s%s",
-		"", mp -> m_mbox);
+		  mp -> m_path ? mp -> m_path : "" , mp -> m_mbox);
 	} else
 #endif /* not BANG */
 	    (void) sprintf (addr, "%s!%s", mp -> m_host, mp -> m_mbox);
diff -r 07f8972434be -r 76d91e545ea8 zotnet/tws/dtimep.c
--- a/zotnet/tws/dtimep.c	Wed Nov 12 02:46:27 2014 +0900
+++ b/zotnet/tws/dtimep.c	Mon Nov 24 14:49:25 2014 +0900
@@ -115,8 +115,6 @@
 #endif	/* BSD42 */
 #endif
 
-extern int lex_string( char **, int) ;
-
 static	void zonehack (tw)
 register struct tws *tw;
 {
diff -r 07f8972434be -r 76d91e545ea8 zotnet/tws/dtimep.c-lexed
--- a/zotnet/tws/dtimep.c-lexed	Wed Nov 12 02:46:27 2014 +0900
+++ b/zotnet/tws/dtimep.c-lexed	Mon Nov 24 14:49:25 2014 +0900
@@ -115,7 +115,7 @@
 #endif	/* BSD42 */
 #endif
 
-static	zonehack (tw)
+static	void zonehack (tw)
 register struct tws *tw;
 {
     register struct tm *tm;
diff -r 07f8972434be -r 76d91e545ea8 zotnet/tws/dtimep.lex
--- a/zotnet/tws/dtimep.lex	Wed Nov 12 02:46:27 2014 +0900
+++ b/zotnet/tws/dtimep.lex	Mon Nov 24 14:49:25 2014 +0900
@@ -142,7 +142,7 @@
 #endif	/* BSD42 */
 #endif
 
-static	zonehack (tw)
+static	void zonehack (tw)
 register struct tws *tw;
 {
     register struct tm *tm;