X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs.c;h=eee5d5a6dbb8e4b6c8f755f7adbe2129289d35e6;hb=41d82d7d825b9b4e73bb227f5b2fafa86067cba0;hp=a0034643948bff09f770a5552179035e9f278b8a;hpb=6874f61e24438ca6f4c54319ed52306bd5d349f9;p=deb_libnfs.git

diff --git a/lib/libnfs.c b/lib/libnfs.c
index a003464..eee5d5a 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -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;
 
@@ -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;
@@ -1749,8 +1762,8 @@ 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);
+	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;
@@ -2899,7 +2912,8 @@ void nfs_set_error(struct nfs_context *nfs, char *error_string, ...)
 	char *str = NULL;
 
         va_start(ap, error_string);
-	vasprintf(&str, error_string, ap);
+	str = malloc(1024);
+	vsnprintf(str, 1024, error_string, ap);
 	if (nfs->rpc->error_string != NULL) {
 		free(nfs->rpc->error_string);
 	}
@@ -3081,3 +3095,36 @@ const char *nfs_get_server(struct nfs_context *nfs) {
 const char *nfs_get_export(struct nfs_context *nfs) {
 	return nfs->export;
 }
+
+
+#if defined(WIN32)
+int poll(struct pollfd *fds, int nfsd, int timeout)
+{
+	fd_set rfds, wfds, efds;
+	int ret;
+
+	FD_ZERO(&rfds);
+	FD_ZERO(&wfds);
+	FD_ZERO(&efds);
+	if (fds->events & POLLIN) {
+		FD_SET(fds->fd, &rfds);
+	}
+	if (fds->events & POLLOUT) {
+		FD_SET(fds->fd, &wfds);
+	}
+	FD_SET(fds->fd, &efds);
+	select(fds->fd + 1, &rfds, &wfds, &efds, NULL);
+	fds->revents = 0;
+	if (FD_ISSET(fds->fd, &rfds)) {
+		fds->revents |= POLLIN;
+	}
+	if (FD_ISSET(fds->fd, &wfds)) {
+		fds->revents |= POLLOUT;
+	}
+	if (FD_ISSET(fds->fd, &efds)) {
+		fds->revents |= POLLHUP;
+	}
+	return 1;
+}
+#endif
+