zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-28 23:02:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

hopefully the last few GetChars fixes for linux

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2023-10-07 19:54:21 -03:00 committed by Christoph Oelckers
parent f4fb583c6c
commit f0be58e862
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/platform/posix/sdl/i_system.cpp
View file

@ -337,7 +337,7 @@ int I_PickIWad (WadStuff *wads, int numwads, bool showwin, int defaultiwad, int&
cmd.AppendFormat(" --default \"%s (%s)\"", wads[defaultiwad].Name.GetChars(), filepart); cmd.AppendFormat(" --default \"%s (%s)\"", wads[defaultiwad].Name.GetChars(), filepart);
} }
FILE *f = popen(cmd, "r"); FILE *f = popen(cmd.GetChars(), "r");
if(f != NULL) if(f != NULL)
{ {
char gotstr[16]; char gotstr[16];

6
src/common/platform/posix/unix/i_specialpaths.cpp
View file

@ -74,7 +74,7 @@ FString GetUserFile (const char *file)
FString oldpath = NicePath("$HOME/." GAMENAMELOWERCASE "/"); FString oldpath = NicePath("$HOME/." GAMENAMELOWERCASE "/");
if (stat (oldpath.GetChars(), &extrainfo) != -1) if (stat (oldpath.GetChars(), &extrainfo) != -1)
{ {
if (rename(oldpath.GetChars(), path) == -1) if (rename(oldpath.GetChars(), path.GetChars()) == -1)
{ {
I_Error ("Failed to move old " GAMENAMELOWERCASE " directory (%s) to new location (%s).", I_Error ("Failed to move old " GAMENAMELOWERCASE " directory (%s) to new location (%s).",
oldpath.GetChars(), path.GetChars()); oldpath.GetChars(), path.GetChars());
@ -83,7 +83,7 @@ FString GetUserFile (const char *file)
moved = true; moved = true;
} }
if (!moved && mkdir (path, S_IRUSR | S_IWUSR | S_IXUSR) == -1) if (!moved && mkdir (path.GetChars(), S_IRUSR | S_IWUSR | S_IXUSR) == -1)
{ {
I_FatalError ("Failed to create %s directory:\n%s", I_FatalError ("Failed to create %s directory:\n%s",
path.GetChars(), strerror (errno)); path.GetChars(), strerror (errno));
@ -231,7 +231,7 @@ FString M_GetDemoPath()
FString M_GetNormalizedPath(const char* path) FString M_GetNormalizedPath(const char* path)
{ {
char *actualpath; char *actualpath;
actualpath = realpath(path.GetChars(), NULL); actualpath = realpath(path, NULL);
if (!actualpath) // error ? if (!actualpath) // error ?
return nullptr; return nullptr;
FString fullpath = actualpath; FString fullpath = actualpath;