Respond to libgc deprecation warning

[disorder] / lib / client-common.c

diff --git a/lib/client-common.c b/lib/client-common.c
index 897260e133e34f09d295a1df717e805ac22a2ab4..a4a9851357f6ba703180584af76cfc11334981f1 100644 (file)
--- a/lib/client-common.c
+++ b/lib/client-common.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
 /*
  * This file is part of DisOrder

- * Copyright (C) 2004, 2005, 2006, 2007, 2009 Richard Kettlewell
+ * Copyright (C) 2004-7, 2009, 2011-13 Richard Kettlewell

  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -21,11 +21,22 @@
 
 #include "common.h"
 
 
 #include "common.h"
 

-#include <netinet/in.h>
-#include <sys/un.h>
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#if HAVE_SYS_UN_H
+# include <sys/un.h>
+#endif

 #include <errno.h>
 #include <errno.h>

-#include <netdb.h>
-#include <unistd.h>
+#if HAVE_NETDB_H
+# include <netdb.h>
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#if HAVE_WS2TCPIP_H
+# include <Ws2tcpip.h>
+#endif

 
 #include "log.h"
 #include "configuration.h"
 
 #include "log.h"
 #include "configuration.h"


@@ -42,7 +53,9 @@
 socklen_t find_server(struct config *c,
                       struct sockaddr **sap, char **namep) {
   struct sockaddr *sa;
 socklen_t find_server(struct config *c,
                       struct sockaddr **sap, char **namep) {
   struct sockaddr *sa;

+#if !_WIN32

   struct sockaddr_un su;
   struct sockaddr_un su;

+#endif

   struct addrinfo *res = 0;
   char *name = NULL;
   socklen_t len;
   struct addrinfo *res = 0;
   char *name = NULL;
   socklen_t len;


@@ -54,18 +67,19 @@ socklen_t find_server(struct config *c,
     sa = res->ai_addr;
     len = res->ai_addrlen;
   } else {
     sa = res->ai_addr;
     len = res->ai_addrlen;
   } else {

-    if(getuid() == 0) {
-      /* root will use the private socket if possible (which it should be) */
-      name = config_get_file2(c, "private/socket");
-      if(access(name, R_OK) != 0) {
-        xfree(name);
-        name = NULL;
-      }
+#if _WIN32
+    disorder_fatal(0, "local connections are not supported on Windows");
+#else
+    /* use the private socket if possible (which it should be) */
+    name = config_get_file2(c, "private/socket");
+    if(access(name, R_OK) != 0) {
+      xfree(name);
+      name = NULL;

     }
     if(!name)
       name = config_get_file2(c, "socket");
     if(strlen(name) >= sizeof su.sun_path) {
     }
     if(!name)
       name = config_get_file2(c, "socket");
     if(strlen(name) >= sizeof su.sun_path) {

-      disorder_error(errno, "socket path is too long");
+      disorder_error(0, "socket path is too long");

       return -1;
     }
     memset(&su, 0, sizeof su);
       return -1;
     }
     memset(&su, 0, sizeof su);


@@ -74,6 +88,7 @@ socklen_t find_server(struct config *c,
     sa = (struct sockaddr *)&su;
     len = sizeof su;
     xfree(name);
     sa = (struct sockaddr *)&su;
     len = sizeof su;
     xfree(name);

+#endif

   }
   *sap = xmalloc_noptr(len);
   memcpy(*sap, sa, len);
   }
   *sap = xmalloc_noptr(len);
   memcpy(*sap, sa, len);