X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs.c;h=a70e6ac57e6ad7a68bf938f2dc01eb4c30538900;hb=a3d6cf111ed6c756b4483eb02486c046a3d0195b;hp=df273fb3d144894705001bbb48a9ddd6599801f4;hpb=2606f9bb3d46fa8e4534e2afa8b29f1630c5f530;p=deb_libnfs.git

diff --git a/lib/libnfs.c b/lib/libnfs.c
index df273fb..a70e6ac 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -493,7 +493,7 @@ int nfs_mount_async(struct nfs_context *nfs, const char *server, const char *exp
 		rpc_set_error(nfs->rpc, "out of memory. failed to allocate memory for nfs mount data");
 		return -1;
 	}
-	bzero(data, sizeof(struct nfs_cb_data));
+	bzero((char *)data, sizeof(struct nfs_cb_data));
 	new_server = strdup(server);
 	new_export = strdup(export);
 	if (nfs->server != NULL) {
@@ -614,7 +614,7 @@ static int nfs_lookuppath_async(struct nfs_context *nfs, const char *path, nfs_c
 		rpc_set_error(nfs->rpc, "out of memory: failed to allocate nfs_cb_data structure");
 		return -1;
 	}
-	bzero(data, sizeof(struct nfs_cb_data));
+	bzero((char *)data, sizeof(struct nfs_cb_data));
 	data->nfs                = nfs;
 	data->cb                 = cb;
 	data->continue_cb        = continue_cb;
@@ -779,7 +779,7 @@ static void nfs_open_cb(struct rpc_context *rpc _U_, int status, void *command_d
 		free_nfs_cb_data(data);
 		return;
 	}
-	bzero(nfsfh, sizeof(struct nfsfh));
+	bzero((char *)nfsfh, sizeof(struct nfsfh));
 
 	if (data->continue_int & O_SYNC) {
 		nfsfh->is_sync = 1;
@@ -933,7 +933,7 @@ int nfs_pread_async(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset,
 		rpc_set_error(nfs->rpc, "out of memory: failed to allocate nfs_cb_data structure");
 		return -1;
 	}
-	bzero(data, sizeof(struct nfs_cb_data));
+	bzero((char *)data, sizeof(struct nfs_cb_data));
 	data->nfs          = nfs;
 	data->cb           = cb;
 	data->private_data = private_data;
@@ -979,7 +979,7 @@ int nfs_pread_async(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset,
 			rpc_set_error(nfs->rpc, "out of memory: failed to allocate nfs_mcb_data structure");
 			return -1;
 		}
-		bzero(mdata, sizeof(struct nfs_mcb_data));
+		bzero((char *)mdata, sizeof(struct nfs_mcb_data));
 		mdata->data   = data;
 		mdata->offset = offset;
 		mdata->count  = readcount;
@@ -1050,7 +1050,7 @@ int nfs_pwrite_async(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset,
 		rpc_set_error(nfs->rpc, "out of memory: failed to allocate nfs_cb_data structure");
 		return -1;
 	}
-	bzero(data, sizeof(struct nfs_cb_data));
+	bzero((char *)data, sizeof(struct nfs_cb_data));
 	data->nfs          = nfs;
 	data->cb           = cb;
 	data->private_data = private_data;
@@ -1109,7 +1109,7 @@ int nfs_fstat_async(struct nfs_context *nfs, struct nfsfh *nfsfh, nfs_cb cb, voi
 		rpc_set_error(nfs->rpc, "out of memory: failed to allocate nfs_cb_data structure");
 		return -1;
 	}
-	bzero(data, sizeof(struct nfs_cb_data));
+	bzero((char *)data, sizeof(struct nfs_cb_data));
 	data->nfs          = nfs;
 	data->cb           = cb;
 	data->private_data = private_data;
@@ -1166,7 +1166,7 @@ int nfs_fsync_async(struct nfs_context *nfs, struct nfsfh *nfsfh, nfs_cb cb, voi
 		rpc_set_error(nfs->rpc, "out of memory: failed to allocate nfs_cb_data structure");
 		return -1;
 	}
-	bzero(data, sizeof(struct nfs_cb_data));
+	bzero((char *)data, sizeof(struct nfs_cb_data));
 	data->nfs          = nfs;
 	data->cb           = cb;
 	data->private_data = private_data;
@@ -1225,12 +1225,12 @@ int nfs_ftruncate_async(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t leng
 		rpc_set_error(nfs->rpc, "out of memory: failed to allocate nfs_cb_data structure");
 		return -1;
 	}
-	bzero(data, sizeof(struct nfs_cb_data));
+	bzero((char *)data, sizeof(struct nfs_cb_data));
 	data->nfs          = nfs;
 	data->cb           = cb;
 	data->private_data = private_data;
 
-	bzero(&args, sizeof(SETATTR3args));
+	bzero((char *)&args, sizeof(SETATTR3args));
 	args.object.data.data_len = nfsfh->fh.data.data_len;
 	args.object.data.data_val = nfsfh->fh.data.data_val;
 	args.new_attributes.size.set_it = 1;
@@ -1483,7 +1483,7 @@ static void nfs_create_2_cb(struct rpc_context *rpc _U_, int status, void *comma
 		free_nfs_cb_data(data);
 		return;
 	}
-	bzero(nfsfh, sizeof(struct nfsfh));
+	bzero((char *)nfsfh, sizeof(struct nfsfh));
 
 	/* steal the filehandle */
 	nfsfh->fh.data.data_len = data->fh.data.data_len;
@@ -1663,13 +1663,13 @@ int nfs_unlink_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void
  */
 static void nfs_opendir_cb(struct rpc_context *rpc _U_, int status, void *command_data, void *private_data)
 {
-	READDIR3res *res;
+	READDIRPLUS3res *res;
 	struct nfs_cb_data *data = private_data;
 	struct nfs_context *nfs = data->nfs;
 	struct nfsdir *nfsdir = data->continue_data;
-	struct entry3 *entry;
+	struct entryplus3 *entry;
 	uint64_t cookie;
-	
+
 	if (status == RPC_STATUS_ERROR) {
 		data->cb(-EFAULT, nfs, command_data, data->private_data);
 		nfs_free_nfsdir(nfsdir);
@@ -1695,7 +1695,7 @@ static void nfs_opendir_cb(struct rpc_context *rpc _U_, int status, void *comman
 		return;
 	}
 
-	entry =res->READDIR3res_u.resok.reply.entries;
+	entry =res->READDIRPLUS3res_u.resok.reply.entries;
 	while (entry != NULL) {
 		struct nfsdirent *nfsdirent;
 
@@ -1707,7 +1707,7 @@ static void nfs_opendir_cb(struct rpc_context *rpc _U_, int status, void *comman
 			free_nfs_cb_data(data);
 			return;
 		}
-		bzero(nfsdirent, sizeof(struct nfsdirent));
+		bzero((char *)nfsdirent, sizeof(struct nfsdirent));
 		nfsdirent->name = strdup(entry->name);
 		if (nfsdirent->name == NULL) {
 			data->cb(-ENOMEM, nfs, "Failed to allocate dirent->name", data->private_data);
@@ -1717,6 +1717,19 @@ static void nfs_opendir_cb(struct rpc_context *rpc _U_, int status, void *comman
 			return;
 		}
 		nfsdirent->inode = entry->fileid;
+		if (entry->name_attributes.attributes_follow) {
+			nfsdirent->type = entry->name_attributes.post_op_attr_u.attributes.type;
+			nfsdirent->mode = entry->name_attributes.post_op_attr_u.attributes.mode;
+			nfsdirent->size = entry->name_attributes.post_op_attr_u.attributes.size;
+
+			nfsdirent->atime.tv_sec  = entry->name_attributes.post_op_attr_u.attributes.atime.seconds;
+			nfsdirent->atime.tv_usec = entry->name_attributes.post_op_attr_u.attributes.atime.nseconds/1000;
+			nfsdirent->mtime.tv_sec  = entry->name_attributes.post_op_attr_u.attributes.mtime.seconds;
+			nfsdirent->mtime.tv_usec = entry->name_attributes.post_op_attr_u.attributes.mtime.nseconds/1000;
+			nfsdirent->ctime.tv_sec  = entry->name_attributes.post_op_attr_u.attributes.ctime.seconds;
+			nfsdirent->ctime.tv_usec = entry->name_attributes.post_op_attr_u.attributes.ctime.nseconds/1000;
+		}
+
 		nfsdirent->next  = nfsdir->entries;
 		nfsdir->entries  = nfsdirent;
 
@@ -1724,9 +1737,9 @@ static void nfs_opendir_cb(struct rpc_context *rpc _U_, int status, void *comman
 		entry  = entry->nextentry;
 	}
 
-	if (res->READDIR3res_u.resok.reply.eof == 0) {
-	     	if (rpc_nfs_readdir_async(nfs->rpc, nfs_opendir_cb, &data->fh, cookie, res->READDIR3res_u.resok.cookieverf, 20000, data) != 0) {
-			rpc_set_error(nfs->rpc, "RPC error: Failed to send READDIR call for %s", data->path);
+	if (res->READDIRPLUS3res_u.resok.reply.eof == 0) {
+	     	if (rpc_nfs_readdirplus_async(nfs->rpc, nfs_opendir_cb, &data->fh, cookie, res->READDIRPLUS3res_u.resok.cookieverf, 8192, data) != 0) {
+			rpc_set_error(nfs->rpc, "RPC error: Failed to send READDIRPLUS call for %s", data->path);
 			data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
 			nfs_free_nfsdir(nfsdir);
 			data->continue_data = NULL;
@@ -1748,9 +1761,9 @@ static int nfs_opendir_continue_internal(struct nfs_context *nfs, struct nfs_cb_
 {
 	cookieverf3 cv;
 
-	bzero(cv, sizeof(cookieverf3));
-	if (rpc_nfs_readdir_async(nfs->rpc, nfs_opendir_cb, &data->fh, 0, (char *)&cv, 20000, data) != 0) {
-		rpc_set_error(nfs->rpc, "RPC error: Failed to send READDIR call for %s", data->path);
+	bzero((char *)cv, sizeof(cookieverf3));
+	if (rpc_nfs_readdirplus_async(nfs->rpc, nfs_opendir_cb, &data->fh, 0, (char *)&cv, 8192, data) != 0) {
+		rpc_set_error(nfs->rpc, "RPC error: Failed to send READDIRPLUS call for %s", data->path);
 		data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
 		free_nfs_cb_data(data);
 		return -1;
@@ -1767,7 +1780,7 @@ int nfs_opendir_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void
 		rpc_set_error(nfs->rpc, "failed to allocate buffer for nfsdir");
 		return -1;
 	}
-	bzero(nfsdir, sizeof(struct nfsdir));
+	bzero((char *)nfsdir, sizeof(struct nfsdir));
 
 	if (nfs_lookuppath_async(nfs, path, cb, private_data, nfs_opendir_continue_internal, nfsdir, free, 0) != 0) {
 		rpc_set_error(nfs->rpc, "Out of memory: failed to start parsing the path components");
@@ -2041,7 +2054,7 @@ static int nfs_chmod_continue_internal(struct nfs_context *nfs, struct nfs_cb_da
 {
 	SETATTR3args args;
 
-	bzero(&args, sizeof(SETATTR3args));
+	bzero((char *)&args, sizeof(SETATTR3args));
 	args.object.data.data_len = data->fh.data.data_len;
 	args.object.data.data_val = data->fh.data.data_val;
 	args.new_attributes.mode.set_it = 1;
@@ -2079,7 +2092,7 @@ int nfs_fchmod_async(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode, nfs
 		rpc_set_error(nfs->rpc, "out of memory. failed to allocate memory for nfs mount data");
 		return -1;
 	}
-	bzero(data, sizeof(struct nfs_cb_data));
+	bzero((char *)data, sizeof(struct nfs_cb_data));
 	data->nfs          = nfs;
 	data->cb           = cb;
 	data->private_data = private_data;
@@ -2145,7 +2158,7 @@ static int nfs_chown_continue_internal(struct nfs_context *nfs, struct nfs_cb_da
 	SETATTR3args args;
 	struct nfs_chown_data *chown_data = data->continue_data;
 
-	bzero(&args, sizeof(SETATTR3args));
+	bzero((char *)&args, sizeof(SETATTR3args));
 	args.object.data.data_len = data->fh.data.data_len;
 	args.object.data.data_val = data->fh.data.data_val;
 	if (chown_data->uid != (uid_t)-1) {
@@ -2212,7 +2225,7 @@ int nfs_fchown_async(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int
 		rpc_set_error(nfs->rpc, "out of memory. failed to allocate memory for fchown data");
 		return -1;
 	}
-	bzero(data, sizeof(struct nfs_cb_data));
+	bzero((char *)data, sizeof(struct nfs_cb_data));
 	data->nfs           = nfs;
 	data->cb            = cb;
 	data->private_data  = private_data;
@@ -2276,7 +2289,7 @@ static int nfs_utimes_continue_internal(struct nfs_context *nfs, struct nfs_cb_d
 	SETATTR3args args;
 	struct timeval *utimes_data = data->continue_data;
 
-	bzero(&args, sizeof(SETATTR3args));
+	bzero((char *)&args, sizeof(SETATTR3args));
 	args.object.data.data_len = data->fh.data.data_len;
 	args.object.data.data_val = data->fh.data.data_val;
 	if (utimes_data != NULL) {
@@ -2524,7 +2537,7 @@ int nfs_symlink_async(struct nfs_context *nfs, const char *oldpath, const char *
 		rpc_set_error(nfs->rpc, "Out of memory, failed to allocate buffer for symlink data");
 		return -1;
 	}
-	bzero(symlink_data, sizeof(struct nfs_symlink_data));
+	bzero((char *)symlink_data, sizeof(struct nfs_symlink_data));
 
 	symlink_data->oldpath = strdup(oldpath);
 	if (symlink_data->oldpath == NULL) {
@@ -2678,7 +2691,7 @@ int nfs_rename_async(struct nfs_context *nfs, const char *oldpath, const char *n
 		rpc_set_error(nfs->rpc, "Out of memory, failed to allocate buffer for rename data");
 		return -1;
 	}
-	bzero(rename_data, sizeof(struct nfs_rename_data));
+	bzero((char *)rename_data, sizeof(struct nfs_rename_data));
 
 	rename_data->oldpath = strdup(oldpath);
 	if (rename_data->oldpath == NULL) {
@@ -2834,7 +2847,7 @@ int nfs_link_async(struct nfs_context *nfs, const char *oldpath, const char *new
 		rpc_set_error(nfs->rpc, "Out of memory, failed to allocate buffer for link data");
 		return -1;
 	}
-	bzero(link_data, sizeof(struct nfs_link_data));
+	bzero((char *)link_data, sizeof(struct nfs_link_data));
 
 	link_data->oldpath = strdup(oldpath);
 	if (link_data->oldpath == NULL) {
@@ -2899,16 +2912,12 @@ void nfs_set_error(struct nfs_context *nfs, char *error_string, ...)
 	char *str = NULL;
 
         va_start(ap, error_string);
-#if defined (WIN32)
 	str = malloc(1024);
 	vsnprintf(str, 1024, error_string, ap);
-#else
-	vasprintf(&str, error_string, ap);
-#endif
 	if (nfs->rpc->error_string != NULL) {
 		free(nfs->rpc->error_string);
 	}
-	fs->rpc->error_string = str;
+	nfs->rpc->error_string = str;
         va_end(ap);
 }
 
@@ -3058,7 +3067,7 @@ int mount_getexports_async(struct rpc_context *rpc, const char *server, rpc_cb c
 	if (data == NULL) {
 		return -1;
 	}
-	bzero(data, sizeof(struct mount_cb_data));
+	bzero((char *)data, sizeof(struct mount_cb_data));
 	data->cb           = cb;
 	data->private_data = private_data;
 	data->server       = strdup(server);
@@ -3115,6 +3124,7 @@ int poll(struct pollfd *fds, int nfsd, int timeout)
 	if (FD_ISSET(fds->fd, &efds)) {
 		fds->revents |= POLLHUP;
 	}
+	return 1;
 }
 #endif