Always write out missing lists.

[doldaconnect.git] / daemon / utils.c

diff --git a/daemon/utils.c b/daemon/utils.c
index d084db6..5f2c03a 100644 (file)
--- a/daemon/utils.c
+++ b/daemon/utils.c
@@ -126,6 +126,19 @@ wchar_t *swprintf2(wchar_t *format, ...)
     return(buf);
 }
 
+int havecharset(char *charset)
+{
+    iconv_t cd;
+    
+    if((cd = iconv_open("wchar_t", charset)) == (iconv_t)-1)
+       return(0);
+    iconv_close(cd);
+    if((cd = iconv_open(charset, "wchar_t")) == (iconv_t)-1)
+       return(0);
+    iconv_close(cd);
+    return(1);
+}
+
 wchar_t *icmbstowcs(char *mbs, char *charset)
 {
     int ret;
@@ -707,21 +720,30 @@ char *getetcpath(char *binpath)
     return(etcpath);
 }
 
-char *findfile(char *gname, char *uname, char *homedir)
+char *findfile(char *gname, char *uname, char *homedir, int filldef)
 {
     char *path, *binpath, *etcpath, *p;
+    struct passwd *pw;
+    int mode;
     
-    if((homedir != NULL) && ((path = sprintf2("%s/.%s", homedir, uname)) != NULL))
-    {
-       if(!access(path, F_OK))
-           return(path);
-       free(path);
+    mode = R_OK | (filldef ? W_OK : 0);
+    if(uname != NULL) {
+       if(homedir == NULL)
+           homedir = getenv("HOME");
+       if((homedir == NULL) && ((pw = getpwuid(getuid())) != NULL))
+           homedir = pw->pw_dir;
+       if((homedir != NULL) && ((path = sprintf2("%s/.%s", homedir, uname)) != NULL))
+       {
+           if(!access(path, mode))
+               return(path);
+           free(path);
+       }
     }
     if(gname != NULL)
     {
        if(strchr(gname, '/') != NULL)
        {
-           if(!access(gname, F_OK))
+           if(!access(gname, mode))
                return(sstrdup(gname));
        } else {
            if((binpath = getenv("PATH")) == NULL)
@@ -732,7 +754,7 @@ char *findfile(char *gname, char *uname, char *homedir)
            {
                if((path = sprintf2("%s/%s", p, gname)) != NULL)
                {
-                   if(!access(path, F_OK))
+                   if(!access(path, mode))
                    {
                        free(etcpath);
                        return(path);
@@ -743,7 +765,13 @@ char *findfile(char *gname, char *uname, char *homedir)
            free(etcpath);
        }
     }
-    return(NULL);
+    if(filldef) {
+       if(uname && homedir)
+           return(sprintf2("%s/.%s", homedir, uname));
+       return(sprintf2("/etc/%s", gname));
+    } else {
+       return(NULL);
+    }
 }
 
 struct wcspair *newwcspair(wchar_t *key, wchar_t *val, struct wcspair **list)