~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More general error handling for sinks
[disorder]
/
lib
/
client-common.c
diff --git
a/lib/client-common.c
b/lib/client-common.c
index
f88008f
..
3e419e4
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,19
@@
#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
#include "log.h"
#include "configuration.h"
#include "log.h"
#include "configuration.h"
@@
-63,7
+71,7
@@
socklen_t find_server(struct config *c,
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);