diff -r 40a3b13ffc9d -r 9dfc861273e5 src/evfuse.c
--- a/src/evfuse.c	Tue Nov 18 02:06:52 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "evfuse.h"
-#include "lib/log.h"
-
-struct evfuse {
-    // our mountpoint
-    char *mountpoint;
-
-    // the /dev/fuse fd/channel that we get from fuse_mount
-    struct fuse_chan *chan;
-
-    // the session that we use to process the fuse stuff
-    struct fuse_session *session;
-
-    // the event that we use to receive requests
-    struct event *ev;
-    
-    // what our receive-message length is
-    size_t recv_size;
-
-    // the buffer that we use to receive events
-    char *recv_buf;
-};
-
-// prototypes
-void evfuse_close (struct evfuse *ctx);
-
-static void _evfuse_ev_read (evutil_socket_t fd, short what, void *arg) {
-    struct evfuse *ctx = arg;
-    struct fuse_chan *ch = ctx->chan;
-    int res;
-    
-    // loop until we complete a recv
-    do {
-        // a new fuse_req is available
-        res = fuse_chan_recv(&ch, ctx->recv_buf, ctx->recv_size);
-    } while (res == -EINTR);
-
-    if (res == 0)
-        ERROR("fuse_chan_recv gave EOF");
-
-    if (res < 0 && res != -EAGAIN)
-        ERROR("fuse_chan_recv failed: %s", strerror(-res));
-    
-    if (res > 0) {
-        DEBUG("got %d bytes from /dev/fuse", res);
-
-        // received a fuse_req, so process it
-        fuse_session_process(ctx->session, ctx->recv_buf, res, ch);
-    }
-    
-    // reschedule
-    if (event_add(ctx->ev, NULL))
-        PERROR("event_add");
-
-    // ok, wait for the next event
-    return;
-
-error:
-    // close, but don't free
-    evfuse_close(ctx);
-}
-
-struct evfuse *evfuse_new (struct event_base *evbase, struct fuse_args *args, struct fuse_lowlevel_ops *llops, void *cb_data) {
-    struct evfuse *ctx = NULL;
-    int multithreaded, foreground;
-    
-    // allocate our context
-    if ((ctx = calloc(1, sizeof(*ctx))) == NULL)
-        ERROR("calloc");
-
-    // parse the commandline for the mountpoint
-    if (fuse_parse_cmdline(args, &ctx->mountpoint, &multithreaded, &foreground) == -1)
-        ERROR("fuse_parse_cmdline");
-
-    // mount it
-    if ((ctx->chan = fuse_mount(ctx->mountpoint, args)) == NULL)
-        PERROR("fuse_mount_common");
-
-    // the receive buffer stufff
-    ctx->recv_size = fuse_chan_bufsize(ctx->chan);
-
-    // allocate the recv buffer
-    if ((ctx->recv_buf = malloc(ctx->recv_size)) == NULL)
-        ERROR("malloc");
-    
-    // allocate a low-level session
-    if ((ctx->session = fuse_lowlevel_new(args, llops, sizeof(*llops), cb_data)) == NULL)
-        PERROR("fuse_lowlevel_new");
-    
-    // add the channel to the session
-    // this isn't strictly necessary, but let's do it anyways
-    fuse_session_add_chan(ctx->session, ctx->chan);
-    
-    // now, we can start listening for events on the channel
-    if ((ctx->ev = event_new(evbase, fuse_chan_fd(ctx->chan), EV_READ, &_evfuse_ev_read, ctx)) == NULL)
-        ERROR("event_new");
-
-    if (event_add(ctx->ev, NULL))
-        PERROR("event_add");
-
-    // and then we wait
-    return ctx;
-
-error:
-    evfuse_free(ctx);
-
-    return NULL;
-}
-
-void evfuse_close (struct evfuse *ctx) {
-    if (ctx->ev) {
-        // remove our event
-        if (event_del(ctx->ev))
-            PWARNING("event_del");
-
-        ctx->ev = NULL;
-    }
-
-    if (ctx->session) {
-        // remove the chan
-        fuse_session_remove_chan(ctx->chan);
-
-        // destroy the session
-        fuse_session_destroy(ctx->session);
-
-        ctx->session = NULL;
-    }
-
-    if (ctx->chan) {
-        // unmount
-        fuse_unmount(ctx->mountpoint, ctx->chan);
-
-        ctx->chan = NULL;
-    }
-
-    // free
-    free(ctx->recv_buf); ctx->recv_buf = NULL;
-    free(ctx->mountpoint); ctx->mountpoint = NULL;
-}
-
-void evfuse_free (struct evfuse *ctx) {
-    if (ctx) {
-        evfuse_close(ctx);
-
-        free(ctx);
-    }
-}
-