From 3652e93ad88d531993ae69c970dc16ddc843c878 Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Fri, 19 Sep 2003 01:07:47 +0000
Subject: [PATCH] Accept spaces in argument to '--contentdir'.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1242 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog      |  1 +
 sc2/src/options.c  |  2 +-
 sc2/src/options.h  |  2 +-
 sc2/src/starcon2.c | 12 ++++++------
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index c138d62b2..416ee4aa1 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.4:
+- Accept spaces in --contentdir argument. - SvdB
 - Separated and abstracted sound buffer-tagging and trackplayer
   clip/subtitle chaining -Alex
 - Abstracted the recursive mutexes in MixSDL and DCQ code -Michael
diff --git a/sc2/src/options.c b/sc2/src/options.c
index f39011d9d..a2263f599 100644
--- a/sc2/src/options.c
+++ b/sc2/src/options.c
@@ -55,7 +55,7 @@ static void mountDirZips (uio_MountHandle *contentHandle,
 		uio_DirHandle *dirHandle);
 
 void
-prepareContentDir (char *contentDirName, const char **addons)
+prepareContentDir (const char *contentDirName, const char **addons)
 {
 	const char *testfile = "version";
 	char cwd[PATH_MAX];
diff --git a/sc2/src/options.h b/sc2/src/options.h
index f49184fea..755e7fd9c 100644
--- a/sc2/src/options.h
+++ b/sc2/src/options.h
@@ -44,7 +44,7 @@ extern uio_DirHandle *configDir;
 extern uio_DirHandle *saveDir;
 extern uio_DirHandle *meleeDir;
 
-void prepareContentDir (char *contentDirName, const char **addons);
+void prepareContentDir (const char *contentDirName, const char **addons);
 void prepareConfigDir(void);
 void prepareMeleeDir(void);
 void prepareSaveDir(void);
diff --git a/sc2/src/starcon2.c b/sc2/src/starcon2.c
index e9f01c27e..44dc7d750 100644
--- a/sc2/src/starcon2.c
+++ b/sc2/src/starcon2.c
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
 	int width = 640, height = 480, bpp = 16;
 	int vol;
 	int val;
-	char contentdir[1000];
+	const char *contentDir;
 	float gamma = 1.0;
 	int gammaset = 0;
 	const char **addons;
@@ -127,11 +127,11 @@ main (int argc, char *argv[])
 			__DATE__, __TIME__);
 
 #ifdef CONTENTDIR
-	strcpy (contentdir, CONTENTDIR);
+	contentDir = CONTENTDIR;
 #elif defined (win32)
-	strcpy (contentdir, "../../content");
+	contentDir = "../../content";
 #else
-	strcpy (contentdir, "content");
+	contentDir = "content";
 #endif
 
 	/* InitThreadSystem should come before anything else.
@@ -187,7 +187,7 @@ main (int argc, char *argv[])
 				gfxflags |= TFB_GFXFLAGS_SHOWFPS;
 			break;
 			case 'n':
-				sscanf(optarg, "%s", contentdir);
+				contentDir = optarg;
 			break;
 			case 'M':
 				sscanf(optarg, "%d", &vol);
@@ -338,7 +338,7 @@ main (int argc, char *argv[])
 	}
 	
 	initIO();
-	prepareContentDir (contentdir, addons);
+	prepareContentDir (contentDir, addons);
 	HFree ((void*)addons);
 	prepareConfigDir ();
 	prepareMeleeDir ();