summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Ørbekk <orbekk@pvv.ntnu.no>2008-08-15 21:30:11 +0200
committerKjetil Ørbekk <orbekk@pvv.ntnu.no>2008-08-15 21:30:11 +0200
commit194feb8f68c6c92e14302471177adf40fc357e93 (patch)
tree7a222b68bf8fe7240bc40626350433db4a44160e
parentd94d0a8f5b3d5847cf70da02d5aa5522cd7b4c51 (diff)
- Removed the musicfolder argument
-rwxr-xr-xsrc/mfs_vnops.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/mfs_vnops.c b/src/mfs_vnops.c
index ccd44b3..1b71b38 100755
--- a/src/mfs_vnops.c
+++ b/src/mfs_vnops.c
@@ -349,14 +349,15 @@ static struct fuse_operations mfs_ops = {
static int musicfs_opt_proc (void *data, const char *arg, int key,
struct fuse_args *outargs)
{
- static int musicpath_set = 0;
+ /* Using config now. This is how we added the additional parameter: */
+ /* static int musicpath_set = 0; */
+ /* if (key == FUSE_OPT_KEY_NONOPT && !musicpath_set) { */
+ /* /\* The source directory isn't already set, let's do it *\/ */
+ /* strcpy(musicpath, arg); */
+ /* musicpath_set = 1; */
+ /* return (0); */
+ /* } */
- if (key == FUSE_OPT_KEY_NONOPT && !musicpath_set) {
- /* The source directory isn't already set, let's do it */
- strcpy(musicpath, arg);
- musicpath_set = 1;
- return (0);
- }
return (1);
}
@@ -364,13 +365,10 @@ int
mfs_run(int argc, char **argv)
{
int ret;
- /*
- * XXX: Build index of mp3's.
- */
/* Update tables. */
- if (argc < 2) {
- fprintf(stderr, "Usage: %s <musicfolder> <mountpoint>\n", argv[0]);
+ if (argc < 1) {
+ fprintf(stderr, "Usage: %s <mountpoint>\n", argv[0]);
return (-1);
}