chuqui@nsc.UUCP (Chuq) (08/21/84)
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.