![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/fusedav.c b/src/fusedav.c
index d145e836b2a668a50b9652cf6a8d765b31d307d7..a0723b17f8d2259742090eed4c9b8ed7333dda52 100644 (file)
--- a/src/fusedav.c
+++ b/src/fusedav.c
#include "statcache.h"
#include "filecache.h"
#include "session.h"
-#include "openssl-thread.h"
#include "fusedav.h"
const ne_propname query_properties[] = {
ne_lock_store *lock_store = NULL;
struct ne_lock *lock = NULL;
int lock_thread_exit = 0;
+int lock_timeout = 60;
#define MIME_XATTR "user.mime_type"
#define MAX_REDIRECTS 10
-#define LOCK_TIMEOUT 8
struct fill_info {
void *buf;
return fn;
}
-static void getdir_propfind_callback(void *userdata, const char *href, const ne_prop_result_set *results) {
+static void getdir_propfind_callback(void *userdata, const ne_uri *u, const ne_prop_result_set *results) {
struct fill_info *f = userdata;
struct stat st;
char fn[PATH_MAX], *t;
@@ -236,7 +235,7 @@ static void getdir_propfind_callback(void *userdata, const char *href, const ne_
assert(f);
- strncpy(fn, href, sizeof(fn));
+ strncpy(fn, u->path, sizeof(fn));
fn[sizeof(fn)-1] = 0;
strip_trailing_slash(fn, &is_dir);
@@ -248,7 +247,7 @@ static void getdir_propfind_callback(void *userdata, const char *href, const ne_
else
t = fn;
- dir_cache_add(f->root, t, is_dir);
+ dir_cache_add(f->root, t);
f->filler(f->buf, h = ne_path_unescape(t), NULL, 0);
free(h);
}
@@ -260,7 +259,6 @@ static void getdir_propfind_callback(void *userdata, const char *href, const ne_
static void getdir_cache_callback(
const char *root,
const char *fn,
- int is_dir,
void *user) {
struct fill_info *f = user;
const char *path,
void *buf,
fuse_fill_dir_t filler,
- off_t offset,
- struct fuse_file_info *fi) {
+ __unused off_t offset,
+ __unused struct fuse_file_info *fi) {
struct fill_info f;
ne_session *session;
return 0;
}
-static void getattr_propfind_callback(void *userdata, const char *href, const ne_prop_result_set *results) {
+static void getattr_propfind_callback(void *userdata, const ne_uri *u, const ne_prop_result_set *results) {
struct stat *st = (struct stat*) userdata;
char fn[PATH_MAX];
int is_dir;
assert(st);
- strncpy(fn, href, sizeof(fn));
+ strncpy(fn, u->path, sizeof(fn));
fn[sizeof(fn)-1] = 0;
strip_trailing_slash(fn, &is_dir);
return 0;
}
-static int dav_mkdir(const char *path, mode_t mode) {
+static int dav_mkdir(const char *path, __unused mode_t mode) {
char fn[PATH_MAX];
ne_session *session;
return r;
}
-static int dav_release(const char *path, struct fuse_file_info *info) {
+static int dav_release(const char *path, __unused struct fuse_file_info *info) {
void *f = NULL;
int r = 0;
ne_session *session;
return r;
}
-static int dav_fsync(const char *path, __unused int isdatasync, struct fuse_file_info *info) {
+static int dav_fsync(const char *path, __unused int isdatasync, __unused struct fuse_file_info *info) {
void *f = NULL;
int r = 0;
ne_session *session;
return r;
}
-static int dav_mknod(const char *path, mode_t mode, dev_t rdev) {
+static int dav_mknod(const char *path, mode_t mode, __unused dev_t rdev) {
char tempfile[PATH_MAX];
int fd;
ne_session *session;
return 0;
}
-static int dav_read(const char *path, char *buf, size_t size, off_t offset, struct fuse_file_info *info) {
+static int dav_read(const char *path, char *buf, size_t size, off_t offset, __unused struct fuse_file_info *info) {
void *f = NULL;
ssize_t r;
@@ -633,8 +631,6 @@ static int dav_read(const char *path, char *buf, size_t size, off_t offset, stru
goto finish;
}
- fprintf(stderr, "read: %i\n", r);
-
finish:
if (f)
file_cache_unref(f);
return r;
}
-static int dav_write(const char *path, const char *buf, size_t size, off_t offset, struct fuse_file_info *info) {
+static int dav_write(const char *path, const char *buf, size_t size, off_t offset, __unused struct fuse_file_info *info) {
void *f = NULL;
ssize_t r;
void *userdata,
const ne_propname *pname,
const char *value,
- const ne_status *status) {
+ __unused const ne_status *status) {
struct listxattr_info *l = userdata;
int n;
}
}
-static void listxattr_propfind_callback(void *userdata, const char *href, const ne_prop_result_set *results) {
+static void listxattr_propfind_callback(void *userdata, __unused const ne_uri *u, const ne_prop_result_set *results) {
struct listxattr_info *l = userdata;
ne_propset_iterate(results, listxattr_iterator, l);
}
void *userdata,
const ne_propname *pname,
const char *value,
- const ne_status *status) {
+ __unused const ne_status *status) {
struct getxattr_info *g = userdata;
return 0;
}
-static void getxattr_propfind_callback(void *userdata, const char *href, const ne_prop_result_set *results) {
+static void getxattr_propfind_callback(void *userdata, __unused const ne_uri *u, const ne_prop_result_set *results) {
struct getxattr_info *g = userdata;
ne_propset_iterate(results, getxattr_iterator, g);
}
e = argv0;
fprintf(stderr,
- "%s [-h] [-D] [-u USERNAME] [-p PASSWORD] [-o OPTIONS] URL MOUNTPOINT\n"
+ "%s [-hDL] [-t SECS] [-u USERNAME] [-p PASSWORD] [-o OPTIONS] URL MOUNTPOINT\n"
"\t-h Show this help\n"
"\t-D Enable debug mode\n"
"\t-u Username if required\n"
"\t-p Password if required\n"
- "\t-o Additional FUSE mount options\n",
+ "\t-o Additional FUSE mount options\n"
+ "\t-L Locking the repository during mount\n"
+ "\t-t Set lock timeout\n",
e);
}
-static void exit_handler(int s) {
+static void exit_handler(__unused int sig) {
static const char m[] = "*** Caught signal ***\n";
if(fuse != NULL)
fuse_exit(fuse);
write(2, m, strlen(m));
}
-static void empty_handler(int sig) {}
+static void empty_handler(__unused int sig) {}
static int setup_signal_handlers(void) {
struct sigaction sa;
if (!(session = session_get(0)))
return -1;
- if (!(owner = getenv("USER")))
- if (!(owner = getenv("LOGNAME"))) {
- snprintf(_owner, sizeof(_owner), "%lu", (unsigned long) getuid());
- owner = owner;
- }
+ if (!(owner = username))
+ if (!(owner = getenv("USER")))
+ if (!(owner = getenv("LOGNAME"))) {
+ snprintf(_owner, sizeof(_owner), "%lu", (unsigned long) getuid());
+ owner = owner;
+ }
ne_fill_server_uri(session, &lock->uri);
lock->uri.path = strdup(base_directory);
lock->depth = NE_DEPTH_INFINITE;
- lock->timeout = LOCK_TIMEOUT+2;
+ lock->timeout = lock_timeout;
lock->owner = strdup(owner);
- fprintf(stderr, "Acquiring lock...\n");
+ if (debug)
+ fprintf(stderr, "Acquiring lock...\n");
for (i = 0; i < MAX_REDIRECTS; i++) {
const ne_uri *u;
assert(lock);
while (!lock_thread_exit) {
- int r;
+ int r, t;
- lock->timeout = LOCK_TIMEOUT;
+ lock->timeout = lock_timeout;
pthread_sigmask(SIG_BLOCK, &block, NULL);
r = ne_lock_refresh(session, lock);
if (lock_thread_exit)
break;
- sleep(LOCK_TIMEOUT);
+ t = lock_timeout/2;
+ if (t <= 0)
+ t = 1;
+ sleep(t);
}
if (debug)
goto finish;
}
- openssl_thread_setup();
-
+ if (!ne_has_support(NE_FEATURE_SSL) ||
+ !ne_has_support(NE_FEATURE_TS_SSL) ||
+ !ne_has_support(NE_FEATURE_LFS)) {
+ fprintf(stderr, "fusedav requires libneon built with SSL, SSL thread safety and LFS enabled.\n");
+ goto finish;
+ }
+
mask = umask(0);
umask(mask);
case 'L':
enable_locking = 1;
break;
+
+ case 't':
+ if ((lock_timeout = atoi(optarg)) < 0) {
+ fprintf(stderr, "Invalid lock timeout '%s'\n", optarg);
+ goto finish;
+ }
+ break;
case 'h':
+ ret = 0;
+
+ /* fall through */
default:
usage(argv[0]);
goto finish;
mount_args_strings[0] = argv[optind];
if (o) {
- mount_args_strings[1] = "-o";
+ mount_args_strings[1] = (char*) "-o";
mount_args_strings[2] = o;
mount_args.argc += 2;
}
file_cache_close_all();
cache_free();
session_free();
- openssl_thread_cleanup();
return ret;
}