Apple-2-Tools/gsplus
1
0
Fork 0
mirror of https://github.com/digarok/gsplus.git synced 2024-11-28 04:49:18 +00:00
Code Issues Projects Releases Wiki Activity

host mli - convert cygwin paths to Win32 paths before using with Win32 API.

Browse Source
This commit is contained in:
Kelvin Sherlock 2018-08-23 20:47:09 -04:00
parent 2b38b6bf8d
commit fcf8dea873
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/host_mli.c
View File

@ -1258,7 +1258,7 @@ static char *expand_path(const char *path, word32 *error) {
ssize_t ok = cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, buffer, sizeof(buffer)); ssize_t ok = cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, buffer, sizeof(buffer));
if (ok < 0) { if (ok < 0) {
*error = fstError; if (error) *error = fstError;
return NULL; return NULL;
} }
return host_gc_strdup(buffer); return host_gc_strdup(buffer);
@ -1283,6 +1283,7 @@ void host_mli_head() {
saved_call = get_memory_c(rts + 1, 0); saved_call = get_memory_c(rts + 1, 0);
saved_dcb = get_memory16_c(rts + 2, 0); saved_dcb = get_memory16_c(rts + 2, 0);
saved_p = engine.psr; saved_p = engine.psr;
word16 terr = 0;
/* do pcount / path stuff here */ /* do pcount / path stuff here */
char *path1 = NULL; char *path1 = NULL;
@ -1311,27 +1312,30 @@ void host_mli_head() {
path1 = is_host_path(get_memory16_c(saved_dcb + 1, 0)); path1 = is_host_path(get_memory16_c(saved_dcb + 1, 0));
if (!path1) goto prodos_mli; if (!path1) goto prodos_mli;
path3 = host_gc_append_path(host_root, path1); path3 = host_gc_append_path(host_root, path1);
path3 = expand_path(path3, &terr);
break; break;
case RENAME: case RENAME:
path1 = is_host_path(get_memory16_c(saved_dcb + 1,0)); path1 = is_host_path(get_memory16_c(saved_dcb + 1,0));
path2 = is_host_path(get_memory16_c(saved_dcb + 3,0)); path2 = is_host_path(get_memory16_c(saved_dcb + 3,0));
if (!path1 && !path2) goto prodos_mli; if (!path1 && !path2) goto prodos_mli;
if (path1) path3 = host_gc_append_path(host_root, path1); if (path1) path3 = host_gc_append_path(host_root, path1);
if (path2) path4 = host_gc_append_path(host_root, path2); if (path2) path4 = host_gc_append_path(host_root, path2);
path3 = expand_path(path3, &terr);
path4 = expand_path(path4, &terr);
break; break;
case SET_PREFIX: case SET_PREFIX:
path1 = is_host_path(get_memory16_c(saved_dcb + 1,0)); path1 = is_host_path(get_memory16_c(saved_dcb + 1,0));
if (!path1 && !saved_prefix) goto prodos_mli; if (!path1 && !saved_prefix) goto prodos_mli;
if (path1) path3 = host_gc_append_path(host_root, path1); if (path1) path3 = host_gc_append_path(host_root, path1);
path3 = expand_path(path3, &terr);
break; break;
case GET_PREFIX: case GET_PREFIX:
if (!saved_prefix) goto prodos_mli; if (!saved_prefix) goto prodos_mli;
break; break;
/* refnum based */ /* refnum based */
case NEWLINE: case NEWLINE:
case READ: case READ: