/*
* Copyright (C) 2013 Eric Biggers
*
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
*
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
*
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <errno.h>
+#include <unistd.h>
+
#include "wimlib/error.h"
#include "wimlib/file_io.h"
#include "wimlib/util.h"
#ifdef __WIN32__
# include "wimlib/win32.h" /* For pread(), pwrite() replacements */
-#else
-# include <sys/uio.h> /* for writev() and `struct iovec' */
#endif
-#include <errno.h>
-#include <unistd.h>
-
-
/* Wrapper around read() that checks for errors keeps retrying until all
* requested bytes have been read or until end-of file has occurred.
*
for (bytes_remaining = count;
bytes_remaining != 0;
bytes_remaining -= bytes_read, buf += bytes_read,
- offset += bytes_read)
+ offset += bytes_read)
{
bytes_read = pread(fd->fd, buf, bytes_remaining, offset);
if (unlikely(bytes_read <= 0)) {
for (bytes_remaining = count;
bytes_remaining != 0;
bytes_remaining -= bytes_written, buf += bytes_written,
- offset += bytes_written)
+ offset += bytes_written)
{
bytes_written = pwrite(fd->fd, buf, bytes_remaining, offset);
if (unlikely(bytes_written < 0)) {
return 0;
}
-/* Wrapper around writev() that checks for errors and keep retrying until all
- * requested bytes have been written.
- *
- * Return values:
- * WIMLIB_ERR_SUCCESS (0)
- * WIMLIB_ERR_WRITE (errno set)
- * */
-int
-full_writev(struct filedes *fd, struct iovec *iov, int iovcnt)
-{
- size_t total_bytes_written = 0;
- while (iovcnt > 0) {
- ssize_t bytes_written;
-
- bytes_written = writev(fd->fd, iov, iovcnt);
- if (unlikely(bytes_written < 0)) {
- if (errno == EINTR)
- continue;
- return WIMLIB_ERR_WRITE;
- }
- total_bytes_written += bytes_written;
- while (bytes_written) {
- if (bytes_written >= iov[0].iov_len) {
- bytes_written -= iov[0].iov_len;
- iov++;
- iovcnt--;
- } else {
- iov[0].iov_base += bytes_written;
- iov[0].iov_len -= bytes_written;
- bytes_written = 0;
- }
- }
- }
- fd->offset += total_bytes_written;
- return 0;
-}
-
ssize_t
raw_pread(struct filedes *fd, void *buf, size_t count, off_t offset)
{