X-Git-Url: https://git.cworth.org/git?p=ttt;a=blobdiff_plain;f=src%2Fx.c;h=a95fedfbc5e8a142606698cf4ab629368e1e2e8d;hp=18c69a47457bf786aa9899999ed419ea96cdb4dd;hb=7de44ed398081656115dce6db7d0a04c1a50bb34;hpb=ded32923a25488449be27687013845d7fa0e9e5e

diff --git a/src/x.c b/src/x.c
index 18c69a4..a95fedf 100644
--- a/src/x.c
+++ b/src/x.c
@@ -151,6 +151,9 @@ xstrdup (const char *s)
 {
     char *ret;
 
+    if (s == NULL)
+	return NULL;
+
     ret = strdup (s);
 
     if (ret == NULL) {
@@ -202,6 +205,29 @@ xbind (int sockfd, const struct sockaddr *my_addr, socklen_t addrlen)
     }
 }
 
+ttt_status_t
+xconnect (int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen)
+{
+    int ret;
+
+    ret = connect (sockfd, serv_addr, addrlen);
+    if (ret == -1) {
+	switch (errno) {
+	case ECONNREFUSED:
+	    return TTT_STATUS_CONNECTION_REFUSED;
+	case EHOSTUNREACH:
+	case ENETUNREACH:
+	    return TTT_STATUS_NETWORK_UNREACHABLE;
+	default:
+	fprintf (stderr, "Error: connect failed (errno = %d): %s. Aborting.\n",
+		 errno, strerror (errno));
+	exit (1);
+	}
+    }
+
+    return TTT_STATUS_SUCCESS;
+}
+
 void
 xlisten (int s, int backlog)
 {
@@ -248,3 +274,33 @@ xselect (int		 n,
 
     return ret;
 }
+
+ssize_t
+xread (int fd, void *buf, size_t count)
+{
+    int ret;
+
+    ret = read (fd, buf, count);
+    if (ret == -1) {
+	fprintf (stderr, "Error: read failed: %s. Aborting.\n",
+		 strerror (errno));
+	exit (1);
+    }
+
+    return ret;
+}
+
+ssize_t
+xwrite (int fd, const void *buf, size_t count)
+{
+    int ret;
+
+    ret = write (fd, buf, count);
+    if (ret == -1) {
+	fprintf (stderr, "Error: write failed: %s. Aborting.\n",
+		 strerror (errno));
+	exit (1);
+    }
+
+    return ret;
+}