rrn@lib.tmc.edu (Stan Barber) (12/14/90)
Description: This is an official patch for rn 4.3. This is patch 52. If you need the other patches, you can get them via the Archive Server by sending mail to "archive-server@bcm.tmc.edu" with the subject line of the form "send public rn.XX.patch". Note that only patches 41 and later are available from this resource at this time. Once rn 4.4 is released, the patches to rn 4.3 will be removed. The fully patched rn kit is also available via anonymous ftp from lib.tmc.edu and gazette.bcm.tmc.edu. Look in public/rn. Special note: rn 4.4 will be released in January, 1991. Other patches to rn 4.3 may be released before the rn 4.4 release, but there will be no patch upgrading rn 4.3 to rn 4.4. Please plan to get to fresh copy of the rn kit when 4.4 is released. It will be available via the archive-server@bcm.tmc.edu at that time. This patch fixes the following problems or adds the following new features: Added the closing paren in term.c that should have been in patch 51. Added the capital-N command to compliment the recently added capital-Y command when prompted for new newsgroups. [Thanks to jik@pit-manager.mit.edu for the diffs!] Added documentation for capital-N to rn manual page. Fix: cd to your rn source directory and patch away Index: rcstuff.c Prereq: 4.3.2.11 *** /tmp/,RCSt1a06473 Thu Dec 13 23:22:49 1990 --- /tmp/,RCSt2a06473 Thu Dec 13 23:22:51 1990 *************** *** 1,4 ! /* $Header: rcstuff.c,v 4.3.2.11 90/11/22 17:49:57 sob Exp $ * * $Log: rcstuff.c,v $ * Revision 4.3.2.11 90/11/22 17:49:57 sob --- 1,4 ----- ! /* $Header: rcstuff.c,v 4.3.2.12 90/12/12 03:05:15 sob Exp $ * * $Log: rcstuff.c,v $ * Revision 4.3.2.12 90/12/12 03:05:15 sob *************** *** 1,6 /* $Header: rcstuff.c,v 4.3.2.11 90/11/22 17:49:57 sob Exp $ * * $Log: rcstuff.c,v $ * Revision 4.3.2.11 90/11/22 17:49:57 sob * Fixed "Y" for regular rn users (non-NNTP). * --- 1,10 ----- /* $Header: rcstuff.c,v 4.3.2.12 90/12/12 03:05:15 sob Exp $ * * $Log: rcstuff.c,v $ + * Revision 4.3.2.12 90/12/12 03:05:15 sob + * Adds "N" command to compliment the "Y" command when prompted for adding + * new newsgroups. + * * Revision 4.3.2.11 90/11/22 17:49:57 sob * Fixed "Y" for regular rn users (non-NNTP). * *************** *** 278,283 /* returns TRUE if found or added, FALSE if not. */ /* assumes that we are chdir'ed to SPOOL */ static int addnewbydefault = 0; bool --- 282,290 ----- /* returns TRUE if found or added, FALSE if not. */ /* assumes that we are chdir'ed to SPOOL */ + #define ADDNEW_SUB 1 + #define ADDNEW_UNSUB 2 + static int addnewbydefault = 0; bool *************** *** 339,346 return FALSE; } if (addnewbydefault) { ! printf("(Adding %s to end of your .newsrc)\n", ngname); ! ng = add_newsgroup(ngname, ':'); do_reloc = FALSE; } else { #ifdef VERBOSE --- 346,357 ----- return FALSE; } if (addnewbydefault) { ! printf("(Adding %s to end of your .newsrc %ssubscribed)\n", ! ngname, (addnewbydefault == ADDNEW_SUB) ? "" : "un"); ! if (addnewbydefault == ADDNEW_SUB) ! ng = add_newsgroup(ngname, ':'); ! else ! ng = add_newsgroup(ngname, '!'); do_reloc = FALSE; } else { #ifdef VERBOSE *************** *** 345,351 } else { #ifdef VERBOSE IF(verbose) ! sprintf(promptbuf,"\nNewsgroup %s not in .newsrc--subscribe? [ynY] ",ngname); ELSE #endif #ifdef TERSE --- 356,362 ----- } else { #ifdef VERBOSE IF(verbose) ! sprintf(promptbuf,"\nNewsgroup %s not in .newsrc--subscribe? [ynYN] ",ngname); ELSE #endif #ifdef TERSE *************** *** 361,367 if (*buf == 'h') { #ifdef VERBOSE IF(verbose) ! printf("Type y or SP to add %s to your .newsrc.\nType Y to add all new groups to the end of your .newsrc.\n", ngname) FLUSH; ELSE #endif --- 372,378 ----- if (*buf == 'h') { #ifdef VERBOSE IF(verbose) ! printf("Type y or SP to add %s to your .newsrc.\nType Y to add all new groups to the end of your .newsrc.\nType N to add all new groups to the end of your .newsrc unsubscribed.\n", ngname) FLUSH; ELSE #endif *************** *** 366,372 ELSE #endif #ifdef TERSE ! fputs("y or SP to add, Y to add all new groups\n",stdout) FLUSH; #endif fputs(ntoforget,stdout) FLUSH; goto reask_add; --- 377,383 ----- ELSE #endif #ifdef TERSE ! fputs("y or SP to add, Y to add all new groups, N to add all new groups unsubscribed\n",stdout) FLUSH; #endif fputs(ntoforget,stdout) FLUSH; goto reask_add; *************** *** 381,389 } else if (*buf == 'Y') { fputs( ! "(I'll add all new newsgroups to the end of your .newsrc.)\n", stdout); ! addnewbydefault = 1; ! printf("(Adding %s to end of your .newsrc)\n", ngname); ng = add_newsgroup(ngname, ':'); do_reloc = FALSE; } --- 392,401 ----- } else if (*buf == 'Y') { fputs( ! "(I'll add all new newsgroups (subscribed) to the end of your .newsrc.)\n", ! stdout); ! addnewbydefault = ADDNEW_SUB; ! printf("(Adding %s to end of your .newsrc subscribed)\n", ngname); ng = add_newsgroup(ngname, ':'); do_reloc = FALSE; } *************** *** 387,392 ng = add_newsgroup(ngname, ':'); do_reloc = FALSE; } else { fputs(hforhelp,stdout) FLUSH; settle_down(); --- 399,413 ----- ng = add_newsgroup(ngname, ':'); do_reloc = FALSE; } + else if (*buf == 'N') { + fputs( + "(I'll add all new newsgroups (unsubscribed) to the end of your .newsrc.)\n", + stdout); + addnewbydefault = ADDNEW_UNSUB; + printf("(Adding %s to end of your .newsrc unsubscribed)\n", ngname); + ng = add_newsgroup(ngname, '!'); + do_reloc = FALSE; + } else { fputs(hforhelp,stdout) FLUSH; settle_down(); *************** *** 623,629 newng = 0; } else if (*buf == '$') { ! putchar('\n') FLUSH; return nextrcline-1; } else if (*buf == '.') { --- 644,650 ----- newng = 0; } else if (*buf == '$') { ! if (! addnewbydefault) putchar('\n') FLUSH; return nextrcline-1; } else if (*buf == '.') { Index: term.c Prereq: 4.3.2.12 *** /tmp/,RCSt1a06464 Thu Dec 13 23:21:39 1990 --- /tmp/,RCSt2a06464 Thu Dec 13 23:21:41 1990 *************** *** 1,4 ! /* $Header: term.c,v 4.3.2.12 90/12/10 01:33:54 sob Exp $ * * $Log: term.c,v $ * Revision 4.3.2.12 90/12/10 01:33:54 sob --- 1,4 ----- ! /* $Header: term.c,v 4.3.2.13 90/12/12 03:03:28 sob Exp $ * * $Log: term.c,v $ * Revision 4.3.2.13 90/12/12 03:03:28 sob *************** *** 1,6 /* $Header: term.c,v 4.3.2.12 90/12/10 01:33:54 sob Exp $ * * $Log: term.c,v $ * Revision 4.3.2.12 90/12/10 01:33:54 sob * First attempts to make rn "8 bit clean" * --- 1,9 ----- /* $Header: term.c,v 4.3.2.13 90/12/12 03:03:28 sob Exp $ * * $Log: term.c,v $ + * Revision 4.3.2.13 90/12/12 03:03:28 sob + * Lost a closing paren in circfill() + * * Revision 4.3.2.12 90/12/10 01:33:54 sob * First attempts to make rn "8 bit clean" * *************** *** 629,635 errno = 0; Howmany = read(devtty,circlebuf+nextin,1); ! if (Howmany < 0 && (errno == EAGAIN || errno == EINTR) Howmany = 0; if (Howmany) { nextin += Howmany; --- 632,638 ----- errno = 0; Howmany = read(devtty,circlebuf+nextin,1); ! if (Howmany < 0 && (errno == EAGAIN || errno == EINTR)) Howmany = 0; if (Howmany) { nextin += Howmany; Index: rn.1 Prereq: 4.3.1.10 *** /tmp/,RCSt1a06504 Thu Dec 13 23:31:34 1990 --- /tmp/,RCSt2a06504 Thu Dec 13 23:31:37 1990 *************** *** 1,4 ! ''' $Header: rn.1,v 4.3.1.10 90/11/06 01:17:29 sob Exp $ ''' ''' $Log: rn.1,v $ ''' Revision 4.3.1.10 90/11/06 01:17:29 sob --- 1,4 ----- ! ''' $Header: rn.1,v 4.3.2.2 90/12/12 03:48:54 sob Exp $ ''' ''' $Log: rn.1,v $ ''' Revision 4.3.2.2 90/12/12 03:48:54 sob *************** *** 1,6 ''' $Header: rn.1,v 4.3.1.10 90/11/06 01:17:29 sob Exp $ ''' ''' $Log: rn.1,v $ ''' Revision 4.3.1.10 90/11/06 01:17:29 sob ''' Added text about new Y response when adding newsgroups. ''' --- 1,13 ----- ''' $Header: rn.1,v 4.3.2.2 90/12/12 03:48:54 sob Exp $ ''' ''' $Log: rn.1,v $ + ''' Revision 4.3.2.2 90/12/12 03:48:54 sob + ''' Added documentation for the new "N" command at startup newsgroup + ''' selection. + ''' + ''' Revision 4.3.2.1 90/11/26 02:12:34 sob + ''' Added information about environmental variables NEWSRC and NNTPSERVER. + ''' ''' Revision 4.3.1.10 90/11/06 01:17:29 sob ''' Added text about new Y response when adding newsgroups. ''' *************** *** 294,300 not, will not be listed. If any new newsgroups are found, you will be asked for each one whether you would like to add it. If you want to add all new newsgroups, you can ! type \*(L'Y\*(R' and they will be added the the end of the .I .newsrc file. After any new newsgroups have been added, the \*(L'a\*(R' command also --- 301,307 ----- not, will not be listed. If any new newsgroups are found, you will be asked for each one whether you would like to add it. If you want to add all new newsgroups, you can ! type \*(L'Y\*(R' and they will be added the the end of the .I .newsrc file and as groups you want to read. If you don't want to subscribe, all the new groups can be added by typing \*(L'N\*(R'. *************** *** 296,302 you would like to add it. If you want to add all new newsgroups, you can type \*(L'Y\*(R' and they will be added the the end of the .I .newsrc ! file. After any new newsgroups have been added, the \*(L'a\*(R' command also restricts the current set of newsgroups just like the \*(L'o\*(R' command does. --- 303,310 ----- you would like to add it. If you want to add all new newsgroups, you can type \*(L'Y\*(R' and they will be added the the end of the .I .newsrc ! file and as groups you want to read. If you don't want to subscribe, all ! the new groups can be added by typing \*(L'N\*(R'. After any new newsgroups have been added, the \*(L'a\*(R' command also restricts the current set of newsgroups just like the \*(L'o\*(R' command does. *************** *** 1475,1480 See also NEWSHEADER. .Sp Default: Pnews \-h %h .Ip NOPOSTRING 8 The string to insert in the group summary line, which heads each article, for a group to which local posting is not allowed. See also MODSTRING. --- 1483,1498 ----- See also NEWSHEADER. .Sp Default: Pnews \-h %h + .Ip NEWSRC 8 + Your newsgroup subscription list. + .Sp + Default: $HOME/.newsrc + .Ip NNTPSERVER 8 + The hostname of your NNTPSERVER. [This does not apply unless you are running + the NNTP version of rn.] + .Sp + Default: the hostname listed in the server file, usually + /usr/local/lib/rn/server. .Ip NOPOSTRING 8 The string to insert in the group summary line, which heads each article, for a group to which local posting is not allowed. See also MODSTRING. Index: rn.c Prereq: 4.3.2.8 *** /tmp/,RCSt1a06456 Thu Dec 13 23:21:00 1990 --- /tmp/,RCSt2a06456 Thu Dec 13 23:21:01 1990 *************** *** 9,16 * RRN/RN: 11/01/89 */ ! static char rnid[] = "@(#)$Header: rn.c,v 4.3.2.8 90/12/10 01:35:43 sob Exp $"; ! static char patchlevel[] = "Patch #: 51"; /* $Log: rn.c,v $ * Revision 4.3.2.8 90/12/10 01:35:43 sob --- 9,16 ----- * RRN/RN: 11/01/89 */ ! static char rnid[] = "@(#)$Header: rn.c,v 4.3.2.9 90/12/13 22:58:24 sob Exp $"; ! static char patchlevel[] = "Patch #: 52"; /* $Log: rn.c,v $ * Revision 4.3.2.9 90/12/13 22:58:24 sob *************** *** 13,18 static char patchlevel[] = "Patch #: 51"; /* $Log: rn.c,v $ * Revision 4.3.2.8 90/12/10 01:35:43 sob * Checkpoint for patch 51 * --- 13,21 ----- static char patchlevel[] = "Patch #: 52"; /* $Log: rn.c,v $ + * Revision 4.3.2.9 90/12/13 22:58:24 sob + * Checkpoint for patch 52 + * * Revision 4.3.2.8 90/12/10 01:35:43 sob * Checkpoint for patch 51 * Index: patchlevel Prereq: 51 *** patchlevel Mon Dec 10 00:53:54 1990 --- ../rn/patchlevel Mon Dec 10 01:36:07 1990 *************** *** 1,2 ! Patch #: 51 --- 1,2 ----- ! Patch #: 52