- Moved $HOME function to mfs_subr

3 files changed, 37 insertions, 25 deletions

diff --git a/include/musicfs.h b/include/musicfs.h
index 3da10da..a376f4d 100644
--- a/include/musicfs.h
+++ b/include/musicfs.h
@@ -78,6 +78,7 @@ void	 mfs_lookup_album(const char *, struct filler_data *);
 char	*mfs_gettoken(const char *, int);
 int	 mfs_numtoken(const char *);
 int      mfs_file_data_for_path(const char *, void *);
+char    *mfs_get_home_path(const char *);
 
 enum mfs_filetype mfs_get_filetype(const char *);
 #endif
diff --git a/src/mfs_subr.c b/src/mfs_subr.c
index e8f28b2..4ee807b 100644
--- a/src/mfs_subr.c
+++ b/src/mfs_subr.c
@@ -50,6 +50,33 @@ struct lookuphandle {
 
 sqlite3 *handle;
 
+/*
+ * Returns the path to $HOME[/extra]
+ */
+char *mfs_get_home_path(const char *extra)
+{
+	int hlen, exlen = 0;
+	char *res;
+	const char *home = getenv("HOME");
+
+	hlen = strlen(home);
+	if (extra)
+		exlen = strlen(extra);
+
+	res = malloc(sizeof(char) * (hlen + exlen + 2));
+	strcpy(res, home);
+
+	if (extra) {
+		res[hlen] = '/';
+		strcpy(res + hlen + 1, extra);
+	}
+
+	return (res);
+}
+
+/*
+ * Insert a musicpath into the database.
+ */
 int
 mfs_insert_path(char *path)
 {
@@ -89,11 +116,19 @@ mfs_insert_path(char *path)
 	return (0);
 }
 
+/*
+ * Reload the configuration from $HOME/.mfsrc
+ */
+int
+mfs_reload_config()
+{
+	return (0);
+}
+
 int
 mfs_initscan(char *musicpath)
 {
 	int error;
-	sqlite3_stmt *st;
 
 	/* Open database. */
 	error = sqlite3_open(DBNAME, &handle);
diff --git a/src/mfs_vnops.c b/src/mfs_vnops.c
index 87ade5a..ccd44b3 100755
--- a/src/mfs_vnops.c
+++ b/src/mfs_vnops.c
@@ -42,30 +42,6 @@
 char musicpath[MAXPATHLEN]; // = "/home/lulf/dev/musicfs/music";
 char *logpath = "/home/lulf/dev/musicfs/musicfs.log";
 
-/*
- * Returns the path to $HOME[/extra]
- */
-char *mfs_get_home_path(const char *extra)
-{
-	int hlen, exlen = 0;
-	char *res;
-	const char *home = getenv("HOME");
-
-	hlen = strlen(home);
-	if (extra)
-		exlen = strlen(extra);
-
-	res = malloc(sizeof(char) * (hlen + exlen + 2));
-	strcpy(res, home);
-
-	if (extra) {
-		res[hlen] = '/';
-		strcpy(res + hlen + 1, extra);
-	}
-
-	return (res);
-}
-
 static int mfs_getattr (const char *path, struct stat *stbuf)
 {
 	struct file_data fd;