Use winargs.c also for unix (step 1 in refactoring out the various ar…

…gs-files)
alan-if · Aug 9, 2019 · 19b99b8 · 19b99b8
1 parent 7f83b25
commit 19b99b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/interpreter/args.c b/interpreter/args.c
@@ -166,20 +166,16 @@ bool differentInterpreterName(char *string) {
 
 
 /*======================================================================*/
-#if defined(__windows__) || defined(__cygwin__)
+#if defined(__windows__) || defined(__cygwin__) || defined(__unix__)
 #include "winargs.c"
 #else
-#if defined(__unix__) || defined(__macos__)
+#if defined(__macos__)
 #include "unixargs.c"
 #else
-#ifdef __mac__
-#include "macargs.c"
-#else
 /***********************************************************************\
 
    UNIMPLEMENTED OS
 
 \***********************************************************************/
 #endif
 #endif
-#endif
diff --git a/interpreter/winargs.c b/interpreter/winargs.c
@@ -63,9 +63,9 @@ void args(int argc, char * argv[])
         if (differentInterpreterName(programName)) {
             // TODO break out as a function
             FILE *adventureFile;
-            adventureFileName = duplicate(programName,
-                                          strlen(programName)
-                                          +strlen(ACODEEXTENSION)+1);
+            adventureFileName = allocate(strlen(programName)
+                                         +strlen(ACODEEXTENSION)+1);
+            strcpy(adventureFileName, programName);
             strcat(adventureFileName, ACODEEXTENSION);
             // TODO break out as utils::fileExists()
             if ((adventureFile = fopen(adventureFileName, "r")) == NULL) {