From 7866d74e9c43f41aa1cb75dd51ab918b9aa9f638 Mon Sep 17 00:00:00 2001
From: David Griffith <dave@661.org>
Date: Mon, 9 Jul 2012 21:10:26 -0700
Subject: [PATCH] f_setup mods for the DOS port

---
 src/dos/bcinit.c   | 33 ++++++++++++++++-----------------
 src/dos/bcpic.c    |  2 +-
 src/dos/bcsample.c |  2 +-
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/dos/bcinit.c b/src/dos/bcinit.c
index 72780dd..59a6f88 100644
--- a/src/dos/bcinit.c
+++ b/src/dos/bcinit.c
@@ -57,8 +57,6 @@ extern char command_name[];
 extern char save_name[];
 extern char auxilary_name[];
 
-char stripped_story_name[10];
-
 int display = -1;
 
 int user_background = -1;
@@ -333,6 +331,7 @@ void os_process_arguments (int argc, char *argv[])
 {
     const char *p;
     int i;
+    char stripped_story_name[10];
 
     /* Parse command line options */
 
@@ -346,33 +345,33 @@ void os_process_arguments (int argc, char *argv[])
 
     /* Set the story file name */
 
-    story_name = argv[optind];
+    f_setup.story_file = strdup(argv[optind]);
 
     /* Strip path and extension off the story file name */
 
-    p = story_name;
+    p = strdup(f_setup.story_file);
 
-    for (i = 0; story_name[i] != 0; i++)
-	if (story_name[i] == '\\' || story_name[i] == '/'
-	    || story_name[i] == ':')
-	    p = story_name + i + 1;
+    for (i = 0; f_setup.story_file[i] != 0; i++)
+	if (f_setup.story_file[i] == '\\' || f_setup.story_file[i] == '/'
+	    || f_setup.story_file[i] == ':')
+	    p = f_setup.story_file + i + 1;
 
     for (i = 0; p[i] != 0 && p[i] != '.'; i++)
 	stripped_story_name[i] = p[i];
-
     stripped_story_name[i] = 0;
+    f_setup.story_name = strdup(stripped_story_name);
 
     /* Create nice default file names */
 
-    strcpy (script_name, stripped_story_name);
-    strcpy (command_name, stripped_story_name);
-    strcpy (save_name, stripped_story_name);
-    strcpy (auxilary_name, stripped_story_name);
+    f_setup.script_name = strdup(f_setup.story_name);
+    f_setup.command_name = strdup(f_setup.story_name);
+    f_setup.save_name = strdup(f_setup.story_name);
+    f_setup.aux_name = strdup(f_setup.story_name);
 
-    strcat (script_name, ".scr");
-    strcat (command_name, ".rec");
-    strcat (save_name, ".sav");
-    strcat (auxilary_name, ".aux");
+    strcat (f_setup.script_name, ".scr");
+    strcat (f_setup.command_name, ".rec");
+    strcat (f_setup.save_name, ".sav");
+    strcat (f_setup.aux_name, ".aux");
 
     /* Save the executable file name */
 
diff --git a/src/dos/bcpic.c b/src/dos/bcpic.c
index bd42fc3..6e3df71 100644
--- a/src/dos/bcpic.c
+++ b/src/dos/bcpic.c
@@ -78,7 +78,7 @@ static bool open_graphics_file (int number)
 
     /* Why does DOS not like "graphics\\" anymore? */
     strcpy (fname, "graphics/");
-    strcat (fname, stripped_story_name);
+    strcat (fname, f_setup.story_name);
     strcat (fname, extension);
 
     /* Open file, load header, allocate memory, load picture directory */
diff --git a/src/dos/bcsample.c b/src/dos/bcsample.c
index 33c41a4..258a972 100644
--- a/src/dos/bcsample.c
+++ b/src/dos/bcsample.c
@@ -280,7 +280,7 @@ void os_prepare_sample (int number)
 	numstr[0] = '0' + number / 10;
 	numstr[1] = '0' + number % 10;
 
-	strncat (sample_name, stripped_story_name, 6);
+	strncat (sample_name, f_setup.story_name, 6);
 	strncat (sample_name, numstr, 2);
 	strncat (sample_name, ".snd", 4);
 
-- 
2.34.1