From b340a61cb935e014090eed7105f8f50c3a00e71b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 17 May 2004 07:17:51 +0000 Subject: r755: - disallow process_model _thread when we don't have pwread/pwrite and have to use the nonthreadsafe wrapper - add pread/pwrite wrapper to ntvfs_simple - fix const warning in ntvfs_simple metze (This used to be commit f0b2e42978a28204f497cccb07e407f409e3bf50) --- source4/ntvfs/simple/vfs_simple.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'source4/ntvfs/simple/vfs_simple.c') diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c index 37edd8aa11..1abf5ed9af 100644 --- a/source4/ntvfs/simple/vfs_simple.c +++ b/source4/ntvfs/simple/vfs_simple.c @@ -35,6 +35,26 @@ #define CHECK_READ_ONLY(req) do { if (lp_readonly(req->conn->service)) return NT_STATUS_ACCESS_DENIED; } while (0) +#ifndef HAVE_PREAD +static ssize_t pread(int __fd, void *__buf, size_t __nbytes, off_t __offset) +{ + if (lseek(__fd, __offset, SEEK_SET) != __offset) { + return -1; + } + return read(__fd, __buf, __nbytes); +} +#endif + +#ifndef HAVE_PWRITE +static ssize_t pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset) +{ + if (lseek(__fd, __offset, SEEK_SET) != __offset) { + return -1; + } + return write(__fd, __buf, __nbytes); +} +#endif + /* connect to a share - used when a tree_connect operation comes in. For a disk based backend we needs to ensure that the base @@ -151,7 +171,7 @@ static NTSTATUS svfs_map_fileinfo(struct request_context *req, union smb_fileinf struct svfs_dir *dir = NULL; char *pattern = NULL; int i; - char *s, *short_name; + const char *s, *short_name; s = strrchr(unix_path, '/'); if (s) { -- cgit