X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs-sync.c;h=7ba52225395fcfc10f715181030882240c672640;hb=ee872606f1e484f684276ec595f1e39d1f95b9a9;hp=09e197ad312fcf3a5c6ee77a8ad9fcde72aff454;hpb=fab61e3d0384e61553b39860b923d41bc0cf17b1;p=deb_libnfs.git diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c index 09e197a..7ba5222 100644 --- a/lib/libnfs-sync.c +++ b/lib/libnfs-sync.c @@ -17,27 +17,66 @@ /* * High level api to nfs filesystems */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef AROS +#include "aros_compat.h" +#endif + #ifdef WIN32 #include "win32_compat.h" -#define DllExport -#else -#include -#include +#endif + +#ifdef HAVE_NET_IF_H +#include +#endif + +#ifdef ANDROID +#define statvfs statfs +#endif + +#ifdef HAVE_SYS_VFS_H +#include +#endif + +#ifdef HAVE_SYS_STATVFS_H #include -#include +#endif + +#ifdef HAVE_SYS_IOCTL_H #include -#include +#endif + +#ifdef HAVE_SYS_SOCKET_H #include -#include #endif -#ifdef HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_POLL_H +#include +#endif + +#ifdef HAVE_NETDB_H +#include +#endif + +#ifdef HAVE_UNISTD_H +#include +#endif + +#ifdef HAVE_NETINET_IN_H +#include +#endif + +#ifdef HAVE_STRINGS_H +#include #endif #include #include #include +#include #include #include #include @@ -47,6 +86,7 @@ #include #endif +#include "libnfs-zdr.h" #include "libnfs.h" #include "libnfs-raw.h" #include "libnfs-raw-mount.h" @@ -66,6 +106,8 @@ static void wait_for_reply(struct rpc_context *rpc, struct sync_cb_data *cb_data { struct pollfd pfd; + assert(rpc->magic == RPC_CONTEXT_MAGIC); + while (!cb_data->is_finished) { pfd.fd = rpc_get_fd(rpc); @@ -134,6 +176,8 @@ int nfs_mount(struct nfs_context *nfs, const char *server, const char *export) struct sync_cb_data cb_data; struct rpc_context *rpc = nfs_get_rpc_context(nfs); + assert(rpc->magic == RPC_CONTEXT_MAGIC); + cb_data.is_finished = 0; if (nfs_mount_async(nfs, server, export, mount_cb, &cb_data) != 0) { @@ -164,11 +208,18 @@ static void stat_cb(int status, struct nfs_context *nfs, void *data, void *priva nfs_set_error(nfs, "stat call failed with \"%s\"", (char *)data); return; } - - memcpy(cb_data->return_data, data, sizeof(struct stat)); +#ifdef WIN32 + memcpy(cb_data->return_data, data, sizeof(struct __stat64)); +#else + memcpy(cb_data->return_data, data, sizeof(struct stat)); +#endif } +#ifdef WIN32 +int nfs_stat(struct nfs_context *nfs, const char *path, struct __stat64 *st) +#else int nfs_stat(struct nfs_context *nfs, const char *path, struct stat *st) +#endif { struct sync_cb_data cb_data; @@ -185,8 +236,36 @@ int nfs_stat(struct nfs_context *nfs, const char *path, struct stat *st) return cb_data.status; } +static void stat64_cb(int status, struct nfs_context *nfs, void *data, void *private_data) +{ + struct sync_cb_data *cb_data = private_data; + + cb_data->is_finished = 1; + cb_data->status = status; + + if (status < 0) { + nfs_set_error(nfs, "stat call failed with \"%s\"", (char *)data); + return; + } + memcpy(cb_data->return_data, data, sizeof(struct nfs_stat_64)); +} + +int nfs_stat64(struct nfs_context *nfs, const char *path, struct nfs_stat_64 *st) +{ + struct sync_cb_data cb_data; + cb_data.is_finished = 0; + cb_data.return_data = st; + + if (nfs_stat64_async(nfs, path, stat64_cb, &cb_data) != 0) { + nfs_set_error(nfs, "nfs_stat64_async failed"); + return -1; + } + + wait_for_nfs_reply(nfs, &cb_data); + return cb_data.status; +} /* * open() @@ -209,14 +288,14 @@ static void open_cb(int status, struct nfs_context *nfs, void *data, void *priva *nfsfh = fh; } -int nfs_open(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh) +int nfs_open(struct nfs_context *nfs, const char *path, int flags, struct nfsfh **nfsfh) { struct sync_cb_data cb_data; cb_data.is_finished = 0; cb_data.return_data = nfsfh; - if (nfs_open_async(nfs, path, mode, open_cb, &cb_data) != 0) { + if (nfs_open_async(nfs, path, flags, open_cb, &cb_data) != 0) { nfs_set_error(nfs, "nfs_open_async failed"); return -1; } @@ -226,6 +305,38 @@ int nfs_open(struct nfs_context *nfs, const char *path, int mode, struct nfsfh * return cb_data.status; } +/* + * chdir() + */ +static void chdir_cb(int status, struct nfs_context *nfs, void *data, void *private_data) +{ + struct sync_cb_data *cb_data = private_data; + + cb_data->is_finished = 1; + cb_data->status = status; + + if (status < 0) { + nfs_set_error(nfs, "chdir call failed with \"%s\"", (char *)data); + return; + } +} + +int nfs_chdir(struct nfs_context *nfs, const char *path) +{ + struct sync_cb_data cb_data; + + cb_data.is_finished = 0; + + if (nfs_chdir_async(nfs, path, chdir_cb, &cb_data) != 0) { + nfs_set_error(nfs, "nfs_chdir_async failed with %s", + nfs_get_error(nfs)); + return -1; + } + + wait_for_nfs_reply(nfs, &cb_data); + + return cb_data.status; +} @@ -1146,7 +1257,9 @@ int nfs_link(struct nfs_context *nfs, const char *oldpath, const char *newpath) void mount_getexports_cb(struct rpc_context *mount_context, int status, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; - exports export = *(exports *)data; + exports export; + + assert(mount_context->magic == RPC_CONTEXT_MAGIC); cb_data->is_finished = 1; cb_data->status = status; @@ -1157,6 +1270,7 @@ void mount_getexports_cb(struct rpc_context *mount_context, int status, void *da return; } + export = *(exports *)data; while (export != NULL) { exports new_export; @@ -1228,6 +1342,8 @@ void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *privat char hostdd[16]; struct nfs_server_list *srvr; + assert(rpc->magic == RPC_CONTEXT_MAGIC); + if (status == RPC_STATUS_CANCEL) { return; } @@ -1281,6 +1397,8 @@ static int send_nfsd_probes(struct rpc_context *rpc, INTERFACE_INFO *InterfaceLi { int i=0; + assert(rpc->magic == RPC_CONTEXT_MAGIC); + for(i = 0; i < numIfs; i++) { SOCKADDR *pAddress; @@ -1411,6 +1529,8 @@ static int send_nfsd_probes(struct rpc_context *rpc, struct ifconf *ifc, struct { char *ptr; + assert(rpc->magic == RPC_CONTEXT_MAGIC); + for (ptr =(char *)(ifc->ifc_buf); ptr < (char *)(ifc->ifc_buf) + ifc->ifc_len; ) { struct ifreq *ifr; char bcdd[16];