Merge remote-tracking branch 'upstream/master'

5 files changed, 7 insertions, 9 deletions

diff --git a/src/cmd/upas/send/bind.c b/src/cmd/upas/send/bind.c
index 8a8fc8ea..05327975 100644
--- a/src/cmd/upas/send/bind.c
+++ b/src/cmd/upas/send/bind.c
@@ -130,4 +130,3 @@ forward_loop(char *addr, char *system)
 			return 1;
 	return 0;
 }
-
diff --git a/src/cmd/upas/send/main.c b/src/cmd/upas/send/main.c
index 6c455833..15a2026e 100644
--- a/src/cmd/upas/send/main.c
+++ b/src/cmd/upas/send/main.c
@@ -122,7 +122,7 @@ main(int argc, char *argv[])
 
 	/*
 	 *  If this is a gateway, translate the sender address into a local
-	 *  address.  This only happens if mail to the local address is 
+	 *  address.  This only happens if mail to the local address is
 	 *  forwarded to the sender.
 	 */
 	gateway(mp);
diff --git a/src/cmd/upas/send/message.c b/src/cmd/upas/send/message.c
index 3ec8d706..60dd050b 100644
--- a/src/cmd/upas/send/message.c
+++ b/src/cmd/upas/send/message.c
@@ -224,7 +224,7 @@ rfc822cruft(message *mp)
 				if(p->addr){
 					cp = skipequiv(s_to_c(p->s));
 					s_append(body, cp);
-				} else 
+				} else
 					s_append(body, s_to_c(p->s));
 			}else{
 				s_putc(body, p->c);
@@ -494,7 +494,7 @@ int
 isutf8(String *s)
 {
 	char *p;
-	
+
 	for(p = s_to_c(s);  *p; p++)
 		if(*p&0x80)
 			return 1;
diff --git a/src/cmd/upas/send/rewrite.c b/src/cmd/upas/send/rewrite.c
index 3f30d4f3..3b19da27 100644
--- a/src/cmd/upas/send/rewrite.c
+++ b/src/cmd/upas/send/rewrite.c
@@ -3,7 +3,7 @@
 
 extern int debug;
 
-/* 
+/*
  *	Routines for dealing with the rewrite rules.
  */
 
@@ -249,7 +249,7 @@ substitute(String *source, Resub *subexp, message *mp)
 	char *s;
 	char *sp;
 	String *stp;
-	
+
 	if(source == 0)
 		return 0;
 	sp = s_to_c(source);
@@ -292,7 +292,7 @@ substitute(String *source, Resub *subexp, message *mp)
 				s_putc(stp, *sp);
 				break;
 			}
-		} else if(*sp == '&') {			
+		} else if(*sp == '&') {
 			if(subexp[0].s.sp != 0)
 				for (s = subexp[0].s.sp;
 				     s < subexp[0].e.ep; s++)
@@ -345,4 +345,3 @@ dumprules(void)
 		fprint(2, " '%s'\n", rp->repl2 ? rp->repl2->base:"...");
 	}
 }
-
diff --git a/src/cmd/upas/send/skipequiv.c b/src/cmd/upas/send/skipequiv.c
index f40181ad..d5bf0bb1 100644
--- a/src/cmd/upas/send/skipequiv.c
+++ b/src/cmd/upas/send/skipequiv.c
@@ -41,7 +41,7 @@ okfile(char *cp, Biobuf *fp)
 
 	len = strlen(cp);
 	Bseek(fp, 0, 0);
-	
+
 	/* one iteration per system name in the file */
 	while(buf = Brdline(fp, '\n')) {
 		ep = &buf[Blinelen(fp)];