rrn@lib.tmc.edu (Stan Barber) (11/24/90)
Description:
This is an official patch for rn 4.3. This is patch 50.
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.
The fully patched rn kit is also available via anonymous ftp from
lib.tmc.edu and gazette.bcm.tmc.edu. Look in public/rn.
This patch fixes the following problems or adds the following new
features:
Removed SERVER conditionals around the processing of the new
Capital Y response when dealing with newly discovered newsgroups.
Now regular rn users and rrn users have the same functionality.
Changes to all .c and .h files to insure that picky C preprocessors
would complain less about "extra tokens."
Fix:
cd to your rn source directory and patch away
Index: addng.c
Prereq: 4.3.2.5
*** addng.c Thu Nov 22 22:50:18 1990
--- ../new/addng.c Fri Nov 23 09:39:22 1990
***************
*** 1,4
! /* $Header: addng.c,v 4.3.2.5 90/09/04 23:29:51 sob Exp $
*
* $Log: addng.c,v $
* Revision 4.3.2.5 90/09/04 23:29:51 sob
--- 1,4 -----
! /* $Header: addng.c,v 4.3.2.6 90/11/22 16:06:35 sob Exp $
*
* $Log: addng.c,v $
* Revision 4.3.2.6 90/11/22 16:06:35 sob
***************
*** 1,6
/* $Header: addng.c,v 4.3.2.5 90/09/04 23:29:51 sob Exp $
*
* $Log: addng.c,v $
* Revision 4.3.2.5 90/09/04 23:29:51 sob
* Added fix for bithof() from bug report by kwthomas@nsslsun.gcn.uoknor.edu
*
--- 1,9 -----
/* $Header: addng.c,v 4.3.2.6 90/11/22 16:06:35 sob Exp $
*
* $Log: addng.c,v $
+ * Revision 4.3.2.6 90/11/22 16:06:35 sob
+ * Changes to make pickly C preprocessors happier.
+ *
* Revision 4.3.2.5 90/09/04 23:29:51 sob
* Added fix for bithof() from bug report by kwthomas@nsslsun.gcn.uoknor.edu
*
***************
*** 140,146
(void) sscanf(tst,"%d%d%d%d",&x,&tot,&min,&max);
if (tot > 0) return(time(Null(long *)));
else return(0);
! #else not SERVER
sprintf(tst, ngsize ? "%s/%s/1" : "%s/%s" ,spool,getngdir(ngnam));
if (stat(tst,&filestat) < 0)
--- 143,149 -----
(void) sscanf(tst,"%d%d%d%d",&x,&tot,&min,&max);
if (tot > 0) return(time(Null(long *)));
else return(0);
! #else /* not SERVER */
sprintf(tst, ngsize ? "%s/%s/1" : "%s/%s" ,spool,getngdir(ngnam));
if (stat(tst,&filestat) < 0)
Index: art.c
Prereq: 4.3.2.6
*** art.c Thu Nov 22 22:49:54 1990
--- ../new/art.c Fri Nov 23 09:38:57 1990
***************
*** 1,4
! /* $Header: art.c,v 4.3.2.6 90/10/01 21:14:36 sob Exp $
*
* $Log: art.c,v $
* Revision 4.3.2.6 90/10/01 21:14:36 sob
--- 1,4 -----
! /* $Header: art.c,v 4.3.2.7 90/11/22 13:48:59 sob Exp $
*
* $Log: art.c,v $
* Revision 4.3.2.7 90/11/22 13:48:59 sob
***************
*** 1,6
/* $Header: art.c,v 4.3.2.6 90/10/01 21:14:36 sob Exp $
*
* $Log: art.c,v $
* Revision 4.3.2.6 90/10/01 21:14:36 sob
* Shifted to fileno to increase portability.
*
--- 1,9 -----
/* $Header: art.c,v 4.3.2.7 90/11/22 13:48:59 sob Exp $
*
* $Log: art.c,v $
+ * Revision 4.3.2.7 90/11/22 13:48:59 sob
+ * Added changes that will hopefully fix the "long lines" bug.
+ *
* Revision 4.3.2.6 90/10/01 21:14:36 sob
* Shifted to fileno to increase portability.
*
***************
*** 156,162
interp(art_buf, (sizeof art_buf), firstline);
#ifdef CLEAREOL
maybe_eol();
! #endif CLEAREOL
fputs(art_buf,stdout) FLUSH;
artopen(art); /* rewind article in case interp */
/* forced a header parse */
--- 159,165 -----
interp(art_buf, (sizeof art_buf), firstline);
#ifdef CLEAREOL
maybe_eol();
! #endif /* CLEAREOL */
fputs(art_buf,stdout) FLUSH;
artopen(art); /* rewind article in case interp */
/* forced a header parse */
***************
*** 166,172
#ifdef CLEAREOL
maybe_eol();
! #endif CLEAREOL
printf("Article %ld",(long)art);
i = (((ART_NUM)toread[ng]) - 1 + was_read(art));
#ifdef DELAYMARK
--- 169,175 -----
#ifdef CLEAREOL
maybe_eol();
! #endif /* CLEAREOL */
printf("Article %ld",(long)art);
i = (((ART_NUM)toread[ng]) - 1 + was_read(art));
#ifdef DELAYMARK
***************
*** 276,282
*s++ = '\0'; /* make into 2 strings */
#ifdef CLEAREOL
maybe_eol();
! #endif CLEAREOL
fputs(art_buf,stdout) FLUSH;
/* print up through : */
if (!UG)
--- 279,285 -----
*s++ = '\0'; /* make into 2 strings */
#ifdef CLEAREOL
maybe_eol();
! #endif /* CLEAREOL */
fputs(art_buf,stdout) FLUSH;
/* print up through : */
if (!UG)
***************
*** 318,324
if (outputok)
#endif
maybe_eol();
! #endif CLEAREOL
#ifdef CUSTOMLINES
if (pagestop && bufptr == art_buf &&
execute(&page_compex,art_buf) )
--- 321,327 -----
if (outputok)
#endif
maybe_eol();
! #endif /* CLEAREOL */
#ifdef CUSTOMLINES
if (pagestop && bufptr == art_buf &&
execute(&page_compex,art_buf) )
***************
*** 483,489
/* simulate XN if need be */
}
#ifdef CLEAREOL
! /* #ifdef INNERSEARCH
if (outputok)
#endif
maybe_eol(); */ /* comment this out for now
--- 486,492 -----
/* simulate XN if need be */
}
#ifdef CLEAREOL
! #ifdef INNERSEARCH
if (outputok)
#endif
{
***************
*** 486,496
/* #ifdef INNERSEARCH
if (outputok)
#endif
! maybe_eol(); */ /* comment this out for now
! until I am sure it is
! needed*/
!
! #endif CLEAREOL
}
artline++; /* count the line just printed */
--- 489,501 -----
#ifdef INNERSEARCH
if (outputok)
#endif
! {
! /* force movement onto the new line so CE will work */
! putchar(' ');
! backspace();
! maybe_eol();
! }
! #endif /* CLEAREOL */
}
artline++; /* count the line just printed */
***************
*** 576,583
clear_rest();
else
erase_eol(); /* and erase the prompt */
! #endif CLEAREOL
! carriage_return(); /* Resets kernels tab coloumn counter to 0 */ fflush(stdout);
fake_command: /* used by innersearch */
--- 581,589 -----
clear_rest();
else
erase_eol(); /* and erase the prompt */
! #endif /* CLEAREOL */
! carriage_return(); /* Resets kernel's tab column counter to 0 */
! fflush(stdout);
fake_command: /* used by innersearch */
***************
*** 648,654
}
carriage_return();
erase_eol(); /* erase the prompt */
! carriage_return(); /* Resets kernels tab coloumn counter to 0 */
/* FALL THROUGH */
caseG:
case 'G': {
--- 654,660 -----
}
carriage_return();
erase_eol(); /* erase the prompt */
! carriage_return(); /* Resets kernel's tab column counter to 0 */
/* FALL THROUGH */
caseG:
case 'G': {
***************
*** 742,748
}
#endif
clear();
! carriage_return(); /* Resets kernels tab coloumn counter to 0 */
do_fseek = TRUE;
artline = topline;
if (artline < 0)
--- 748,754 -----
}
#endif
clear();
! carriage_return(); /* Resets kernel's tab column counter to 0 */
do_fseek = TRUE;
artline = topline;
if (artline < 0)
***************
*** 762,769
else
clear();
! #endif CLEAREOL
! carriage_return(); /* Resets kernels tab coloumn counter to 0 */
do_fseek = TRUE; /* reposition article file */
target = topline - (LINES - 2);
artline = topline;
--- 768,775 -----
else
clear();
! #endif /* CLEAREOL */
! carriage_return(); /* Resets kernel's tab column counter to 0 */
do_fseek = TRUE; /* reposition article file */
target = topline - (LINES - 2);
artline = topline;
***************
*** 859,865
else
clear(); /* else clear screen */
! #endif CLEAREOL
if (*blinebeg != '\f'
#ifdef CUSTOMLINES
&& (!pagestop || blinebeg != art_buf ||
--- 865,871 -----
else
clear(); /* else clear screen */
! #endif /* CLEAREOL */
if (*blinebeg != '\f'
#ifdef CUSTOMLINES
&& (!pagestop || blinebeg != art_buf ||
Index: artio.c
Prereq: 4.3.2.5
*** artio.c Thu Nov 22 22:49:34 1990
--- ../new/artio.c Fri Nov 23 09:39:21 1990
***************
*** 1,4
! /* $Header: artio.c,v 4.3.2.5 90/03/22 23:04:04 sob Exp $
*
* $Log: artio.c,v $
* Revision 4.3.2.5 90/03/22 23:04:04 sob
--- 1,4 -----
! /* $Header: artio.c,v 4.3.2.6 90/11/22 16:06:57 sob Exp $
*
* $Log: artio.c,v $
* Revision 4.3.2.6 90/11/22 16:06:57 sob
***************
*** 1,6
/* $Header: artio.c,v 4.3.2.5 90/03/22 23:04:04 sob Exp $
*
* $Log: artio.c,v $
* Revision 4.3.2.5 90/03/22 23:04:04 sob
* Fixes provided by Wayne Davison <drivax!davison>
*
--- 1,9 -----
/* $Header: artio.c,v 4.3.2.6 90/11/22 16:06:57 sob Exp $
*
* $Log: artio.c,v $
+ * Revision 4.3.2.6 90/11/22 16:06:57 sob
+ * Changes to make pickly C preprocessors happier.
+ *
* Revision 4.3.2.5 90/03/22 23:04:04 sob
* Fixes provided by Wayne Davison <drivax!davison>
*
***************
*** 62,68
/* produce the name of the article */
if (artfp = fopen(artname,"r")) /* if we can open it */
openart = artnum; /* remember what we did here */
! #endif SERVER
#ifdef LINKART
{
char tmpbuf[256];
--- 65,71 -----
/* produce the name of the article */
if (artfp = fopen(artname,"r")) /* if we can open it */
openart = artnum; /* remember what we did here */
! #endif /* SERVER */
#ifdef LINKART
{
char tmpbuf[256];
***************
*** 93,99
}
#ifdef SERVER
! static long our_pid;
FILE *
nntpopen(artnum,function)
--- 96,102 -----
}
#ifdef SERVER
! static long our_pid=0;
FILE *
nntpopen(artnum,function)
Index: backpage.c
Prereq: 4.3
*** backpage.c Thu Nov 22 22:50:21 1990
--- ../new/backpage.c Fri Nov 23 09:39:29 1990
***************
*** 1,4
! /* $Header: backpage.c,v 4.3 85/05/01 11:36:03 lwall Exp $
*
* $Log: backpage.c,v $
* Revision 4.3 85/05/01 11:36:03 lwall
--- 1,4 -----
! /* $Header: backpage.c,v 4.3.2.1 90/11/22 16:08:00 sob Exp $
*
* $Log: backpage.c,v $
* Revision 4.3.2.1 90/11/22 16:08:00 sob
***************
*** 1,6
/* $Header: backpage.c,v 4.3 85/05/01 11:36:03 lwall Exp $
*
* $Log: backpage.c,v $
* Revision 4.3 85/05/01 11:36:03 lwall
* Baseline for release with 4.3bsd.
*
--- 1,9 -----
/* $Header: backpage.c,v 4.3.2.1 90/11/22 16:08:00 sob Exp $
*
* $Log: backpage.c,v $
+ * Revision 4.3.2.1 90/11/22 16:08:00 sob
+ * Made changes to accomodate picky C precompilers
+ *
* Revision 4.3 85/05/01 11:36:03 lwall
* Baseline for release with 4.3bsd.
*
***************
*** 56,62
#ifndef lint
(void)lseek(varyfd,oldoffset,0);
write(varyfd, (char *)varybuf,sizeof(varybuf));
! #endif lint
}
#ifndef lint
(void)lseek(varyfd,offset,0);
--- 59,65 -----
#ifndef lint
(void)lseek(varyfd,oldoffset,0);
write(varyfd, (char *)varybuf,sizeof(varybuf));
! #endif /* lint */
}
#ifndef lint
(void)lseek(varyfd,offset,0);
***************
*** 61,67
#ifndef lint
(void)lseek(varyfd,offset,0);
read(varyfd,(char *)varybuf,sizeof(varybuf));
! #endif lint
oldoffset = offset;
}
return varybuf[subindx];
--- 64,70 -----
#ifndef lint
(void)lseek(varyfd,offset,0);
read(varyfd,(char *)varybuf,sizeof(varybuf));
! #endif /* lint */
oldoffset = offset;
}
return varybuf[subindx];
***************
*** 95,101
#ifndef lint
(void)lseek(varyfd,oldoffset,0);
write(varyfd,(char *)varybuf,sizeof(varybuf));
! #endif lint
}
#ifndef lint
(void)lseek(varyfd,offset,0);
--- 98,104 -----
#ifndef lint
(void)lseek(varyfd,oldoffset,0);
write(varyfd,(char *)varybuf,sizeof(varybuf));
! #endif /* lint */
}
#ifndef lint
(void)lseek(varyfd,offset,0);
***************
*** 100,106
#ifndef lint
(void)lseek(varyfd,offset,0);
read(varyfd,(char *)varybuf,sizeof(varybuf));
! #endif lint
oldoffset = offset;
}
varybuf[subindx] = newvalue;
--- 103,109 -----
#ifndef lint
(void)lseek(varyfd,offset,0);
read(varyfd,(char *)varybuf,sizeof(varybuf));
! #endif /* lint */
oldoffset = offset;
}
varybuf[subindx] = newvalue;
Index: bits.c
Prereq: 4.3.2.4
*** bits.c Thu Nov 22 22:50:00 1990
--- ../new/bits.c Fri Nov 23 09:39:04 1990
***************
*** 1,4
! /* $Header: bits.c,v 4.3.2.4 90/10/06 11:55:33 sob Exp $
*
* $Log: bits.c,v $
* Revision 4.3.2.4 90/10/06 11:55:33 sob
--- 1,4 -----
! /* $Header: bits.c,v 4.3.2.5 90/11/22 13:47:16 sob Exp $
*
* $Log: bits.c,v $
* Revision 4.3.2.5 90/11/22 13:47:16 sob
***************
*** 1,6
/* $Header: bits.c,v 4.3.2.4 90/10/06 11:55:33 sob Exp $
*
* $Log: bits.c,v $
* Revision 4.3.2.4 90/10/06 11:55:33 sob
* Added fix for DBM support.
*
--- 1,9 -----
/* $Header: bits.c,v 4.3.2.5 90/11/22 13:47:16 sob Exp $
*
* $Log: bits.c,v $
+ * Revision 4.3.2.5 90/11/22 13:47:16 sob
+ * Altered #endifs to make System V compiliers happy.
+ *
* Revision 4.3.2.4 90/10/06 11:55:33 sob
* Added fix for DBM support.
*
***************
*** 49,55
#ifdef DBM
# ifdef NULL
# undef NULL
! # endif NULL
# include <dbm.h>
#endif DBM
MEM_SIZE ctlsize; /* size of bitmap in bytes */
--- 52,58 -----
#ifdef DBM
# ifdef NULL
# undef NULL
! # endif
# include <dbm.h>
#endif
MEM_SIZE ctlsize; /* size of bitmap in bytes */
***************
*** 51,57
# undef NULL
# endif NULL
# include <dbm.h>
! #endif DBM
MEM_SIZE ctlsize; /* size of bitmap in bytes */
void
--- 54,60 -----
# undef NULL
# endif
# include <dbm.h>
! #endif
MEM_SIZE ctlsize; /* size of bitmap in bytes */
void
***************
*** 332,338
#endif
htype[XREF_LINE].ht_minpos >= 0) {
/* are there article# xrefs? */
! #endif DBM
char *xref_buf, *curxref;
register char *xartnum;
char *rver_buf = Nullch;
--- 335,341 -----
#endif
htype[XREF_LINE].ht_minpos >= 0) {
/* are there article# xrefs? */
! #endif /* DBM */
char *xref_buf, *curxref;
register char *xartnum;
char *rver_buf = Nullch;
***************
*** 385,391
if (debug)
printf ("chase_xref: curxref: %s\n", curxref);
#endif
! #else !DBM
#ifdef DEBUGGING
if (htype[XREF_LINE].ht_minpos >= 0)
#endif
--- 388,394 -----
if (debug)
printf ("chase_xref: curxref: %s\n", curxref);
#endif
! #else /* !DBM */
#ifdef DEBUGGING
if (htype[XREF_LINE].ht_minpos >= 0)
#endif
***************
*** 420,426
#ifndef NORELAY
rver_buf = fetchlines(artnum,RVER_LINE);
if ((t = instr(rver_buf,"; site ")) == Nullch)
! #else NORELAY
/* In version 2.10.3 of news or afterwards, the Relay-Version
* and Posting-Version header lines have been removed. For
* the code below to work as intended, I have modified it to
--- 423,429 -----
#ifndef NORELAY
rver_buf = fetchlines(artnum,RVER_LINE);
if ((t = instr(rver_buf,"; site ")) == Nullch)
! #else /* NORELAY */
/* In version 2.10.3 of news or afterwards, the Relay-Version
* and Posting-Version header lines have been removed. For
* the code below to work as intended, I have modified it to
***************
*** 430,436
*/
rver_buf = fetchlines(artnum,PATH_LINE);
if (instr(rver_buf,"!") == Nullch)
! #endif NORELAY
inews_site = savestr(nullstr);
else {
char new_site[128];
--- 433,439 -----
*/
rver_buf = fetchlines(artnum,PATH_LINE);
if (instr(rver_buf,"!") == Nullch)
! #endif /* NORELAY */
inews_site = savestr(nullstr);
else {
char new_site[128];
***************
*** 437,443
#ifndef NORELAY
cpytill(new_site,t + 7,'.');
! #else NORELAY
cpytill(new_site,rver_buf,'!');
#endif NORELAY
inews_site = savestr(new_site);
--- 440,446 -----
#ifndef NORELAY
cpytill(new_site,t + 7,'.');
! #else /* NORELAY */
cpytill(new_site,rver_buf,'!');
#endif /* NORELAY */
inews_site = savestr(new_site);
***************
*** 439,445
cpytill(new_site,t + 7,'.');
#else NORELAY
cpytill(new_site,rver_buf,'!');
! #endif NORELAY
inews_site = savestr(new_site);
}
if (strNE(tmpbuf,inews_site)) {
--- 442,448 -----
cpytill(new_site,t + 7,'.');
#else /* NORELAY */
cpytill(new_site,rver_buf,'!');
! #endif /* NORELAY */
inews_site = savestr(new_site);
}
if (strNE(tmpbuf,inews_site)) {
***************
*** 450,456
goto wild_goose;
}
}
! #endif DBM
while (*curxref) {
/* for each newsgroup */
curxref = cpytill(tmpbuf,curxref,' ');
--- 453,459 -----
goto wild_goose;
}
}
! #endif /* DBM */
while (*curxref) {
/* for each newsgroup */
curxref = cpytill(tmpbuf,curxref,' ');
***************
*** 458,464
xartnum = index(tmpbuf,'/');
#else
xartnum = index(tmpbuf,':');
! #endif DBM
if (!xartnum) /* probably an old-style Xref */
break;
*xartnum++ = '\0';
--- 461,467 -----
xartnum = index(tmpbuf,'/');
#else
xartnum = index(tmpbuf,':');
! #endif /* DBM */
if (!xartnum) /* probably an old-style Xref */
break;
*xartnum++ = '\0';
***************
*** 481,487
free(xref_buf);
#ifdef DBM
free(ident_buf);
! #endif DBM
if (rver_buf != Nullch)
free(rver_buf);
}
--- 484,490 -----
free(xref_buf);
#ifdef DBM
free(ident_buf);
! #endif /* DBM */
if (rver_buf != Nullch)
free(rver_buf);
}
***************
*** 507,513
absfirst = 1; /* pretend there is one */
#ifndef lint
ctlsize = (MEM_SIZE)(OFFSET(lastart)/BITSPERBYTE+20);
! #endif lint
ctlarea = safemalloc(ctlsize); /* allocate control area */
/* now modify ctlarea to reflect what has already been read */
--- 510,516 -----
absfirst = 1; /* pretend there is one */
#ifndef lint
ctlsize = (MEM_SIZE)(OFFSET(lastart)/BITSPERBYTE+20);
! #endif /* lint */
ctlarea = safemalloc(ctlsize); /* allocate control area */
/* now modify ctlarea to reflect what has already been read */
***************
*** 518,524
#ifndef lint
if (i >= LBUFLEN-2) /* bigger than buf? */
mybuf = safemalloc((MEM_SIZE)(i+2));
! #endif lint
strcpy(mybuf,s); /* make scratch copy of line */
mybuf[i++] = ','; /* put extra comma on the end */
mybuf[i] = '\0';
--- 521,527 -----
#ifndef lint
if (i >= LBUFLEN-2) /* bigger than buf? */
mybuf = safemalloc((MEM_SIZE)(i+2));
! #endif /* lint */
strcpy(mybuf,s); /* make scratch copy of line */
mybuf[i++] = ','; /* put extra comma on the end */
mybuf[i] = '\0';
***************
*** 615,621
newsize = (MEM_SIZE)(OFFSET(newlast)/BITSPERBYTE+2);
#else
newsize = Null(MEM_SIZE);
! #endif lint
if (newsize > ctlsize) {
newsize += 20;
ctlarea = saferealloc(ctlarea,newsize);
--- 618,624 -----
newsize = (MEM_SIZE)(OFFSET(newlast)/BITSPERBYTE+2);
#else
newsize = Null(MEM_SIZE);
! #endif /* lint */
if (newsize > ctlsize) {
newsize += 20;
ctlarea = saferealloc(ctlarea,newsize);
***************
*** 629,635
#ifndef lint
subj_list = (char**)saferealloc((char*)subj_list,
(MEM_SIZE)((OFFSET(newlast)+2)*sizeof(char *)) );
! #endif lint
for (i=lastart+1; i<=newlast; i++)
subj_list[OFFSET(i)] = Nullch;
}
--- 632,638 -----
#ifndef lint
subj_list = (char**)saferealloc((char*)subj_list,
(MEM_SIZE)((OFFSET(newlast)+2)*sizeof(char *)) );
! #endif /* lint */
for (i=lastart+1; i<=newlast; i++)
subj_list[OFFSET(i)] = Nullch;
}
Index: bits.h
Prereq: 4.3.1.2
*** bits.h Thu Nov 22 22:50:26 1990
--- ../new/bits.h Fri Nov 23 09:39:30 1990
***************
*** 1,4
! /* $Header: bits.h,v 4.3.1.2 86/11/03 09:49:58 lwall Exp $
*
* $Log: bits.h,v $
* Revision 4.3.1.2 86/11/03 09:49:58 lwall
--- 1,4 -----
! /* $Header: bits.h,v 4.3.2.1 90/11/22 15:46:42 sob Exp $
*
* $Log: bits.h,v $
* Revision 4.3.2.1 90/11/22 15:46:42 sob
***************
*** 1,6
/* $Header: bits.h,v 4.3.1.2 86/11/03 09:49:58 lwall Exp $
*
* $Log: bits.h,v $
* Revision 4.3.1.2 86/11/03 09:49:58 lwall
* Added firstbit variable.
*
--- 1,9 -----
/* $Header: bits.h,v 4.3.2.1 90/11/22 15:46:42 sob Exp $
*
* $Log: bits.h,v $
+ * Revision 4.3.2.1 90/11/22 15:46:42 sob
+ * Made changes to make pickly preprocessors happier.
+ *
* Revision 4.3.1.2 86/11/03 09:49:58 lwall
* Added firstbit variable.
*
***************
*** 38,44
#define ctl_read(a) ((ctlarea[(OFFSET(a)) / BITSPERBYTE] & pow2((OFFSET(a)) % BITSPERBYTE)) != 0)
#define was_read(a) ((a)<firstbit || ctl_read(a))
! #endif lint
EXT ART_NUM absfirst INIT(0); /* 1st real article in current newsgroup */
EXT ART_NUM firstart INIT(0); /* minimum unread article number in newsgroup */
--- 41,47 -----
#define ctl_read(a) ((ctlarea[(OFFSET(a)) / BITSPERBYTE] & pow2((OFFSET(a)) % BITSPERBYTE)) != 0)
#define was_read(a) ((a)<firstbit || ctl_read(a))
! #endif /* lint */
EXT ART_NUM absfirst INIT(0); /* 1st real article in current newsgroup */
EXT ART_NUM firstart INIT(0); /* minimum unread article number in newsgroup */
Index: final.c
Prereq: 4.3.2.8
*** final.c Thu Nov 22 22:50:17 1990
--- ../new/final.c Fri Nov 23 09:39:20 1990
***************
*** 1,4
! /* $Header: final.c,v 4.3.2.8 90/04/14 19:37:14 sob Exp $
*
* $Log: final.c,v $
* Revision 4.3.2.8 90/04/14 19:37:14 sob
--- 1,4 -----
! /* $Header: final.c,v 4.3.2.9 90/11/22 16:08:34 sob Exp $
*
* $Log: final.c,v $
* Revision 4.3.2.9 90/11/22 16:08:34 sob
***************
*** 1,6
/* $Header: final.c,v 4.3.2.8 90/04/14 19:37:14 sob Exp $
*
* $Log: final.c,v $
* Revision 4.3.2.8 90/04/14 19:37:14 sob
* Added better support for the NeXT.
*
--- 1,9 -----
/* $Header: final.c,v 4.3.2.9 90/11/22 16:08:34 sob Exp $
*
* $Log: final.c,v $
+ * Revision 4.3.2.9 90/11/22 16:08:34 sob
+ * Added changes to accomodate pick C preprocessors.
+ *
* Revision 4.3.2.8 90/04/14 19:37:14 sob
* Added better support for the NeXT.
*
***************
*** 59,65
sigset(SIGHUP, sig_catcher); /* and hangups */
#ifndef lint
sigignore(SIGEMT);
! #endif lint
sigset(SIGILL, sig_catcher);
sigset(SIGTRAP, sig_catcher);
--- 62,68 -----
sigset(SIGHUP, sig_catcher); /* and hangups */
#ifndef lint
sigignore(SIGEMT);
! #endif /* lint */
sigset(SIGILL, sig_catcher);
sigset(SIGTRAP, sig_catcher);
***************
*** 85,91
{
#ifdef SERVER
char artname[32];
! #endif SERVER
if (bizarre)
resetty();
--- 88,94 -----
{
#ifdef SERVER
char artname[32];
! #endif /* SERVER */
if (bizarre)
resetty();
***************
*** 100,106
UNLINK(artname);
}
close_server();
! #endif SERVER
if (status < 0) {
chdir("/usr/tmp");
sigset(SIGILL,SIG_DFL);
--- 103,109 -----
UNLINK(artname);
}
close_server();
! #endif /* SERVER */
if (status < 0) {
chdir("/usr/tmp");
sigset(SIGILL,SIG_DFL);
Index: head.c
Prereq: 4.3.2.6
*** head.c Thu Nov 22 22:50:08 1990
--- ../new/head.c Fri Nov 23 09:39:11 1990
***************
*** 1,4
! /* $Header: head.c,v 4.3.2.6 90/10/01 01:59:10 sob Exp $
*
* $Log: head.c,v $
* Revision 4.3.2.6 90/10/01 01:59:10 sob
--- 1,4 -----
! /* $Header: head.c,v 4.3.2.7 90/11/22 13:49:50 sob Exp $
*
* $Log: head.c,v $
* Revision 4.3.2.7 90/11/22 13:49:50 sob
***************
*** 1,6
/* $Header: head.c,v 4.3.2.6 90/10/01 01:59:10 sob Exp $
*
* $Log: head.c,v $
* Revision 4.3.2.6 90/10/01 01:59:10 sob
* Fixed possible core dump problem reported by geoff@desint.uucp
*
--- 1,9 -----
/* $Header: head.c,v 4.3.2.7 90/11/22 13:49:50 sob Exp $
*
* $Log: head.c,v $
+ * Revision 4.3.2.7 90/11/22 13:49:50 sob
+ * Added changes to make System V compilers happy.
+ *
* Revision 4.3.2.6 90/10/01 01:59:10 sob
* Fixed possible core dump problem reported by geoff@desint.uucp
*
***************
*** 214,220
static int xhdr = 1; /* Can we use xhdr command? */
int eoo; /* End of server output */
char ser_line[256];
! #endif SERVER
#ifdef CACHESUBJ
if (!subj_list) {
--- 217,223 -----
static int xhdr = 1; /* Can we use xhdr command? */
int eoo; /* End of server output */
char ser_line[256];
! #endif /* SERVER */
#ifdef CACHESUBJ
if (!subj_list) {
***************
*** 224,230
#ifndef lint
subj_list =
(char**)safemalloc((MEM_SIZE)((OFFSET(lastart)+2)*sizeof(char *)));
! #endif lint
for (i=0; i<=OFFSET(lastart); i++)
subj_list[i] = Nullch;
}
--- 227,233 -----
#ifndef lint
subj_list =
(char**)safemalloc((MEM_SIZE)((OFFSET(lastart)+2)*sizeof(char *)));
! #endif /* lint */
for (i=0; i<=OFFSET(lastart); i++)
subj_list[i] = Nullch;
}
***************
*** 291,297
strcpy(s, t);
}
}
! #else not SERVER
if (artopen(artnum) != Nullfp) {
do {
if (fgets(s,256,artfp) == Nullch)
--- 294,300 -----
strcpy(s, t);
}
}
! #else /* not SERVER */
if (artopen(artnum) != Nullfp) {
do {
if (fgets(s,256,artfp) == Nullch)
***************
*** 360,366
size = lastpos - firstpos + 1;
#else
size = Null(int);
! #endif lint
#ifdef DEBUGGING
if (debug && (size < 1 || size > 1000)) {
printf("Firstpos = %ld, lastpos = %ld\n",(long)firstpos,(long)lastpos);
--- 363,369 -----
size = lastpos - firstpos + 1;
#else
size = Null(int);
! #endif /* lint */
#ifdef DEBUGGING
if (debug && (size < 1 || size > 1000)) {
printf("Firstpos = %ld, lastpos = %ld\n",(long)firstpos,(long)lastpos);
Index: init.c
Prereq: 4.3.2.7
*** init.c Thu Nov 22 22:50:09 1990
--- ../new/init.c Fri Nov 23 09:39:12 1990
***************
*** 1,4
! /* $Header: init.c,v 4.3.2.7 90/10/30 22:42:23 sob Exp $
*
* $Log: init.c,v $
* Revision 4.3.2.7 90/10/30 22:42:23 sob
--- 1,4 -----
! /* $Header: init.c,v 4.3.2.8 90/11/22 13:51:39 sob Exp $
*
* $Log: init.c,v $
* Revision 4.3.2.8 90/11/22 13:51:39 sob
***************
*** 1,6
/* $Header: init.c,v 4.3.2.7 90/10/30 22:42:23 sob Exp $
*
* $Log: init.c,v $
* Revision 4.3.2.7 90/10/30 22:42:23 sob
* Used fileno() instead of _file to increase portability.
*
--- 1,10 -----
/* $Header: init.c,v 4.3.2.8 90/11/22 13:51:39 sob Exp $
*
* $Log: init.c,v $
+ * Revision 4.3.2.8 90/11/22 13:51:39 sob
+ * Removed some cruft trailing the #endif directive to make more compilers
+ * happy.
+ *
* Revision 4.3.2.7 90/10/30 22:42:23 sob
* Used fileno() instead of _file to increase portability.
*
***************
*** 85,91
#ifdef SERVER
char *server;
int response;
! #endif SERVER
#ifdef NOLINEBUF
static char std_out_buf[BUFSIZ]; /* must be static or malloced */
--- 89,95 -----
#ifdef SERVER
char *server;
int response;
! #endif
#ifdef NOLINEBUF
static char std_out_buf[BUFSIZ]; /* must be static or malloced */
***************
*** 178,184
if (handle_server_response(response, server) < 0)
finalize(1);
! #endif SERVER
/* open active file, etc. */
--- 182,188 -----
if (handle_server_response(response, server) < 0)
finalize(1);
! #endif
/* open active file, etc. */
Index: intrp.c
Prereq: 4.3.2.7
*** intrp.c Thu Nov 22 22:49:40 1990
--- ../new/intrp.c Fri Nov 23 09:38:43 1990
***************
*** 1,4
! /* $Header: intrp.c,v 4.3.2.7 90/11/05 23:59:33 sob Exp $
*
* $Log: intrp.c,v $
* Revision 4.3.2.7 90/11/05 23:59:33 sob
--- 1,4 -----
! /* $Header: intrp.c,v 4.3.2.8 90/11/22 13:52:27 sob Exp $
*
* $Log: intrp.c,v $
* Revision 4.3.2.8 90/11/22 13:52:27 sob
***************
*** 1,6
/* $Header: intrp.c,v 4.3.2.7 90/11/05 23:59:33 sob Exp $
*
* $Log: intrp.c,v $
* Revision 4.3.2.7 90/11/05 23:59:33 sob
* moved the definition of tmpbuf such that it get defined before it is used.
*
--- 1,9 -----
/* $Header: intrp.c,v 4.3.2.8 90/11/22 13:52:27 sob Exp $
*
* $Log: intrp.c,v $
+ * Revision 4.3.2.8 90/11/22 13:52:27 sob
+ * Made changes to keep preprocessors from complaining.
+ *
* Revision 4.3.2.7 90/11/05 23:59:33 sob
* moved the definition of tmpbuf such that it get defined before it is used.
*
***************
*** 68,74
char *hostname;
# undef SITENAME
# define SITENAME hostname
! #else !GETHOSTNAME
# ifdef DOUNAME
# include <sys/utsname.h>
struct utsname utsn;
--- 71,77 -----
char *hostname;
# undef SITENAME
# define SITENAME hostname
! #else /* !GETHOSTNAME */
# ifdef DOUNAME
# include <sys/utsname.h>
struct utsname utsn;
***************
*** 74,80
struct utsname utsn;
# undef SITENAME
# define SITENAME utsn.nodename
! # else !DOUNAME
# ifdef PHOSTNAME
char *hostname;
# undef SITENAME
--- 77,83 -----
struct utsname utsn;
# undef SITENAME
# define SITENAME utsn.nodename
! # else /* !DOUNAME */
# ifdef PHOSTNAME
char *hostname;
# undef SITENAME
***************
*** 79,85
char *hostname;
# undef SITENAME
# define SITENAME hostname
! # else !PHOSTNAME
# ifdef WHOAMI
# undef SITENAME
# define SITENAME sysname
--- 82,88 -----
char *hostname;
# undef SITENAME
# define SITENAME hostname
! # else /* !PHOSTNAME */
# ifdef WHOAMI
# undef SITENAME
# define SITENAME sysname
***************
*** 83,92
# ifdef WHOAMI
# undef SITENAME
# define SITENAME sysname
! # endif WHOAMI
! # endif PHOSTNAME
! # endif DOUNAME
! #endif GETHOSTNAME
#ifdef TILDENAME
static char *tildename = Nullch;
--- 86,95 -----
# ifdef WHOAMI
# undef SITENAME
# define SITENAME sysname
! # endif /* WHOAMI */
! # endif /* PHOSTNAME */
! # endif /* DOUNAME */
! #endif /* GETHOSTNAME */
#ifdef TILDENAME
static char *tildename = Nullch;
***************
*** 130,136
if (logname == Nullch)
logname = savestr(getlogin());
#endif
!
if (checkflag) /* that getwd below takes ~1/3 sec. */
return; /* and we do not need it for -c */
getwd(tcbuf); /* find working directory name */
--- 133,139 -----
if (logname == Nullch)
logname = savestr(getlogin());
#endif
!
if (checkflag) /* that getwd below takes ~1/3 sec. */
return; /* and we do not need it for -c */
getwd(tcbuf); /* find working directory name */
***************
*** 283,289
}
#endif
}
! #else !TILDENAME
#ifdef VERBOSE
IF(verbose)
fputs("~loginname not implemented.\n",stdout) FLUSH;
--- 286,292 -----
}
#endif
}
! #else /* !TILDENAME */
#ifdef VERBOSE
IF(verbose)
fputs("~loginname not implemented.\n",stdout) FLUSH;
Index: kfile.c
*** kfile.c Thu Nov 22 22:50:14 1990
--- ../new/kfile.c Fri Nov 23 09:39:19 1990
***************
*** 1,4
! /* $Header: kfile.c,v 1.2 90/03/22 23:04:41 sob Exp $
*
* $Log: kfile.c,v $
* Revision 1.2 90/03/22 23:04:41 sob
--- 1,4 -----
! /* $Header: kfile.c,v 4.3.2.2 90/11/22 16:09:54 sob Exp $
*
* $Log: kfile.c,v $
* Revision 4.3.2.2 90/11/22 16:09:54 sob
***************
*** 1,7
/* $Header: kfile.c,v 1.2 90/03/22 23:04:41 sob Exp $
*
* $Log: kfile.c,v $
! * Revision 1.2 90/03/22 23:04:41 sob
* Fixes provided by Wayne Davison <drivax!davison>
*
* Revision 4.3.1.3 85/05/29 09:11:52 lwall
--- 1,10 -----
/* $Header: kfile.c,v 4.3.2.2 90/11/22 16:09:54 sob Exp $
*
* $Log: kfile.c,v $
! * Revision 4.3.2.2 90/11/22 16:09:54 sob
! * Added changes to accomodate picky C preprocessors
! *
! * Revision 4.3.2.1 90/03/22 23:04:41 sob
* Fixes provided by Wayne Davison <drivax!davison>
*
* Revision 4.3.1.3 85/05/29 09:11:52 lwall
***************
*** 48,54
return -1;
}
! #else KILLFILES
char killglobal[] = KILLGLOBAL;
char killlocal[] = KILLLOCAL;
--- 51,57 -----
return -1;
}
! #else /* KILLFILES */
char killglobal[] = KILLGLOBAL;
char killlocal[] = KILLLOCAL;
***************
*** 295,298
printf(cantopen,cmd_buf) FLUSH;
}
}
! #endif KILLFILES
--- 298,301 -----
printf(cantopen,cmd_buf) FLUSH;
}
}
! #endif /* KILLFILES */
Index: ndir.c
Prereq: 4.3.1.5
*** ndir.c Thu Nov 22 22:50:25 1990
--- ../new/ndir.c Fri Nov 23 09:39:29 1990
***************
*** 1,4
! /* $Header: ndir.c,v 4.3.1.5 90/03/22 23:04:47 sob Exp $
*
* $Log: ndir.c,v $
* Revision 4.3.1.5 90/03/22 23:04:47 sob
--- 1,4 -----
! /* $Header: ndir.c,v 4.3.1.6 90/11/22 16:08:50 sob Exp $
*
* $Log: ndir.c,v $
* Revision 4.3.1.6 90/11/22 16:08:50 sob
***************
*** 1,6
/* $Header: ndir.c,v 4.3.1.5 90/03/22 23:04:47 sob Exp $
*
* $Log: ndir.c,v $
* Revision 4.3.1.5 90/03/22 23:04:47 sob
* Fixes provided by Wayne Davison <drivax!davison>
*
--- 1,9 -----
/* $Header: ndir.c,v 4.3.1.6 90/11/22 16:08:50 sob Exp $
*
* $Log: ndir.c,v $
+ * Revision 4.3.1.6 90/11/22 16:08:50 sob
+ * Added changes to accomodate pick C preprocessors.
+ *
* Revision 4.3.1.5 90/03/22 23:04:47 sob
* Fixes provided by Wayne Davison <drivax!davison>
*
***************
*** 116,119
dirp->dd_loc = 0;
free(dirp);
}
! #endif USENDIR
--- 119,122 -----
dirp->dd_loc = 0;
free(dirp);
}
! #endif /* USENDIR */
Index: ng.c
Prereq: 4.3.2.7
*** ng.c Thu Nov 22 22:49:45 1990
--- ../new/ng.c Fri Nov 23 09:38:48 1990
***************
*** 1,4
! /* $Header: ng.c,v 4.3.2.7 90/04/21 14:44:23 sob Exp $
*
* $Log: ng.c,v $
* Revision 4.3.2.7 90/04/21 14:44:23 sob
--- 1,4 -----
! /* $Header: ng.c,v 4.3.2.8 90/11/22 16:14:17 sob Exp $
*
* $Log: ng.c,v $
* Revision 4.3.2.8 90/11/22 16:14:17 sob
***************
*** 1,6
/* $Header: ng.c,v 4.3.2.7 90/04/21 14:44:23 sob Exp $
*
* $Log: ng.c,v $
* Revision 4.3.2.7 90/04/21 14:44:23 sob
* Revised previous patch insure that it does not decrement below zero.
*
--- 1,9 -----
/* $Header: ng.c,v 4.3.2.8 90/11/22 16:14:17 sob Exp $
*
* $Log: ng.c,v $
+ * Revision 4.3.2.8 90/11/22 16:14:17 sob
+ * Added changes to accomodate picky C preprocessors
+ *
* Revision 4.3.2.7 90/04/21 14:44:23 sob
* Revised previous patch insure that it does not decrement below zero.
*
***************
*** 137,144
#ifdef SERVER
char ser_line[256];
char artname[32];
! static long our_pid;
! #endif SERVER
char oldmode = mode;
register long i; /* scratch */
int skipstate; /* how many unavailable articles */
--- 140,147 -----
#ifdef SERVER
char ser_line[256];
char artname[32];
! static long our_pid=0;
! #endif /* SERVER */
char oldmode = mode;
register long i; /* scratch */
int skipstate; /* how many unavailable articles */
***************
*** 149,155
#ifdef SERVER
if (our_pid == 0) /* Agreed, this is gross */
our_pid = getpid();
! #endif SERVER
#ifdef ARTSEARCH
srchahead = (scanon && ((ART_NUM)toread[ng]) >= scanon ? -1 : 0);
--- 152,158 -----
#ifdef SERVER
if (our_pid == 0) /* Agreed, this is gross */
our_pid = getpid();
! #endif /* SERVER */
#ifdef ARTSEARCH
srchahead = (scanon && ((ART_NUM)toread[ng]) >= scanon ? -1 : 0);
***************
*** 173,179
ngname, ser_line);
return (-1);
}
! #else not SERVER
if (eaccess(ngdir,5)) { /* directory read protected? */
if (eaccess(ngdir,0)) {
#ifdef VERBOSE
--- 176,182 -----
ngname, ser_line);
return (-1);
}
! #else /* not SERVER */
if (eaccess(ngdir,5)) { /* directory read protected? */
if (eaccess(ngdir,0)) {
#ifdef VERBOSE
***************
*** 214,220
mode = oldmode;
return -1;
}
! #endif SERVER
#ifdef CACHESUBJ
subj_list = Null(char **); /* no subject list till needed */
--- 217,223 -----
mode = oldmode;
return -1;
}
! #endif /* SERVER */
#ifdef CACHESUBJ
subj_list = Null(char **); /* no subject list till needed */
***************
*** 415,421
oneless(i);
art = newart - 1;
}
! #endif SERVER
break;
}
oneless(art); /* mark deleted as read */
--- 418,424 -----
oneless(i);
art = newart - 1;
}
! #endif /* SERVER */
break;
}
oneless(art); /* mark deleted as read */
***************
*** 474,480
#ifdef CLEAREOL
if (erase_screen && can_home_clear)
clear_rest();
! #endif CLEAREOL
unflush_output(); /* disable any ^O in effect */
standout(); /* enter standout mode */
printf(prompt,mailcall,dfltcmd);/* print prompt, whatever it is */
--- 477,483 -----
#ifdef CLEAREOL
if (erase_screen && can_home_clear)
clear_rest();
! #endif /* CLEAREOL */
unflush_output(); /* disable any ^O in effect */
standout(); /* enter standout mode */
printf(prompt,mailcall,dfltcmd);/* print prompt, whatever it is */
***************
*** 528,534
#ifdef SERVER
sprintf(artname, "/tmp/rrn%ld.%ld", (long) openart, our_pid);
UNLINK(artname);
! #endif SERVER
openart = 0;
}
putchar('\n') FLUSH;
--- 531,537 -----
#ifdef SERVER
sprintf(artname, "/tmp/rrn%ld.%ld", (long) openart, our_pid);
UNLINK(artname);
! #endif /* SERVER */
openart = 0;
}
putchar('\n') FLUSH;
***************
*** 543,549
free(subj_list[i]);
#ifndef lint
free((char*)subj_list);
! #endif lint
}
#endif
write_rc(); /* and update .newsrc */
--- 546,552 -----
free(subj_list[i]);
#ifndef lint
free((char*)subj_list);
! #endif /* lint */
}
#endif
write_rc(); /* and update .newsrc */
***************
*** 863,869
#ifndef CACHESUBJ
char *s;
#endif
!
page_init();
#ifdef CACHESUBJ
if (!subj_list)
--- 866,872 -----
#ifndef CACHESUBJ
char *s;
#endif
!
page_init();
#ifdef CACHESUBJ
if (!subj_list)
***************
*** 1065,1068
dfltcmd = "npq";
}
}
-
--- 1068,1070 -----
dfltcmd = "npq";
}
}
Index: ngdata.c
Prereq: 4.3.2.10
*** ngdata.c Thu Nov 22 22:50:09 1990
--- ../new/ngdata.c Fri Nov 23 09:39:13 1990
***************
*** 1,4
! /* $Header: ngdata.c,v 4.3.2.10 90/04/14 22:05:15 sob Exp $
*
* $Log: ngdata.c,v $
* Revision 4.3.2.10 90/04/14 22:05:15 sob
--- 1,4 -----
! /* $Header: ngdata.c,v 4.3.2.11 90/11/22 16:14:34 sob Exp $
*
* $Log: ngdata.c,v $
* Revision 4.3.2.11 90/11/22 16:14:34 sob
***************
*** 1,6
/* $Header: ngdata.c,v 4.3.2.10 90/04/14 22:05:15 sob Exp $
*
* $Log: ngdata.c,v $
* Revision 4.3.2.10 90/04/14 22:05:15 sob
* Removed redundant declaration of active_name
*
--- 1,9 -----
/* $Header: ngdata.c,v 4.3.2.11 90/11/22 16:14:34 sob Exp $
*
* $Log: ngdata.c,v $
+ * Revision 4.3.2.11 90/11/22 16:14:34 sob
+ * Added changes to accomodate picky C preprocessors
+ *
* Revision 4.3.2.10 90/04/14 22:05:15 sob
* Removed redundant declaration of active_name
*
***************
*** 104,110
fseek(actfp,0L,0); /* just get to the beginning */
! #else not SERVER
actfp = fopen(filexp(ACTIVE),"r");
if (actfp == Nullfp) {
--- 107,113 -----
fseek(actfp,0L,0); /* just get to the beginning */
! #else /* not SERVER */
actfp = fopen(filexp(ACTIVE),"r");
if (actfp == Nullfp) {
***************
*** 111,117
printf(cantopen,filexp(ACTIVE)) FLUSH;
finalize(1);
}
! #endif SERVER
}
/* find the maximum article number of a newsgroup */
--- 114,120 -----
printf(cantopen,filexp(ACTIVE)) FLUSH;
finalize(1);
}
! #endif
}
/* find the maximum article number of a newsgroup */
***************
*** 208,214
retval = (ACT_POS)ftell(actfp);
#else
retval = Null(ACT_POS);
! #endif lint
while (fgets(outbuf,80,actfp) != Nullch) {
if (outbuf[len] == ' ' && strnEQ(outbuf,nam,len))
return retval;
--- 211,217 -----
retval = (ACT_POS)ftell(actfp);
#else
retval = Null(ACT_POS);
! #endif /* lint */
while (fgets(outbuf,80,actfp) != Nullch) {
if (outbuf[len] == ' ' && strnEQ(outbuf,nam,len))
return retval;
***************
*** 214,220
return retval;
#ifndef lint
retval = (ACT_POS) ftell(actfp);
! #endif lint
}
return (ACT_POS) -1; /* well, not so quietly, actually */
}
--- 217,223 -----
return retval;
#ifndef lint
retval = (ACT_POS) ftell(actfp);
! #endif /* lint */
}
return (ACT_POS) -1; /* well, not so quietly, actually */
}
***************
*** 223,229
return (ACT_POS) suggestion;
#else
return retval;
! #endif lint
/*NOTREACHED*/
}
--- 226,232 -----
return (ACT_POS) suggestion;
#else
return retval;
! #endif /* lint */
/*NOTREACHED*/
}
***************
*** 298,304
# else
return abs1st;
# endif
! #else not MININACT
sprintf(dirname,"%s/%s",spool,getngdir(rcline[ngnum]));
a1st = getngmin(dirname,0L);
if (!a1st) /* nothing there at all? */
--- 301,307 -----
# else
return abs1st;
# endif
! #else /* not MININACT */
sprintf(dirname,"%s/%s",spool,getngdir(rcline[ngnum]));
a1st = getngmin(dirname,0L);
if (!a1st) /* nothing there at all? */
***************
*** 307,313
abs1st[ngnum] = a1st;
# endif
return a1st;
! #endif MININACT
}
/* scan a directory for minimum article number greater than floor */
--- 310,316 -----
abs1st[ngnum] = a1st;
# endif
return a1st;
! #endif /* MININACT */
}
/* scan a directory for minimum article number greater than floor */
Index: only.c
Prereq: 4.3
*** only.c Thu Nov 22 22:50:25 1990
--- ../new/only.c Fri Nov 23 09:39:28 1990
***************
*** 1,4
! /* $Header: only.c,v 4.3 85/05/01 11:45:21 lwall Exp $
*
* $Log: only.c,v $
* Revision 4.3 85/05/01 11:45:21 lwall
--- 1,4 -----
! /* $Header: only.c,v 4.3.2.1 90/11/22 16:11:20 sob Exp $
*
* $Log: only.c,v $
* Revision 4.3.2.1 90/11/22 16:11:20 sob
***************
*** 1,6
/* $Header: only.c,v 4.3 85/05/01 11:45:21 lwall Exp $
*
* $Log: only.c,v $
* Revision 4.3 85/05/01 11:45:21 lwall
* Baseline for release with 4.3bsd.
*
--- 1,9 -----
/* $Header: only.c,v 4.3.2.1 90/11/22 16:11:20 sob Exp $
*
* $Log: only.c,v $
+ * Revision 4.3.2.1 90/11/22 16:11:20 sob
+ * Added changes to accomodate pickly C preprocessors.
+ *
* Revision 4.3 85/05/01 11:45:21 lwall
* Baseline for release with 4.3bsd.
*
***************
*** 35,41
#ifdef SPEEDOVERMEM
#ifndef lint
compextodo[maxngtodo] = (COMPEX*)safemalloc(sizeof(COMPEX));
! #endif lint
init_compex(compextodo[maxngtodo]);
compile(compextodo[maxngtodo],pat,TRUE,TRUE);
if ((s = ng_comp(compextodo[maxngtodo],pat,TRUE,TRUE)) != Nullch) {
--- 38,44 -----
#ifdef SPEEDOVERMEM
#ifndef lint
compextodo[maxngtodo] = (COMPEX*)safemalloc(sizeof(COMPEX));
! #endif /* lint */
init_compex(compextodo[maxngtodo]);
compile(compextodo[maxngtodo],pat,TRUE,TRUE);
if ((s = ng_comp(compextodo[maxngtodo],pat,TRUE,TRUE)) != Nullch) {
***************
*** 117,123
free_compex(compextodo[whicharg]);
#ifndef lint
free((char*)compextodo[whicharg]);
! #endif lint
#endif
}
maxngtodo = 0;
--- 120,126 -----
free_compex(compextodo[whicharg]);
#ifndef lint
free((char*)compextodo[whicharg]);
! #endif /* lint */
#endif
}
maxngtodo = 0;
Index: rcstuff.c
Prereq: 4.3.2.9
*** rcstuff.c Thu Nov 22 22:49:52 1990
--- ../new/rcstuff.c Fri Nov 23 09:38:56 1990
***************
*** 1,4
! /* $Header: rcstuff.c,v 4.3.2.9 90/11/06 01:04:39 sob Exp $
*
* $Log: rcstuff.c,v $
* Revision 4.3.2.9 90/11/06 01:04:39 sob
--- 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,6
/* $Header: rcstuff.c,v 4.3.2.9 90/11/06 01:04:39 sob Exp $
*
* $Log: rcstuff.c,v $
* Revision 4.3.2.9 90/11/06 01:04:39 sob
* Updated help messages to include new Y command when adding new newsgroups.
*
--- 1,12 -----
/* $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).
+ *
+ * Revision 4.3.2.10 90/11/22 13:53:26 sob
+ * Made changes to keep more preprocessors happy.
+ *
* Revision 4.3.2.9 90/11/06 01:04:39 sob
* Updated help messages to include new Y command when adding new newsgroups.
*
***************
*** 88,94
long length;
#ifdef SERVER
char *cp;
! #endif SERVER
#ifdef HASHNG
for (i=0; i<HASHSIZ; i++)
--- 94,100 -----
long length;
#ifdef SERVER
char *cp;
! #endif /* SERVER */
#ifdef HASHNG
for (i=0; i<HASHSIZ; i++)
***************
*** 104,110
else
rcname = savestr(filexp(RCNAME));
! #else not SERVER
rcname = savestr(filexp(RCNAME));
--- 110,116 -----
else
rcname = savestr(filexp(RCNAME));
! #else /* not SERVER */
rcname = savestr(filexp(RCNAME));
***************
*** 108,114
rcname = savestr(filexp(RCNAME));
! #endif SERVER
rctname = savestr(filexp(RCTNAME));
rcbname = savestr(filexp(RCBNAME));
--- 114,120 -----
rcname = savestr(filexp(RCNAME));
! #endif /* SERVER */
rctname = savestr(filexp(RCTNAME));
rcbname = savestr(filexp(RCBNAME));
***************
*** 157,163
/*NOSTRICT*/
#ifndef lint
some_buf = saferealloc(some_buf,(MEM_SIZE)(length+1));
! #endif lint
rcline[newng] = some_buf;
}
#ifdef NOTDEF
--- 163,169 -----
/*NOSTRICT*/
#ifndef lint
some_buf = saferealloc(some_buf,(MEM_SIZE)(length+1));
! #endif /* lint */
rcline[newng] = some_buf;
}
#ifdef NOTDEF
***************
*** 178,184
if (!*s && !checkflag) {
#ifndef lint
rcline[newng] = saferealloc(rcline[newng],(MEM_SIZE)length+2);
! #endif lint
s = rcline[newng] + length;
*s = ':';
*(s+1) = '\0';
--- 184,190 -----
if (!*s && !checkflag) {
#ifndef lint
rcline[newng] = saferealloc(rcline[newng],(MEM_SIZE)length+2);
! #endif /* lint */
s = rcline[newng] + length;
*s = ':';
*(s+1) = '\0';
***************
*** 283,289
char promptbuf[128];
#ifdef SERVER
char ser_line[256];
! #endif SERVER
#ifdef VERBOSE
IF(verbose)
--- 289,295 -----
char promptbuf[128];
#ifdef SERVER
char ser_line[256];
! #endif /* SERVER */
#ifdef VERBOSE
IF(verbose)
***************
*** 314,320
fprintf(stderr, "Server response to GROUP %s:\n%s\n",
ngname, ser_line);
}
! #else not SERVER
if ((softptr[ng] = findact(buf,ngname,strlen(ngname),0L)) < 0 ) {
--- 320,326 -----
fprintf(stderr, "Server response to GROUP %s:\n%s\n",
ngname, ser_line);
}
! #else /* not SERVER */
if ((softptr[ng] = findact(buf,ngname,strlen(ngname),0L)) < 0 ) {
***************
*** 318,324
if ((softptr[ng] = findact(buf,ngname,strlen(ngname),0L)) < 0 ) {
! #endif SERVER
dingaling();
#ifdef VERBOSE
--- 324,330 -----
if ((softptr[ng] = findact(buf,ngname,strlen(ngname),0L)) < 0 ) {
! #endif /* SERVER */
dingaling();
#ifdef VERBOSE
***************
*** 332,338
sleep(2);
return FALSE;
}
- #ifdef SERVER
if (addnewbydefault) {
printf("(Adding %s to end of your .newsrc)\n", ngname);
ng = add_newsgroup(ngname, ':');
--- 338,343 -----
sleep(2);
return FALSE;
}
if (addnewbydefault) {
printf("(Adding %s to end of your .newsrc)\n", ngname);
ng = add_newsgroup(ngname, ':');
***************
*** 338,344
ng = add_newsgroup(ngname, ':');
do_reloc = FALSE;
} else {
- #endif /* SERVER */
#ifdef VERBOSE
IF(verbose)
sprintf(promptbuf,"\nNewsgroup %s not in .newsrc--subscribe? [ynY] ",ngname);
--- 343,348 -----
ng = add_newsgroup(ngname, ':');
do_reloc = FALSE;
} else {
#ifdef VERBOSE
IF(verbose)
sprintf(promptbuf,"\nNewsgroup %s not in .newsrc--subscribe? [ynY] ",ngname);
***************
*** 388,394
settle_down();
goto reask_add;
}
- #ifdef SERVER
}
#endif
}
--- 392,397 -----
settle_down();
goto reask_add;
}
}
}
else if (rcchar[ng] == NEGCHAR) { /* unsubscribed? */
***************
*** 390,396
}
#ifdef SERVER
}
- #endif
}
else if (rcchar[ng] == NEGCHAR) { /* unsubscribed? */
#ifdef VERBOSE
--- 393,398 -----
goto reask_add;
}
}
}
else if (rcchar[ng] == NEGCHAR) { /* unsubscribed? */
#ifdef VERBOSE
***************
*** 543,549
if (newng < 0) {
reask_reloc:
unflush_output(); /* disable any ^O in effect */
- #ifdef SERVER
if (addnewbydefault) {
buf[0] = '$';
buf[1] = '\0';
--- 545,550 -----
if (newng < 0) {
reask_reloc:
unflush_output(); /* disable any ^O in effect */
if (addnewbydefault) {
buf[0] = '$';
buf[1] = '\0';
***************
*** 548,554
buf[0] = '$';
buf[1] = '\0';
} else {
- #endif SERVER
#ifdef VERBOSE
IF(verbose)
printf("\nPut newsgroup where? [%s] ", dflt);
--- 549,554 -----
buf[0] = '$';
buf[1] = '\0';
} else {
#ifdef VERBOSE
IF(verbose)
printf("\nPut newsgroup where? [%s] ", dflt);
***************
*** 561,567
reinp_reloc:
eat_typeahead();
getcmd(buf);
- #ifdef SERVER
}
#endif SERVER
if (errno || *buf == '\f') {
--- 561,566 -----
reinp_reloc:
eat_typeahead();
getcmd(buf);
}
if (errno || *buf == '\f') {
/* if return from stop signal */
***************
*** 563,569
getcmd(buf);
#ifdef SERVER
}
- #endif SERVER
if (errno || *buf == '\f') {
/* if return from stop signal */
goto reask_reloc; /* give them a prompt again */
--- 562,567 -----
eat_typeahead();
getcmd(buf);
}
if (errno || *buf == '\f') {
/* if return from stop signal */
goto reask_reloc; /* give them a prompt again */
Index: respond.c
Prereq: 4.3.2.3
*** respond.c Thu Nov 22 22:50:03 1990
--- ../new/respond.c Fri Nov 23 09:39:06 1990
***************
*** 1,4
! /* $Header: respond.c,v 4.3.2.3 90/03/22 23:05:19 sob Exp $
*
* $Log: respond.c,v $
* Revision 4.3.2.3 90/03/22 23:05:19 sob
--- 1,4 -----
! /* $Header: respond.c,v 4.3.2.4 90/11/22 16:09:04 sob Exp $
*
* $Log: respond.c,v $
* Revision 4.3.2.4 90/11/22 16:09:04 sob
***************
*** 1,6
/* $Header: respond.c,v 4.3.2.3 90/03/22 23:05:19 sob Exp $
*
* $Log: respond.c,v $
* Revision 4.3.2.3 90/03/22 23:05:19 sob
* Fixes provided by Wayne Davison <drivax!davison>
*
--- 1,9 -----
/* $Header: respond.c,v 4.3.2.4 90/11/22 16:09:04 sob Exp $
*
* $Log: respond.c,v $
+ * Revision 4.3.2.4 90/11/22 16:09:04 sob
+ * Added changes to accomodate pickly C preprocessors
+ *
* Revision 4.3.2.3 90/03/22 23:05:19 sob
* Fixes provided by Wayne Davison <drivax!davison>
*
***************
*** 249,255
s_bomb:
#ifdef SERVER
if (chdir(spool)) {
! #else not SERVER
if (chdir(spool) || chdir(ngdir)) {
#endif SERVER
printf(nocd,ngdir) FLUSH;
--- 252,258 -----
s_bomb:
#ifdef SERVER
if (chdir(spool)) {
! #else /* not SERVER */
if (chdir(spool) || chdir(ngdir)) {
#endif /* SERVER */
printf(nocd,ngdir) FLUSH;
***************
*** 251,257
if (chdir(spool)) {
#else not SERVER
if (chdir(spool) || chdir(ngdir)) {
! #endif SERVER
printf(nocd,ngdir) FLUSH;
sig_catcher(0);
}
--- 254,260 -----
if (chdir(spool)) {
#else /* not SERVER */
if (chdir(spool) || chdir(ngdir)) {
! #endif /* SERVER */
printf(nocd,ngdir) FLUSH;
sig_catcher(0);
}
***************
*** 435,441
#endif
#ifdef SERVER
if (chdir(spool)) {
! #else not SERVER
if (chdir(spool) || chdir(ngdir)) {
#endif SERVER
printf(nocd,ngdir) FLUSH;
--- 438,444 -----
#endif
#ifdef SERVER
if (chdir(spool)) {
! #else /* not SERVER */
if (chdir(spool) || chdir(ngdir)) {
#endif /* SERVER */
printf(nocd,ngdir) FLUSH;
***************
*** 437,443
if (chdir(spool)) {
#else not SERVER
if (chdir(spool) || chdir(ngdir)) {
! #endif SERVER
printf(nocd,ngdir) FLUSH;
sig_catcher(0);
}
--- 440,446 -----
if (chdir(spool)) {
#else /* not SERVER */
if (chdir(spool) || chdir(ngdir)) {
! #endif /* SERVER */
printf(nocd,ngdir) FLUSH;
sig_catcher(0);
}
Index: sw.c
Prereq: 4.3.2.3
*** sw.c Thu Nov 22 22:49:41 1990
--- ../new/sw.c Fri Nov 23 09:38:44 1990
***************
*** 1,4
! /* $Header: sw.c,v 4.3.2.3 90/05/08 22:06:00 sob Exp $
*
* $Log: sw.c,v $
* Revision 4.3.2.3 90/05/08 22:06:00 sob
--- 1,4 -----
! /* $Header: sw.c,v 4.3.2.4 90/11/22 16:09:19 sob Exp $
*
* $Log: sw.c,v $
* Revision 4.3.2.4 90/11/22 16:09:19 sob
***************
*** 1,6
/* $Header: sw.c,v 4.3.2.3 90/05/08 22:06:00 sob Exp $
*
* $Log: sw.c,v $
* Revision 4.3.2.3 90/05/08 22:06:00 sob
* Added quick startup (-q) flag.
*
--- 1,9 -----
/* $Header: sw.c,v 4.3.2.4 90/11/22 16:09:19 sob Exp $
*
* $Log: sw.c,v $
+ * Revision 4.3.2.4 90/11/22 16:09:19 sob
+ * Added changes to accomodate pickly C preprocessors
+ *
* Revision 4.3.2.3 90/05/08 22:06:00 sob
* Added quick startup (-q) flag.
*
***************
*** 415,421
printf("%cl ", mp[muck_up_clear]);
#ifdef CLEAREOL
printf("%cL ", mp[can_home_clear]);
! #endif CLEAREOL
if (marking)
printf("-m%c ",marking==UNDERLINE?'u':'s');
else
--- 418,424 -----
printf("%cl ", mp[muck_up_clear]);
#ifdef CLEAREOL
printf("%cL ", mp[can_home_clear]);
! #endif /* CLEAREOL */
if (marking)
printf("-m%c ",marking==UNDERLINE?'u':'s');
else
Index: util.c
Prereq: 4.3.2.7
*** util.c Thu Nov 22 22:50:06 1990
--- ../new/util.c Fri Nov 23 09:39:09 1990
***************
*** 1,4
! /* $Header: util.c,v 4.3.2.7 90/10/01 01:52:18 sob Exp $
*
* $Log: util.c,v $
* Revision 4.3.2.7 90/10/01 01:52:18 sob
--- 1,4 -----
! /* $Header: util.c,v 4.3.2.8 90/11/22 13:54:06 sob Exp $
*
* $Log: util.c,v $
* Revision 4.3.2.8 90/11/22 13:54:06 sob
***************
*** 1,6
/* $Header: util.c,v 4.3.2.7 90/10/01 01:52:18 sob Exp $
*
* $Log: util.c,v $
* Revision 4.3.2.7 90/10/01 01:52:18 sob
* Altered the preprocessor defines on GETWD/GETCWD per suggestion by
* rsm@math.arizona.edu.
--- 1,9 -----
/* $Header: util.c,v 4.3.2.8 90/11/22 13:54:06 sob Exp $
*
* $Log: util.c,v $
+ * Revision 4.3.2.8 90/11/22 13:54:06 sob
+ * Made changes to keep more preprocessors happy.
+ *
* Revision 4.3.2.7 90/10/01 01:52:18 sob
* Altered the preprocessor defines on GETWD/GETCWD per suggestion by
* rsm@math.arizona.edu.
***************
*** 73,79
for (i = 3; i < 10; ++i)
close(i);
! #endif SERVER
if (*s)
execl(shell, shell, "-c", s, Nullch);
--- 76,82 -----
for (i = 3; i < 10; ++i)
close(i);
! #endif /* SERVER */
if (*s)
execl(shell, shell, "-c", s, Nullch);
***************
*** 400,406
safemalloc((MEM_SIZE) (i+2) * sizeof(char*));
#else
char **tmpenv = Null(char **);
! #endif lint
firstsetenv = FALSE;
for (j=0; j<i; j++) /* copy environment */
--- 403,409 -----
safemalloc((MEM_SIZE) (i+2) * sizeof(char*));
#else
char **tmpenv = Null(char **);
! #endif /* lint */
firstsetenv = FALSE;
for (j=0; j<i; j++) /* copy environment */
***************
*** 412,418
environ = (char**) saferealloc((char*) environ,
(MEM_SIZE) (i+2) * sizeof(char*));
/* just expand it a bit */
! #endif lint
environ[i+1] = Nullch; /* make sure it's null terminated */
}
environ[i] = safemalloc((MEM_SIZE) strlen(nam) + strlen(val) + 2);
--- 415,421 -----
environ = (char**) saferealloc((char*) environ,
(MEM_SIZE) (i+2) * sizeof(char*));
/* just expand it a bit */
! #endif /* lint */
environ[i+1] = Nullch; /* make sure it's null terminated */
}
environ[i] = safemalloc((MEM_SIZE) strlen(nam) + strlen(val) + 2);
Index: rn.c
Prereq: 4.3.2.6
*** rn.c Fri Nov 23 21:18:32 1990
--- ../../rn/rn.c Fri Nov 23 20:30:52 1990
***************
*** 9,16
* RRN/RN: 11/01/89
*/
! static char rnid[] = "@(#)$Header: rn.c,v 4.3.2.6 90/11/22 13:55:23 sob Exp $";
! static char patchlevel[] = "Patch #: 49";
/* $Log: rn.c,v $
* Revision 4.3.2.6 90/11/22 13:55:23 sob
--- 9,16 -----
* RRN/RN: 11/01/89
*/
! static char rnid[] = "@(#)$Header: rn.c,v 4.3.2.7 90/11/23 20:30:43 sob Exp $";
! static char patchlevel[] = "Patch #: 50";
/* $Log: rn.c,v $
* Revision 4.3.2.7 90/11/23 20:30:43 sob
***************
*** 13,18
static char patchlevel[] = "Patch #: 49";
/* $Log: rn.c,v $
* Revision 4.3.2.6 90/11/22 13:55:23 sob
* Checkpoint for patch #49
*
--- 13,21 -----
static char patchlevel[] = "Patch #: 50";
/* $Log: rn.c,v $
+ * Revision 4.3.2.7 90/11/23 20:30:43 sob
+ * Checkpoint for patch 50
+ *
* Revision 4.3.2.6 90/11/22 13:55:23 sob
* Checkpoint for patch #49
*
*** patchlevel Thu Nov 22 22:49:27 1990
--- ../new/patchlevel Fri Nov 23 09:38:31 1990
***************
*** 1,2
! Patch #: 49
--- 1,2 -----
! Patch #: 50
pjg@acsu.buffalo.edu (Paul Graham) (11/25/90)
patch 50 failed on ndir.c. fetching kit9 reveals the progression 1.3 -> 1.5 -> 1.6. my ndir.c (patchlevel 48,49) was at 1.3 and patch 50 wanted 1.5. was it just a glitch that patch 50 was posted to n.s.nntp et. al. but not patch 49? -- pjg@acsu.buffalo.edu / rutgers!ub!pjg / pjg@ubvms (Bitnet) opinions found above are mine unless marked otherwise.
sob@lib.tmc.edu (Stan Barber) (11/25/90)
It appears to have been a snafu on my end. I will repost patch 49 to
news.software.{b|nntp}rob@mtdiablo.Concord.CA.US (Rob Boldbear) (11/28/90)
In article <47439@eerie.acsu.Buffalo.EDU> pjg@acsu.buffalo.edu (Paul Graham) writes: >patch 50 failed on ndir.c. fetching kit9 reveals the progression >1.3 -> 1.5 -> 1.6. my ndir.c (patchlevel 48,49) was at 1.3 and >patch 50 wanted 1.5. I had the same problem. Applying the patch anyway caused only the new rcs comment to be rejected. I have found with the last few rn/rrn patches that I always get a small number of rejects, always because the context of the new rcs comment doesn't fit the old version. -- Rob Bernardo Mt. Diablo Software Solutions _ / email: rob@mtdiablo.Concord.CA.US phone: (415) 827-4301 <_/_>< "Putting dogma ahead of people is the antithesis of compassion. But / that's exactly what many avowed Christians who profess `compassion' do." -Me
dean@coplex.UUCP (Dean Brooks) (11/28/90)
pjg@acsu.buffalo.edu (Paul Graham) writes: >patch 50 failed on ndir.c. fetching kit9 reveals the progression >1.3 -> 1.5 -> 1.6. my ndir.c (patchlevel 48,49) was at 1.3 and >patch 50 wanted 1.5. Patch 50 failed on ndir.c at our site as well. (Sys 5.3.2, no NNTP) -- dean@coplex.UUCP Dean A. Brooks Copper Electronics, Inc. Louisville, Ky UUCP: !uunet!coplex!dean