[PATCH] daemon/Win32: Replace pread on platforms that don't have this function.
-- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://et.redhat.com/~rjones/libguestfs/ See what it can do: http://et.redhat.com/~rjones/libguestfs/recipes.html
Richard W.M. Jones wrote:
Subject: [PATCH 1/2] daemon/Win32: Replace pread on platforms that don't have this function.
--- daemon/configure.ac | 1 + daemon/file.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/daemon/configure.ac b/daemon/configure.ac index 89bd800..e70f05e 100644 --- a/daemon/configure.ac +++ b/daemon/configure.ac @@ -180,6 +180,7 @@ AC_CHECK_FUNCS([\ lremovexattr \ mknod \ posix_fallocate \ + pread \ removexattr \ setxattr \ sync])
I'm adding a pread module to gnulib right now. Once that's in, you can drop the rest of this patch, below.
diff --git a/daemon/file.c b/daemon/file.c index 252c02c..e6bbc19 100644 --- a/daemon/file.c +++ b/daemon/file.c @@ -402,6 +402,7 @@ do_pread (const char *path, int count, int64_t offset, size_t *size_r) return NULL; }
+#ifdef HAVE_PREAD r = pread (fd, buf, count, offset); if (r == -1) { reply_with_perror ("pread: %s", path); @@ -409,6 +410,25 @@ do_pread (const char *path, int count, int64_t offset, size_t *size_r) free (buf); return NULL; } +#else + if (lseek (fd, offset, SEEK_SET) == (off_t) -1) { + reply_with_perror ("lseek: %s", path); + close (fd); + free (buf); + return NULL; + } + r = read (fd, buf, count); + if (r == -1) { + reply_with_perror ("read: %s", path); + close (fd); + free (buf); + return NULL; + } + /* The real pread function would reset the file offset here, + * but we don't care since we're just about to close the + * file anyway. + */ +#endif /* !HAVE_PREAD */
if (close (fd) == -1) { reply_with_perror ("close: %s", path);
On Wed, Nov 25, 2009 at 02:44:17PM +0100, Jim Meyering wrote:
I'm adding a pread module to gnulib right now. Once that's in, you can drop the rest of this patch, below.
Will do. Note that pread restores the file offset after doing the read ... Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top
Richard W.M. Jones wrote:
On Wed, Nov 25, 2009 at 02:44:17PM +0100, Jim Meyering wrote:
I'm adding a pread module to gnulib right now. Once that's in, you can drop the rest of this patch, below.
Will do. Note that pread restores the file offset after doing the read ...
Yep, I read the POSIX spec and used glibc's implementation.
Any chance of a sync module? See my other patch here: https://www.redhat.com/archives/libguestfs/2009-November/msg00236.html Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v
participants (2)
-
Jim Meyering -
Richard W.M. Jones