X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/7481fc9c5a603e35a6972c0be07d18d507e5dd50..e35ff2b844e30196d4eb7c0693e5eaf214dfcbbb:/file.c

diff --git a/file.c b/file.c
index 5a97064..cf0706d 100644
--- a/file.c
+++ b/file.c
@@ -1,13 +1,11 @@
 /* -*-c-*-
  *
- * $Id: file.c,v 1.7 2004/04/08 01:36:25 mdw Exp $
- *
  * File source and target
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the `fw' port forwarder.
  *
@@ -15,46 +13,18 @@
  * 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,
  * 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,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Header files ------------------------------------------------------*/
-
-#include "config.h"
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include <mLib/alloc.h>
-#include <mLib/dstr.h>
-#include <mLib/fdflags.h>
-#include <mLib/sub.h>
-
-#include "conf.h"
-#include "endpt.h"
-#include "fattr.h"
-#include "file.h"
 #include "fw.h"
-#include "reffd.h"
-#include "scan.h"
-#include "source.h"
-#include "target.h"
 
 /*----- Data structures ---------------------------------------------------*/
 
@@ -92,7 +62,7 @@ typedef struct fdata {
 typedef struct fsource {
   source s;
   fdata f;
-} fsource;  
+} fsource;
 
 /* --- File target block --- */
 
@@ -178,7 +148,7 @@ static reffd *file_nullref(void)
     reffd_handler(rnull, file_null, 0);
   }
   return (rnull);
-}  
+}
 
 /* --- @file_fspec@ --- *
  *
@@ -252,7 +222,7 @@ static void file_fspec(fspec *f, scanner *sc)
   else if (fd) {
     f->type = FTYPE_FD;
     f->u.fd = fd;
-    token(sc);  
+    token(sc);
   } else if (type == FTYPE_FD) {
     if (sc->t == CTOK_WORD)
       error(sc, "bad file descriptor `%s'", sc->d.buf);
@@ -308,7 +278,7 @@ static void file_pfspec(fspec *f, dstr *d)
     case FTYPE_NULL:
       dstr_puts(d, "null");
       break;
-  }	  
+  }
 }
 
 static void file_desc(fdata *f, dstr *d)