filesystem: QNX should use SDL_LoadFile() instead of rolling it from scratch.

This commit is contained in:
Ryan C. Gordon 2017-08-17 02:58:46 -04:00
parent c13c45c7be
commit e50d3cdf8e

View File

@ -43,36 +43,7 @@
#include "SDL_filesystem.h" #include "SDL_filesystem.h"
/* QNX's /proc/self/exefile is a text file and not a symlink. */ /* QNX's /proc/self/exefile is a text file and not a symlink. */
#if defined(__QNXNTO__) #if !defined(__QNXNTO__)
static char *
readWholeFile(const char *path)
{
char *retval = (char *) SDL_malloc(PATH_MAX+1);
if (retval != NULL)
{
const int fd = open(path, O_RDONLY);
const ssize_t br = (fd == -1) ? -1 : read(fd, retval, PATH_MAX);
char *ptr;
if (fd != -1)
close(fd);
if ((br < 0) || (br > PATH_MAX))
{
free(retval);
return NULL;
} /* if */
retval[br] = '\0';
ptr = (char *) SDL_realloc(retval, br + 1);
if (ptr != NULL) /* just shrinking buffer; don't care if it failed. */
retval = ptr;
} /* else */
return retval;
}
#else
static char * static char *
readSymLink(const char *path) readSymLink(const char *path)
{ {
@ -159,7 +130,7 @@ SDL_GetBasePath(void)
#elif defined(__NETBSD__) #elif defined(__NETBSD__)
retval = readSymLink("/proc/curproc/exe"); retval = readSymLink("/proc/curproc/exe");
#elif defined(__QNXNTO__) #elif defined(__QNXNTO__)
retval = readWholeFile("/proc/self/exefile"); retval = SDL_LoadFile("/proc/self/exefile", NULL);
#else #else
retval = readSymLink("/proc/self/exe"); /* linux. */ retval = readSymLink("/proc/self/exe"); /* linux. */
if (retval == NULL) { if (retval == NULL) {