From dec0fa945c807ed495a3b74fbf98c6d30a19b4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 21 Dec 1999 18:10:24 +0000 Subject: [PATCH] * filebuf.cc (open): Support ios::ate if _G_HAVE_IO_FILE_OPEN. From-SVN: r31057 --- libio/ChangeLog | 4 ++++ libio/filebuf.cc | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libio/ChangeLog b/libio/ChangeLog index c903fc8748c..b582999f614 100644 --- a/libio/ChangeLog +++ b/libio/ChangeLog @@ -1,3 +1,7 @@ +1999-12-21 Martin v. Löwis + + * filebuf.cc (open): Support ios::ate if _G_HAVE_IO_FILE_OPEN. + 1999-12-15 Jason Merrill * filedoalloc.c, floatio.h, iovfprintf.c, iovfscanf.c: Remove diff --git a/libio/filebuf.cc b/libio/filebuf.cc index 422d442736e..0b0fd6d88d3 100644 --- a/libio/filebuf.cc +++ b/libio/filebuf.cc @@ -1,5 +1,5 @@ /* This is part of libio/iostream, providing -*- C++ -*- input/output. -Copyright (C) 1993, 1995 Free Software Foundation +Copyright (C) 1993, 1995, 1999 Free Software Foundation This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or modify it under the @@ -112,15 +112,23 @@ filebuf* filebuf::open(const char *filename, ios::openmode mode, int prot) if (mode & (int)ios::noreplace) posix_mode |= O_EXCL; #if _G_HAVE_IO_FILE_OPEN - return (filebuf*)_IO_file_open (this, filename, posix_mode, prot, - read_write, 0); + if (!_IO_file_open (this, filename, posix_mode, prot, + read_write, 0)) + return NULL; + if (mode & ios::ate) { + if (pubseekoff(0, ios::end) == EOF) { + _IO_un_link (this); + return NULL; + } + } + return this; #else int fd = ::open(filename, posix_mode, prot); if (fd < 0) return NULL; _fileno = fd; xsetflags(read_write, _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); - if (mode & (ios::ate|ios::app)) { + if (mode & ios::ate) { if (pubseekoff(0, ios::end) == EOF) return NULL; }