X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/7481fc9c5a603e35a6972c0be07d18d507e5dd50..755e6619263d316dc46fa504e0c333c963ec8eaa:/un.c

diff --git a/un.c b/un.c
index 6fd46b4..1ee5363 100644
--- a/un.c
+++ b/un.c
@@ -1,64 +1,30 @@
 /* -*-c-*-
  *
- * $Id: un.c,v 1.9 2004/04/08 01:36:25 mdw Exp $
- *
  * Protocol specific definitions for Unix-domain sockets
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
- * This file is part of the `fw' port forwarder.
+ * This file is part of the `fwd' port forwarder.
  *
- * `fw' is free software; you can redistribute it and/or modify
+ * `fwd' is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
- * `fw' is distributed in the hope that it will be useful,
+ *
+ * `fwd' is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
- * along with `fw'; if not, write to the Free Software Foundation,
+ * along with `fwd'; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Header files ------------------------------------------------------*/
-
-#include "config.h"
-#undef sun /* Cretins */
-
-#include <errno.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#include <mLib/alloc.h>
-#include <mLib/dstr.h>
-#include <mLib/report.h>
-#include <mLib/sub.h>
-
-#include "addr.h"
-#include "conf.h"
-#include "fattr.h"
-#include "fw.h"
-#include "reffd.h"
-#include "scan.h"
-#include "socket.h"
-#include "un.h"
+#include "fwd.h"
 
 /*----- Data structures ---------------------------------------------------*/
 
@@ -81,7 +47,7 @@ static addr *un_read(scanner *sc, unsigned type)
   dstr d = DSTR_INIT;
   un_addr *ua;
 
-  conf_name(sc, '/', &d);
+  conf_fname(sc, &d);
   ua = xmalloc(sizeof(addr) +
 	       offsetof(struct sockaddr_un, sun_path) +
 	       d.len + 1);
@@ -153,8 +119,8 @@ static reffd *un_accept(int fd, addr_opts *ao, const char *desc)
   {
     char buf[PATH_MAX + sizeof(struct sockaddr)];
     struct sockaddr_un *sun = (struct sockaddr_un *)buf;
-    size_t sunsz = sizeof(buf);
- 
+    socklen_t sunsz = sizeof(buf);
+
     if ((nfd = accept(fd, (struct sockaddr *)sun, &sunsz)) < 0)
       return (0);
   }