archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 03:11:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11670 from JosJuice/android-open-mode

Browse source 
Android: Translate C++ "w" to ParcelFileDescriptor "wt"
This commit is contained in:
Pierre Bourdon 2023-03-18 18:20:17 +01:00 committed by GitHub
commit 04915d6749
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
Source/Android/jni/AndroidCommon/AndroidCommon.cpp
View file

@ -12,6 +12,7 @@
#include <jni.h>
#include "Common/Assert.h"
#include "Common/Logging/Log.h"
#include "Common/StringUtil.h"
#include "jni/AndroidCommon/IDCache.h"
@ -63,38 +64,50 @@ std::string OpenModeToAndroid(std::string mode)
// The 'b' specifier is not supported by Android. Since we're on POSIX, it's fine to just skip it.
mode.erase(std::remove(mode.begin(), mode.end(), 'b'));
if (mode == "r+")
mode = "rw";
else if (mode == "w+")
mode = "rwt";
else if (mode == "a+")
mode = "rwa";
if (mode == "r")
return "r";
else if (mode == "w")
return "wt";
else if (mode == "a")
mode = "wa";
return "wa";
else if (mode == "r+")
return "rw";
else if (mode == "w+")
return "rwt";
else if (mode == "a+")
return "rwa";
return mode;
ERROR_LOG_FMT(COMMON, "OpenModeToAndroid(std::string): Unsupported open mode: {}", mode);
return "";
}
std::string OpenModeToAndroid(std::ios_base::openmode mode)
{
std::string result;
if (mode & std::ios_base::in)
result += 'r';
if (mode & (std::ios_base::out | std::ios_base::app))
result += 'w';
if (mode & std::ios_base::app)
result += 'a';
constexpr std::ios_base::openmode t = std::ios_base::in | std::ios_base::trunc;
if ((mode & t) == t)
result += 't';
// The 'b' specifier is not supported by Android. Since we're on POSIX, it's fine to just skip it.
mode &= ~std::ios_base::binary;
return result;
switch (mode)
{
case std::ios_base::in:
return "r";
case std::ios_base::out:
case std::ios_base::out | std::ios_base::trunc:
return "wt";
case std::ios_base::app:
case std::ios_base::out | std::ios_base::app:
return "wa";
case std::ios_base::in | std::ios_base::out:
return "rw";
case std::ios_base::in | std::ios_base::out | std::ios_base::trunc:
return "rwt";
case std::ios_base::in | std::ios_base::app:
case std::ios_base::in | std::ios_base::out | std::ios_base::app:
return "rwa";
default:
ERROR_LOG_FMT(COMMON,
"OpenModeToAndroid(std::ios_base::openmode): Unsupported open mode: {:#x}", mode);
return "";
}
}
int OpenAndroidContent(std::string_view uri, std::string_view mode)