diff --git a/CHANGES b/CHANGES
index 77d7764..9f034b3 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+Changes to proxytunnel version 1.0.7 -- Sat Nov 24 12:32:02 CET 2001
+
+- Applied patch from "Andrew Griffiths" <nullptr@tasmail.com> to fix
+  possible string format attacks. -- Maniac
+- Some code cleanup and reformatting -- Maniac
+- Added '-q' / '--quiet' flag to suppress status messages, Proxytunnel
+  can not be completely quiet and transparant. (Not when also providing
+  the '-v' flag naturally) -- Maniac
+- Changed ipbuf size to 16, which should be enough. -- Maniac
+
 Changes to proxytunnel version 1.0.6 -- Thu Nov 22 10:38:10 CET 2001
 
 - Added support for compiling on Solaris, uncomment some lines in the
diff --git a/CREDITS b/CREDITS
index e828656..6874672 100644
--- a/CREDITS
+++ b/CREDITS
@@ -8,6 +8,7 @@ people.
 
 	Ralph Loader <suckfish@ihug.co.nz>	- Broken DNS w/ DynDNS patch
 	Martin Senft <martin@illicon.de>	- Solaris patches
+	Andrew Griffiths" <nullptr@tasmail.com> - String format fixes
 
 
 Furthermore we would like to thank the wonderfull people at SourceForge
diff --git a/cmdline.c b/cmdline.c
index 7555b28..a92403b 100755
--- a/cmdline.c
+++ b/cmdline.c
@@ -57,6 +57,7 @@ cmdline_parser_print_help (void)
    -D INT     --destport=INT      Destination portnumber to built the tunnel to\n\
    -n         --dottedquad        Convert destination hostname to dotted quad\n\
    -v         --verbose           Turn on verbosity (default=off)\n\
+   -q         --quiet             Suppress messages  (default=off)\n\
 ", PACKAGE);
 }
 
@@ -76,33 +77,36 @@ gengetopt_strdup (char * s)
   return n;
 }
 
-
-int
-cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info)
+int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *args_info )
 {
   int c;	/* Character of the parsed option.  */
   int missing_required_options = 0;	
 
-  args_info->help_given = 0 ;
-  args_info->version_given = 0 ;
-  args_info->user_given = 0 ;
-  args_info->pass_given = 0 ;
-  args_info->proxyhost_given = 0 ;
-  args_info->proxyport_given = 0 ;
-  args_info->desthost_given = 0 ;
-  args_info->destport_given = 0 ;
+  args_info->help_given = 0;
+  args_info->version_given = 0;
+  args_info->user_given = 0;
+  args_info->pass_given = 0;
+  args_info->proxyhost_given = 0;
+  args_info->proxyport_given = 0;
+  args_info->desthost_given = 0;
+  args_info->destport_given = 0;
   args_info->dottedquad_given = 0;
-  args_info->verbose_given = 0 ;
+  args_info->verbose_given = 0;
   args_info->inetd_given = 0;
-#define clear_args() { \
-  args_info->user_arg = NULL; \
-  args_info->pass_arg = NULL; \
-  args_info->proxyhost_arg = NULL; \
-  args_info->desthost_arg = NULL; \
-  args_info->dottedquad_flag = 0;\
-  args_info->verbose_flag = 0;\
-  args_info->inetd_flag = 0;\
-}
+  args_info->quiet_given = 0;
+
+/* No... we can't make this a function... -- Maniac */
+#define clear_args() \
+{ \
+	args_info->user_arg = NULL; \
+	args_info->pass_arg = NULL; \
+	args_info->proxyhost_arg = NULL; \
+	args_info->desthost_arg = NULL; \
+	args_info->dottedquad_flag = 0; \
+	args_info->verbose_flag = 0; \
+	args_info->inetd_flag = 0; \
+	args_info->quiet_flag = 0; \
+} 
 
   clear_args();
 
