X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/206212ca161b23aece16795f0b4e61a133ba7a6a..367d81afe3d72b6bc1519d2ae2187a6535370025:/file.c

diff --git a/file.c b/file.c
index 914edd8..8b4f533 100644
--- a/file.c
+++ b/file.c
@@ -7,52 +7,24 @@
 
 /*----- 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"
-
-#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"
+#include "fwd.h"
 
 /*----- Data structures ---------------------------------------------------*/
 
@@ -168,7 +140,7 @@ static reffd *file_nullref(void)
   else {
     int n;
     if ((n = open("/dev/null", O_RDWR)) < 0) {
-      fw_log(-1, "couldn't open `/dev/null': %s", strerror(errno));
+      fw_log(NOW, "couldn't open `/dev/null': %s", strerror(errno));
       return (0);
     }
     fdflags(n, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
@@ -258,7 +230,7 @@ static void file_fspec(fspec *f, scanner *sc)
       error(sc, "parse error, expected file descriptor");
   } else {
     dstr d = DSTR_INIT;
-    conf_name(sc, '/', &d);
+    conf_fname(sc, &d);
     f->type = FTYPE_NAME;
     f->u.name = xstrdup(d.buf);
     dstr_destroy(&d);
@@ -270,13 +242,15 @@ static void file_fspec(fspec *f, scanner *sc)
 static void file_read(fdata *f, scanner *sc)
 {
   file_fspec(&f->in, sc);
-  if (sc->t != ',') {
+  if (sc->t == ',') {
+    token(sc);
+    file_fspec(&f->out, sc);
+  } else {
     f->out = f->in;
     if (f->out.type == FTYPE_FD && f->out.u.fd == rstdin)
       f->out.u.fd = rstdout;
-  } else {
-    token(sc);
-    file_fspec(&f->out, sc);
+    else if (f->out.type == FTYPE_NAME)
+      f->out.u.name = xstrdup(f->in.u.name);
   }
   f->fa = fattr_global;
   f->fo = file_opts;
@@ -385,7 +359,7 @@ static endpt *file_endpt(fdata *f, const char *desc)
     case FTYPE_NAME: {
       int fd;
       if ((fd = open(f->in.u.name, O_RDONLY | O_NONBLOCK)) < 0) {
-	fw_log(-1, "[%s] couldn't open `%s' for reading: %s",
+	fw_log(NOW, "[%s] couldn't open `%s' for reading: %s",
 	       desc, f->in.u.name, strerror(errno));
 	return (0);
       }
@@ -417,7 +391,7 @@ static endpt *file_endpt(fdata *f, const char *desc)
       if ((m & O_CREAT) &&
 	  (fd = open(f->out.u.name, m | O_EXCL, f->fa.mode)) < 0 &&
 	  (errno != EEXIST || (m & O_EXCL))) {
-	fw_log(-1, "[%s] couldn't create `%s': %s",
+	fw_log(NOW, "[%s] couldn't create `%s': %s",
 	       desc, f->out.u.name, strerror(errno));
 	REFFD_DEC(in);
 	return (0);
@@ -425,11 +399,11 @@ static endpt *file_endpt(fdata *f, const char *desc)
 
       if (fd != -1) {
 	if (fattr_apply(f->out.u.name, &f->fa)) {
-	  fw_log(-1, "[%s] couldn't apply file attributes to `%s': %s",
+	  fw_log(NOW, "[%s] couldn't apply file attributes to `%s': %s",
 		 desc, f->out.u.name, strerror(errno));
 	}
       } else if ((fd = open(f->out.u.name, m & ~O_CREAT)) < 0) {
-	fw_log(-1, "[%s] couldn't open `%s': %s",
+	fw_log(NOW, "[%s] couldn't open `%s': %s",
 	       desc, f->out.u.name, strerror(errno));
 	REFFD_DEC(in);
 	return (0);
@@ -516,7 +490,7 @@ static void fsource_attach(source *s, scanner *sc, target *t)
     ee->ops->close(ee);
     goto tidy;
   }
-  endpt_join(e, ee);
+  endpt_join(e, ee, fs->s.desc);
 
   /* --- Dispose of the source and target now --- */