-/*
+/*
Copyright (C) by Ronnie Sahlberg <ronniesahlberg@gmail.com> 2010
This program is free software; you can redistribute it and/or modify
#include <fcntl.h>
#include <errno.h>
#include <poll.h>
-#include "libnfs.h"
+#include <ccan/compiler/compiler.h>
+#include "nfs.h"
#include "libnfs-raw.h"
-#include "libnfs-raw-mount.h"
-#include "libnfs-raw-nfs.h"
+#include "rpc/mount.h"
+#include "rpc/nfs.h"
struct sync_cb_data {
int is_finished;
int status;
- off_t offset;
+ nfs_off_t offset;
void *return_data;
int return_int;
};
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
struct nfsfh *fh, **nfsfh;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
char *buffer;
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_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, nfs_off_t offset, size_t count, char *buffer)
{
struct sync_cb_data cb_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
cb_data->is_finished = 1;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
cb_data->is_finished = 1;
}
}
-int nfs_pwrite_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buf)
+int nfs_pwrite_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, nfs_off_t offset, size_t count, char *buf)
{
struct sync_cb_data cb_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
cb_data->is_finished = 1;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
cb_data->is_finished = 1;
}
}
-int nfs_ftruncate_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length)
+int nfs_ftruncate_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, nfs_off_t length)
{
struct sync_cb_data cb_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
cb_data->is_finished = 1;
}
}
-int nfs_truncate_sync(struct nfs_context *nfs, const char *path, off_t length)
+int nfs_truncate_sync(struct nfs_context *nfs, const char *path, nfs_off_t length)
{
struct sync_cb_data cb_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
cb_data->is_finished = 1;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
cb_data->is_finished = 1;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
struct nfsfh *fh, **nfsfh;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
struct nfsdir *dir, **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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
}
if (cb_data->return_data != NULL) {
- memcpy(cb_data->return_data, data, sizeof(off_t));
+ memcpy(cb_data->return_data, data, sizeof(nfs_off_t));
}
}
-int nfs_lseek_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int whence, off_t *current_offset)
+int nfs_lseek_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, nfs_off_t offset, int whence, nfs_off_t *current_offset)
{
struct sync_cb_data cb_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;
/*
* 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 UNUSED, void *data, void *private_data)
{
struct sync_cb_data *cb_data = private_data;