1.1 --- a/core/systems/LibrarySys.cpp Thu Jan 25 08:31:52 2007 +0000
1.2 +++ b/core/systems/LibrarySys.cpp Thu Jan 25 09:19:38 2007 +0000
1.3 @@ -1,4 +1,7 @@
1.4 #include <stdio.h>
1.5 +#include <stdarg.h>
1.6 +#include <string.h>
1.7 +#include <sm_platform.h>
1.8 #include "LibrarySys.h"
1.9
1.10 LibrarySystem g_LibSys;
1.11 @@ -9,7 +12,7 @@
1.12 {
1.13 #if defined PLATFORM_WINDOWS
1.14 FreeLibrary(m_lib);
1.15 -#else if defined PLATFORM_POSIX
1.16 +#elif defined PLATFORM_POSIX
1.17 dlclose(m_lib);
1.18 #endif
1.19 m_lib = NULL;
1.20 @@ -30,7 +33,7 @@
1.21 {
1.22 #if defined PLATFORM_WINDOWS
1.23 return GetProcAddress(m_lib, symname);
1.24 -#else if defined PLATFORM_POSIX
1.25 +#elif defined PLATFORM_POSIX
1.26 return dlsym(m_lib, symname);
1.27 #endif
1.28 }
1.29 @@ -51,12 +54,12 @@
1.30 {
1.31 m_fd.cFileName[0] = '\0';
1.32 }
1.33 -#else if defined PLATFORM_POSIX
1.34 +#elif defined PLATFORM_POSIX
1.35 m_dir = opendir(path);
1.36 if (IsValid())
1.37 {
1.38 /* :TODO: we need to read past "." and ".."! */
1.39 - ep = readdir(dp);
1.40 + ep = readdir(m_dir);
1.41 snprintf(m_origpath, PLATFORM_MAX_PATH, "%s", path);
1.42 } else {
1.43 ep = NULL;
1.44 @@ -70,7 +73,7 @@
1.45 {
1.46 #if defined PLATFORM_WINDOWS
1.47 FindClose(m_dir);
1.48 -#else if defined PLATFORM_POSIX
1.49 +#elif defined PLATFORM_POSIX
1.50 closedir(m_dir);
1.51 #endif
1.52 }
1.53 @@ -84,8 +87,8 @@
1.54 FindClose(m_dir);
1.55 m_dir = INVALID_HANDLE_VALUE;
1.56 }
1.57 -#else if defined PLATFORM_POSIX
1.58 - if ((ep=readdir(m_dir) == NULL)
1.59 +#elif defined PLATFORM_POSIX
1.60 + if ((ep=readdir(m_dir)) == NULL)
1.61 {
1.62 closedir(m_dir);
1.63 m_dir = NULL;
1.64 @@ -102,10 +105,10 @@
1.65 {
1.66 #if defined PLATFORM_WINDOWS
1.67 return ((m_fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY);
1.68 -#else if defined PLATFORM_LINUX
1.69 +#elif defined PLATFORM_LINUX
1.70 char temppath[PLATFORM_MAX_PATH];
1.71 snprintf(temppath, sizeof(temppath), "%s/%s", m_origpath, GetEntryName());
1.72 - return g_LibrarySys.IsPathDirectory(temppath);
1.73 + return g_LibSys.IsPathDirectory(temppath);
1.74 #endif
1.75 }
1.76
1.77 @@ -113,10 +116,10 @@
1.78 {
1.79 #if defined PLATFORM_WINDOWS
1.80 return !(m_fd.dwFileAttributes & (FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_DEVICE));
1.81 -#else if defined PLATFORM_POSIX
1.82 +#elif defined PLATFORM_POSIX
1.83 char temppath[PLATFORM_MAX_PATH];
1.84 snprintf(temppath, sizeof(temppath), "%s/%s", m_origpath, GetEntryName());
1.85 - return g_LibrarySys.IsPathFile(temppath);
1.86 + return g_LibSys.IsPathFile(temppath);
1.87 #endif
1.88 }
1.89
1.90 @@ -124,7 +127,7 @@
1.91 {
1.92 #if defined PLATFORM_WINDOWS
1.93 return m_fd.cFileName;
1.94 -#else if defined PLATFORM_LINUX
1.95 +#elif defined PLATFORM_LINUX
1.96 return ep ? ep->d_name : "";
1.97 #endif
1.98 }
1.99 @@ -138,7 +141,7 @@
1.100 {
1.101 #if defined PLATFORM_WINDOWS
1.102 return (m_dir != INVALID_HANDLE_VALUE);
1.103 -#else if defined PLATFORM_LINUX
1.104 +#elif defined PLATFORM_LINUX
1.105 return (m_dir != NULL);
1.106 #endif
1.107 }
1.108 @@ -155,7 +158,7 @@
1.109 DWORD attr = GetFileAttributesA(path);
1.110
1.111 return (attr != INVALID_FILE_ATTRIBUTES);
1.112 -#else if defined PLATFORM_POSIX
1.113 +#elif defined PLATFORM_POSIX
1.114 struct stat s;
1.115
1.116 return (stat(path, &s) == 0);
1.117 @@ -178,7 +181,7 @@
1.118 }
1.119
1.120 return true;
1.121 -#else if defined PLATFORM_LINUX
1.122 +#elif defined PLATFORM_LINUX
1.123 struct stat s;
1.124
1.125 if (stat(path, &s) != 0)
1.126 @@ -205,7 +208,7 @@
1.127 return true;
1.128 }
1.129
1.130 -#else if defined PLATFORM_LINUX
1.131 +#elif defined PLATFORM_LINUX
1.132 struct stat s;
1.133
1.134 if (stat(path, &s) != 0)
1.135 @@ -249,7 +252,7 @@
1.136 (LPSTR)error,
1.137 err_max,
1.138 NULL);
1.139 -#else if defined PLATFORM_POSIX
1.140 +#elif defined PLATFORM_POSIX
1.141 snprintf(error, err_max, "%s", strerror(errno));
1.142 #endif
1.143 }
1.144 @@ -270,7 +273,7 @@
1.145 GetPlatformError(error, err_max);
1.146 return false;
1.147 }
1.148 -#else if defined PLATFORM_POSIX
1.149 +#elif defined PLATFORM_POSIX
1.150 lib = dlopen(path, RTLD_NOW);
1.151 if (!lib)
1.152 {