@@ -131,12 +135,13 @@ cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_i
         { "dottedquad",	0, NULL, 'n' },
         { "verbose",	0, NULL, 'v' },
 	{ "inetd",	0, NULL, 'i' },
+	{ "quiet",	0, NULL, 'q' },
         { NULL,	0, NULL, 0 }
       };
 
-      c = getopt_long (argc, argv, "hViu:s:g:G:d:D:nv", long_options, &option_index);
+      c = getopt_long (argc, argv, "hViu:s:g:G:d:D:nvq", long_options, &option_index);
 #else
-      c = getopt( argc, argv, "hViu:s:g:G:d:D:nv" );
+      c = getopt( argc, argv, "hViu:s:g:G:d:D:nvq" );
 #endif
 
       if (c == -1) break;	/* Exit from `while (1)' loop.  */
@@ -231,6 +236,10 @@ cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_i
           args_info->verbose_flag = !(args_info->verbose_flag);
           break;
 
+	case 'q':	/* Suppress messages -- Quiet mode */
+	  args_info->quiet_flag = !(args_info->quiet_flag);
+	  break;
+
         case 0:	/* Long option with no short option */
 
         case '?':	/* Invalid option.  */
diff --git a/cmdline.h b/cmdline.h
index 540a442..06db0dd 100755
--- a/cmdline.h
+++ b/cmdline.h
@@ -24,32 +24,34 @@
 #define _cmdline_h
 
 struct gengetopt_args_info {
-  char * user_arg;	/* Username to send to HTTPS proxy for authentication.  */
-  char * pass_arg;	/* Password to send to HTTPS proxy for authentication.  */
-  char * proxyhost_arg;	/* HTTPS Proxy host to connect to.  */
-  int proxyport_arg;	/* HTTPS Proxy host portnumber to connect to.  */
-  char * desthost_arg;	/* Destination host to built the tunnel to.  */
-  int destport_arg;	/* Destination host portnumber to built the tunnel to.  */
+  char * user_arg;	/* Username to send to HTTPS proxy for auth. */
+  char * pass_arg;	/* Password to send to HTTPS proxy for auth. */
+  char * proxyhost_arg;	/* HTTPS Proxy host to connect to. */
+  int proxyport_arg;	/* HTTPS Proxy host portnumber to connect to. */
+  char * desthost_arg;	/* Destination host to built the tunnel to. */
+  int destport_arg;	/* Dest host portnumber to built the tunnel to. */
   int dottedquad_flag;	/* Resolve hostname to dottedquad notation. */
-  int verbose_flag;	/* Turn on verbosity (default=off).  */
-  int inetd_flag;	/* Turn on inetd (default=off).  */
+  int verbose_flag;	/* Turn on verbosity (default=off). */
+  int inetd_flag;	/* Turn on inetd (default=off). */
+  int quiet_flag;	/* Turn on quiet mode (default=off). */
 
-  int help_given ;	/* Whether help was given.  */
-  int version_given ;	/* Whether version was given.  */
-  int user_given ;	/* Whether user was given.  */
-  int pass_given ;	/* Whether pass was given.  */
-  int proxyhost_given ;	/* Whether proxyhost was given.  */
-  int proxyport_given ;	/* Whether proxyport was given.  */
-  int desthost_given ;	/* Whether desthost was given.  */
-  int destport_given ;	/* Whether destport was given.  */
+  int help_given;	/* Whether help was given. */
+  int version_given;	/* Whether version was given. */
+  int user_given;	/* Whether user was given. */
+  int pass_given;	/* Whether pass was given. */
+  int proxyhost_given;	/* Whether proxyhost was given. */
+  int proxyport_given;	/* Whether proxyport was given. */
+  int desthost_given;	/* Whether desthost was given. */
+  int destport_given;	/* Whether destport was given. */
   int dottedquad_given;	/* Whether dottedquad was given. */
-  int verbose_given ;	/* Whether verbose was given.  */
-  int inetd_given ;	/* Whether inetd was given.  */
+  int verbose_given;	/* Whether verbose was given. */
+  int inetd_given;	/* Whether inetd was given. */
+  int quiet_given;	/* Whether quiet mode was given. */
 } ;
 
