summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/mail/edit.c6
-rw-r--r--usr.bin/mail/fio.c10
-rw-r--r--usr.bin/mail/lex.c6
3 files changed, 11 insertions, 11 deletions
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index 2882d059aa6..7486569726c 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: edit.c,v 1.12 2003/06/03 02:56:11 millert Exp $ */
+/* $OpenBSD: edit.c,v 1.13 2004/05/10 15:25:51 deraadt Exp $ */
/* $NetBSD: edit.c,v 1.5 1996/06/08 19:48:20 christos Exp $ */
/*
@@ -34,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)edit.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: edit.c,v 1.12 2003/06/03 02:56:11 millert Exp $";
+static const char rcsid[] = "$OpenBSD: edit.c,v 1.13 2004/05/10 15:25:51 deraadt Exp $";
#endif
#endif /* not lint */
@@ -106,7 +106,7 @@ edit1(int *msgvec, int type)
dot = mp = &message[msgvec[i] - 1];
touch(mp);
(void)ignoresig(SIGINT, &oact, &oset);
- fp = run_editor(setinput(mp), mp->m_size, type, readonly);
+ fp = run_editor(setinput(mp), (off_t)mp->m_size, type, readonly);
if (fp != NULL) {
(void)fseek(otf, 0L, 2);
size = ftell(otf);
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index 3f4acf57531..bb03ebc6e1f 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fio.c,v 1.24 2003/07/07 21:36:51 deraadt Exp $ */
+/* $OpenBSD: fio.c,v 1.25 2004/05/10 15:25:51 deraadt Exp $ */
/* $NetBSD: fio.c,v 1.8 1997/07/07 22:57:55 phil Exp $ */
/*
@@ -34,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)fio.c 8.2 (Berkeley) 4/20/95";
#else
-static const char rcsid[] = "$OpenBSD: fio.c,v 1.24 2003/07/07 21:36:51 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: fio.c,v 1.25 2004/05/10 15:25:51 deraadt Exp $";
#endif
#endif /* not lint */
@@ -91,14 +91,14 @@ setptr(FILE *ibuf, off_t offset)
msgCount = 0;
} else {
/* Seek into the file to get to the new messages */
- (void)fseek(ibuf, offset, 0);
+ (void)fseeko(ibuf, offset, 0);
/*
* We need to make "offset" a pointer to the end of
* the temp file that has the copy of the mail file.
* If any messages have been edited, this will be
* different from the offset into the mail file.
*/
- (void)fseek(otf, 0L, SEEK_END);
+ (void)fseeko(otf, (off_t)0, SEEK_END);
offset = ftell(otf);
}
omsgCount = msgCount;
@@ -327,7 +327,7 @@ rm(char *name)
}
if (unlink(name) == -1) {
if (errno == EPERM)
- return(truncate(name, 0));
+ return(truncate(name, (off_t)0));
else
return(-1);
}
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index 9dd08bcecc7..9062840857c 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lex.c,v 1.31 2004/05/10 12:10:50 millert Exp $ */
+/* $OpenBSD: lex.c,v 1.32 2004/05/10 15:25:51 deraadt Exp $ */
/* $NetBSD: lex.c,v 1.10 1997/05/17 19:55:13 pk Exp $ */
/*
@@ -34,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95";
#else
-static const char rcsid[] = "$OpenBSD: lex.c,v 1.31 2004/05/10 12:10:50 millert Exp $";
+static const char rcsid[] = "$OpenBSD: lex.c,v 1.32 2004/05/10 15:25:51 deraadt Exp $";
#endif
#endif /* not lint */
@@ -142,7 +142,7 @@ setfile(char *name)
err(1, "%s", tempname);
(void)fcntl(fileno(itf), F_SETFD, 1);
(void)rm(tempname);
- setptr(ibuf, 0);
+ setptr(ibuf, (off_t)0);
setmsize(msgCount);
/*
* New mail may have arrived while we were reading