Module Name: src
Committed By: christos
Date: Fri Oct 22 21:29:46 UTC 2010
Modified Files:
src/lib/libc/stdio: ftell.c local.h
Log Message:
implement EOVERFLOW
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/stdio/ftell.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libc/stdio/local.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdio/ftell.c
diff -u src/lib/libc/stdio/ftell.c:1.15 src/lib/libc/stdio/ftell.c:1.16
--- src/lib/libc/stdio/ftell.c:1.15 Thu Aug 7 12:43:25 2003
+++ src/lib/libc/stdio/ftell.c Fri Oct 22 17:29:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ftell.c,v 1.15 2003/08/07 16:43:25 agc Exp $ */
+/* $NetBSD: ftell.c,v 1.16 2010/10/22 21:29:45 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ftell.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: ftell.c,v 1.15 2003/08/07 16:43:25 agc Exp $");
+__RCSID("$NetBSD: ftell.c,v 1.16 2010/10/22 21:29:45 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,7 +62,7 @@
if (fp->_seek == NULL) {
FUNLOCKFILE(fp);
errno = ESPIPE; /* historic practice */
- return (-1L);
+ return -1L;
}
/*
@@ -97,5 +97,10 @@
pos += fp->_p - fp->_bf._base;
}
FUNLOCKFILE(fp);
+ if (_FPOS_OVERFLOW(pos)) {
+ errno = EOVERFLOW;
+ return -1L;
+ }
+
return (long)(pos);
}
Index: src/lib/libc/stdio/local.h
diff -u src/lib/libc/stdio/local.h:1.25 src/lib/libc/stdio/local.h:1.26
--- src/lib/libc/stdio/local.h:1.25 Mon Sep 6 10:52:55 2010
+++ src/lib/libc/stdio/local.h Fri Oct 22 17:29:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: local.h,v 1.25 2010/09/06 14:52:55 christos Exp $ */
+/* $NetBSD: local.h,v 1.26 2010/10/22 21:29:45 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -113,3 +113,9 @@
extern void __flockfile_internal __P((FILE *, int));
extern void __funlockfile_internal __P((FILE *, int));
+
+/*
+ * Detect if the current file position fits in a long int.
+ */
+#define _FPOS_OVERFLOW(pos) (sizeof(fpos_t) != sizeof(long) && \
+ ((pos) & (~0ULL << ((sizeof(fpos_t) - sizeof(long)) * NBBY))) != 0)
