fix bug #32 mugglei will not run from a linked subfolder

4 files changed, 18 insertions, 12 deletions

diff --git a/HISTORY b/HISTORY
index 3f5eae8..8cf2845 100644
--- a/HISTORY
+++ b/HISTORY
@@ -372,3 +372,4 @@ Balke.
 - update README.* about MySQL with utf8
 - importing subdirectories with mugglei: sorting by folder did not work for
   those tracks. Found by Thomas Balke.
+- fix bug #32 reported by Anonymous: mugglei will not run from a linked subfolder
diff --git a/mg_db.c b/mg_db.c
index 9be504c..dc85a76 100644
--- a/mg_db.c
+++ b/mg_db.c
@@ -40,6 +40,18 @@ static map <mgKeyTypes, map<string,string> > map_ids;
 
 mgDbServer* DbServer;
 
+const char *
+mugglepath() {
+	char buf[5000];
+	memset(buf,0,5000);
+	if (getenv("PWD"))
+		strncpy(buf,getenv("PWD"),4990);
+	else
+		getcwd(buf,4990);
+	strcat(buf,"/");
+	return strdup(buf);
+}
+
 mgDbServer::mgDbServer() {
 #ifdef HAVE_SQLITE
 	m_server = new mgDbServerSQLite;
@@ -1198,18 +1210,14 @@ mgDb::SyncFile(const char *filename) {
 	mgSQLString c_lang(m_TLAN);
 	mgSQLString c_cddbid(getAlbum(filename,c_album,c_artist));
 
-	char cwd[5000];
-	if (!getcwd(cwd,4999)) {
-		std::cout << "Path too long" << std::endl;
-		exit (1);
-	}
+	const char *cwd = mugglepath();
 	int tldlen = strlen(the_setup.ToplevelDir);
-	strcat(cwd,"/");
 	int cwdlen = strlen(cwd);
 	const char *relpath=cwd;
 	if (cwdlen>tldlen); relpath += tldlen;
 	char *b;
 	msprintf(&b,"%s%s",relpath,cfilename);
+	free((void*)cwd);
 	mgSQLString c_mp3file(b);
 	char *folders[4];
 	char *fbuf=SeparateFolders(b,folders,4);
diff --git a/mg_db.h b/mg_db.h
index eb26c0e..642f38a 100644
--- a/mg_db.h
+++ b/mg_db.h
@@ -39,6 +39,8 @@ strlist& operator+=(strlist&a, strlist b);
 
 string sql_list (string prefix,strlist v,string sep=",",string postfix="");
 
+const char *mugglepath(void);
+
 class mgSQLStringImp
 {
 	public:
diff --git a/mugglei.c b/mugglei.c
index 6aded67..2c34973 100644
--- a/mugglei.c
+++ b/mugglei.c
@@ -64,13 +64,8 @@ import() {
 
 bool
 path_within_tld() {
-	char path[5000];
-	if (!getcwd(path,4999)) {
-		std::cout << "Path too long" << std::endl;
-		exit (1);
-	}
+	const char* path = mugglepath();
 	int tldlen = strlen(the_setup.ToplevelDir);
-	strcat(path,"/");
 	int pathlen = strlen(path);
 	if (pathlen<tldlen)
 		return false;