FCL/sf/mw/qt: comparison src/corelib/io/qfile.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 When a QFile is opened using this function, close() does not actually
 close the file, but only flushes it.
 \bold{Warning:}
 \list 1
-\o If \a fh is \c stdin, \c stdout, or \c stderr, you may not be able
+\o If \a fh does not refer to a regular file, e.g., it is \c stdin,
-to seek(). See QIODevice::isSequential() for more information.
+\c stdout, or \c stderr, you may not be able to seek(). size()
+returns \c 0 in those cases. See QIODevice::isSequential() for
+more information.
 \o Since this function opens the file without specifying the file name,
 you cannot use this QFile with a QFileInfo.
 \endlist
-\note For Windows CE you may not be able to call seek() and resize().
+\note For Windows CE you may not be able to call resize().
-Also, size() is set to \c 0.
 \sa close(), {qmake Variable Reference#CONFIG}{qmake Variable Reference}
 \bold{Note for the Windows Platform}
 if(d->openExternalFile(mode, fh)) {
 QIODevice::open(mode);
 if (mode & Append) {
 seek(size());
 } else {
-long pos = ftell(fh);
+qint64 pos = (qint64)QT_FTELL(fh);
 if (pos != -1)
 seek(pos);
 }
 return true;
 }
 */
 /*!
 \overload
-Opens the existing file descripter \a fd in the given \a mode.
+Opens the existing file descriptor \a fd in the given \a mode.
 Returns true if successful; otherwise returns false.
 When a QFile is opened using this function, close() does not
 actually close the file.
 The QFile that is opened using this function is automatically set
 to be in raw mode; this means that the file input/output functions
 are slow. If you run into performance issues, you should try to
 use one of the other open functions.
-\warning If \a fd is 0 (\c stdin), 1 (\c stdout), or 2 (\c
+\warning If \a fd is not a regular file, e.g, it is 0 (\c stdin),
-stderr), you may not be able to seek(). size() is set to \c
+1 (\c stdout), or 2 (\c stderr), you may not be able to seek(). In
-LLONG_MAX (in \c <climits>).
+those cases, size() returns \c 0.  See QIODevice::isSequential()
+for more information.
 \warning For Windows CE you may not be able to call seek(), setSize(),
-fileTime(). size() is set to \c 0.
+fileTime(). size() returns \c 0.
 \warning Since this function opens the file without specifying the file name,
 you cannot use this QFile with a QFileInfo.
 \sa close()
 qWarning("QFile::open: File access not specified");
 return false;
 }
 if(d->openExternalFile(mode, fd)) {
 QIODevice::open(mode);
-if (mode & Append)
+if (mode & Append) {
 seek(size());
+} else {
+qint64 pos = (qint64)QT_LSEEK(fd, QT_OFF_T(0), SEEK_CUR);
+if (pos != -1)
+seek(pos);
+}
 return true;
 }
 return false;
 }
 return QFile(fileName).setPermissions(permissions);
 }
 static inline qint64 _qfile_writeData(QAbstractFileEngine *engine, QRingBuffer *buffer)
 {
-qint64 ret = engine->write(buffer->readPointer(), buffer->size());
+qint64 ret = engine->write(buffer->readPointer(), buffer->nextDataBlockSize());
 if (ret > 0)
 buffer->free(ret);
 return ret;
 }

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7
child 7	f7bc934e204c