--- YDEC.C	Wed Nov 14 11:30:52 2001
+++ ydec.c	Tue Feb  5 16:37:11 2002
@@ -21,24 +21,39 @@
 */
 
 
+#ifdef WINDOWS
 // Includes for Windows-version.  Only used to create a MessageBox
 
 #include <windows.h>
 #include <winsock.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
-#include <io.h>
+#include <string.h>
 #include <math.h>
 #include <signal.h>
-// For SOPEN
-#include <share.h>
 #include <fcntl.h>
-#include <sys\stat.h>
+#include <errno.h>
 
-#include <dir.h>
+#ifdef WINDOWS
+#include <io.h>
 #include <dos.h>
+#include <dir.h>
+// For SOPEN
+#include <share.h>
+#include <sys\stat.h>
 
 #pragma warn -pro
+#else
+#include <sys/stat.h>
+long filelength(int fd){
+	struct stat st;
+	if (fstat(fd, &st))
+		return -1;
+	return st.st_size;
+}
+#endif
 
 
 int errors,errparts,errfiles;
@@ -276,7 +291,7 @@
 		}
 	if (strncmp((char*) srcbuf,"=yend ",6)==0)
 		{
-		if (aDsp) print("Endline (%d bytes): %s\r\n",decolen,srcbuf);
+		if (aDsp) print("Endline (%ld bytes): %s\r\n",decolen,srcbuf);
 		goto end_of_file;
 		}
 	if (strncmp((char*) srcbuf,"=ybegin ",8)==0)
@@ -723,9 +738,8 @@
 
 char srcmask[260];
 
-int DecodeFile(char * fname)
+int DecodeStream(FILE * fIn, char *fname)
 	{
-	FILE * fIn;
 	char line[8200];
 	char * cp;
 	char filename[260];
@@ -734,13 +748,6 @@
 	long flen,wlen;
 	char filename2[260];
 
-	fIn=fopen(fname,"rb");
-	if (fIn==NULL)
-		{
-		eprint("Cannot open sourcefile (%s) [reason:%d]\r\n",fname,errno);
-		errors++;
-		return(1);
-		}
 loop:
 	cp=fgets(line,8192,fIn);    // Read source line
 	if (cp==NULL) goto eof1;
@@ -808,8 +815,8 @@
 	// ----- Special Handling for offline decoder (missing parts or mixed sequence)
 	if (y_part)
 		{
-		sprintf(filename ,"%s%s%s(%ld).tmp",ad_despath,attname,attext,y_size);
-		sprintf(filename2,"%s%s%s(%ld).dec",ad_despath,attname,attext,y_size);
+		sprintf(filename ,"%s%s%s(%d).tmp",ad_despath,attname,attext,y_size);
+		sprintf(filename2,"%s%s%s(%d).dec",ad_despath,attname,attext,y_size);
 		}
 	// ----------------------------------------------------------------------
 
@@ -860,7 +867,7 @@
 				else
 					{
 					fclose(fOut);
-					eprint("Size mismatch on target multipart file !(act:%ld, new:%ld) (%s)\r\n",flen,y_size,filename);
+					eprint("Size mismatch on target multipart file !(act:%ld, new:%d) (%s)\r\n",flen,y_size,filename);
 					errors++;
 					goto abortus;
 					}
@@ -874,7 +881,7 @@
 					errors++;
 					goto abortus;
 					}
-				fprintf(fOut,"%ld,%ld\r\n",1,y_size);  // Everything is missing !
+				fprintf(fOut,"%d,%d\r\n",1,y_size);  // Everything is missing !
 				fclose(fOut);
 				}
 			}
@@ -884,7 +891,6 @@
 			{
 			eprint("AutoDecode: Cannot create DesFile (%s)\r\n",filename);
 			errors++;
-			fclose(fIn);
 			return(-1);
 			// goto loop;
 			}
@@ -902,7 +908,6 @@
 					{
 					eprint("Could not create the target file (disk full?)\r\n");
 					fclose(fOut);
-					fclose(fIn);
 					errors++;
 					return(-2);
 					}
@@ -950,7 +955,7 @@
 		id=rename(filename,ad_desname);
 		if (id)
 			{
-			if (errno==35)
+			if (errno==EEXIST)
 				{
 				eprint("File exists already: (%s)\r\n",ad_desname);
 				errors++;
@@ -971,19 +976,36 @@
 
 
 eof1:
-	fclose(fIn);
 	return(0);
 	}
 
 
+int DecodeFile(char * fname)
+	{
+	int r;
+	FILE * fIn;
+	fIn=fopen(fname,"rb");
+	if (fIn==NULL)
+		{
+		eprint("Cannot open sourcefile (%s) [reason:%d]\r\n",fname,errno);
+		errors++;
+		return(1);
+		}
+	
+	r=DecodeStream(fIn, fname);
+	fclose(fIn);
+	return r;
+	}
 
 
 int main(int ac, char * av[])
 	{
-	struct ffblk fblk;
 	int id;
+#ifdef WINDOWS
+	struct ffblk fblk;
 	char mask[260];
 	char * cp;
+#endif
 
 	errors=0;  //  Counter for batch decoder errors
 	errfiles=0;
@@ -1003,6 +1025,7 @@
 //	if (ac>=2) print("[1]: %s\r\n",av[1]);
 //	if (ac>=3) print("[2]: %s\r\n",av[2]);
 
+#ifdef WINDOWS
 	if (ac<2)
 		{
 		print("Missing parameter (filename or filename*.* required) !\r\n");
@@ -1064,6 +1087,26 @@
 	if (id==0) goto loop;
 
 done:
+#else
+	id = 1;
+	if (id<ac)
+		{
+		if (strcmp(av[id],"-h")==0 || strcmp(av[id],"--help")==0) 
+			{
+			goto usage;
+			}
+		else if (strcmp(av[id],"-a")==0)
+			{
+			aDsp=1;
+			id++;
+			}
+		}
+	if (id<ac)
+		for (; id<ac; id++)
+			DecodeFile(av[id]);
+	else
+		DecodeStream(stdin, "-");
+#endif
 
 
 	if (errors|errfiles|errparts)
@@ -1073,7 +1116,10 @@
 		if (errfiles) print("%d file(s) with errors stored to disk\r\n",errfiles);
 		if (errparts) print("%d corrupt part(s) detected.\r\n",errparts);
 
+#ifdef WINDOWS
 		MessageBox(NULL,"Decoder terminated. \r\n\r\n Errors found !","yDecode",MB_OK|MB_ICONSTOP);
+#endif
+		return(2);
 		}
 
 	return(0);
@@ -1083,8 +1129,13 @@
 	print("Usage: yDecoder v-1.0\r\n\r\n");
 	print("ydec filename             (for normal operation) \r\n");
 	print("ydec *.txt                (for operation on multiple files)\r\n");
+#ifdef WINDOWS
 	print("ydec filename  /a         (for all debug output) \r\n");
 	print("ydec filename  /a  | more (for all debug output with paging) \r\n");
+#else
+	print("ydec -a filename          (for all debug output) \r\n");
+	print("foo | ydec                (decode from stdin) \r\n");
+#endif
 
 
 	return(1);