From 183be5348e53ef1df9a6e1eb82f10f24ce612f40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@trolltech.com>
Date: Thu, 7 Jan 2010 15:54:06 +0100
Subject: Fix bugs evidenced by change to keep flush errors on QFile::close

When closing a file, the contents of the write buffer should be emptied
even in the case where flush fails, so it doesn't leak to subsequent
files opened through the same instance. This is inline with what would
happen with native close on a buffered device.

Also changed the resource file engine to succeed on flush. Since all
writes fail there, logically it's write buffer is empty and flush should
succeed. This keeps auto-tests happy :-)

tst_QFile::fullDisk auto-test extended to ensure re-opening QFile does
not keep the write buffer alive.

Reviewed-by: Thiago Macieira
---
 src/corelib/io/qfile.cpp       | 3 +++
 src/corelib/io/qresource.cpp   | 2 +-
 tests/auto/qfile/tst_qfile.cpp | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index b6fa5f3..6395cc7 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -1389,6 +1389,9 @@ QFile::close()
     bool flushed = flush();
     QIODevice::close();
 
+    // reset write buffer
+    d->lastWasWrite = false;
+    d->writeBuffer.clear();
 
     // keep earlier error from flush
     if (fileEngine()->close() && flushed)
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 3d54969..adfbb15 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -1285,7 +1285,7 @@ bool QResourceFileEngine::close()
 
 bool QResourceFileEngine::flush()
 {
-    return false;
+    return true;
 }
 
 qint64 QResourceFileEngine::read(char *data, qint64 len)
diff --git a/tests/auto/qfile/tst_qfile.cpp b/tests/auto/qfile/tst_qfile.cpp
index 453434d..f407b12 100644
--- a/tests/auto/qfile/tst_qfile.cpp
+++ b/tests/auto/qfile/tst_qfile.cpp
@@ -2119,15 +2119,17 @@ void tst_QFile::fullDisk()
     file.write(&c, 0);
     QVERIFY(!file.flush());
     QCOMPARE(file.error(), QFile::ResourceError);
-    file.write(&c, 1);
+    QCOMPARE(file.write(&c, 1), qint64(1));
     QVERIFY(!file.flush());
     QCOMPARE(file.error(), QFile::ResourceError);
 
     file.close();
     QVERIFY(!file.isOpen());
     QCOMPARE(file.error(), QFile::ResourceError);
+
     file.open(QIODevice::WriteOnly);
     QCOMPARE(file.error(), QFile::NoError);
+    QVERIFY(file.flush()); // Shouldn't inherit write buffer
     file.close();
     QCOMPARE(file.error(), QFile::NoError);
 
-- 
cgit v0.12