mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix "Load/Save to cloudstorage" for non-ASCII user names

Browse source 
On Windows that would fail because stat() doesn't deal well with our
utf8 strings.

Added new subsurface_stat() portability function to replace stat().
Added Windows implementation of subsurface_stat() using wstat(),
with conversion to ut16 of the inputed path.
Other platform implementations (linux, android) make use of the normal stat().

Added non ASCII test case in TestGitStorage::testGitStorageLocal()

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
This commit is contained in:
Jeremie Guichard 2017-02-24 14:06:48 +07:00 • committed by Dirk Hohndel
parent 5640a6a839
commit 5ed93a9d9e
6 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/android.cpp
View file

@ -176,6 +176,11 @@ int subsurface_access(const char *path, int mode)
return access(path, mode);
}
int subsurface_stat(const char* path, struct stat* buf)
{
return stat(path, buf);
}
struct zip *subsurface_zip_open_readonly(const char *path, int flags, int *errorp)
{
return zip_open(path, flags, errorp);

2
core/dive.h
View file

@ -8,6 +8,7 @@
#include <zip.h>
#include <sqlite3.h>
#include <string.h>
#include <sys/stat.h>
#include "divesite.h"
/* Windows has no MIN/MAX macros - so let's just roll our own */
@ -728,6 +729,7 @@ extern int subsurface_open(const char *path, int oflags, mode_t mode);
extern FILE *subsurface_fopen(const char *path, const char *mode);
extern void *subsurface_opendir(const char *path);
extern int subsurface_access(const char *path, int mode);
extern int subsurface_stat(const char* path, struct stat* buf);
extern struct zip *subsurface_zip_open_readonly(const char *path, int flags, int *errorp);
extern int subsurface_zip_close(struct zip *zip);
extern void subsurface_console_init(bool dedicated, bool logfile);

4
core/git-access.c
View file

@ -768,7 +768,7 @@ static struct git_repository *get_remote_repo(const char *localdir, const char *
}
git_storage_update_progress(false, "start git interaction");
/* Do we already have a local cache? */
if (!stat(localdir, &st)) {
if (!subsurface_stat(localdir, &st)) {
if (!S_ISDIR(st.st_mode)) {
if (is_subsurface_cloud)
(void)cleanup_local_cache(remote, branch);
@ -934,7 +934,7 @@ struct git_repository *is_git_repository(const char *filename, const char **bran
return repo;
}
if (stat(loc, &st) < 0 || !S_ISDIR(st.st_mode)) {
if (subsurface_stat(loc, &st) < 0 || !S_ISDIR(st.st_mode)) {
free(loc);
free(branch);
return dummy_git_repository;

5
core/linux.c
View file

@ -204,6 +204,11 @@ int subsurface_access(const char *path, int mode)
return access(path, mode);
}
int subsurface_stat(const char* path, struct stat* buf)
{
return stat(path, buf);
}
struct zip *subsurface_zip_open_readonly(const char *path, int flags, int *errorp)
{
return zip_open(path, flags, errorp);

12
core/windows.c
View file

@ -346,6 +346,18 @@ int subsurface_access(const char *path, int mode)
return ret;
}
int subsurface_stat(const char* path, struct stat* buf)
{
int ret = -1;
if (!path)
return ret;
wchar_t *wpath = utf8_to_utf16(path);
if (wpath)
ret = wstat(wpath, buf);
free((void *)wpath);
return ret;
}
#ifndef O_BINARY
#define O_BINARY 0
#endif

1
tests/testgitstorage.cpp
View file

@ -64,6 +64,7 @@ void TestGitStorage::testGitStorageLocal_data()
// test different path we may encounter (since storage depends on user name)
QTest::addColumn<QString>("testDirName");
QTest::newRow("ASCII path") << "./gittest";
QTest::newRow("Non ASCII path") << "./gittest_éèêôàüäößíñóúäåöø";
}
void TestGitStorage::testGitStorageLocal()