svn: 2243

src/conf.c

@@ -352,7 +352,7 @@ init_conf()
   char *p = strrchr(binname, '/');
 
   p++;
-  if (strncmp(p, "wraith.", 7))
+  if (strncmp(p, "wraith.", 7) && strchr(p, '-'))
     conf.binname = strdup(p);
   else
     conf.binname = strdup("wraith");

src/dccutil.c

@@ -75,9 +75,8 @@ colorbuf(char *buf, size_t len, int idx)
   static int cflags;
   int schar = 0;
   char buf3[1024] = "", buf2[1024] = "", c = 0;
-  bool upper = 0;
 #ifdef no
-  bool alan = 0;
+  bool upper = 0, alan = 0;
 
   if (idx != -1 && !egg_strcasecmp(dcc[idx].nick, "alan"))
     alan = 1;