X-Git-Url: http://git.alex.org.uk

diff --git a/cliserv.h b/cliserv.h
index b05e7ee..77310c3 100644
--- a/cliserv.h
+++ b/cliserv.h
@@ -35,7 +35,21 @@ typedef unsigned long long u64;
 #error I need at least some 64-bit type
 #endif
 
-#include NBD_H
+#ifdef NBD_H_LOCAL
+/* 2.6.18 and above use __be* rather than u* */
+#define __be32 u32
+#define __be64 u64
+#include "nbd.h"
+#endif
+#ifdef NBD_H_LINUX
+# ifdef HAVE_LINUX_TYPES_H
+#  include <linux/types.h>
+# else
+#  define __be32 u32
+#  define __be64 u64
+# endif
+# include <linux/nbd.h>
+#endif
 
 #if NBD_LFS==1
 #define _LARGEFILE_SOURCE
@@ -47,8 +61,7 @@ u64 cliserv_magic = 0x00420281861253LL;
 
 #define INFO(a) do { } while(0)
 
-void setmysockopt(int sock)
-{
+void setmysockopt(int sock) {
 	int size = 1;
 #if 0
 	if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, &size, sizeof(int)) < 0)
@@ -66,21 +79,29 @@ void setmysockopt(int sock)
 #endif
 }
 
-void err(const char *s)
-{
+#ifndef G_GNUC_NORETURN
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#define G_GNUC_NORETURN __attribute__((__noreturn__))
+#else
+#define G_GNUC_NORETURN
+#endif
+#endif
+
+void err(const char *s) G_GNUC_NORETURN;
+
+void err(const char *s) {
 	const int maxlen = 150;
 	char s1[maxlen], *s2;
-	int n = 0;
 
 	strncpy(s1, s, maxlen);
-	if (s2 = strstr(s, "%m")) {
+	if ((s2 = strstr(s, "%m"))) {
 		strcpy(s1 + (s2 - s), strerror(errno));
 		s2 += 2;
 		strcpy(s1 + strlen(s1), s2);
 	}
 #ifndef	sun
 	/* Solaris doesn't have %h in syslog */
-	else if (s2 = strstr(s, "%h")) {
+	else if ((s2 = strstr(s, "%h"))) {
 		strcpy(s1 + (s2 - s), hstrerror(h_errno));
 		s2 += 2;
 		strcpy(s1 + strlen(s1), s2);
@@ -90,14 +111,13 @@ void err(const char *s)
 	s1[maxlen-1] = '\0';
 #ifdef ISSERVER
 	syslog(LOG_ERR, "%s", s1);
-#else
-	fprintf(stderr, "Error: %s\n", s1);
+	syslog(LOG_ERR, "Exiting.");
 #endif
+	fprintf(stderr, "Error: %s\nExiting.\n", s1);
 	exit(1);
 }
 
-void logging(void)
-{
+void logging(void) {
 #ifdef ISSERVER
 	openlog(MY_NAME, LOG_PID, LOG_DAEMON);
 #endif
@@ -106,13 +126,11 @@ void logging(void)
 }
 
 #ifdef WORDS_BIGENDIAN
-u64 ntohll(u64 a)
-{
+u64 ntohll(u64 a) {
 	return a;
 }
 #else
-u64 ntohll(u64 a)
-{
+u64 ntohll(u64 a) {
 	u32 lo = a & 0xffffffff;
 	u32 hi = a >> 32U;
 	lo = ntohl(lo);
@@ -121,3 +139,7 @@ u64 ntohll(u64 a)
 }
 #endif
 #define htonll ntohll
+
+/* Flags used between the client and server */
+#define NBD_FLAG_HAS_FLAGS	(1 << 0)	/* Flags are there */
+#define NBD_FLAG_READ_ONLY	(1 << 1)	/* Device is read-only */