[uim commit] r5420 - trunk/gtk

[codesite-noreply]

Author: ek.kato
Date: Wed Apr 16 19:55:01 2008
New Revision: 5420

Modified:
  trunk/gtk/compose.c

Log:
* gtk/compose.c (TransFileName) : Fix broken "include" directive
 using %H and %L caused from r5410.


Modified: trunk/gtk/compose.c
==============================================================================
--- trunk/gtk/compose.c (original)
+++ trunk/gtk/compose.c Wed Apr 16 19:55:01 2008
@@ -391,13 +391,10 @@
    char *j;
    char ret[MAXPATHLEN];

-    home = getenv("HOME");
-    get_compose_filename(lcCompose, sizeof(lcCompose));
-
    j = ret;
    i = name;
-    lcCompose[0] = '\0';
-    while (*i) {
+    lcCompose[0] = ret[0] = '\0';
+    while (*i && j - ret < MAXPATHLEN - 1) {
        if (*i == '%') {
            i++;
            switch (*i) {
@@ -405,12 +402,14 @@
                *j++ = '%';
                break;
            case 'H':
+               home = getenv("HOME");
                if (home) {
                    strlcat(ret, home, sizeof(ret));
                    j += strlen(home);
                }
                break;
            case 'L':
+               get_compose_filename(lcCompose, sizeof(lcCompose));
                if (lcCompose[0] != '\0') {
                    strlcat(ret, lcCompose, sizeof(ret));
                    j += strlen(lcCompose);
@@ -421,8 +420,8 @@
        } else {
            *j++ = *i++;
        }
+       *j = '\0';
    }
-    *j = '\0';
    strlcpy(transname, ret, len);
    return 1;
}