X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs-sync.c;h=29c805c6f4bb135896025add4ca04cf045f4a3ea;hb=1e8994af0fde29bb03c52c5c4a972ef8d8ddbc33;hp=0dc6253f69f5f1da26e3cb9512abd785b9ac5c5e;hpb=84004dbf9bb2ab8a7f8b968affc53ee3065fa911;p=deb_libnfs.git diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c index 0dc6253..29c805c 100644 --- a/lib/libnfs-sync.c +++ b/lib/libnfs-sync.c @@ -33,6 +33,7 @@ #include "libnfs-raw.h" #include "libnfs-raw-mount.h" #include "libnfs-raw-nfs.h" +#include "libnfs-private.h" struct sync_cb_data { int is_finished; @@ -43,7 +44,7 @@ struct sync_cb_data { }; -static void wait_for_reply(struct nfs_context *nfs, struct sync_cb_data *cb_data) +static void wait_for_reply(struct rpc_context *rpc, struct sync_cb_data *cb_data) { struct pollfd pfd; @@ -51,16 +52,16 @@ static void wait_for_reply(struct nfs_context *nfs, struct sync_cb_data *cb_data if (cb_data->is_finished) { break; } - pfd.fd = nfs_get_fd(nfs); - pfd.events = nfs_which_events(nfs); + pfd.fd = rpc_get_fd(rpc); + pfd.events = rpc_which_events(rpc); if (poll(&pfd, 1, -1) < 0) { - printf("Poll failed"); + rpc_set_error(rpc, "Poll failed"); cb_data->status = -EIO; break; } - if (nfs_service(nfs, pfd.revents) < 0) { - printf("nfs_service failed\n"); + if (rpc_service(rpc, pfd.revents) < 0) { + rpc_set_error(rpc, "rpc_service failed"); cb_data->status = -EIO; break; } @@ -75,7 +76,7 @@ static void wait_for_reply(struct nfs_context *nfs, struct sync_cb_data *cb_data /* * connect to the server and mount the export */ -static void mount_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void mount_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -83,23 +84,23 @@ static void mount_cb(int status, struct nfs_context *nfs _U_, void *data, void * cb_data->status = status; if (status < 0) { - printf("mount/mnt call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "mount/mnt call failed with \"%s\"", (char *)data); return; } } -int nfs_mount_sync(struct nfs_context *nfs, const char *server, const char *export) +int nfs_mount(struct nfs_context *nfs, const char *server, const char *export) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_mount_async(nfs, server, export, mount_cb, &cb_data) != 0) { - printf("nfs_mount_async failed\n"); + nfs_set_error(nfs, "nfs_mount_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -108,7 +109,7 @@ int nfs_mount_sync(struct nfs_context *nfs, const char *server, const char *expo /* * stat() */ -static void stat_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void stat_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -116,14 +117,14 @@ static void stat_cb(int status, struct nfs_context *nfs _U_, void *data, void *p cb_data->status = status; if (status < 0) { - printf("stat call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "stat call failed with \"%s\"", (char *)data); return; } memcpy(cb_data->return_data, data, sizeof(struct stat)); } -int nfs_stat_sync(struct nfs_context *nfs, const char *path, struct stat *st) +int nfs_stat(struct nfs_context *nfs, const char *path, struct stat *st) { struct sync_cb_data cb_data; @@ -131,11 +132,11 @@ int nfs_stat_sync(struct nfs_context *nfs, const char *path, struct stat *st) cb_data.return_data = st; if (nfs_stat_async(nfs, path, stat_cb, &cb_data) != 0) { - printf("nfs_stat_async failed\n"); + nfs_set_error(nfs, "nfs_stat_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -146,7 +147,7 @@ int nfs_stat_sync(struct nfs_context *nfs, const char *path, struct stat *st) /* * open() */ -static void open_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void open_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; struct nfsfh *fh, **nfsfh; @@ -155,7 +156,7 @@ static void open_cb(int status, struct nfs_context *nfs _U_, void *data, void *p cb_data->status = status; if (status < 0) { - printf("open call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "open call failed with \"%s\"", (char *)data); return; } @@ -164,7 +165,7 @@ static void open_cb(int status, struct nfs_context *nfs _U_, void *data, void *p *nfsfh = fh; } -int nfs_open_sync(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh) +int nfs_open(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh) { struct sync_cb_data cb_data; @@ -172,11 +173,11 @@ int nfs_open_sync(struct nfs_context *nfs, const char *path, int mode, struct nf cb_data.return_data = nfsfh; if (nfs_open_async(nfs, path, mode, open_cb, &cb_data) != 0) { - printf("nfs_open_async failed\n"); + nfs_set_error(nfs, "nfs_open_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -187,7 +188,7 @@ int nfs_open_sync(struct nfs_context *nfs, const char *path, int mode, struct nf /* * pread() */ -static void pread_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void pread_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; char *buffer; @@ -195,7 +196,7 @@ static void pread_cb(int status, struct nfs_context *nfs _U_, void *data, void * cb_data->status = status; if (status < 0) { - printf("pread call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "pread call failed with \"%s\"", (char *)data); return; } @@ -203,7 +204,7 @@ static void pread_cb(int status, struct nfs_context *nfs _U_, void *data, void * memcpy(buffer, (char *)data, status); } -int nfs_pread_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buffer) +int nfs_pread(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buffer) { struct sync_cb_data cb_data; @@ -211,11 +212,11 @@ int nfs_pread_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, s cb_data.return_data = buffer; if (nfs_pread_async(nfs, nfsfh, offset, count, pread_cb, &cb_data) != 0) { - printf("nfs_pread_async failed\n"); + nfs_set_error(nfs, "nfs_pread_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -223,38 +224,38 @@ int nfs_pread_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, s /* * read() */ -int nfs_read_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buffer) +int nfs_read(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buffer) { - return nfs_pread_sync(nfs, nfsfh, nfs_get_current_offset(nfsfh), count, buffer); + return nfs_pread(nfs, nfsfh, nfs_get_current_offset(nfsfh), count, buffer); } /* * close() */ -static void close_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void close_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) { - printf("close call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "close call failed with \"%s\"", (char *)data); return; } } -int nfs_close_sync(struct nfs_context *nfs, struct nfsfh *nfsfh) +int nfs_close(struct nfs_context *nfs, struct nfsfh *nfsfh) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_close_async(nfs, nfsfh, close_cb, &cb_data) != 0) { - printf("nfs_close_async failed\n"); + nfs_set_error(nfs, "nfs_close_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -265,7 +266,7 @@ int nfs_close_sync(struct nfs_context *nfs, struct nfsfh *nfsfh) /* * fstat() */ -int nfs_fstat_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st) +int nfs_fstat(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st) { struct sync_cb_data cb_data; @@ -273,11 +274,11 @@ int nfs_fstat_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st cb_data.return_data = st; if (nfs_fstat_async(nfs, nfsfh, stat_cb, &cb_data) != 0) { - printf("nfs_fstat_async failed\n"); + nfs_set_error(nfs, "nfs_fstat_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -286,30 +287,30 @@ int nfs_fstat_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st /* * pwrite() */ -static void pwrite_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void pwrite_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) { - printf("pwrite call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "pwrite call failed with \"%s\"", (char *)data); return; } } -int nfs_pwrite_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buf) +int nfs_pwrite(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buf) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_pwrite_async(nfs, nfsfh, offset, count, buf, pwrite_cb, &cb_data) != 0) { - printf("nfs_pwrite_async failed\n"); + nfs_set_error(nfs, "nfs_pwrite_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -317,39 +318,39 @@ int nfs_pwrite_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, /* * write() */ -int nfs_write_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buf) +int nfs_write(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buf) { - return nfs_pwrite_sync(nfs, nfsfh, nfs_get_current_offset(nfsfh), count, buf); + return nfs_pwrite(nfs, nfsfh, nfs_get_current_offset(nfsfh), count, buf); } /* * fsync() */ -static void fsync_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void fsync_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) { - printf("fsync call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "fsync call failed with \"%s\"", (char *)data); return; } } -int nfs_fsync_sync(struct nfs_context *nfs, struct nfsfh *nfsfh) +int nfs_fsync(struct nfs_context *nfs, struct nfsfh *nfsfh) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_fsync_async(nfs, nfsfh, fsync_cb, &cb_data) != 0) { - printf("nfs_fsync_async failed\n"); + nfs_set_error(nfs, "nfs_fsync_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -360,30 +361,30 @@ int nfs_fsync_sync(struct nfs_context *nfs, struct nfsfh *nfsfh) /* * ftruncate() */ -static void ftruncate_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void ftruncate_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) { - printf("ftruncate call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "ftruncate call failed with \"%s\"", (char *)data); return; } } -int nfs_ftruncate_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length) +int nfs_ftruncate(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_ftruncate_async(nfs, nfsfh, length, ftruncate_cb, &cb_data) != 0) { - printf("nfs_ftruncate_async failed\n"); + nfs_set_error(nfs, "nfs_ftruncate_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -393,30 +394,30 @@ int nfs_ftruncate_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t lengt /* * truncate() */ -static void truncate_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void truncate_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) { - printf("truncate call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "truncate call failed with \"%s\"", (char *)data); return; } } -int nfs_truncate_sync(struct nfs_context *nfs, const char *path, off_t length) +int nfs_truncate(struct nfs_context *nfs, const char *path, off_t length) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_truncate_async(nfs, path, length, truncate_cb, &cb_data) != 0) { - printf("nfs_ftruncate_async failed\n"); + nfs_set_error(nfs, "nfs_ftruncate_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -428,30 +429,30 @@ int nfs_truncate_sync(struct nfs_context *nfs, const char *path, off_t length) /* * mkdir() */ -static void mkdir_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void mkdir_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) { - printf("mkdir call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "mkdir call failed with \"%s\"", (char *)data); return; } } -int nfs_mkdir_sync(struct nfs_context *nfs, const char *path) +int nfs_mkdir(struct nfs_context *nfs, const char *path) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_mkdir_async(nfs, path, mkdir_cb, &cb_data) != 0) { - printf("nfs_mkdir_async failed\n"); + nfs_set_error(nfs, "nfs_mkdir_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -463,30 +464,30 @@ int nfs_mkdir_sync(struct nfs_context *nfs, const char *path) /* * rmdir() */ -static void rmdir_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void rmdir_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) { - printf("rmdir call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "rmdir call failed with \"%s\"", (char *)data); return; } } -int nfs_rmdir_sync(struct nfs_context *nfs, const char *path) +int nfs_rmdir(struct nfs_context *nfs, const char *path) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_rmdir_async(nfs, path, rmdir_cb, &cb_data) != 0) { - printf("nfs_rmdir_async failed\n"); + nfs_set_error(nfs, "nfs_rmdir_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -496,7 +497,7 @@ int nfs_rmdir_sync(struct nfs_context *nfs, const char *path) /* * creat() */ -static void creat_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void creat_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; struct nfsfh *fh, **nfsfh; @@ -505,7 +506,7 @@ static void creat_cb(int status, struct nfs_context *nfs _U_, void *data, void * cb_data->status = status; if (status < 0) { - printf("creat call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "creat call failed with \"%s\"", (char *)data); return; } @@ -514,7 +515,7 @@ static void creat_cb(int status, struct nfs_context *nfs _U_, void *data, void * *nfsfh = fh; } -int nfs_creat_sync(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh) +int nfs_creat(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh) { struct sync_cb_data cb_data; @@ -522,11 +523,11 @@ int nfs_creat_sync(struct nfs_context *nfs, const char *path, int mode, struct n cb_data.return_data = nfsfh; if (nfs_creat_async(nfs, path, mode, creat_cb, &cb_data) != 0) { - printf("nfs_creat_async failed\n"); + nfs_set_error(nfs, "nfs_creat_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -537,7 +538,7 @@ int nfs_creat_sync(struct nfs_context *nfs, const char *path, int mode, struct n /* * unlink() */ -static void unlink_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void unlink_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -545,23 +546,23 @@ static void unlink_cb(int status, struct nfs_context *nfs _U_, void *data, void cb_data->status = status; if (status < 0) { - printf("unlink call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "unlink call failed with \"%s\"", (char *)data); return; } } -int nfs_unlink_sync(struct nfs_context *nfs, const char *path) +int nfs_unlink(struct nfs_context *nfs, const char *path) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_unlink_async(nfs, path, unlink_cb, &cb_data) != 0) { - printf("nfs_unlink_async failed\n"); + nfs_set_error(nfs, "nfs_unlink_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -571,7 +572,7 @@ int nfs_unlink_sync(struct nfs_context *nfs, const char *path) /* * opendir() */ -static void opendir_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void opendir_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; struct nfsdir *dir, **nfsdir; @@ -580,7 +581,7 @@ static void opendir_cb(int status, struct nfs_context *nfs _U_, void *data, void cb_data->status = status; if (status < 0) { - printf("opendir call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "opendir call failed with \"%s\"", (char *)data); return; } @@ -589,7 +590,7 @@ static void opendir_cb(int status, struct nfs_context *nfs _U_, void *data, void *nfsdir = dir; } -int nfs_opendir_sync(struct nfs_context *nfs, const char *path, struct nfsdir **nfsdir) +int nfs_opendir(struct nfs_context *nfs, const char *path, struct nfsdir **nfsdir) { struct sync_cb_data cb_data; @@ -597,11 +598,11 @@ int nfs_opendir_sync(struct nfs_context *nfs, const char *path, struct nfsdir ** cb_data.return_data = nfsdir; if (nfs_opendir_async(nfs, path, opendir_cb, &cb_data) != 0) { - printf("nfs_opendir_async failed\n"); + nfs_set_error(nfs, "nfs_opendir_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -610,7 +611,7 @@ int nfs_opendir_sync(struct nfs_context *nfs, const char *path, struct nfsdir ** /* * lseek() */ -static void lseek_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void lseek_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -618,7 +619,7 @@ static void lseek_cb(int status, struct nfs_context *nfs _U_, void *data, void * cb_data->status = status; if (status < 0) { - printf("lseek call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "lseek call failed with \"%s\"", (char *)data); return; } @@ -627,7 +628,7 @@ static void lseek_cb(int status, struct nfs_context *nfs _U_, void *data, void * } } -int nfs_lseek_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int whence, off_t *current_offset) +int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int whence, off_t *current_offset) { struct sync_cb_data cb_data; @@ -635,11 +636,11 @@ int nfs_lseek_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, i cb_data.return_data = current_offset; if (nfs_lseek_async(nfs, nfsfh, offset, whence, lseek_cb, &cb_data) != 0) { - printf("nfs_lseek_async failed\n"); + nfs_set_error(nfs, "nfs_lseek_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -649,7 +650,7 @@ int nfs_lseek_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, i /* * statvfs() */ -static void statvfs_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void statvfs_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -657,14 +658,14 @@ static void statvfs_cb(int status, struct nfs_context *nfs _U_, void *data, void cb_data->status = status; if (status < 0) { - printf("statvfs call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "statvfs call failed with \"%s\"", (char *)data); return; } memcpy(cb_data->return_data, data, sizeof(struct statvfs)); } -int nfs_statvfs_sync(struct nfs_context *nfs, const char *path, struct statvfs *svfs) +int nfs_statvfs(struct nfs_context *nfs, const char *path, struct statvfs *svfs) { struct sync_cb_data cb_data; @@ -672,11 +673,11 @@ int nfs_statvfs_sync(struct nfs_context *nfs, const char *path, struct statvfs * cb_data.return_data = svfs; if (nfs_statvfs_async(nfs, path, statvfs_cb, &cb_data) != 0) { - printf("nfs_statvfs_async failed\n"); + nfs_set_error(nfs, "nfs_statvfs_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -688,7 +689,7 @@ int nfs_statvfs_sync(struct nfs_context *nfs, const char *path, struct statvfs * /* * readlink() */ -static void readlink_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void readlink_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -696,12 +697,12 @@ static void readlink_cb(int status, struct nfs_context *nfs _U_, void *data, voi cb_data->status = status; if (status < 0) { - printf("readlink call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "readlink call failed with \"%s\"", (char *)data); return; } if (strlen(data) > (size_t)cb_data->return_int) { - printf("Too small buffer for readlink\n"); + nfs_set_error(nfs, "Too small buffer for readlink"); cb_data->status = -ENAMETOOLONG; return; } @@ -709,7 +710,7 @@ static void readlink_cb(int status, struct nfs_context *nfs _U_, void *data, voi memcpy(cb_data->return_data, data, strlen(data)+1); } -int nfs_readlink_sync(struct nfs_context *nfs, const char *path, char *buf, int bufsize) +int nfs_readlink(struct nfs_context *nfs, const char *path, char *buf, int bufsize) { struct sync_cb_data cb_data; @@ -718,11 +719,11 @@ int nfs_readlink_sync(struct nfs_context *nfs, const char *path, char *buf, int cb_data.return_int = bufsize; if (nfs_readlink_async(nfs, path, readlink_cb, &cb_data) != 0) { - printf("nfs_readlink_async failed\n"); + nfs_set_error(nfs, "nfs_readlink_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -732,7 +733,7 @@ int nfs_readlink_sync(struct nfs_context *nfs, const char *path, char *buf, int /* * chmod() */ -static void chmod_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void chmod_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -740,23 +741,23 @@ static void chmod_cb(int status, struct nfs_context *nfs _U_, void *data, void * cb_data->status = status; if (status < 0) { - printf("chmod call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "chmod call failed with \"%s\"", (char *)data); return; } } -int nfs_chmod_sync(struct nfs_context *nfs, const char *path, int mode) +int nfs_chmod(struct nfs_context *nfs, const char *path, int mode) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_chmod_async(nfs, path, mode, chmod_cb, &cb_data) != 0) { - printf("nfs_chmod_async failed\n"); + nfs_set_error(nfs, "nfs_chmod_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -767,7 +768,7 @@ int nfs_chmod_sync(struct nfs_context *nfs, const char *path, int mode) /* * fchmod() */ -static void fchmod_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void fchmod_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -775,23 +776,23 @@ static void fchmod_cb(int status, struct nfs_context *nfs _U_, void *data, void cb_data->status = status; if (status < 0) { - printf("fchmod call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "fchmod call failed with \"%s\"", (char *)data); return; } } -int nfs_fchmod_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode) +int nfs_fchmod(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_fchmod_async(nfs, nfsfh, mode, fchmod_cb, &cb_data) != 0) { - printf("nfs_fchmod_async failed\n"); + nfs_set_error(nfs, "nfs_fchmod_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -802,7 +803,7 @@ int nfs_fchmod_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode) /* * chown() */ -static void chown_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void chown_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -810,23 +811,23 @@ static void chown_cb(int status, struct nfs_context *nfs _U_, void *data, void * cb_data->status = status; if (status < 0) { - printf("chown call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "chown call failed with \"%s\"", (char *)data); return; } } -int nfs_chown_sync(struct nfs_context *nfs, const char *path, int uid, int gid) +int nfs_chown(struct nfs_context *nfs, const char *path, int uid, int gid) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_chown_async(nfs, path, uid, gid, chown_cb, &cb_data) != 0) { - printf("nfs_chown_async failed\n"); + nfs_set_error(nfs, "nfs_chown_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -834,7 +835,7 @@ int nfs_chown_sync(struct nfs_context *nfs, const char *path, int uid, int gid) /* * fchown() */ -static void fchown_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void fchown_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -842,23 +843,23 @@ static void fchown_cb(int status, struct nfs_context *nfs _U_, void *data, void cb_data->status = status; if (status < 0) { - printf("fchown call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "fchown call failed with \"%s\"", (char *)data); return; } } -int nfs_fchown_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int gid) +int nfs_fchown(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int gid) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_fchown_async(nfs, nfsfh, uid, gid, fchown_cb, &cb_data) != 0) { - printf("nfs_fchown_async failed\n"); + nfs_set_error(nfs, "nfs_fchown_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -868,7 +869,7 @@ int nfs_fchown_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int g /* * utimes() */ -static void utimes_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void utimes_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -876,23 +877,23 @@ static void utimes_cb(int status, struct nfs_context *nfs _U_, void *data, void cb_data->status = status; if (status < 0) { - printf("utimes call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "utimes call failed with \"%s\"", (char *)data); return; } } -int nfs_utimes_sync(struct nfs_context *nfs, const char *path, struct timeval *times) +int nfs_utimes(struct nfs_context *nfs, const char *path, struct timeval *times) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_utimes_async(nfs, path, times, utimes_cb, &cb_data) != 0) { - printf("nfs_utimes_async failed\n"); + nfs_set_error(nfs, "nfs_utimes_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -902,7 +903,7 @@ int nfs_utimes_sync(struct nfs_context *nfs, const char *path, struct timeval *t /* * utime() */ -static void utime_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void utime_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -910,23 +911,23 @@ static void utime_cb(int status, struct nfs_context *nfs _U_, void *data, void * cb_data->status = status; if (status < 0) { - printf("utime call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "utime call failed with \"%s\"", (char *)data); return; } } -int nfs_utime_sync(struct nfs_context *nfs, const char *path, struct utimbuf *times) +int nfs_utime(struct nfs_context *nfs, const char *path, struct utimbuf *times) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_utime_async(nfs, path, times, utime_cb, &cb_data) != 0) { - printf("nfs_utimes_async failed\n"); + nfs_set_error(nfs, "nfs_utimes_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -937,7 +938,7 @@ int nfs_utime_sync(struct nfs_context *nfs, const char *path, struct utimbuf *ti /* * access() */ -static void access_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void access_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -945,23 +946,23 @@ static void access_cb(int status, struct nfs_context *nfs _U_, void *data, void cb_data->status = status; if (status < 0) { - printf("access call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "access call failed with \"%s\"", (char *)data); return; } } -int nfs_access_sync(struct nfs_context *nfs, const char *path, int mode) +int nfs_access(struct nfs_context *nfs, const char *path, int mode) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_access_async(nfs, path, mode, access_cb, &cb_data) != 0) { - printf("nfs_access_async failed\n"); + nfs_set_error(nfs, "nfs_access_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -971,7 +972,7 @@ int nfs_access_sync(struct nfs_context *nfs, const char *path, int mode) /* * symlink() */ -static void symlink_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void symlink_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -979,23 +980,23 @@ static void symlink_cb(int status, struct nfs_context *nfs _U_, void *data, void cb_data->status = status; if (status < 0) { - printf("symlink call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "symlink call failed with \"%s\"", (char *)data); return; } } -int nfs_symlink_sync(struct nfs_context *nfs, const char *oldpath, const char *newpath) +int nfs_symlink(struct nfs_context *nfs, const char *oldpath, const char *newpath) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_symlink_async(nfs, oldpath, newpath, symlink_cb, &cb_data) != 0) { - printf("nfs_symlink_async failed\n"); + nfs_set_error(nfs, "nfs_symlink_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -1005,7 +1006,7 @@ int nfs_symlink_sync(struct nfs_context *nfs, const char *oldpath, const char *n /* * rename() */ -static void rename_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void rename_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -1013,23 +1014,23 @@ static void rename_cb(int status, struct nfs_context *nfs _U_, void *data, void cb_data->status = status; if (status < 0) { - printf("rename call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "rename call failed with \"%s\"", (char *)data); return; } } -int nfs_rename_sync(struct nfs_context *nfs, const char *oldpath, const char *newpath) +int nfs_rename(struct nfs_context *nfs, const char *oldpath, const char *newpath) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_rename_async(nfs, oldpath, newpath, rename_cb, &cb_data) != 0) { - printf("nfs_rename_async failed\n"); + nfs_set_error(nfs, "nfs_rename_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } @@ -1039,7 +1040,7 @@ int nfs_rename_sync(struct nfs_context *nfs, const char *oldpath, const char *ne /* * link() */ -static void link_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data) +static void link_cb(int status, struct nfs_context *nfs, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; @@ -1047,23 +1048,79 @@ static void link_cb(int status, struct nfs_context *nfs _U_, void *data, void *p cb_data->status = status; if (status < 0) { - printf("link call failed with \"%s\"\n", (char *)data); + nfs_set_error(nfs, "link call failed with \"%s\"", (char *)data); return; } } -int nfs_link_sync(struct nfs_context *nfs, const char *oldpath, const char *newpath) +int nfs_link(struct nfs_context *nfs, const char *oldpath, const char *newpath) { struct sync_cb_data cb_data; cb_data.is_finished = 0; if (nfs_link_async(nfs, oldpath, newpath, link_cb, &cb_data) != 0) { - printf("nfs_link_async failed\n"); + nfs_set_error(nfs, "nfs_link_async failed"); return -1; } - wait_for_reply(nfs, &cb_data); + wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); return cb_data.status; } + +void mount_getexports_cb(struct rpc_context *mount_context _U_, int status, void *data, void *private_data) +{ + struct sync_cb_data *cb_data = private_data; + exports export = *(exports *)data; + + cb_data->is_finished = 1; + cb_data->status = status; + cb_data->return_data = NULL; + + while (export != NULL) { + exports new_export; + + new_export = malloc(sizeof(*new_export)); + memset(new_export, 0, sizeof(*new_export)); + new_export->ex_dir = strdup(export->ex_dir); + new_export->ex_next = cb_data->return_data; + + cb_data->return_data = new_export; + + export = export->ex_next; + } +} + +struct exportnode *mount_getexports(const char *server) +{ + struct sync_cb_data cb_data; + struct rpc_context *rpc; + + + cb_data.is_finished = 0; + cb_data.return_data = NULL; + + rpc = rpc_init_context(); + if (mount_getexports_async(rpc, server, mount_getexports_cb, &cb_data) != 0) { + rpc_destroy_context(rpc); + return NULL; + } + + wait_for_reply(rpc, &cb_data); + rpc_destroy_context(rpc); + + return cb_data.return_data; +} + +void mount_free_export_list(struct exportnode *exports) +{ + struct exportnode *tmp; + + while ((tmp = exports)) { + exports = exports->ex_next; + free(tmp->ex_dir); + free(tmp); + } +} +