From 058e90e202de283fd948d417b00be8171ef37cfa Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Wed, 4 Dec 2013 19:07:54 +0100
Subject: [PATCH] mail(1): Raise WARNS to 2 and fix warnings.

---
 usr.bin/mail/Makefile | 2 +-
 usr.bin/mail/cmd1.c   | 3 +--
 usr.bin/mail/main.c   | 3 +--
 usr.bin/mail/util.c   | 6 ++----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index 85d7c8be8e..26c5a9fbd1 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -10,7 +10,7 @@ FILESDIR=	${SHAREDIR}/misc
 EFILES=	mail.rc
 LINKS=	${BINDIR}/mail ${BINDIR}/Mail ${BINDIR}/mail ${BINDIR}/mailx
 MLINKS=	mail.1 Mail.1 mail.1 mailx.1
-WARNS?=	1
+WARNS?=	2
 
 .PATH: ${.CURDIR}/misc
 
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 82db870d8d..fb65d31270 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -28,7 +28,6 @@
  *
  * @(#)cmd1.c	8.2 (Berkeley) 4/20/95
  * $FreeBSD: src/usr.bin/mail/cmd1.c,v 1.3.6.3 2003/01/06 05:46:03 mikeh Exp $
- * $DragonFly: src/usr.bin/mail/cmd1.c,v 1.4 2004/09/08 03:01:11 joerg Exp $
  */
 
 #include "rcv.h"
@@ -206,7 +205,7 @@ printhead(int mesg)
 int
 pdot(void)
 {
-	printf("%d\n", dot - &message[0] + 1);
+	printf("%td\n", dot - &message[0] + 1);
 	return (0);
 }
 
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index d055c28ae2..8747ca9a49 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -29,7 +29,6 @@
  * @(#) Copyright (c) 1980, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)main.c	8.2 (Berkeley) 4/20/95
  * $FreeBSD: src/usr.bin/mail/main.c,v 1.6.2.5 2003/01/06 05:46:03 mikeh Exp $
- * $DragonFly: src/usr.bin/mail/main.c,v 1.6 2004/09/08 03:01:11 joerg Exp $
  */
 
 #include "rcv.h"
@@ -200,7 +199,7 @@ main(int argc, char **argv)
 "       %s [-EHiInNv] [-F] -f [name]\n"
 "       %s [-EHiInNv] [-F] [-u user]\n"
 "       %s -e [-f name]\n"
-"       %s -H\n", progname, strlen(progname), "",
+"       %s -H\n", progname, (int)strlen(progname), "",
 			    progname, progname, progname, progname);
 			exit(1);
 		}
diff --git a/usr.bin/mail/util.c b/usr.bin/mail/util.c
index 7768ad7bf9..661ad7934d 100644
--- a/usr.bin/mail/util.c
+++ b/usr.bin/mail/util.c
@@ -28,7 +28,6 @@
  *
  * @(#)aux.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/mail/aux.c,v 1.4.6.4 2003/01/06 05:46:03 mikeh Exp $
- * $DragonFly: src/usr.bin/mail/aux.c,v 1.4 2004/09/08 03:01:11 joerg Exp $
  */
 
 #include <sys/time.h>
@@ -229,10 +228,9 @@ ishfield(char *linebuf, char *colon, const char *field)
 void
 istrncpy(char *dest, const char *src, size_t dsize)
 {
-
 	strlcpy(dest, src, dsize);
-	while (*dest)
-		*dest++ = tolower((unsigned char)*dest);
+	for (; *dest; dest++)
+		*dest = tolower((unsigned char)*dest);
 }
 
 /*
-- 
2.41.0