General code cleanup, more modularization, numeric constant replacement.

src/sbbs3/xmodem.c

@@ -45,7 +45,7 @@
 
 void xmodem_put_nak(xmodem_t* xm)
 {
-	while(getcom(1)!=NOINP && (xm->mode&NO_LOCAL || kbhit()!=LOC_ABORT))
+	while(getcom(1)!=NOINP)
 		;				/* wait for any trailing data */
 	putcom(NAK);
 }
@@ -263,6 +263,11 @@ int xmodem_get_ack(xmodem_t* xm, int tries)
 	return(0);
 }
 
+const char* xmodem_source(void)
+{
+	return(__FILE__);
+}
+
 char* xmodem_ver(char *buf)
 {
 	sscanf("$Revision$", "%*s %s", buf);
@@ -270,7 +275,3 @@ char* xmodem_ver(char *buf)
 	return(buf);
 }
 
-const char* xmodem_source(void)
-{
-	return(__FILE__);
-}
\ No newline at end of file

src/sbbs3/zmodem.h

@@ -23,6 +23,7 @@
 #define	LF			0x0a
 #define	CR			0x0d
 #endif
+#define DLE			0x10
 #define	XON			0x11
 #define	XOFF		0x13
 #define	NAK			0x15
@@ -190,8 +191,6 @@
 
 typedef struct {
 
-	SOCKET sock;											/* socket descriptor */
-
 	unsigned char rxd_header[ZMAXHLEN];						/* last received header */
 	int rxd_header_len;										/* last received header size */
 
@@ -240,7 +239,11 @@ typedef struct {
 
 	int n_cans;
 
-	long mode;
+	/* Stuff added by RRS */
+	SOCKET	sock;					/* socket descriptor */
+	long	mode;
+	FILE*	statfp;
+	FILE*	errfp;
 
 } zmodem_t;