thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RISCOS: Move the path conversion functions into a separate file

Browse source
This commit is contained in:
Cameron Cawley 2019-03-28 22:35:13 +00:00
parent bcef809e61
commit 8c15b41dd7
6 changed files with 129 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backends/platform/sdl/module.mk
View file

@ -35,6 +35,7 @@ endif
ifdef RISCOS
MODULE_OBJS += \
riscos/riscos-main.o \
riscos/riscos-utils.o \
riscos/riscos.o
endif

70
backends/platform/sdl/riscos/riscos-utils.cpp Normal file
View file

@ -0,0 +1,70 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include "common/scummsys.h"
#include "backends/platform/sdl/riscos/riscos-utils.h"
#include <unixlib/local.h>
#include <limits.h>
namespace RISCOS_Utils {
Common::String toRISCOS(Common::String path) {
char start[PATH_MAX];
char *end = __riscosify_std(path.c_str(), 0, start, PATH_MAX, 0);
return Common::String(start, end);
}
Common::String toUnix(Common::String path) {
Common::String out = Common::String(path);
uint32 start = 0;
if (out.contains("$")) {
char *x = strstr(out.c_str(), "$");
start = x ? x - out.c_str() : -1;
} else if (out.contains(":")) {
char *x = strstr(out.c_str(), ":");
start = x ? x - out.c_str() : -1;
}
for (uint32 ptr = start; ptr < out.size(); ptr += 1) {
switch (out.c_str()[ptr]) {
case '.':
out.setChar('/', ptr);
break;
case '/':
out.setChar('.', ptr);
break;
case '\xA0':
out.setChar(' ', ptr);
break;
default:
break;
}
}
if (out.contains("$") || out.contains(":"))
out = "/" + out;
return out;
}
}

49
backends/platform/sdl/riscos/riscos-utils.h Normal file
View file

@ -0,0 +1,49 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#ifndef PLATFORM_SDL_RISCOS_UTILS_H
#define PLATFORM_SDL_RISCOS_UTILS_H
#include "common/str.h"
// Helper functions
namespace RISCOS_Utils {
/**
* Converts a Unix style path to a RISC OS style path.
*
* @param str Unix style path to convert.
* @return RISC OS style path.
*/
Common::String toRISCOS(Common::String path);
/**
* Converts a RISC OS style path to a Unix style path.
*
* @param str RISC OS style path to convert.
* @return Unix style path.
*/
Common::String toUnix(Common::String path);
}
#endif