diff options
| author | bviktor <bviktor@outlook.com> | 2012-11-03 21:48:56 -0700 |
|---|---|---|
| committer | bviktor <bviktor@outlook.com> | 2012-11-03 21:48:56 -0700 |
| commit | 3c5284f19de644e010d0dfe85d179fb5633c92fb (patch) | |
| tree | cfcfb0f27d78dd65bb657f0e0caeabb42737cc03 /plugins/lua | |
| parent | e0b1724158d44370d34d108a5f07fe0b36e4e254 (diff) | |
| parent | c2c23894fc4e376ff10c9c3cbcfa5c350c1e3073 (diff) | |
Merge pull request #224 from Arnavion/utf8-everywhere
UTF-8 everywhere
Diffstat (limited to 'plugins/lua')
| -rw-r--r-- | plugins/lua/lua-xp.vcxproj | 4 | ||||
| -rw-r--r-- | plugins/lua/lua.c | 18 | ||||
| -rw-r--r-- | plugins/lua/lua.vcxproj | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/plugins/lua/lua-xp.vcxproj b/plugins/lua/lua-xp.vcxproj index da2c749e..ba32e574 100644 --- a/plugins/lua/lua-xp.vcxproj +++ b/plugins/lua/lua-xp.vcxproj @@ -63,7 +63,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(DepsRoot)\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(DepsRoot)\include;..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -82,7 +82,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(DepsRoot)\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(DepsRoot)\include;..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c index fb624e47..cd237c24 100644 --- a/plugins/lua/lua.c +++ b/plugins/lua/lua.c @@ -46,9 +46,12 @@ #include <errno.h> #include <ctype.h> +#include <glib.h> + #ifdef _WIN32 #include <direct.h> /* for getcwd */ #include "../../src/dirent/dirent-win32.h" +#include "../../src/common/typedef.h" #endif #if !( defined(_WIN32) || defined(LXC_XCHAT_GETTEXT) ) @@ -429,7 +432,7 @@ lxc_autoload_from_path(const char *path) strerror(errno)); break; } - sprintf(file, "%s/%s", path, ent->d_name); + sprintf(file, "%s" G_DIR_SEPARATOR_S "%s", path, ent->d_name); (void)lxc_load_file((const char *)file); free(file); } @@ -510,22 +513,19 @@ static int lxc_cb_load(char *word[], char *word_eol[], void *userdata) len = strlen(word[2]); if (len > 4 && strcasecmp (".lua", word[2] + len - 4) == 0) { -#ifdef WIN32 - if (strrchr(word[2], '\\') != NULL) -#else - if (strrchr(word[2], '/') != NULL) -#endif + if (strrchr(word[2], G_DIR_SEPARATOR) != NULL) strncpy(file, word[2], PATH_MAX); - else { + else + { if (stat(word[2], st) == 0) { xdir = getcwd (buf, PATH_MAX); - snprintf (file, PATH_MAX, "%s/%s", xdir, word[2]); + snprintf (file, PATH_MAX, "%s" G_DIR_SEPARATOR_S "%s", xdir, word[2]); } else { xdir = hexchat_get_info (ph, "hexchatdirfs"); - snprintf (file, PATH_MAX, "%s/addons/%s", xdir, word[2]); + snprintf (file, PATH_MAX, "%s" G_DIR_SEPARATOR_S "addons" G_DIR_SEPARATOR_S "%s", xdir, word[2]); } } diff --git a/plugins/lua/lua.vcxproj b/plugins/lua/lua.vcxproj index c4ce5e2f..a49fb5a9 100644 --- a/plugins/lua/lua.vcxproj +++ b/plugins/lua/lua.vcxproj @@ -60,7 +60,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(DepsRoot)\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(DepsRoot)\include;..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -79,7 +79,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(DepsRoot)\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(DepsRoot)\include;..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> |