shithub: choc

Info  •  Files  •  Log  •  Branches

music: Allow / separators in substitute filenames.

For substitute music files we want to be able to specify relative
paths in a platform-independent way using Unix path separators.
Replace Unix-style / separators in the path that was read with the
path separator for the native system.

--- a/src/i_sdlmusic.c

+++ b/src/i_sdlmusic.c

@@ -485,6 +485,11 @@

     }

 #endif

+    // Paths in the substitute filenames can contain Unix-style /

+    // path separators, but we should convert this to the separator

+    // for the native platform.

+    path = M_StringReplace(path, "/", DIR_SEPARATOR_S);

+

     // Copy config filename and cut off the filename to just get the

     // parent dir.

     basedir = strdup(base_filename);

@@ -499,6 +504,7 @@

         result = strdup(path);

     }

     free(basedir);

+    free(path);

     return result;

 }