Relay-Version: version B 2.10 5/3/83; site utzoo.UUCP Posting-Version: version B 2.10.2.chuqui_test 8/16/84; site nsc.UUCP Path: utzoo!watmath!clyde!burl!ulysses!mhuxl!ihnp4!nsc!chuqui From: chuqui@nsc.UUCP (Chuq) Newsgroups: net.news.b Subject: 2.10.2 fix: readnews/NOCOLON Message-ID: <1339@nsc.UUCP> Date: Tue, 21-Aug-84 13:28:04 EDT Article-I.D.: nsc.1339 Posted: Tue Aug 21 13:28:04 1984 Date-Received: Wed, 22-Aug-84 01:48:31 EDT Organization: Bryn Myrrdin Lines: 102 As distributed, NOCOLON in 2.10.2 is broken. Regardless of how you define it in defs.h colons are disabled. These fixes set it up to work based on NOCOLON again. chuq ------- readr.c ------- *** /tmp/d07131 Tue Aug 21 10:24:25 1984 --- readr.c Tue Aug 21 09:45:27 1984 *************** *** 82,87 static int dgest = 0; static FILE *ofp; /* Current output file to terminal*/ static FILE *fp; /* current article to be printed*/ static int holdup; /* 1 iff should stop before hdr */ static int ignorenews; /* 1 iff readnews -p > /dev/null*/ static long timelastsaved; /* time newsrc last written out */ --- 82,88 ----- static int dgest = 0; static FILE *ofp; /* Current output file to terminal*/ static FILE *fp; /* current article to be printed*/ + #ifndef NOCOLON static int holdup; /* 1 iff should stop before hdr */ #endif NOCOLON static int ignorenews; /* 1 iff readnews -p > /dev/null*/ *************** *** 83,88 static FILE *ofp; /* Current output file to terminal*/ static FILE *fp; /* current article to be printed*/ static int holdup; /* 1 iff should stop before hdr */ static int ignorenews; /* 1 iff readnews -p > /dev/null*/ static long timelastsaved; /* time newsrc last written out */ static jmp_buf sigjmpbuf; /* for signal processing */ --- 84,90 ----- static FILE *fp; /* current article to be printed*/ #ifndef NOCOLON static int holdup; /* 1 iff should stop before hdr */ + #endif NOCOLON static int ignorenews; /* 1 iff readnews -p > /dev/null*/ static long timelastsaved; /* time newsrc last written out */ static jmp_buf sigjmpbuf; /* for signal processing */ *************** *** 1078,1083 } else pout(ofp); holdup = TRUE; } else --- 1080,1086 ----- } else pout(ofp); + #ifndef NOCOLON holdup = TRUE; #endif NOCOLON } *************** *** 1079,1084 else pout(ofp); holdup = TRUE; } else #endif --- 1082,1088 ----- pout(ofp); #ifndef NOCOLON holdup = TRUE; + #endif NOCOLON } else #endif *************** *** 1253,1259 return; /* Wait for user to read previous article. */ ! if (FALSE) { holdup = FALSE; fprintf(ofp, ":"); fflush(ofp); --- 1257,1263 ----- return; /* Wait for user to read previous article. */ ! if (holdup) { holdup = FALSE; fprintf(ofp, ":"); fflush(ofp); -- From the depths of the Crystal Cavern: Chuq Von Rospach {amd,decwrl,fortune,hplabs,ihnp4}!nsc!chuqui nsc!chuqui@decwrl.ARPA Dreams, dreams, enchanter! Gone with the harp's echo when the strings fall mute; with the flame's shadow when the fire dies. Be still, and listen.