upload tizen2.0 source

[framework/uifw/xorg/lib/libx11.git] / src / xlibi18n / lcFile.c

diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c
index 21a546d..2c06fa2 100644 (file)
--- a/src/xlibi18n/lcFile.c
+++ b/src/xlibi18n/lcFile.c
@@ -36,7 +36,7 @@
 
 /************************************************************************/
 
-#ifdef __UNIXOS2__
+#ifndef HAVE_SETEUID
 # define seteuid setuid
 #endif
 #define        iscomment(ch)   ((ch) == '#' || (ch) == '\0')
@@ -423,10 +423,7 @@ resolve_name(
            from = args[1], to = args[0];       /* right to left */
        }
        if (! strcmp(from, lc_name)) {
-           name = Xmalloc(strlen(to) + 1);
-           if (name != NULL) {
-               strcpy(name, to);
-           }
+           name = strdup(to);
            break;
        }
     }
@@ -579,8 +576,7 @@ _XlcResolveLocaleName(
 
     if (name == NULL) {
        /* vendor locale name == Xlocale name, no expansion of alias */
-       pub->siname = Xmalloc (strlen (lc_name) + 1);
-       strcpy (pub->siname, lc_name);
+       pub->siname = strdup (lc_name);
     } else {
        pub->siname = name;
     }
@@ -685,8 +681,7 @@ _XlcLocaleDirName(char *dir_name, size_t dir_len, char *lc_name)
                Xfree(name);
            continue;
        }
-       if ((1 + (target_dir ? strlen (target_dir) : 0) +
-            strlen("locale.dir")) < PATH_MAX) {
+       if ((1 + strlen (target_dir) + strlen("locale.dir")) < PATH_MAX) {
            sprintf(buf, "%s/locale.dir", target_dir);
            target_name = resolve_name(name, buf, RtoL);
        }
@@ -730,8 +725,7 @@ _XlcLocaleDirName(char *dir_name, size_t dir_len, char *lc_name)
     last_dir_len = strlen (dir_name) + 1;
     last_dir_name = Xmalloc (last_dir_len);
     strcpy (last_dir_name, dir_name);
-    last_lc_name = Xmalloc (strlen (lc_name) + 1);
-    strcpy (last_lc_name, lc_name);
+    last_lc_name = strdup (lc_name);
 
     return dir_name;
 }
@@ -785,8 +779,7 @@ _XlcLocaleLibDirName(char *dir_name, size_t dir_len, char *lc_name)
                Xfree(name);
            continue;
        }
-       if ((1 + (target_dir ? strlen (target_dir) : 0) +
-            strlen("locale.dir")) < PATH_MAX) {
+       if ((1 + strlen (target_dir) + strlen("locale.dir")) < PATH_MAX) {
            sprintf(buf, "%s/locale.dir", target_dir);
            target_name = resolve_name(name, buf, RtoL);
        }
@@ -830,8 +823,7 @@ _XlcLocaleLibDirName(char *dir_name, size_t dir_len, char *lc_name)
     last_dir_len = strlen (dir_name) + 1;
     last_dir_name = Xmalloc (last_dir_len);
     strcpy (last_dir_name, dir_name);
-    last_lc_name = Xmalloc (strlen (lc_name) + 1);
-    strcpy (last_lc_name, lc_name);
+    last_lc_name = strdup (lc_name);
 
     return dir_name;
 }