New printfile() mode flag: P_NOCRLF, used for the new INCLUDE @-code for

including one file in another without auto-prepended CRLF.

exec/load/sbbsdefs.js

@@ -8,7 +8,7 @@
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2004 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2005 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -325,6 +325,9 @@ var   P_SAVEATR		=(1<<1)		/* Save the new current attributres after	*/
 					    		/* msg has printed */
 var   P_NOATCODES	=(1<<2)		/* Don't allow @ codes                      */
 var   P_OPENCLOSE	=(1<<3)		/* Open and close the file					*/
+var   P_NOPAUSE		=(1<<4)		/* Disable screen pause						*/
+var   P_HTML		=(1<<5)		/* Message is HTML							*/
+var   P_NOCRLF		=(1<<6)		/* Don't prepend a CRLF	in printfile()		*/
 							    /********************************************/
 
     							/********************************************/

exec/sbbsdefs.inc

@@ -172,7 +172,9 @@
 				# msg has printed.
 !define P_NOATCODES	.2	# Don't allow @ codes
 !define P_OPENCLOSE	.3	# Open and close the file
-
+!define P_NOPAUSE	.4	# Disable screen pause
+!define P_HTML		.5	# Message is HTML
+!define P_NOCRLF	.6	# Don't prepend a CRLF
 
 				# Values for USER_EVENT function
 !define EVENT_NONE      0       # Only accessible by menu

src/sbbs3/prntfile.cpp

@@ -75,7 +75,7 @@ void sbbs_t::printfile(char *str, long mode)
 		sys_status&=~SS_ABORT; 
 	}
 
-	if(!tos && !wip && !rip && !html)
+	if(!(mode&P_NOCRLF) && !tos && !wip && !rip && !html)
 		CRLF;
 
 	if((stream=fnopen(&file,str,O_RDONLY))==NULL) {

src/sbbs3/sbbsdefs.h

@@ -686,6 +686,7 @@ typedef enum {						/* Values for xtrn_t.event				*/
 #define P_OPENCLOSE (1<<3)		/* Open and close the file					*/
 #define P_NOPAUSE	(1<<4)		/* Disable screen pause						*/
 #define P_HTML		(1<<5)		/* Message is HTML							*/
+#define P_NOCRLF	(1<<6)		/* Don't prepend a CRLF	in printfile()		*/
 								
 								/* Bits in 'mode' for listfiles             */
 #define FL_ULTIME   (1<<0)		/* List files by upload time                */