Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src From tnozaki@: make fpos_t a complex object that keeps track...
details: https://anonhg.NetBSD.org/src/rev/d2e8ccec3c69
branches: trunk
changeset: 772969:d2e8ccec3c69
user: christos <christos%NetBSD.org@localhost>
date: Sun Jan 22 18:36:14 2012 +0000
description:
>From tnozaki@: make fpos_t a complex object that keeps track of the parse
state of the stream. Change argument of the seek function to funopen() from
fpos_t to off_t. Make f{g,s}etpos() use the new fpos_t struct, while providing
backwards compatible entry points. Approved by releng@
diffstat:
bin/csh/csh.c | 10 ++--
distrib/sets/lists/base/ad.mips64eb | 6 +-
distrib/sets/lists/base/ad.mips64el | 6 +-
distrib/sets/lists/base/md.amd64 | 4 +-
distrib/sets/lists/base/md.sparc64 | 4 +-
distrib/sets/lists/base/shl.mi | 6 +-
distrib/sets/lists/comp/ad.mips64eb | 6 +-
distrib/sets/lists/comp/ad.mips64el | 6 +-
distrib/sets/lists/comp/md.amd64 | 4 +-
distrib/sets/lists/comp/md.sparc64 | 4 +-
distrib/sets/lists/comp/shl.mi | 4 +-
include/stdio.h | 19 ++++-----
lib/libc/compat/Makefile | 3 +-
lib/libc/compat/Makefile.inc | 3 +-
lib/libc/compat/include/stdio.h | 46 +++++++++++++++++++++++
lib/libc/compat/stdio/Makefile.inc | 23 +++++++++++
lib/libc/compat/stdio/compat_fgetpos.c | 64 ++++++++++++++++++++++++++++++++
lib/libc/compat/stdio/compat_fsetpos.c | 68 ++++++++++++++++++++++++++++++++++
lib/libc/shlib_version | 7 +--
lib/libc/stdio/fgetpos.c | 21 +++++++---
lib/libc/stdio/findfp.c | 6 +-
lib/libc/stdio/fmemopen.c | 14 +++---
lib/libc/stdio/fopen.c | 6 +-
lib/libc/stdio/freopen.c | 6 +-
lib/libc/stdio/fseek.3 | 34 ++++++----------
lib/libc/stdio/fseeko.c | 18 ++++----
lib/libc/stdio/fsetpos.c | 23 ++++++++---
lib/libc/stdio/ftell.c | 10 ++--
lib/libc/stdio/ftello.c | 10 ++--
lib/libc/stdio/funopen.3 | 12 +----
lib/libc/stdio/funopen.c | 6 +-
lib/libc/stdio/local.h | 8 ++--
lib/libc/stdio/stdio.c | 10 ++--
tests/fs/nfs/nfsservice/mountd.c | 8 ++--
34 files changed, 344 insertions(+), 141 deletions(-)
diffs (truncated from 1208 to 300 lines):
diff -r 3131b12474d3 -r d2e8ccec3c69 bin/csh/csh.c
--- a/bin/csh/csh.c Sun Jan 22 18:27:28 2012 +0000
+++ b/bin/csh/csh.c Sun Jan 22 18:36:14 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.c,v 1.42 2011/08/29 14:51:17 joerg Exp $ */
+/* $NetBSD: csh.c,v 1.43 2012/01/22 18:36:14 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93";
#else
-__RCSID("$NetBSD: csh.c,v 1.42 2011/08/29 14:51:17 joerg Exp $");
+__RCSID("$NetBSD: csh.c,v 1.43 2012/01/22 18:36:14 christos Exp $");
#endif
#endif /* not lint */
@@ -94,7 +94,7 @@
extern char **environ;
static int readf(void *, char *, int);
-static fpos_t seekf(void *, fpos_t, int);
+static off_t seekf(void *, off_t, int);
static int writef(void *, const char *, int);
static int closef(void *);
static int srccat(Char *, Char *);
@@ -1245,8 +1245,8 @@
return write(DESC(oreo), buf, siz);
}
-static fpos_t
-seekf(void *oreo, fpos_t off, int whence)
+static off_t
+seekf(void *oreo, off_t off, int whence)
{
return lseek(DESC(oreo), off, whence);
}
diff -r 3131b12474d3 -r d2e8ccec3c69 distrib/sets/lists/base/ad.mips64eb
--- a/distrib/sets/lists/base/ad.mips64eb Sun Jan 22 18:27:28 2012 +0000
+++ b/distrib/sets/lists/base/ad.mips64eb Sun Jan 22 18:36:14 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.77 2012/01/09 15:24:37 dholland Exp $
+# $NetBSD: ad.mips64eb,v 1.78 2012/01/22 18:36:14 christos Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -66,7 +66,7 @@
./usr/lib/64/libbz2.so.1 base-compat-shlib compat,pic
./usr/lib/64/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/64/libc.so.12 base-compat-shlib compat,pic
-./usr/lib/64/libc.so.12.179 base-compat-shlib compat,pic
+./usr/lib/64/libc.so.12.180 base-compat-shlib compat,pic
./usr/lib/64/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic
@@ -362,7 +362,7 @@
./usr/lib/o32/libbz2.so.1 base-compat-shlib compat,pic
./usr/lib/o32/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/o32/libc.so.12 base-compat-shlib compat,pic
-./usr/lib/o32/libc.so.12.179 base-compat-shlib compat,pic
+./usr/lib/o32/libc.so.12.180 base-compat-shlib compat,pic
./usr/lib/o32/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic
diff -r 3131b12474d3 -r d2e8ccec3c69 distrib/sets/lists/base/ad.mips64el
--- a/distrib/sets/lists/base/ad.mips64el Sun Jan 22 18:27:28 2012 +0000
+++ b/distrib/sets/lists/base/ad.mips64el Sun Jan 22 18:36:14 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.76 2012/01/09 15:24:37 dholland Exp $
+# $NetBSD: ad.mips64el,v 1.77 2012/01/22 18:36:15 christos Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -66,7 +66,7 @@
./usr/lib/64/libbz2.so.1 base-compat-shlib compat,pic
./usr/lib/64/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/64/libc.so.12 base-compat-shlib compat,pic
-./usr/lib/64/libc.so.12.179 base-compat-shlib compat,pic
+./usr/lib/64/libc.so.12.180 base-compat-shlib compat,pic
./usr/lib/64/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic
@@ -362,7 +362,7 @@
./usr/lib/o32/libbz2.so.1 base-compat-shlib compat,pic
./usr/lib/o32/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/o32/libc.so.12 base-compat-shlib compat,pic
-./usr/lib/o32/libc.so.12.179 base-compat-shlib compat,pic
+./usr/lib/o32/libc.so.12.180 base-compat-shlib compat,pic
./usr/lib/o32/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic
diff -r 3131b12474d3 -r d2e8ccec3c69 distrib/sets/lists/base/md.amd64
--- a/distrib/sets/lists/base/md.amd64 Sun Jan 22 18:27:28 2012 +0000
+++ b/distrib/sets/lists/base/md.amd64 Sun Jan 22 18:36:14 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.149 2012/01/09 15:24:37 dholland Exp $
+# $NetBSD: md.amd64,v 1.150 2012/01/22 18:36:15 christos Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -69,7 +69,7 @@
./usr/lib/i386/libbz2.so.1 base-compat-shlib compat,pic
./usr/lib/i386/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/i386/libc.so.12 base-compat-shlib compat,pic
-./usr/lib/i386/libc.so.12.179 base-compat-shlib compat,pic
+./usr/lib/i386/libc.so.12.180 base-compat-shlib compat,pic
./usr/lib/i386/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/i386/libcrypt.so.1 base-compat-shlib compat,pic
diff -r 3131b12474d3 -r d2e8ccec3c69 distrib/sets/lists/base/md.sparc64
--- a/distrib/sets/lists/base/md.sparc64 Sun Jan 22 18:27:28 2012 +0000
+++ b/distrib/sets/lists/base/md.sparc64 Sun Jan 22 18:36:14 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.142 2012/01/09 15:24:37 dholland Exp $
+# $NetBSD: md.sparc64,v 1.143 2012/01/22 18:36:15 christos Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
@@ -67,7 +67,7 @@
./usr/lib/sparc/libbz2.so.1 base-compat-shlib compat,pic
./usr/lib/sparc/libbz2.so.1.1 base-compat-shlib compat,pic
./usr/lib/sparc/libc.so.12 base-compat-shlib compat,pic
-./usr/lib/sparc/libc.so.12.179 base-compat-shlib compat,pic
+./usr/lib/sparc/libc.so.12.180 base-compat-shlib compat,pic
./usr/lib/sparc/libcom_err.so.7 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/libcrypt.so.1 base-compat-shlib compat,pic
diff -r 3131b12474d3 -r d2e8ccec3c69 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi Sun Jan 22 18:27:28 2012 +0000
+++ b/distrib/sets/lists/base/shl.mi Sun Jan 22 18:36:14 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.611 2012/01/09 15:24:37 dholland Exp $
+# $NetBSD: shl.mi,v 1.612 2012/01/22 18:36:15 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -15,7 +15,7 @@
#
./lib/libc.so base-sys-shlib dynamicroot
./lib/libc.so.12 base-sys-shlib dynamicroot
-./lib/libc.so.12.179 base-sys-shlib dynamicroot
+./lib/libc.so.12.180 base-sys-shlib dynamicroot
./lib/libcrypt.so base-sys-shlib dynamicroot
./lib/libcrypt.so.1 base-sys-shlib dynamicroot
./lib/libcrypt.so.1.0 base-sys-shlib dynamicroot
@@ -173,7 +173,7 @@
./usr/lib/libbz2.so.1.1 base-sys-shlib
./usr/lib/libc.so base-sys-shlib
./usr/lib/libc.so.12 base-sys-shlib
-./usr/lib/libc.so.12.179 base-sys-shlib
+./usr/lib/libc.so.12.180 base-sys-shlib
./usr/lib/libcdk.so base-obsolete obsolete
./usr/lib/libcom_err.so base-krb5-shlib kerberos
./usr/lib/libcom_err.so.7 base-krb5-shlib kerberos
diff -r 3131b12474d3 -r d2e8ccec3c69 distrib/sets/lists/comp/ad.mips64eb
--- a/distrib/sets/lists/comp/ad.mips64eb Sun Jan 22 18:27:28 2012 +0000
+++ b/distrib/sets/lists/comp/ad.mips64eb Sun Jan 22 18:36:14 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.64 2012/01/09 15:24:37 dholland Exp $
+# $NetBSD: ad.mips64eb,v 1.65 2012/01/22 18:36:15 christos Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -1266,7 +1266,7 @@
./usr/libdata/debug/usr/lib/64/libbluetooth.so.4.2.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libbz2.so.1.1.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/64/libc.so.12.179.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/64/libc.so.12.180.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/64/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/64/libcrypt.so.1.0.debug comp-sys-debug debug,compat
@@ -1418,7 +1418,7 @@
./usr/libdata/debug/usr/lib/o32/libbluetooth.so.4.2.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libbz2.so.1.1.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/o32/libc.so.12.179.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/o32/libc.so.12.180.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/o32/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/o32/libcrypt.so.1.0.debug comp-sys-debug debug,compat
diff -r 3131b12474d3 -r d2e8ccec3c69 distrib/sets/lists/comp/ad.mips64el
--- a/distrib/sets/lists/comp/ad.mips64el Sun Jan 22 18:27:28 2012 +0000
+++ b/distrib/sets/lists/comp/ad.mips64el Sun Jan 22 18:36:14 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.64 2012/01/09 15:24:37 dholland Exp $
+# $NetBSD: ad.mips64el,v 1.65 2012/01/22 18:36:16 christos Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -1266,7 +1266,7 @@
./usr/libdata/debug/usr/lib/64/libbluetooth.so.4.2.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libbz2.so.1.1.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/64/libc.so.12.179.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/64/libc.so.12.180.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/64/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/64/libcrypt.so.1.0.debug comp-sys-debug debug,compat
@@ -1418,7 +1418,7 @@
./usr/libdata/debug/usr/lib/o32/libbluetooth.so.4.2.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libbz2.so.1.1.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/o32/libc.so.12.179.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/o32/libc.so.12.180.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/o32/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/o32/libcrypt.so.1.0.debug comp-sys-debug debug,compat
diff -r 3131b12474d3 -r d2e8ccec3c69 distrib/sets/lists/comp/md.amd64
--- a/distrib/sets/lists/comp/md.amd64 Sun Jan 22 18:27:28 2012 +0000
+++ b/distrib/sets/lists/comp/md.amd64 Sun Jan 22 18:36:14 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.150 2012/01/18 17:32:41 riz Exp $
+# $NetBSD: md.amd64,v 1.151 2012/01/22 18:36:16 christos Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -1048,7 +1048,7 @@
./usr/libdata/debug/usr/lib/i386/libbluetooth.so.4.2.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libbsdmalloc.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libbz2.so.1.1.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libc.so.12.179.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libc.so.12.180.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/i386/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/i386/libcrypt.so.1.0.debug comp-compat-shlib compat,pic,debug
diff -r 3131b12474d3 -r d2e8ccec3c69 distrib/sets/lists/comp/md.sparc64
--- a/distrib/sets/lists/comp/md.sparc64 Sun Jan 22 18:27:28 2012 +0000
+++ b/distrib/sets/lists/comp/md.sparc64 Sun Jan 22 18:36:14 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.133 2012/01/09 15:24:37 dholland Exp $
+# $NetBSD: md.sparc64,v 1.134 2012/01/22 18:36:16 christos Exp $
./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
@@ -891,7 +891,7 @@
./usr/libdata/debug/usr/lib/sparc/libbluetooth.so.4.2.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libbsdmalloc.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libbz2.so.1.1.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libc.so.12.179.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libc.so.12.180.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete
./usr/libdata/debug/usr/lib/sparc/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/sparc/libcrypt.so.1.0.debug comp-compat-shlib compat,pic,debug
diff -r 3131b12474d3 -r d2e8ccec3c69 distrib/sets/lists/comp/shl.mi
--- a/distrib/sets/lists/comp/shl.mi Sun Jan 22 18:27:28 2012 +0000
+++ b/distrib/sets/lists/comp/shl.mi Sun Jan 22 18:36:14 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.204 2012/01/09 15:24:37 dholland Exp $
+# $NetBSD: shl.mi,v 1.205 2012/01/22 18:36:16 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -248,7 +248,7 @@
./usr/libdata/debug/usr/lib/libbluetooth.so.4.2.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libbz2.so.1.1.debug comp-sys-debug debug
-./usr/libdata/debug/usr/lib/libc.so.12.179.debug comp-sys-debug debug
+./usr/libdata/debug/usr/lib/libc.so.12.180.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libcom_err.so.7.0.debug comp-krb5-debug kerberos,debug
./usr/libdata/debug/usr/lib/libcrypt.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libcrypto.so.7.0.debug comp-crypto-debug crypto,debug
diff -r 3131b12474d3 -r d2e8ccec3c69 include/stdio.h
--- a/include/stdio.h Sun Jan 22 18:27:28 2012 +0000
+++ b/include/stdio.h Sun Jan 22 18:36:14 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: stdio.h,v 1.79 2011/07/17 20:54:34 joerg Exp $ */
+/* $NetBSD: stdio.h,v 1.80 2012/01/22 18:36:16 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -64,13 +64,10 @@
* innards of an fpos_t anyway. The library internally uses off_t,
* which we assume is exactly as big as eight chars.
*/
-#if (!defined(_ANSI_SOURCE) && !defined(__STRICT_ANSI__)) || defined(_LIBC)
-typedef __off_t fpos_t;
-#else
typedef struct __sfpos {
__off_t _pos;
+ __mbstate_t _mbstate_in, _mbstate_out;
} fpos_t;
-#endif
#define _FSTDIO /* Define for new stdio with functions. */
@@ -125,7 +122,7 @@
void *_cookie; /* cookie passed to io functions */
int (*_close)(void *);
int (*_read) (void *, char *, int);
- fpos_t (*_seek) (void *, fpos_t, int);
+ __off_t (*_seek) (void *, __off_t, int);
int (*_write)(void *, const char *, int);
/* file extension */
@@ -144,7 +141,7 @@
/* Unix stdio files get aligned to block boundaries on fseek() */
int _blksize; /* stat.st_blksize (may be != _bf._size) */
Home |
Main Index |
Thread Index |
Old Index