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') 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