From 79b6e800c6162424203533bedcc35da2fbadbcf8 Mon Sep 17 00:00:00 2001
From: Gerhard Rieger <gerhard@dest-unreach.org>
Date: Tue, 29 Jan 2008 22:11:28 +0100
Subject: [PATCH] corrected some print statements and variable names

---
 CHANGES      |  2 ++
 VERSION      |  2 +-
 dalan.c      |  4 ++--
 xio-rawip.c  | 11 ++++++-----
 xio-system.c |  3 ++-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 88aca29..667f5e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,8 @@ new features:
 	docu source doc/socat.yo released
 
 corrections:
+	corrected some print statements and variable names
+
 	make uninstall  did not uninstall procan
 
 	fixed lots of weaknesses in test.sh
diff --git a/VERSION b/VERSION
index 32c65da..075b3c7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-"1.6.0.0"
+"1.6.0.0+"
diff --git a/dalan.c b/dalan.c
index 74ea4a8..bc475cd 100644
--- a/dalan.c
+++ b/dalan.c
@@ -1,5 +1,5 @@
 /* source: dalan.c */
-/* Copyright Gerhard Rieger 2001-2004 */
+/* Copyright Gerhard Rieger 2001-2008 */
 /* Published under the GNU General Public License V.2, see file COPYING */
 
 /* idea of a low level data description language. currently only a most
@@ -79,7 +79,7 @@ int dalan(const char *line, char *data, size_t *p, size_t n) {
   size_t p1 = *p;
   char c;
 
-  fputs(line, stderr); fputc('\n', stderr);
+  /*fputs(line, stderr); fputc('\n', stderr);*/
   while (c = *line++) {
     switch (c) {
     case ' ':
diff --git a/xio-rawip.c b/xio-rawip.c
index e0ab9b4..1fe7450 100644
--- a/xio-rawip.c
+++ b/xio-rawip.c
@@ -1,5 +1,5 @@
 /* source: xio-rawip.c */
-/* Copyright Gerhard Rieger 2001-2007 */
+/* Copyright Gerhard Rieger 2001-2008 */
 /* Published under the GNU General Public License V.2, see file COPYING */
 
 /* this file contains the source for opening addresses of raw IP type */
@@ -29,7 +29,7 @@ int xioopen_rawip_datagram(int argc, const char *argv[], struct opt *opts,
 static
 int xioopen_rawip_recvfrom(int argc, const char *argv[], struct opt *opts,
 			 int xioflags, xiofile_t *xfd, unsigned groups,
-			 int pf, int dummy2, int dummy3);
+			 int pf, int socktype, int dummy3);
 static
 int xioopen_rawip_recv(int argc, const char *argv[], struct opt *opts,
 		       int xioflags, xiofile_t *xfd, unsigned groups,
@@ -250,11 +250,12 @@ int xioopen_rawip_recvfrom(int argc, const char *argv[], struct opt *opts,
 static
 int xioopen_rawip_recv(int argc, const char *argv[], struct opt *opts,
 		       int xioflags, xiofile_t *xfd, unsigned groups,
-		       int pf, int socktype, int ipproto) {
+		       int pf, int socktype, int dummy3) {
    const char *protname = argv[1];
    char *garbage;
    union sockaddr_union us;
    socklen_t uslen = sizeof(us);
+   int ipproto;
    int result;
 
    if (argc != 2) {
@@ -264,11 +265,11 @@ int xioopen_rawip_recv(int argc, const char *argv[], struct opt *opts,
    }
 
    if ((ipproto = strtoul(protname, &garbage, 0)) >= 256) {
-      Error2("xioopen_rawip_recvfrom(\"%s\",,): protocol number exceeds 255 (%u)",
+      Error2("xioopen_rawip_recv(\"%s\",,): protocol number exceeds 255 (%u)",
 	     protname, ipproto);
       return STAT_NORETRY;
    } else if (*garbage) {
-      Warn1("xioopen_rawip_recvfrom(\"%s\",,): trailing garbage in protocol specification",
+      Warn1("xioopen_rawip_recv(\"%s\",,): trailing garbage in protocol specification",
 	     protname);
       /*return STAT_NORETRY;*/
    }
diff --git a/xio-system.c b/xio-system.c
index 9b0e949..71dd8eb 100644
--- a/xio-system.c
+++ b/xio-system.c
@@ -1,5 +1,5 @@
 /* source: xio-system.c */
-/* Copyright Gerhard Rieger 2001-2006 */
+/* Copyright Gerhard Rieger 2001-2008 */
 /* Published under the GNU General Public License V.2, see file COPYING */
 
 /* this file contains the source for opening addresses of system type */
@@ -54,6 +54,7 @@ static int xioopen_system(int argc, const char *argv[], struct opt *opts,
       result = System(string);
       if (result != 0) {
 	 Warn2("system(\"%s\") returned with status %d", string, result);
+	 Warn1("system(): %s", strerror(errno));
       }
       Exit(0);	/* this child process */
    }