Extended the functionality of expandPath().

It now performs certain expanding actions depending on an extra argument.
It also can expand relative paths to absolute paths now, hopefully
fixing bug #456.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1185 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/src/options.c

@@ -83,7 +83,7 @@ prepareConfigDir (void) {
 	static uio_AutoMount *autoMount[] = { NULL };
 	uio_MountHandle *contentHandle;
 
-	if (expandPath (buf, PATH_MAX - 13, CONFIGDIR) == -1)
+	if (expandPath (buf, PATH_MAX - 13, CONFIGDIR, EP_ALL_SYSTEM) == -1)
 	{
 		// Doesn't have to be fatal, but might mess up things when saving
 		// config files.
@@ -115,7 +115,7 @@ prepareConfigDir (void) {
 void
 prepareSaveDir (void) {
 	char buf[PATH_MAX];
-	if (expandPath (buf, PATH_MAX - 13, SAVEDIR) == -1)
+	if (expandPath (buf, PATH_MAX - 13, SAVEDIR, EP_ALL_SYSTEM) == -1)
 	{
 		// Doesn't have to be fatal, but might mess up things when saving
 		// config files.
@@ -142,7 +142,7 @@ void
 prepareMeleeDir (void) {
 	char buf[PATH_MAX];
 
-	if (expandPath (buf, PATH_MAX - 13, MELEEDIR) == -1)
+	if (expandPath (buf, PATH_MAX - 13, MELEEDIR, EP_ALL_SYSTEM) == -1)
 	{
 		// Doesn't have to be fatal, but might mess up things when saving
 		// config files.

sc2/src/sc2code/libs/file.h

@@ -30,11 +30,33 @@ void unInitTempDir (void);
 char *tempFilePath (const char *filename);
 extern uio_DirHandle *tempDir;
 
+
 // from dirs.h
 int mkdirhier (const char *path);
 const char *getHomeDir (void);
 int createDirectory (const char *dir, int mode);
-int expandPath (char *dest, size_t len, const char *src);
+
+int expandPath (char *dest, size_t len, const char *src, int what);
+// values for 'what':
+#define EP_HOME      1
+		// Expand '~' for home dirs.
+#define EP_ABSOLUTE  2
+		// Make paths absolute
+#define EP_ENVVARS   4
+		// Expand environment variables.
+#define EP_DOTS      8
+		// Process '..' and '.' (not implemented)
+#define EP_SLASHES   16
+		// Change (Windows style) backslashes to (Unix style) slashes.
+#define EP_ALL (EP_HOME | EP_ENVVARS | EP_ABSOLUTE | EP_DOTS | EP_SLASHES)
+		// Everything
+// Everything except Windows style backslashes on Unix Systems:
+#ifdef WIN32
+#	define EP_ALL_SYSTEM (EP_HOME | EP_ENVVARS | EP_ABSOLUTE | EP_DOTS | \
+		EP_SLASHES)
+#else
+#	define EP_ALL_SYSTEM (EP_HOME | EP_ENVVARS | EP_ABSOLUTE | EP_DOTS)
+#endif
 
 // from files.h
 int copyFile (uio_DirHandle *srcDir, const char *srcName,

sc2/src/sc2code/libs/file/dirs.c

@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 #include "port.h"
 #include "config.h"
 #include "filintrn.h"
@@ -38,6 +39,10 @@
 #define APPDATA_FALLBACK
 
 
+static char *expandPathAbsolute (char *dest, size_t destLen, char first,
+		int what);
+
+
 int
 createDirectory(const char *dir, int mode)
 {
@@ -162,8 +167,10 @@ getHomeDir (void)
 
 // Expand ~/ in a path, and replaces \ by / on Windows.
 // Environment variable parsing could be added here if we need it.
+// Returns 0 on success.
+// Returns -1 on failure, setting errno.
 int
-expandPath (char *dest, size_t len, const char *src)
+expandPath (char *dest, size_t len, const char *src, int what)
 {
 	char *destend;
 	char *destptr;
@@ -179,6 +186,9 @@ expandPath (char *dest, size_t len, const char *src)
 
 	destptr = dest;
 	destend = dest + len;
+
+	if (what & EP_HOME)
+	{
 		if (src[0] == '~')
 		{
 			const char *home;
@@ -198,12 +208,39 @@ expandPath (char *dest, size_t len, const char *src)
 			}
 			homelen = strlen (home);
 		
+			if (what & EP_ABSOLUTE) {
+				dest = expandPathAbsolute (dest, destend - dest,
+						home[0], what);
+				if (dest == NULL)
+				{
+					// errno is set
+					return -1;
+				}
+				what &= ~EP_ABSOLUTE;
+						// The part after the '~' should not be seen
+						// as absolute.
+			}
+
 			CHECKLEN (homelen);
 			memcpy (destptr, home, homelen);
 			destptr += homelen;
 			src++;  /* skip the ~ */
 		}
+	}
 	
+	if (what & EP_ABSOLUTE)
+	{
+		destptr = expandPathAbsolute (destptr, destend - destptr, src[0],
+				what);
+		if (destptr == NULL)
+		{
+			// errno is set
+			return -1;
+		}
+	}
+	
+	if (what & EP_ENVVARS)
+	{
 		while (*src != '\0')
 		{
 			switch (*src)
@@ -299,12 +336,18 @@ expandPath (char *dest, size_t len, const char *src)
 					CHECKLEN(1);
 					*(destptr++) = *(src++);
 					break;
-		}
+			}  // switch
-	}
+		}  // while
 		*destptr = '\0';
+	}  // if (what & EP_ENVVARS)
+	else
+	{
+		strcpy (destptr, src);
+	}
 	
-#ifdef WIN32
+	if (EP_SLASHES)
-	/* Replacing backslashes in path by slashes in Windows. */
+	{
+		/* Replacing backslashes in path by slashes. */
 		destptr = dest;
 		while (*destptr != '\0')
 		{
@@ -312,7 +355,48 @@ expandPath (char *dest, size_t len, const char *src)
 				*destptr = '/';
 			destptr++;
 		}
-#endif
+	}
 	return 0;
 }
 
+// helper for expandPath, expanding an absolute path
+// returns a pointer to the end of the filled in part of dest.
+static char *
+expandPathAbsolute (char *dest, size_t destLen, char first, int what)
+{
+	if (first == '/' || ((what & EP_SLASHES) && first == '\\')) {
+		// Path is already absolute; nothing to do
+		return dest;
+	}
+
+	// Path is not already absolute; we've got work to do.
+	if (getcwd (dest, destLen) == NULL)
+	{
+		// errno is set
+		return NULL;
+	}
+
+	{
+		size_t tempLen;
+		tempLen = strlen (dest);
+		assert (tempLen > 0);
+		dest += tempLen;
+		destLen -= tempLen;
+	}
+	if (dest[-1] != '/'
+#ifdef WIN32
+			&& dest[-1] != '\\'
+#endif
+			)
+	{
+		// Need to add a slash.
+		// There's always space, as we overwrite the '\0' that getcwd()
+		// always returns.
+		dest[0] = '/';
+		dest++;
+		destLen--;
+	}
+	return dest;
+}
+
+