From b8e5a73d12367281bd9d5ecb6d1a6886582fa0d0 Mon Sep 17 00:00:00 2001
From: Ulf Lilleengen <lulf@carrot.studby.ntnu.no>
Date: Sun, 17 Aug 2008 14:37:05 +0200
Subject: - Simplify mfs_file_data_from_path a lot and rename it to
 mfs_realpath, which   have the objective of looking up the real file path,
 given the musicfs path.

Some thoughts:
Instead of creating a function for each operation we want to do, this change
adds a mfs_lookup_path which allocates a buffer with the real path of the file
we're looking for. This way, we can do the operations we want on the path
externally instead, which is a lot simpler when using it. This also gets rid of
the file_data data structure, and just use a pointer pointer where one is to
allocate the real path.
---
 src/mfs_subr.c | 50 +++++++++++++++-----------------------------------
 1 file changed, 15 insertions(+), 35 deletions(-)

(limited to 'src/mfs_subr.c')

diff --git a/src/mfs_subr.c b/src/mfs_subr.c
index d70bade..6f4c7b6 100644
--- a/src/mfs_subr.c
+++ b/src/mfs_subr.c
@@ -559,22 +559,17 @@ mfs_lookup_finish(struct lookuphandle *lh)
 }
 
 /*
- * Build a file_data struct for a path.
+ * Return the realpath given a path in the musicfs tree.
  *
- * data should be a pointer to a file handle
- * returns 0 on success
+ * Returns pointer to real path or NULL if not found.
  */
-int
-mfs_file_data_for_path(const char *path, void *data) {
-	DEBUG("getting file data for %s\n", path);
-	struct file_data *fd;
-	fd = (struct file_data *)data;
+int 
+mfs_realpath(const char *path, char **realpath) {
+	DEBUG("getting real path for %s\n", path);
 	struct lookuphandle *lh;
 	char *artist, *album, *title;
 
 	lh = NULL;
-	fd->fd = -1;
-	fd->found = 0;
 
 	/* Open a specific track. */
 	if (strncmp(path, "/Tracks", 7) == 0) {
@@ -583,7 +578,7 @@ mfs_file_data_for_path(const char *path, void *data) {
 			title = mfs_gettoken(path, 2);
 			if (title == NULL)
 				break;
-			lh = mfs_lookup_start(0, fd, mfs_lookup_open,
+			lh = mfs_lookup_start(0, realpath, mfs_lookup_path,
 			    "SELECT filepath FROM song "
 			    "WHERE (artistname||' - '||title||'.'||extension) LIKE ?");
 			if (lh == NULL)
@@ -602,7 +597,7 @@ mfs_file_data_for_path(const char *path, void *data) {
 			title = mfs_gettoken(path, 3);
 			if (title == NULL)
 				break;
-			lh = mfs_lookup_start(0, fd, mfs_lookup_open,
+			lh = mfs_lookup_start(0, realpath, mfs_lookup_path,
 			    "SELECT filepath FROM song "
 			    "WHERE (title||'.'||extension) LIKE ? AND "
 			    "album LIKE ?");
@@ -624,7 +619,7 @@ mfs_file_data_for_path(const char *path, void *data) {
 			if (!(artist && album && title)) {
 				break;
 			}
-			lh = mfs_lookup_start(0, fd, mfs_lookup_open,
+			lh = mfs_lookup_start(0, realpath, mfs_lookup_path,
 			    "SELECT filepath FROM song WHERE artistname LIKE ? AND "
 			    "album LIKE ? AND "
 			    "(LTRIM(track||' ')||title||'.'||extension) LIKE ?");
@@ -642,7 +637,8 @@ mfs_file_data_for_path(const char *path, void *data) {
 	if (lh) {
 		mfs_lookup_finish(lh);
 	}
-
+	if (*realpath == NULL)
+		return (-ENOMEM);
 	return 0;
 }
 
@@ -846,31 +842,15 @@ mfs_lookup_list(void *data, const char *str)
 }
 
 /*
- * Lookup a file and open it if found.
- */
-int
-mfs_lookup_open(void *data, const char *str)
-{
-	struct file_data *fd;
-
-	fd = (struct file_data *)data;
-	fd->fd = open(str, O_RDONLY);
-	fd->found = 1;
-	return (1);
-}
-
-/*
- * Stat a file.
- * XXX: watch out for duplicates, we might stat more than once.
+ * Lookup the real path of a file.
  */
 int
-mfs_lookup_stat(void *data, const char *str)
+mfs_lookup_path(void *data, const char *str)
 {
-	struct stat *st;
 
-	st = (struct stat *)data;
-	if (stat(str, st) < 0)
-		return (0);
+	char **path;
+	path = data;
+	*path = strdup(str);
 	return (1);
 }
 
-- 
cgit v1.2.3