Make this build.


(dholland)

$NetBSD: patch-async_aio.C,v 1.1 2017/09/09 19:45:46 dholland Exp $

Clean up %m abuse.

--- async/aio.C~	2009-02-12 13:20:42.000000000 +0000
+++ async/aio.C
@@ -21,6 +21,7 @@
  *
  */
 
+#include <cstring>
 #include "aiod.h"
 
 aiobuf::aiobuf (aiod *d, size_t p, size_t l)
@@ -62,7 +63,7 @@ aiod::writeq::output ()
   wbuf.copyout (buf, wsize);
   ssize_t n = write (wfd, buf, wsize);
   if (n < 0)
-    fatal ("write to aiod failed (%m)\n"); // XXX - should make aiod fail
+    fatal ("write to aiod failed (%s)\n", strerror(errno)); // XXX - should make aiod fail
   wbuf.rembytes (n);
   if (!wbuf.resid ())
     fdcb (wfd, selwrite, NULL);
@@ -81,7 +82,7 @@ aiod::writeq::sendmsg (aiomsg_t msg)
   else {
     ssize_t n = write (wfd, &msg, sizeof (msg));
     if (n < 0)
-      fatal ("write to aiod failed (%m)\n");
+      fatal ("write to aiod failed (%s)\n", strerror(errno));
     if (n != sizeof (msg)) {
       // Writes less than PIPE_BUF were supposed to be atomic
       warn ("aiod::writeq::sendmsg: partial write (%d bytes)\n", (int) n);
@@ -98,7 +99,7 @@ aiod::daemon::launch (str path, int shmf
 
   int fds[2];
   if (socketpair (AF_UNIX, SOCK_STREAM, 0, fds) < 0)
-    fatal ("aiod::daemon::launch: socketpair failed: %m\n");
+    fatal ("aiod::daemon::launch: socketpair failed: %s\n", strerror(errno));
   wq.wfd = fd = fds[0];
   close_on_exec (fd);
 
@@ -166,24 +167,24 @@ aiod::aiod (u_int nproc, ssize_t shmsize
       xfree (temp);
     }
   if (!tmpfile)
-    fatal ("aiod: could not create temporary file: %m\n");
+    fatal ("aiod: could not create temporary file: %s\n", strerror(errno));
   umask (m);
   close_on_exec (shmfd);
   if (ftruncate (shmfd, shmmax) < 0)
-    fatal ("aiod: could not grow shared mem file (%m)\n");
+    fatal ("aiod: could not grow shared mem file (%s)\n", strerror(errno));
   struct stat sb;
   if (fstat (shmfd, &sb) < 0)
-    fatal ("fstat (%s): %m\n", tmpfile.cstr ());
+    fatal ("fstat (%s): %s\n", tmpfile.cstr (), strerror(errno));
 
   shmbuf = static_cast<char *>
     (mmap (NULL, (size_t) shmmax, PROT_READ|PROT_WRITE,
 	   MAP_FILE|MAP_SHARED, shmfd, 0));
   if (shmbuf == (char *) MAP_FAILED)
-    fatal ("aiod: could not mmap shared mem file (%m)\n");
+    fatal ("aiod: could not mmap shared mem file (%s)\n", strerror(errno));
 
   int fds[2];
   if (pipe (fds) < 0)
-    fatal ("aiod: pipe syscall failed: %m\n");
+    fatal ("aiod: pipe syscall failed: %s\n", strerror(errno));
   wq.wfd = fds[1];
   close_on_exec (wq.wfd);
   int rfd = fds[0];
@@ -201,10 +202,10 @@ aiod::aiod (u_int nproc, ssize_t shmsize
      * wherever possible we use flock as it is faster.)  */
     int fd = ::open (tmpfile, O_RDWR);
     if (fd < 0)
-      fatal ("cannot reopen %s: %m\n", tmpfile.cstr ());
+      fatal ("cannot reopen %s: %s\n", tmpfile.cstr (), strerror(errno));
     struct stat sb2;
     if (fstat (fd, &sb2) < 0)
-      fatal ("fstat (%s): %m\n", tmpfile.cstr ());
+      fatal ("fstat (%s): %s\n", tmpfile.cstr (), strerror(errno));
     if (sb.st_dev != sb2.st_dev || sb.st_ino != sb2.st_ino)
       fatal ("aiod: somone tampered with %s\n", tmpfile.cstr ());
 
@@ -223,14 +224,14 @@ aiod::aiod (u_int nproc, ssize_t shmsize
    * consuming disk space to make sure it gets garbage collected
    * properly.  */
   if (::unlink (tmpfile) < 0)
-    fatal ("aiod: unlink (%s): %m\n", tmpfile.cstr ());
+    fatal ("aiod: unlink (%s): %s\n", tmpfile.cstr (), strerror(errno));
 }
 
 aiod::~aiod ()
 {
   fail ();
   if (munmap (shmbuf, shmlen) < 0)
-    warn ("~aiod could not unmap shared mem: %m\n");
+    warn ("~aiod could not unmap shared mem: %s\n", strerror(errno));
   close (shmfd);
   delete[] dv;
 }
@@ -267,7 +268,7 @@ aiod::input (int i)
   ssize_t n = read (dv[i].fd, buf, sizeof (buf));
   if (n <= 0) {
     if (n < 0)
-      warn ("aiod: read: %m\n");
+      warn ("aiod: read: %s\n", strerror(errno));
     else
       warn ("aiod: EOF\n");
     fail ();
@@ -469,7 +470,7 @@ aiod::bufalloc_cb2 (size_t inc, ptr<aiob
     bb.settotsize (shmlen + inc);
     shmlen = bb.gettotsize ();
     if (shmpin && mlock (shmbuf + oshmlen, shmlen - oshmlen) < 0)
-      warn ("could not pin aiod shared memory: %m\n");
+      warn ("could not pin aiod shared memory: %s\n", strerror(errno));
     bufwake ();
   }
 }

$NetBSD: patch-async_daemonize.C,v 1.1 2017/09/09 19:45:46 dholland Exp $

Clean up %m abuse.

--- async/daemonize.C~	2009-02-12 13:20:42.000000000 +0000
+++ async/daemonize.C
@@ -21,6 +21,7 @@
  *
  */
 
+#include <cstring>
 #include "async.h"
 
 str syslog_priority ("daemon.notice");
@@ -31,7 +32,7 @@ start_log_to_file (const str &line, cons
   int fd;
   int n;
   if ((fd = open (logfile.cstr (), flags, m)) < 0) {
-    warn ("%s: %m\n", logfile.cstr ());
+    warn ("%s: %s\n", logfile.cstr (), strerror(errno));
     fd = errfd;
   } else {
     warn << "Logging via logfile: " << logfile << "\n";
@@ -65,7 +66,7 @@ start_logger (const str &priority, const
   pid_t pid;
   int status;
   if ((pid = spawn (PATH_LOGGER, av, 0, 0, errfd)) < 0) {
-    warn ("%s: %m\n", PATH_LOGGER);
+    warn ("%s: %s\n", PATH_LOGGER, strerror(errno));
     return start_log_to_file (line, logfile, flags, mode);
   } 
   if (waitpid (pid, &status, 0) <= 0 || !WIFEXITED (status) || 
@@ -74,7 +75,7 @@ start_logger (const str &priority, const
 
   int fds[2];
   if (socketpair (AF_UNIX, SOCK_STREAM, 0, fds) < 0)
-    fatal ("socketpair: %m\n");
+    fatal ("socketpair: %s\n", strerror(errno));
   close_on_exec (fds[0]);
   if (fds[1] != 0)
     close_on_exec (fds[1]);
@@ -84,7 +85,7 @@ start_logger (const str &priority, const
     close (fds[1]);
     return fds[0];
   } else 
-    warn ("%s: %m\n", PATH_LOGGER);
+    warn ("%s: %s\n", PATH_LOGGER, strerror(errno));
 #endif /* PATH_LOGGER */
   return start_log_to_file (line, logfile, flags, mode);
 }
@@ -103,7 +104,7 @@ start_logger ()
     close (fd);
 
   if (socketpair (AF_UNIX, SOCK_STREAM, 0, fds) < 0)
-    fatal ("socketpair: %m\n");
+    fatal ("socketpair: %s\n", strerror(errno));
   close_on_exec (fds[0]);
   if (fds[1] != 0)
     close_on_exec (fds[1]);
@@ -113,7 +114,7 @@ start_logger ()
     if (fds[0] != errfd) {
       err_flush ();		// XXX - we shouldn't depend on aerr.C
       if (dup2 (fds[0], errfd) < 0)
-	fatal ("dup2: %m\n");
+	fatal ("dup2: %s\n", strerror(errno));
       close (fds[0]);
     }
     if (errfd != 1)
@@ -121,7 +122,7 @@ start_logger ()
     return;
   }
   else
-    warn ("%s: %m\n", PATH_LOGGER);
+    warn ("%s: %s\n", PATH_LOGGER, strerror(errno));
 #endif /* PATH_LOGGER */
   
   /* No logger, at least send chatter to stdout rather than stderr, so
@@ -161,13 +162,13 @@ daemonize (const str &nm)
   default:
     _exit (0);
   case -1:
-    fatal ("fork: %m\n");
+    fatal ("fork: %s\n", strerror(errno));
   case 0:
     break;
   }
     
   if (setsid () == -1)
-    fatal ("setsid: %m\n");
+    fatal ("setsid: %s\n", strerror(errno));
   if (!builddir) {
     start_logger ();
     str path = strbuf () << PIDDIR << "/" << pidfilebase << ".pid";

$NetBSD: patch-async_dns.C,v 1.1 2017/09/09 19:45:46 dholland Exp $

Clean up %m abuse.

--- async/dns.C~	2009-02-12 13:20:42.000000000 +0000
+++ async/dns.C
@@ -156,13 +156,13 @@ resolver::udpinit ()
   udpsock = NULL;
   int fd = socket (addr->sa_family, SOCK_DGRAM, 0);
   if (fd < 0) {
-    warn ("resolver::udpsock: socket: %m\n");
+    warn ("resolver::udpsock: socket: %s\n", strerror(errno));
     return false;
   }
   make_async (fd);
   close_on_exec (fd);
   if (connect (fd, addr, addrlen) < 0) {
-    warn ("resolver::udpsock: connect: %m\n");
+    warn ("resolver::udpsock: connect: %s\n", strerror(errno));
     close (fd);
     return false;
   }
@@ -177,7 +177,7 @@ resolver::tcpinit ()
   tcpsock = NULL;
   int fd = socket (addr->sa_family, SOCK_STREAM, 0);
   if (fd < 0) {
-    warn ("resolver::tcpsock: socket: %m\n");
+    warn ("resolver::tcpsock: socket: %s\n", strerror(errno));
     return false;
   }
   make_async (fd);
@@ -415,7 +415,7 @@ resolv_conf::reload_cb (ref<bool> d, boo
   reload_lock = false;
   last_reload = sfs_get_timenow();
   if (!newres) {
-    warn ("resolv_conf::reload_cb: fork: %m\n");
+    warn ("resolv_conf::reload_cb: fork: %s\n", strerror(errno));
     setsock (true);
     return;
   }

$NetBSD: patch-async_dnsparse.C,v 1.1 2017/09/09 19:45:46 dholland Exp $

Fix up illegal pointer aliasing.

--- async/dnsparse.C~	2009-02-12 13:20:42.000000000 +0000
+++ async/dnsparse.C
@@ -757,10 +757,15 @@ printaddrs (const char *msg, ptr<hostent
 void
 printhints (addrhint **hpp)
 {
-  for (; *hpp; hpp++)
-    if ((*hpp)->h_addrtype == AF_INET)
+  in_addr ia;
+
+  for (; *hpp; hpp++) {
+    if ((*hpp)->h_addrtype == AF_INET) {
+      memcpy(&ia, (*hpp)->h_address, sizeof(ia));
       printf ("    (hint:  %s %s)\n", (*hpp)->h_name,
-	      inet_ntoa (*(in_addr *) (*hpp)->h_address));
+	      inet_ntoa (ia));
+    }
+  }
 }
 
 void

$NetBSD: patch-async_ifchg.C,v 1.1 2017/09/09 19:45:46 dholland Exp $

Clean up %m abuse.

--- async/ifchg.C~	2009-02-12 13:20:42.000000000 +0000
+++ async/ifchg.C
@@ -21,6 +21,7 @@
  *
  */
 
+#include <cstring>
 #include "async.h"
 #include "dns.h"
 #include "list.h"
@@ -74,7 +75,7 @@ ifchgcb (cbv cb)
 {
   if (!lazy) {
     if (!myipaddrs (&ifchg_addrs))
-      fatal ("myipaddrs: %m\n");
+      fatal ("myipaddrs: %s\n", strerror(errno));
     lazy = lazycb (60, wrap (ifchgcb_test));
   }
   ifchgcb_t *chg = New ifchgcb_t (cb);

$NetBSD: patch-async_ihash.C,v 1.1 2017/09/09 19:45:46 dholland Exp $

Use legal C++ syntax.

--- async/ihash.C~	2009-02-23 16:26:42.000000000 +0000
+++ async/ihash.C
@@ -53,7 +53,7 @@ _ihash_grow (_ihash_table *htp, const si
       nbuckets = 3;
   }
   
-  ntab = New (void * [nbuckets]);
+  ntab = New void * [nbuckets];
   bzero (ntab, nbuckets * sizeof (*ntab));
 
   for (i = 0; i < htp->buckets; i++)

$NetBSD: patch-async_myname.C,v 1.1 2017/09/09 19:45:46 dholland Exp $

Clean up %m abuse.

--- async/myname.C~	2009-02-12 13:20:42.000000000 +0000
+++ async/myname.C
@@ -21,6 +21,7 @@
  *
  */
 
+#include <cstring>
 #include "dns.h"
 
 str
@@ -42,7 +43,7 @@ myname ()
   char namebuf[MAXHOSTNAMELEN+1];
   namebuf[MAXHOSTNAMELEN] = '\0';
   if (gethostname (namebuf, MAXHOSTNAMELEN) < 0)
-    panic ("gethostname: %m\n");
+    panic ("gethostname: %s\n", strerror(errno));
 
   if (strchr (namebuf, '.'))
     return namebuf;

$NetBSD: patch-configure,v 1.1 2017/09/09 19:45:46 dholland Exp $

Don't trash LDFLAGS.

--- configure~	2009-06-09 14:29:57.000000000 +0000
+++ configure
@@ -35514,9 +35514,9 @@ for flag in $LDFLAGS; do
 	LIBAPM=
 	new_LDFLAGS="$new_LDFLAGS -all-static"
     else
-	new_LDFLAGS=" $flag"
+	new_LDFLAGS="$new_LDFLAGS $flag"
     fi
 done
 LDFLAGS="$new_LDFLAGS"
 
 { $as_echo "$as_me:$LINENO: checking for MAP_NOSYNC option" >&5

$NetBSD: patch-configure.in,v 1.1 2017/09/09 19:45:46 dholland Exp $

Don't trash LDFLAGS.

--- configure.in~	2009-06-09 14:29:36.000000000 +0000
+++ configure.in
@@ -347,7 +347,7 @@ for flag in $LDFLAGS; do
 	LIBAPM=
 	new_LDFLAGS="$new_LDFLAGS -all-static"
     else
-	new_LDFLAGS=" $flag"
+	new_LDFLAGS="$new_LDFLAGS $flag"
     fi
 done
 LDFLAGS="$new_LDFLAGS"