-int cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info);
+int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *args_info );
 
-void cmdline_parser_print_help(void);
-void cmdline_parser_print_version(void);
+void cmdline_parser_print_help( void );
+void cmdline_parser_print_version( void );
 
 #endif /* _cmdline_h */
diff --git a/config.h b/config.h
index d55c2da..273f5ba 100755
--- a/config.h
+++ b/config.h
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#define VERSION	"1.0.6"
+#define VERSION	"1.0.7"
 #define PACKAGE	"Proxytunnel"
 #define PURPOSE "Build generic tunnels through HTTPS proxys"
 #define AUTHORS "Jos Visser (Muppet) <josv@osp.nl>, Mark Janssen (Maniac) <maniac@maniac.nl>"
diff --git a/proxytunnel b/proxytunnel
index f750324..9c8897f 100755
Binary files a/proxytunnel and b/proxytunnel differ
diff --git a/proxytunnel.c b/proxytunnel.c
index 1762f90..b194c1b 100755
--- a/proxytunnel.c
+++ b/proxytunnel.c
@@ -37,20 +37,6 @@
 static const char base64digits[] =
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-#define BAD     -1
-static const char base64val[] = {
-    BAD,BAD,BAD,BAD, BAD,BAD,BAD,BAD, BAD,BAD,BAD,BAD, BAD,BAD,BAD,BAD,
-    BAD,BAD,BAD,BAD, BAD,BAD,BAD,BAD, BAD,BAD,BAD,BAD, BAD,BAD,BAD,BAD,
-    BAD,BAD,BAD,BAD, BAD,BAD,BAD,BAD, BAD,BAD,BAD, 62, BAD,BAD,BAD, 63,
-     52, 53, 54, 55,  56, 57, 58, 59,  60, 61,BAD,BAD, BAD,BAD,BAD,BAD,
-    BAD,  0,  1,  2,   3,  4,  5,  6,   7,  8,  9, 10,  11, 12, 13, 14,
-     15, 16, 17, 18,  19, 20, 21, 22,  23, 24, 25,BAD, BAD,BAD,BAD,BAD,
-    BAD, 26, 27, 28,  29, 30, 31, 32,  33, 34, 35, 36,  37, 38, 39, 40,
-     41, 42, 43, 44,  45, 46, 47, 48,  49, 50, 51,BAD, BAD,BAD,BAD,BAD
-};
-/* bounds-check input */
-#define DECODE64(c) (isascii(c) ? base64val[c] : BAD)
-
 /* 
  * Some variables
  */
@@ -64,7 +50,7 @@ int write_fd=1;			/* The file destriptor to write to */
 struct gengetopt_args_info args_info;
 
 #define SIZE 80
-char basicauth[SIZE];		/* Buffer to hold the proxy's basic authentication screen */
+char basicauth[SIZE];		/* Buffer to hold the proxy's basic auth */
 
 #define SIZE2 65536
 char buf[SIZE2];		/* Data transfer buffer */
@@ -73,7 +59,7 @@ char buf[SIZE2];		/* Data transfer buffer */
  * Small MAX macro
  */
 #ifndef MAX
-#define MAX(x,y) (((x)>(y))?(x):(y))
+#define MAX( x, y )	( ( (x)>(y) ) ? (x) : (y) )
 #endif
 
 
