From 5d9264aff6d7bcdd2f0595bfdf2a3a7a23330d46 Mon Sep 17 00:00:00 2001 From: Arnavion Date: Sat, 3 Nov 2012 10:24:25 -0700 Subject: Initial commit for utf8 everywhere. --- plugins/lua/lua.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'plugins/lua/lua.c') diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c index fb624e47..fd3926f5 100644 --- a/plugins/lua/lua.c +++ b/plugins/lua/lua.c @@ -429,7 +429,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 +510,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]); } } -- cgit 1.4.1 From 4ec499c2417819a174ebd68529da2a21e9c5c72c Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Sun, 4 Nov 2012 04:22:22 +0100 Subject: Eliminate warnings due to missing includes --- plugins/dns/dns.c | 1 + plugins/dns/thread.c | 1 + plugins/exec/exec.c | 2 ++ plugins/lua/lua-xp.vcxproj | 4 ++-- plugins/lua/lua.c | 3 +++ plugins/lua/lua.vcxproj | 4 ++-- plugins/python/python.c | 1 + plugins/tcl/tclplugin.c | 1 + plugins/upd/upd-xp.vcxproj | 4 ++-- plugins/upd/upd.c | 2 ++ plugins/upd/upd.vcxproj | 4 ++-- src/fe-text/fe-text.c | 1 + 12 files changed, 20 insertions(+), 8 deletions(-) (limited to 'plugins/lua/lua.c') diff --git a/plugins/dns/dns.c b/plugins/dns/dns.c index cd64c4b5..9e359805 100644 --- a/plugins/dns/dns.c +++ b/plugins/dns/dns.c @@ -37,6 +37,7 @@ #else #include #endif +#include #else #include #include diff --git a/plugins/dns/thread.c b/plugins/dns/thread.c index 02b17cfb..d0347130 100644 --- a/plugins/dns/thread.c +++ b/plugins/dns/thread.c @@ -1,3 +1,4 @@ +#include #include #include "thread.h" diff --git a/plugins/exec/exec.c b/plugins/exec/exec.c index 483b8e7f..790278a2 100644 --- a/plugins/exec/exec.c +++ b/plugins/exec/exec.c @@ -51,6 +51,8 @@ run_command (char *word[], char *word_eol[], void *userdata) secattr.nLength = sizeof (secattr); secattr.bInheritHandle = TRUE; + timeElapsed = 0.0; + if (strlen (word[2]) > 0) { strcpy (commandLine, "cmd.exe /c "); 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 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(DepsRoot)\include;..\..\src\common;%(AdditionalIncludeDirectories) + $(DepsRoot)\include;..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) Windows @@ -82,7 +82,7 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(DepsRoot)\include;..\..\src\common;%(AdditionalIncludeDirectories) + $(DepsRoot)\include;..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) Windows diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c index fd3926f5..cd237c24 100644 --- a/plugins/lua/lua.c +++ b/plugins/lua/lua.c @@ -46,9 +46,12 @@ #include #include +#include + #ifdef _WIN32 #include /* for getcwd */ #include "../../src/dirent/dirent-win32.h" +#include "../../src/common/typedef.h" #endif #if !( defined(_WIN32) || defined(LXC_XCHAT_GETTEXT) ) 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 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(DepsRoot)\include;..\..\src\common;%(AdditionalIncludeDirectories) + $(DepsRoot)\include;..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) Windows @@ -79,7 +79,7 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions) - $(DepsRoot)\include;..\..\src\common;%(AdditionalIncludeDirectories) + $(DepsRoot)\include;..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) Windows diff --git a/plugins/python/python.c b/plugins/python/python.c index 2ef531c5..efe57480 100644 --- a/plugins/python/python.c +++ b/plugins/python/python.c @@ -57,6 +57,7 @@ #include #ifdef WIN32 +#include #include "../../src/dirent/dirent-win32.h" #include "../../config-win32.h" #else diff --git a/plugins/tcl/tclplugin.c b/plugins/tcl/tclplugin.c index 86e4fc8e..6ec89137 100644 --- a/plugins/tcl/tclplugin.c +++ b/plugins/tcl/tclplugin.c @@ -30,6 +30,7 @@ static char RCSID[] = "$Id: tclplugin.c,v 1.65 2012/07/26 20:02:12 mooooooo Exp #ifdef WIN32 #include +#include "../../src/common/typedef.h" #define bzero(mem, sz) memset((mem), 0, (sz)) #define bcopy(src, dest, count) memmove((dest), (src), (count)) #else diff --git a/plugins/upd/upd-xp.vcxproj b/plugins/upd/upd-xp.vcxproj index dbb68499..0072580b 100644 --- a/plugins/upd/upd-xp.vcxproj +++ b/plugins/upd/upd-xp.vcxproj @@ -64,7 +64,7 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions) true - ..\..\src\common;%(AdditionalIncludeDirectories) + ..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) Windows @@ -85,7 +85,7 @@ true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions) true - ..\..\src\common;%(AdditionalIncludeDirectories) + ..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) Windows diff --git a/plugins/upd/upd.c b/plugins/upd/upd.c index b986b96e..c299c4e6 100644 --- a/plugins/upd/upd.c +++ b/plugins/upd/upd.c @@ -23,6 +23,8 @@ #include #include +#include + #include "hexchat-plugin.h" #define DEFAULT_DELAY 10 /* 10 seconds */ diff --git a/plugins/upd/upd.vcxproj b/plugins/upd/upd.vcxproj index a330e864..355f95c0 100644 --- a/plugins/upd/upd.vcxproj +++ b/plugins/upd/upd.vcxproj @@ -61,7 +61,7 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions) true - ..\..\src\common;%(AdditionalIncludeDirectories) + ..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) Windows @@ -82,7 +82,7 @@ true WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions) true - ..\..\src\common;%(AdditionalIncludeDirectories) + ..\..\src\common;$(Glib);%(AdditionalIncludeDirectories) Windows diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c index c553d9f3..a970e537 100644 --- a/src/fe-text/fe-text.c +++ b/src/fe-text/fe-text.c @@ -23,6 +23,7 @@ #include #endif #ifdef WIN32 +#include #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #else -- cgit 1.4.1