X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffusedav.c;h=8d3cdc72f3dda3abcdac12f7be15ab4fbb03aee4;hb=f662ec3b303d2cd70b96dbd226d43736b1b16c16;hp=619b091205d42f34ccd1e7a5b647156921e92ad6;hpb=0c82f84ef5b8a0a7a773fdb14028bf07a05b3e89;p=fusedav.git diff --git a/src/fusedav.c b/src/fusedav.c index 619b091..8d3cdc7 100644 --- a/src/fusedav.c +++ b/src/fusedav.c @@ -101,7 +101,7 @@ static const char *path_cvt(const char *path) { int l; pthread_once(&path_cvt_once, path_cvt_tsd_key_init); - + if ((r = pthread_getspecific(path_cvt_tsd_key))) free(r); @@ -116,7 +116,7 @@ static const char *path_cvt(const char *path) { free(t); pthread_setspecific(path_cvt_tsd_key, r); - + return r; } @@ -129,7 +129,7 @@ static int simple_propfind_with_redirect( void *userdata) { int i, ret; - + for (i = 0; i < MAX_REDIRECTS; i++) { const ne_uri *u; @@ -144,7 +144,7 @@ static int simple_propfind_with_redirect( if (debug) fprintf(stderr, "REDIRECT FROM '%s' to '%s'\n", path, u->path); - + path = u->path; } @@ -155,9 +155,9 @@ static int proppatch_with_redirect( ne_session *session, const char *path, const ne_proppatch_operation *ops) { - + int i, ret; - + for (i = 0; i < MAX_REDIRECTS; i++) { const ne_uri *u; @@ -172,7 +172,7 @@ static int proppatch_with_redirect( if (debug) fprintf(stderr, "REDIRECT FROM '%s' to '%s'\n", path, u->path); - + path = u->path; } @@ -187,7 +187,7 @@ static void fill_stat(struct stat* st, const ne_prop_result_set *results, int is const ne_propname getcontentlength = { "DAV:", "getcontentlength" }; const ne_propname getlastmodified = { "DAV:", "getlastmodified" }; const ne_propname creationdate = { "DAV:", "creationdate" }; - + assert(st && results); rt = ne_propset_value(results, &resourcetype); @@ -197,7 +197,7 @@ static void fill_stat(struct stat* st, const ne_prop_result_set *results, int is cd = ne_propset_value(results, &creationdate); memset(st, 0, sizeof(struct stat)); - + if (is_dir) { st->st_mode = S_IFDIR | 0777; st->st_nlink = 3; /* find will ignore this directory if nlin <= and st_size == 0 */ @@ -211,12 +211,12 @@ static void fill_stat(struct stat* st, const ne_prop_result_set *results, int is st->st_atime = time(NULL); st->st_mtime = glm ? ne_rfc1123_parse(glm) : 0; st->st_ctime = cd ? ne_iso8601_parse(cd) : 0; - + st->st_blocks = (st->st_size+511)/512; /*fprintf(stderr, "a: %u; m: %u; c: %u\n", st->st_atime, st->st_mtime, st->st_ctime);*/ st->st_mode &= ~mask; - + st->st_uid = getuid(); st->st_gid = getgid(); } @@ -226,7 +226,7 @@ static char *strip_trailing_slash(char *fn, int *is_dir) { assert(fn); assert(is_dir); assert(l > 0); - + if ((*is_dir = (fn[l-1] == '/'))) fn[l-1] = 0; @@ -247,7 +247,7 @@ static void getdir_propfind_callback(void *userdata, const ne_uri *u, const ne_p if (strcmp(fn, f->root) && fn[0]) { char *h; - + if ((t = strrchr(fn, '/'))) t++; else @@ -266,15 +266,15 @@ static void getdir_cache_callback( const char *root, const char *fn, void *user) { - + struct fill_info *f = user; char path[PATH_MAX]; char *h; assert(f); - + snprintf(path, sizeof(path), "%s/%s", !strcmp(root, "/") ? "" : root, fn); - + f->filler(f->buf, h = ne_path_unescape(fn), NULL, 0); free(h); } @@ -285,7 +285,7 @@ static int dav_readdir( fuse_fill_dir_t filler, __unused off_t offset, __unused struct fuse_file_info *fi) { - + struct fill_info f; ne_session *session; @@ -300,17 +300,17 @@ static int dav_readdir( filler(buf, ".", NULL, 0); filler(buf, "..", NULL, 0); - + if (dir_cache_enumerate(path, getdir_cache_callback, &f) < 0) { if (debug) fprintf(stderr, "DIR-CACHE-MISS\n"); - - if (!(session = session_get(1))) + + if (!(session = session_get(1))) return -EIO; dir_cache_begin(path); - + if (simple_propfind_with_redirect(session, path, NE_DEPTH_ONE, query_properties, getdir_propfind_callback, &f) != NE_OK) { dir_cache_finish(path, 2); fprintf(stderr, "PROPFIND failed: %s\n", ne_get_error(session)); @@ -333,7 +333,7 @@ static void getattr_propfind_callback(void *userdata, const ne_uri *u, const ne_ strncpy(fn, u->path, sizeof(fn)); fn[sizeof(fn)-1] = 0; strip_trailing_slash(fn, &is_dir); - + fill_stat(st, results, is_dir); stat_cache_set(fn, st); } @@ -341,7 +341,7 @@ static void getattr_propfind_callback(void *userdata, const ne_uri *u, const ne_ static int get_stat(const char *path, struct stat *stbuf) { ne_session *session; - if (!(session = session_get(1))) + if (!(session = session_get(1))) return -EIO; if (stat_cache_get(path, stbuf) == 0) { @@ -377,7 +377,7 @@ static int dav_unlink(const char *path) { if (debug) fprintf(stderr, "unlink(%s)\n", path); - if (!(session = session_get(1))) + if (!(session = session_get(1))) return -EIO; if ((r = get_stat(path, &st)) < 0) @@ -385,7 +385,7 @@ static int dav_unlink(const char *path) { if (!S_ISREG(st.st_mode)) return -EISDIR; - + if (ne_delete(session, path)) { fprintf(stderr, "DELETE failed: %s\n", ne_get_error(session)); return -ENOENT; @@ -393,7 +393,7 @@ static int dav_unlink(const char *path) { stat_cache_invalidate(path); dir_cache_invalidate_parent(path); - + return 0; } @@ -408,7 +408,7 @@ static int dav_rmdir(const char *path) { if (debug) fprintf(stderr, "rmdir(%s)\n", path); - if (!(session = session_get(1))) + if (!(session = session_get(1))) return -EIO; if ((r = get_stat(path, &st)) < 0) @@ -418,7 +418,7 @@ static int dav_rmdir(const char *path) { return -ENOTDIR; snprintf(fn, sizeof(fn), "%s/", path); - + if (ne_delete(session, fn)) { fprintf(stderr, "DELETE failed: %s\n", ne_get_error(session)); return -ENOENT; @@ -439,11 +439,11 @@ static int dav_mkdir(const char *path, __unused mode_t mode) { if (debug) fprintf(stderr, "mkdir(%s)\n", path); - if (!(session = session_get(1))) + if (!(session = session_get(1))) return -EIO; snprintf(fn, sizeof(fn), "%s/", path); - + if (ne_mkcol(session, fn)) { fprintf(stderr, "MKCOL failed: %s\n", ne_get_error(session)); return -ENOENT; @@ -451,7 +451,7 @@ static int dav_mkdir(const char *path, __unused mode_t mode) { stat_cache_invalidate(path); dir_cache_invalidate_parent(path); - + return 0; } @@ -480,13 +480,13 @@ static int dav_rename(const char *from, const char *to) { snprintf(fn, sizeof(fn), "%s/", from); from = fn; } - + if (ne_move(session, 1, from, to)) { fprintf(stderr, "MOVE failed: %s\n", ne_get_error(session)); r = -ENOENT; goto finish; } - + stat_cache_invalidate(from); stat_cache_invalidate(to); @@ -496,7 +496,7 @@ static int dav_rename(const char *from, const char *to) { finish: free(_from); - + return r; } @@ -514,7 +514,7 @@ static int dav_release(const char *path, __unused struct fuse_file_info *info) { r = -EIO; goto finish; } - + if (!(f = file_cache_get(path))) { fprintf(stderr, "release() called for closed file\n"); r = -EFAULT; @@ -529,7 +529,7 @@ static int dav_release(const char *path, __unused struct fuse_file_info *info) { finish: if (f) file_cache_unref(f); - + return r; } @@ -559,7 +559,7 @@ static int dav_fsync(const char *path, __unused int isdatasync, __unused struct } finish: - + if (f) file_cache_unref(f); @@ -575,7 +575,7 @@ static int dav_mknod(const char *path, mode_t mode, __unused dev_t rdev) { if (debug) fprintf(stderr, "mknod(%s)\n", path); - if (!(session = session_get(1))) + if (!(session = session_get(1))) return -EIO; if (!S_ISREG(mode)) @@ -584,9 +584,9 @@ static int dav_mknod(const char *path, mode_t mode, __unused dev_t rdev) { snprintf(tempfile, sizeof(tempfile), "%s/fusedav-empty-XXXXXX", "/tmp"); if ((fd = mkstemp(tempfile)) < 0) return -errno; - + unlink(tempfile); - + if (ne_put(session, path, fd)) { fprintf(stderr, "mknod:PUT failed: %s\n", ne_get_error(session)); close(fd); @@ -620,12 +620,12 @@ static int dav_open(const char *path, 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; - + path = path_cvt(path); - + if (debug) fprintf(stderr, "read(%s, %lu+%lu)\n", path, (unsigned long) offset, (unsigned long) size); - + if (!(f = file_cache_get(path))) { fprintf(stderr, "read() called for closed file\n"); r = -EFAULT; @@ -640,7 +640,7 @@ static int dav_read(const char *path, char *buf, size_t size, off_t offset, __un finish: if (f) file_cache_unref(f); - + return r; } @@ -663,11 +663,11 @@ static int dav_write(const char *path, const char *buf, size_t size, off_t offse r = -errno; goto finish; } - + finish: if (f) file_cache_unref(f); - + return r; } @@ -676,16 +676,16 @@ static int dav_truncate(const char *path, off_t size) { void *f = NULL; int r = 0; ne_session *session; - + path = path_cvt(path); - + if (debug) fprintf(stderr, "truncate(%s, %lu)\n", path, (unsigned long) size); if (!(session = session_get(1))) r = -EIO; goto finish; - + if (!(f = file_cache_get(path))) { fprintf(stderr, "truncate() called for closed file\n"); r = -EFAULT; @@ -700,7 +700,7 @@ static int dav_truncate(const char *path, off_t size) { finish: if (f) file_cache_unref(f); - + return r; } @@ -710,15 +710,15 @@ static int dav_utime(const char *path, struct utimbuf *buf) { ne_proppatch_operation ops[2]; int r = 0; char *date; - + assert(path); assert(buf); path = path_cvt(path); - + if (debug) fprintf(stderr, "utime(%s, %lu, %lu)\n", path, (unsigned long) buf->actime, (unsigned long) buf->modtime); - + ops[0].name = &getlastmodified; ops[0].type = ne_propset; ops[0].value = date = ne_rfc1123_date(buf->modtime); @@ -734,12 +734,12 @@ static int dav_utime(const char *path, struct utimbuf *buf) { r = -ENOTSUP; goto finish; } - + stat_cache_invalidate(path); finish: free(date); - + return r; } @@ -765,7 +765,7 @@ static int listxattr_iterator( struct listxattr_info *l = userdata; int n; - + assert(l); if (!value || !pname) @@ -773,24 +773,24 @@ static int listxattr_iterator( if (l->list) { n = snprintf(l->list, l->space, "user.webdav(%s;%s)", pname->nspace, pname->name) + 1; - + if (n >= (int) l->space) { l->size += l->space; l->space = 0; return 1; - + } else { l->size += n; l->space -= n; - + if (l->list) l->list += n; - + return 0; } } else { /* Calculate space */ - + l->size += strlen(pname->nspace) + strlen(pname->name) + 15; return 0; } @@ -805,10 +805,10 @@ static int dav_listxattr( const char *path, char *list, size_t size) { - + ne_session *session; struct listxattr_info l; - + assert(path); @@ -828,14 +828,14 @@ static int dav_listxattr( l.space -= sizeof(MIME_XATTR); l.size += sizeof(MIME_XATTR); } - + } else { l.list = NULL; l.space = 0; l.size = sizeof(MIME_XATTR); } - - if (!(session = session_get(1))) + + if (!(session = session_get(1))) return -EIO; if (simple_propfind_with_redirect(session, path, NE_DEPTH_ZERO, NULL, listxattr_propfind_callback, &l) != NE_OK) { @@ -864,7 +864,7 @@ static int getxattr_iterator( __unused const ne_status *status) { struct getxattr_info *g = userdata; - + assert(g); if (!value || !pname) @@ -886,11 +886,11 @@ static int getxattr_iterator( g->size = l; } else { /* Calculate space */ - + g->size = strlen(value); return 0; } - + return 0; } @@ -902,13 +902,13 @@ static void getxattr_propfind_callback(void *userdata, __unused const ne_uri *u, static int parse_xattr(const char *name, char *dnspace, size_t dnspace_length, char *dname, size_t dname_length) { char *e; size_t k; - + assert(name); assert(dnspace); assert(dnspace_length); assert(dname); assert(dname_length); - + if (strncmp(name, "user.webdav(", 12) || name[strlen(name)-1] != ')' || !(e = strchr(name+12, ';'))) @@ -921,7 +921,7 @@ static int parse_xattr(const char *name, char *dnspace, size_t dnspace_length, c dnspace[k] = 0; e++; - + if ((k = strlen(e)) > dname_length-1) return -1; @@ -944,7 +944,7 @@ static int dav_getxattr( struct getxattr_info g; ne_propname props[2]; char dnspace[128], dname[128]; - + assert(path); path = path_cvt(path); @@ -972,7 +972,7 @@ static int dav_getxattr( } g.propname = props[0]; - + if (!(session = session_get(1))) return -EIO; @@ -1007,7 +1007,7 @@ static int dav_setxattr( path = path_cvt(path); name = fix_xattr(name); - + if (debug) fprintf(stderr, "setxattr(%s, %s)\n", path, name); @@ -1015,7 +1015,7 @@ static int dav_setxattr( r = ENOTSUP; goto finish; } - + if (parse_xattr(name, dnspace, sizeof(dnspace), dname, sizeof(dname)) < 0) { r = -ENOATTR; goto finish; @@ -1023,40 +1023,40 @@ static int dav_setxattr( propname.nspace = dnspace; propname.name = dname; - + /* Add trailing NUL byte if required */ if (!memchr(value, 0, size)) { value_fixed = malloc(size+1); assert(value_fixed); - + memcpy(value_fixed, value, size); value_fixed[size] = 0; value = value_fixed; } - + ops[0].name = &propname; ops[0].type = ne_propset; ops[0].value = value; - + ops[1].name = NULL; if (!(session = session_get(1))) { r = -EIO; goto finish; } - + if (proppatch_with_redirect(session, path, ops)) { fprintf(stderr, "PROPPATCH failed: %s\n", ne_get_error(session)); r = -ENOTSUP; goto finish; } - + stat_cache_invalidate(path); finish: free(value_fixed); - + return r; } @@ -1072,7 +1072,7 @@ static int dav_removexattr(const char *path, const char *name) { path = path_cvt(path); name = fix_xattr(name); - + if (debug) fprintf(stderr, "removexattr(%s, %s)\n", path, name); @@ -1083,28 +1083,28 @@ static int dav_removexattr(const char *path, const char *name) { propname.nspace = dnspace; propname.name = dname; - + ops[0].name = &propname; ops[0].type = ne_propremove; ops[0].value = NULL; - + ops[1].name = NULL; if (!(session = session_get(1))) { r = -EIO; goto finish; } - + if (proppatch_with_redirect(session, path, ops)) { fprintf(stderr, "PROPPATCH failed: %s\n", ne_get_error(session)); r = -ENOTSUP; goto finish; } - + stat_cache_invalidate(path); finish: - + return r; } @@ -1113,14 +1113,14 @@ static int dav_chmod(const char *path, mode_t mode) { const ne_propname executable = { "http://apache.org/dav/props/", "executable" }; ne_proppatch_operation ops[2]; int r = 0; - + assert(path); path = path_cvt(path); - + if (debug) fprintf(stderr, "chmod(%s, %04o)\n", path, mode); - + ops[0].name = &executable; ops[0].type = ne_propset; ops[0].value = mode & 0111 ? "T" : "F"; @@ -1136,11 +1136,11 @@ static int dav_chmod(const char *path, mode_t mode) { r = -ENOTSUP; goto finish; } - + stat_cache_invalidate(path); finish: - + return r; } @@ -1173,7 +1173,7 @@ static void usage(char *argv0) { e++; else e = argv0; - + fprintf(stderr, "%s [-hDL] [-t SECS] [-u USERNAME] [-p PASSWORD] [-o OPTIONS] URL MOUNTPOINT\n" "\t-h Show this help\n" @@ -1198,21 +1198,21 @@ static void empty_handler(__unused int sig) {} static int setup_signal_handlers(void) { struct sigaction sa; sigset_t m; - + sa.sa_handler = exit_handler; sigemptyset(&(sa.sa_mask)); sa.sa_flags = 0; - + if (sigaction(SIGHUP, &sa, NULL) == -1 || sigaction(SIGINT, &sa, NULL) == -1 || sigaction(SIGTERM, &sa, NULL) == -1) { - + fprintf(stderr, "Cannot set exit signal handlers: %s\n", strerror(errno)); return -1; } - + sa.sa_handler = SIG_IGN; - + if (sigaction(SIGPIPE, &sa, NULL) == -1) { fprintf(stderr, "Cannot set ignored signals: %s\n", strerror(errno)); return -1; @@ -1234,7 +1234,7 @@ static int setup_signal_handlers(void) { sigaddset(&m, SIGPIPE); sigaddset(&m, SIGUSR1); pthread_sigmask(SIG_SETMASK, &m, NULL); - + return 0; } @@ -1243,7 +1243,7 @@ static int create_lock(void) { char _owner[64], *owner; int i; int ret; - + lock = ne_lock_create(); assert(lock); @@ -1258,7 +1258,7 @@ static int create_lock(void) { } ne_fill_server_uri(session, &lock->uri); - + lock->uri.path = strdup(base_directory); lock->depth = NE_DEPTH_INFINITE; lock->timeout = lock_timeout; @@ -1266,7 +1266,7 @@ static int create_lock(void) { if (debug) fprintf(stderr, "Acquiring lock...\n"); - + for (i = 0; i < MAX_REDIRECTS; i++) { const ne_uri *u; @@ -1295,9 +1295,9 @@ static int create_lock(void) { lock_store = ne_lockstore_create(); assert(lock_store); - + ne_lockstore_add(lock_store, lock); - + return 0; } @@ -1337,7 +1337,7 @@ static void *lock_thread_func(__unused void *p) { while (!lock_thread_exit) { int r, t; - + lock->timeout = lock_timeout; pthread_sigmask(SIG_BLOCK, &block, NULL); @@ -1357,7 +1357,7 @@ static void *lock_thread_func(__unused void *p) { t = 1; sleep(t); } - + if (debug) fprintf(stderr, "lock_thread exiting\n"); @@ -1373,19 +1373,19 @@ int main(int argc, char *argv[]) { pthread_t lock_thread; int lock_thread_running = 0; int enable_locking = 0; - + static char *mount_args_strings[] = { NULL, /* path*/ NULL, /* -o */ NULL, NULL}; - + struct fuse_args mount_args = { .argc = 1, .argv = mount_args_strings, .allocated = 0 }; - + if (ne_sock_init()) { fprintf(stderr, "Failed to initialize libneon.\n"); goto finish; @@ -1397,7 +1397,7 @@ int main(int argc, char *argv[]) { fprintf(stderr, "fusedav requires libneon built with SSL, SSL thread safety and LFS enabled.\n"); goto finish; } - + mask = umask(0); umask(mask); @@ -1405,18 +1405,18 @@ int main(int argc, char *argv[]) { if (setup_signal_handlers() < 0) goto finish; - + while ((c = getopt(argc, argv, "hu:p:Do:Lt:")) != -1) { switch(c) { case 'u': u = optarg; break; - + case 'p': p = optarg; break; - + case 'D': debug = !debug; break; @@ -1435,7 +1435,7 @@ int main(int argc, char *argv[]) { goto finish; } break; - + case 'h': ret = 0; @@ -1471,7 +1471,7 @@ int main(int argc, char *argv[]) { mount_args_strings[2] = o; mount_args.argc += 2; } - + if ((fuse_fd = fuse_mount(mountpoint, &mount_args)) < 0) { fprintf(stderr, "Failed to mount FUSE file system.\n"); goto finish; @@ -1481,26 +1481,26 @@ int main(int argc, char *argv[]) { fprintf(stderr, "Failed to create FUSE object.\n"); goto finish; } - + if (enable_locking && create_lock() >= 0) { int r; if ((r = pthread_create(&lock_thread, NULL, lock_thread_func, NULL)) < 0) { fprintf(stderr, "pthread_create(): %s\n", strerror(r)); goto finish; } - + lock_thread_running = 1; } - + fuse_loop_mt(fuse); if (debug) fprintf(stderr, "Exiting cleanly.\n"); - + ret = 0; - + finish: - + if (lock_thread_running) { lock_thread_exit = 1; pthread_kill(lock_thread, SIGUSR1); @@ -1511,13 +1511,13 @@ finish: if (fuse) fuse_destroy(fuse); - + if (fuse_fd >= 0) fuse_unmount(mountpoint); - + file_cache_close_all(); cache_free(); session_free(); - + return ret; }