@@ -142,7 +128,8 @@ void tunnel_connect() {
 	/*
 	 * Create the socket
 	 */
-	if ((sd=socket(AF_INET,SOCK_STREAM,0))<0) {
+	if( ( sd = socket( AF_INET, SOCK_STREAM, 0 ) ) < 0 )
+	{
 		perror("Can not create socket");
 		exit(1);
 	}
@@ -150,109 +137,131 @@ void tunnel_connect() {
 	/* 
 	 * Lookup the IP address of the proxy
 	 */
-	if (!(he=gethostbyname(args_info.proxyhost_arg))) {
+	if( ! ( he = gethostbyname( args_info.proxyhost_arg ) ) )
+	{
 		perror("Proxy host not found");
 		exit(1);
 	}
  
- 	if (args_info.verbose_flag)
- 		fprintf(stderr,"%s is %d.%d.%d.%d\n",args_info.proxyhost_arg,
-			he->h_addr[0], he->h_addr[1], he->h_addr[2], he->h_addr[3]);
+ 	if( args_info.verbose_flag )
+	{
+ 		fprintf( stderr, "%s is %d.%d.%d.%d\n",
+				args_info.proxyhost_arg,
+				he->h_addr[0] & 255,
+				he->h_addr[1] & 255,
+				he->h_addr[2] & 255,
+				he->h_addr[3] & 255 );
+	}
 
 	/*
 	 * Set up the structure to connect to the proxy port of the proxy host
 	 */
-	memset (&sa, '\0', sizeof(sa));
-  	sa.sin_family=AF_INET;
-  	memcpy(&sa.sin_addr.s_addr,he->h_addr,4);
-  	sa.sin_port= htons(args_info.proxyport_arg);
+	memset( &sa, '\0', sizeof( sa ) );
+  	sa.sin_family = AF_INET;
+  	memcpy( &sa.sin_addr.s_addr, he->h_addr, 4);
+  	sa.sin_port = htons( args_info.proxyport_arg );
   
   	/*
 	 * Connect the socket
 	 */
-  	if (connect(sd,(struct sockaddr*) &sa,sizeof(sa))<0) {
+  	if( connect( sd, (struct sockaddr*) &sa, sizeof( sa ) ) < 0 )
+	{
 		perror("connect() failed");
 		exit(1);
 	}
 
-	fprintf(stderr,"Connected to %s:%d\n",args_info.proxyhost_arg,args_info.proxyport_arg);
+	if( ! args_info.quiet_flag )
+	{
+		fprintf( stderr, "Connected to %s:%d\n",
+			args_info.proxyhost_arg,
+			args_info.proxyport_arg );
+	}
 }
 
 /*
  * Create the HTTP basic authentication cookie for use by the proxy. Result
  * is stored in basicauth.
  */
-void make_basicauth() {
-	int len=strlen(args_info.user_arg)+strlen(args_info.pass_arg)+2;
-	char *p=(char *)malloc(len);
+void make_basicauth()
+{
+	int len = strlen( args_info.user_arg ) + \
+		strlen( args_info.pass_arg ) + 2;
+	char *p = (char *) malloc( len );
 
 	/*
 	 * Set up the cookie in clear text
 	 */
-	sprintf(p,"%s:%s",args_info.user_arg,args_info.pass_arg);
+	sprintf( p, "%s:%s", args_info.user_arg, args_info.pass_arg );
 
 	/*
 	 * Base64 encode the clear text cookie to create the HTTP base64
 	 * authentication cookie
 	 */
-	base64( basicauth, p, strlen(p));
-	fprintf(stderr,"Proxy basic authentication is %s\n",basicauth);
+	base64( basicauth, p, strlen( p ) );
 
-	if (args_info.verbose_flag)
-		fprintf(stderr,"Proxy basic authentication is %s\n",basicauth);
+	if( args_info.verbose_flag )
+	{
+		fprintf( stderr, "Proxy basic auth is %s\n", basicauth );
+	}
 
-	free(p);
+	free( p );
 }
 
 /* 
  * Read one line of data from the tunnel. Line is terminated by a
  * newline character. Result is stored in buf.
  */
-void readline() {
-	char *p=buf;
-	char c=0;
-	int i=0;
+void readline()
+{
+	char	*p = buf;
+	char	c = 0;
+	int	i = 0;
 
 	/*
 	 * Read one character at a time into buf, until a newline is
 	 * encountered.
 	 */
-	while (c!=10 && i<SIZE2-1) {
-		if (recv(sd,&c,1,0)<0) {
-			perror("Socket read error");
-			exit(1);
+	while ( c != 10 && i < SIZE2 - 1 )
+	{
+		if( recv( sd, &c ,1 ,0 ) < 0)
+		{
+			perror( "Socket read error" );
+			exit( 1 );
 		}
 
-		*p=c;
+		*p = c;
 		p++;
 		i++;
 	}
 
-	*p=0;
+	*p = 0;
 
-	if (args_info.verbose_flag)
-		fprintf(stderr,buf);
+	if( args_info.verbose_flag )
+		fprintf( stderr, "%s", buf );
 }
 
 /*
  * Analyze the proxy's HTTP response. This must be a HTTP/1.? 200 OK type
  * header
  */
-void analyze_HTTP() {
-	char *p=strtok(buf," ");
+void analyze_HTTP()
+{
+	char *p = strtok( buf, " ");
 
-	if (strcmp(p,"HTTP/1.0")!=0 && strcmp(p,"HTTP/1.1")!=0) {
+	if (strcmp( p, "HTTP/1.0" ) != 0 && strcmp( p, "HTTP/1.1" ) != 0)
+	{
 		fprintf(stderr,"Unsupported HTTP version number %s\n",p);
 		exit(1);
 	}
 
-	p=strtok(0," ");
+	p = strtok( 0, " ");
 
-	if (strcmp(p,"200")!=0) {
-		fprintf(stderr,"HTTP return code: '%s'\n",p);
-		p+=strlen(p)+1;
-		fprintf(stderr, "%s\n",p);
-		exit(1);
+	if( strcmp( p, "200" ) != 0 )
+	{
+		fprintf( stderr, "HTTP return code: '%s'\n", p );
+		p += strlen( p ) + 1;
+		fprintf( stderr, "%s\n", p );
+		exit( 1 );
 	}
 }
 
@@ -266,10 +275,10 @@ void proxy_protocol()
 	 * Create the proxy CONNECT command into buf
 	 */
 
-	if (args_info.dottedquad_flag)
+	if( args_info.dottedquad_flag )
 	{
-		static char ipbuf[64];
-		struct hostent * he = gethostbyname( args_info.desthost_arg);
+		static char ipbuf[16]; /* IPv4: 'xxx.xxx.xxx.xxx' + \0 = 16 */
+		struct hostent * he = gethostbyname( args_info.desthost_arg );
 		if ( he )
 		{
 			sprintf( ipbuf, "%d.%d.%d.%d", 
@@ -281,18 +290,20 @@ void proxy_protocol()
 			if( args_info.verbose_flag )
 			{
 			   fprintf( stderr, "DEBUG: ipbuf = '%s'\n", ipbuf );
-			   fprintf( stderr, "DEBUG: desthost = '%s'\n", args_info.desthost_arg );
+			   fprintf( stderr, "DEBUG: desthost = '%s'\n",
+					   args_info.desthost_arg );
 			}
 
 			args_info.desthost_arg = ipbuf;
 
 			if( args_info.verbose_flag )
-			   fprintf( stderr, "DEBUG: desthost = '%s'\n", args_info.desthost_arg );
+			   fprintf( stderr, "DEBUG: desthost = '%s'\n",
+					   args_info.desthost_arg );
 
 		}
 		else if( args_info.verbose_flag )
-			fprintf( stderr,
-			"Cannot lookup destination host: %s.\n", args_info.desthost_arg );
+			fprintf( stderr, "Can't lookup dest host: %s.\n",
+					args_info.desthost_arg );
 
 	}
 
@@ -303,7 +314,8 @@ void proxy_protocol()
 		 */
 		sprintf( buf,
 	"CONNECT %s:%d HTTP/1.0\r\nProxy-authorization: Basic %s \r\nProxy-Connection: Keep-Alive\r\n\r\n",
-	args_info.desthost_arg,args_info.destport_arg,basicauth);
+			args_info.desthost_arg,
+			args_info.destport_arg,basicauth );
 	}
 	else
 	{
@@ -311,18 +323,20 @@ void proxy_protocol()
 		 * Create connect string without authorization part
 		 */
 		sprintf( buf, "CONNECT %s:%d HTTP/1.0\r\nProxy-Connection: Keep-Alive\r\n\r\n",
-			args_info.desthost_arg,args_info.destport_arg);
+				args_info.desthost_arg,
+				args_info.destport_arg );
 	}
 	
-	if (args_info.verbose_flag)
-		fprintf(stderr,buf);
+	if( args_info.verbose_flag )
+		fprintf( stderr, "%s", buf);
 	
 	/*
 	 * Send the CONNECT instruction to the proxy
 	 */
-	if (send(sd,buf,strlen(buf),0)<0) {
-		perror("Socket write error");
-		exit(1);
+	if( send( sd, buf, strlen( buf ), 0 ) < 0 )
+	{
+		perror( "Socket write error" );
+		exit( 1 );
 	}
 
 	/*
@@ -337,35 +351,39 @@ void proxy_protocol()
 	 */
 	do {
 		readline();
-	} while (strcmp(buf,"\r\n")!=0);
+	} while ( strcmp( buf, "\r\n" ) != 0 );
 }
 
 /*
  * Copy a block of data from one socket descriptor to another. A true
  * return code signifies EOF on the from socket descriptor.
  */
-int copy(int from, int to) {
+int copy(int from, int to)
+{
 	int n;
 
 	/* 
 	 * Read a buffer from the source socket
 	 */
-	if ((n=read(from,buf,SIZE2))<0) {
-		perror("Socket read error");
-		exit(1);
+	if ( ( n = read( from, buf, SIZE2 ) ) < 0 )
+	{
+		perror( "Socket read error" );
+		exit( 1 );
 	}
 
 	/*
 	 * If we have read 0 bytes, there is an EOF on src
 	 */
-	if (n==0) return 1;
+	if( n==0 )
+		return 1;
 
 	/*
 	 * Write the buffer to the destination socket
 	 */
-	if (write(to,buf,n)!=n) {
-		perror("Socket write error");
-		exit(1);
+	if ( write( to, buf, n ) != n )
+	{
+		perror( "Socket write error" );
+		exit( 1 );
 	}
 
 	/*
@@ -380,7 +398,8 @@ int copy(int from, int to) {
  * for the connected application, sd is the file descriptor
  * of the tunnel.
  */
-void cpio() {
+void cpio()
+{
 	fd_set	readfds;
 	fd_set	writefds;
 	fd_set	exceptfds;
@@ -389,61 +408,76 @@ void cpio() {
 	/*
 	 * Find the biggest file descriptor for select()
 	 */
-	max_fd=MAX(read_fd,write_fd);
-	max_fd=MAX(max_fd,sd);
+	max_fd = MAX( read_fd,write_fd );
+	max_fd = MAX( max_fd,sd );
 
 
 	/*
 	 * We're never interested in sockets being available for write.
 	 */
-	FD_ZERO(&writefds);
+	FD_ZERO( &writefds );
 
-	fprintf(stderr,"Starting tunnel\n");
+	if( ! args_info.quiet_flag )
+	{
+		fprintf( stderr, "Starting tunnel\n" );
+	}
 
 	/*
 	 * Only diamonds are forever :-)
 	 */
-	while (1==1) {
+	while( 1==1 )
+	{
 		/*
 		 * Clear the interesting socket sets
 		 */
-		FD_ZERO(&readfds);
-		FD_ZERO(&exceptfds);
+		FD_ZERO( &readfds );
+		FD_ZERO( &exceptfds );
 
 		/*
 		 * We want to know whether stdin or sd is ready for reading
 		 */
-		FD_SET(read_fd,&readfds);
-		FD_SET(sd,&readfds);
+		FD_SET( read_fd,&readfds );
+		FD_SET( sd,&readfds );
 
 		/*
 		 * And we want to know about exceptional conditions on either
 		 * stdin, stdout or the tunnel
 		 */
-		FD_SET(read_fd,&exceptfds);
-		FD_SET(write_fd,&exceptfds);
-		FD_SET(sd,&exceptfds);
+		FD_SET( read_fd,&exceptfds );
+		FD_SET( write_fd,&exceptfds );
+		FD_SET( sd,&exceptfds );
 
 		/*
-		 * Wait until something happens on one of the registered sockets/files
+		 * Wait until something happens on one of the registered
+		 * sockets/files
 		 */
-		if (select(max_fd+1,&readfds,&writefds,&exceptfds,0)<0) {
+		if ( select( max_fd + 1, &readfds, &writefds,
+					&exceptfds, 0 ) < 0 )
+		{
 			perror("select error");
 			exit(1);
 		}
 
 		/*
-		 * Is stdin ready for read? If so, copy a block of data from stdin to the tunnel.
-		 * Or else if the tunnel socket is ready for read, copy a block of data from the
-		 * tunnel to stdout. Otherwise an exceptional condition is flagged and the program
-		 * is terminated.
+		 * Is stdin ready for read? If so, copy a block of data
+		 * from stdin to the tunnel. Or else if the tunnel socket
+		 * is ready for read, copy a block of data from the
+		 * tunnel to stdout. Otherwise an exceptional condition
+		 * is flagged and the program is terminated.
 		 */
-		if (FD_ISSET(read_fd,&readfds)) {
-			if (copy(read_fd,sd)) break;
-		} else if (FD_ISSET(sd,&readfds)) {
-			if (copy(sd,write_fd)) break;
-		} else {
-			perror("Exceptional condition");
+		if ( FD_ISSET( read_fd, &readfds ) )
+		{
+			if ( copy( read_fd, sd ) )
+				break;
+		}
+		else if( FD_ISSET( sd, &readfds ) )
+		{
+			if( copy(sd,write_fd ) )
+				break;
+		}
+		else
+		{
+			perror( "Exceptional condition" );
 			break;
 		}
 	}
@@ -451,23 +485,27 @@ void cpio() {
 	/*
 	 * Close all files we deal with
 	 */
-	close(read_fd);
-	close(sd);
+	close( read_fd );
+	close( sd );
 
-	if (read_fd!=write_fd) close(write_fd);
-
-	if (args_info.verbose_flag) fprintf(stderr,"Tunnel closed\n");
+	if( read_fd != write_fd )	/* When not running from inetd */
+	{
+		close( write_fd );
+	}
 
+	if( args_info.verbose_flag )
+	{
+		fprintf( stderr, "Tunnel closed\n" );
+	}
 }
 
 /*
  * We begin at the beginning
  */
-int main(int argc, char *argv[])
+int main( int argc, char *argv[] )
 {
 	/*
-	 * New and improved option handling, using GNU getopts
-	 * now, this is still a work in progress -- Maniac
+	 * New and improved option handling, using GNU getopts  -- Maniac
 	 */
 
 	cmdline_parser( argc, argv, &args_info );
@@ -481,14 +519,20 @@ int main(int argc, char *argv[])
 	 * - Enter copy in-out mode to channel data hence and forth
 	 */
 
-	signal(SIGHUP,signal_handler);
-	if ( args_info.user_given && args_info.pass_given ) make_basicauth();
+	signal( SIGHUP, signal_handler );
+	if( args_info.user_given && args_info.pass_given )
+	{
+		make_basicauth();
+	}
 
 	/* Inetd */
-	if (args_info.inetd_flag) write_fd=0;
+	if( args_info.inetd_flag )
+	{
+		write_fd=0;
+	}
 
 	tunnel_connect();
 	proxy_protocol();
 	cpio();
-	exit(0);
+	exit( 0 );
 }