[news.software.anu-news] NEWS V5.9B diff/patch 2/11

gih900@csc.anu.oz (Geoff Huston) (11/25/89)

+-+-+-+ Beginning of part 2 +-+-+-+
X        if ((cp = strchr(xbuf,'<')) && (il = strchr(cp,'>'))) `123
X          *++il = '\0';
X--- 1023,1031 -----
X        `125
X      else ++il;
X      `125
X!   if (fpi = fopen(fn,"r")) `123
X!     while ((fgets(xbuf,510,fpi)) && (*xbuf != '\n'));
X!     while (fgets(xbuf,510,fpi)) `123
X        if (*xbuf == '\n') continue;
X        if ((cp = strchr(xbuf,'<')) && (il = strchr(cp,'>'))) `123
X          *++il = '\0';
X**************
X*** 1022,1028
X              (!strcmp(l_id,newsitm.itm_id)) &&
X              (gn = ga_locate(newsitm.itm_grp)) &&
V              (fpr = do_oitem(&newsitm,"r",ga[gn]->grp_name,0,(ga[gn]->grp_fl
Xags & NEWS_M_RESTRICT_SET)))) `123
X!           fclose(fpr);
X            sys_remote_send(post_path,s_str,post_dist,itm_fname,l_id,0);
X            `125
X          `125
X--- 1036,1043 -----
X              (!strcmp(l_id,newsitm.itm_id)) &&
X              (gn = ga_locate(newsitm.itm_grp)) &&
V              (fpr = do_oitem(&newsitm,"r",ga[gn]->grp_name,0,(ga[gn]->grp_fl
Xags & NEWS_M_RESTRICT_SET)))) `123
X!           fclose(fpi);
X!           fpi = 0;
X            sys_remote_send(post_path,s_str,post_dist,itm_fname,l_id,0);
X            `125
X          `125
X**************
X*** 1027,1032
X            `125
X          `125
X        `125
X      `125
X  `125
X  `012
X--- 1042,1048 -----
X            `125
X          `125
X        `125
X+     if (fpi) fclose(fpi);
X      `125
X  `125
X  `012
X**************
X*** 1170,1176
X        char *id,
X             *ide,
X             *mail_sender = itm[SENDER],
X!            net_sender[132];
X `032
X        if ((id = strchr(itm[SUPERSEDES],'<'))
X              && (ide = strchr(itm[SUPERSEDES],'>'))) `123
X--- 1186,1193 -----
X        char *id,
X             *ide,
X             *mail_sender = itm[SENDER],
X!            net_sender[132],
X! `009   save_itm_fname[256];
X `032
X        strcpy(save_itm_fname,itm_fname);
X        if ((id = strchr(itm[SUPERSEDES],'<'))
X**************
X*** 1172,1177
X             *mail_sender = itm[SENDER],
X             net_sender[132];
X `032
X        if ((id = strchr(itm[SUPERSEDES],'<'))
X              && (ide = strchr(itm[SUPERSEDES],'>'))) `123
X          *(ide + 1) = '\0';
X--- 1189,1195 -----
X             net_sender[132],
X  `009   save_itm_fname[256];
X `032
X+       strcpy(save_itm_fname,itm_fname);
X        if ((id = strchr(itm[SUPERSEDES],'<'))
X              && (ide = strchr(itm[SUPERSEDES],'>'))) `123
X          *(ide + 1) = '\0';
X**************
X*** 1193,1198
X          if (!del_id(id,net_sender)) hist_add(id);
X          printf(" (Supersedes %s)",itm[SUPERSEDES]);
X          `125
X        `125
X      `125
V    if (*itm_fname) sys_remote_send(itm[PATH],itm[NEWSGROUPS],itm[DISTRIBUTIO
XN],itm_fname,itm[MESSAGE_ID],!mod_add);
X--- 1211,1217 -----
X          if (!del_id(id,net_sender)) hist_add(id);
X          printf(" (Supersedes %s)",itm[SUPERSEDES]);
X          `125
X+       strcpy(itm_fname,save_itm_fname);
X        `125
X      `125
V    if (*itm_fname) sys_remote_send(itm[PATH],itm[NEWSGROUPS],itm[DISTRIBUTIO
XN],itm_fname,itm[MESSAGE_ID],!mod_add);
X**************
X*** 1482,1492
X `032
X    if (first_get_call) `123
X      first_get_call = 0;
X!     if (!fgets(add_inline,512,fpr)) `123
X!       infile_eof = 1;
X!       return(0);
X!       `125 `032
X!     while (!strcmp(add_inline,"\f\n")) `123
X        if (!fgets(add_inline,512,fpr)) `123
X          infile_eof = 1;
X          return(0);
X--- 1501,1507 -----
X `032
X    if (first_get_call) `123
X      first_get_call = 0;
X!     do `123
X        if (!fgets(add_inline,512,fpr)) `123
X          infile_eof = 1;
X          return(0);
X**************
X*** 1490,1497
X        if (!fgets(add_inline,512,fpr)) `123
X          infile_eof = 1;
X          return(0);
X!         `125
X!       `125 `032
X      `125
X `032
X    else if (n_stripping) `123
X--- 1505,1512 -----
X        if (!fgets(add_inline,512,fpr)) `123
X          infile_eof = 1;
X          return(0);
X!         `125 `032
X!       `125 while (!strcmp(add_inline,"\f\n"));
X      `125
X `032
X    else if (n_stripping) `123
$ GOSUB UNPACK_FILE

$ FILE_IS = "NEWSBUILD.DIFF"
$ CHECKSUM_IS = 763255641
$ COPY SYS$INPUT VMS_SHARE_DUMMY.DUMMY
X*** [.news_v59_src]newsbuild.com
X--- [.news_src]newsbuild.com
X**************
X*** 36,41
X  $ on control_y then $ stop
X  $ on error then $ goto done
X  $ define lnk$library sys$library:vaxcrtl
X  $ no_wintcp = 1
X  $ if f$search("TWG$TCP:[NETDIST.INCLUDE]*.H") .eqs. "" then $goto notwg
X  $!
X--- 36,42 -----
X  $ on control_y then $ stop
X  $ on error then $ goto done
X  $ define lnk$library sys$library:vaxcrtl
X+ $ no_multinettcp = 1
X  $ no_wintcp = 1
V  $ if f$search("multinet_root:[multinet.include]*.H") .eqs. "" then $goto no
Xmultinet
X  $!
X**************
X*** 37,43
X  $ on error then $ goto done
X  $ define lnk$library sys$library:vaxcrtl
X  $ no_wintcp = 1
X! $ if f$search("TWG$TCP:[NETDIST.INCLUDE]*.H") .eqs. "" then $goto notwg
X  $!
X  $! Include WIN/TCP support modules.....
X  $!
X--- 38,44 -----
X  $ define lnk$library sys$library:vaxcrtl
X  $ no_multinettcp = 1
X  $ no_wintcp = 1
V! $ if f$search("multinet_root:[multinet.include]*.H") .eqs. "" then $goto no
Xmultinet
X  $!
X  $! Include MULTINET/TCP support modules.....
X  $!
X**************
X*** 39,44
X  $ no_wintcp = 1
X  $ if f$search("TWG$TCP:[NETDIST.INCLUDE]*.H") .eqs. "" then $goto notwg
X  $!
X  $! Include WIN/TCP support modules.....
X  $!
X  $ no_wintcp = 0
X--- 40,66 -----
X  $ no_wintcp = 1
V  $ if f$search("multinet_root:[multinet.include]*.H") .eqs. "" then $goto no
Xmultinet
X  $!
X+ $! Include MULTINET/TCP support modules.....
X+ $!
X+ $ no_wintcp = 0
X+ $ define vaxc$include `009multinet_root:[multinet.include.ARPA],-
X+ `009`009`009multinet_root:[multinet.include.NET],-
X+ `009`009`009multinet_root:[multinet.include.NETCHAOS],-
X+ `009`009`009multinet_root:[multinet.include.NETINET],-
X+ `009`009`009multinet_root:[multinet.include.NETPUP],-
X+ `009`009`009multinet_root:[multinet.include.NFS],-
X+ `009`009`009multinet_root:[multinet.include.RPC],-
X+ `009`009`009multinet_root:[multinet.include.SYS],-
X+ `009`009`009multinet_root:[multinet.include.VMS],-
X+ `009`009`009multinet_root:[multinet.include],-
X+                       `009sys$library
X+ $ define lnk$library MULTINET_COMMON_ROOT:[MULTINET.LIBRARY]LIB.OLB
X+ $ define lnk$library_1 MULTINET_COMMON_ROOT:[MULTINET.LIBRARY]RPC.OLB
X+ $ define lnk$library_3 sys$library:vaxcrtl
X+ $ cc :== "CC/DEFINE=MULTINET"
X+ $nomultinet:
X+ $ if f$search("TWG$TCP:[NETDIST.INCLUDE]*.H") .eqs. "" then $goto notwg
X+ $!
X  $! Include WIN/TCP support modules.....
X  $!
X  $ no_wintcp = 0
X**************
X*** 46,51
X                        twg$tcp:[netdist.include.sys],-
X                        twg$tcp:[netdist.include.vms],-
X                        twg$tcp:[netdist.include.netinet],-
X                        sys$library
X  $ define lnk$library twg$tcp:[netdist.lib]libnet
X  $ define lnk$library_1 twg$tcp:[netdist.lib]libnetacc
X--- 68,74 -----
X                        twg$tcp:[netdist.include.sys],-
X                        twg$tcp:[netdist.include.vms],-
X                        twg$tcp:[netdist.include.netinet],-
X+                       twg$tcp:[netdist.include.arpa],-
X                        sys$library
X  $ define lnk$library twg$tcp:[netdist.lib]libnet
X  $ define lnk$library_1 twg$tcp:[netdist.lib]libnetacc
X**************
X*** 77,83
X  $ call compile "NEWSFILES"      "DELOBJ"    'p1
X  $ call compile "NEWSFORWARD"    "DELOBJ"    'p1
X  $ call compile "NEWSHELP"       "DELOBJ"    'p1
X! $ call compile "NEWSMAIL"       "DELOBJ"    'p1
X  $ call compile "NEWSMOD"        "DELOBJ"    'p1
X  $ call compile "NEWSMODE"       "DELOBJ"    'p1
X  $ call compile "NEWSPOST"       "DELOBJ"    'p1
X--- 100,106 -----
X  $ call compile "NEWSFILES"      "DELOBJ"    'p1
X  $ call compile "NEWSFORWARD"    "DELOBJ"    'p1
X  $ call compile "NEWSHELP"       "DELOBJ"    'p1
X! $ call compile "NEWSVMSMAIL"    "DELOBJ"    'p1
X  $ call compile "NEWSMOD"        "DELOBJ"    'p1
X  $ call compile "NEWSMODE"       "DELOBJ"    'p1
X  $ call compile "NEWSPOST"       "DELOBJ"    'p1
X**************
X*** 318,324
X  $ purge nntp_feed.*,[-.news_dist]nntp_feed.*
X  $past18:
X  $!
X! $!  NNTP_TCPCMU
X  $!
X  $ if f$search("NNTP_TCPCMU.OBJ").eqs."" then $ goto do5
X  $ if f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPCMU.C","rdt")).gts.-
X--- 341,347 -----
X  $ purge nntp_feed.*,[-.news_dist]nntp_feed.*
X  $past18:
X  $!
X! $! NNTP_XFER
X  $!
X  $ if f$search("NNTP_XFER.OBJ").eqs."" then $ goto do9a
X  $ if f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_XFER.C","rdt")).gts.-
X**************
X*** 320,325
X  $!
X  $!  NNTP_TCPCMU
X  $!
X  $ if f$search("NNTP_TCPCMU.OBJ").eqs."" then $ goto do5
X  $ if f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPCMU.C","rdt")).gts.-
X    f$cvtime(f$file_attributes("NNTP_TCPCMU.OBJ","rdt")) then $ goto do5
X--- 343,374 -----
X  $!
X  $! NNTP_XFER
X  $!
X+ $ if f$search("NNTP_XFER.OBJ").eqs."" then $ goto do9a
X+ $ if f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_XFER.C","rdt")).gts.-
X+   f$cvtime(f$file_attributes("NNTP_XFER.OBJ","rdt")) then $ goto do9a
X+ $ goto past9a
X+ $do9a:
X+ $ set def [-.news_src]
X+ $ write sys$output "$ cc nntp_xfer"
X+ $ cc/nolis/object=[-.news_build]nntp_xfer nntp_xfer
X+ $ set def [-.news_build]
X+ $ purge nntp_xfer.*,[-.news_src]nntp_xfer.*
X+ $past9a:
X+ $ if f$search("[-.NEWS_DIST]NNTP_XFER.EXE").eqs."" then $ goto do18a
X+ $ if f$cvtime(f$file_attributes("NNTP_XFER.OBJ","rdt")).gts.-
V+   f$cvtime(f$file_attributes("[-.NEWS_DIST]NNTP_XFER.EXE","rdt")) then $ go
Xto do18a
X+ $ goto past18a
X+ $do18a:
X+ $ write sys$output "$ link nntp_xfer"
V+ $ link/notrace/nomap/exe=[-.NEWS_DIST]nntp_xfer nntp_xfer,[-.news_src]optio
Xns_c_link/opt
X+ $ purge nntp_xfer.*,[-.news_dist]nntp_xfer.*
X+ $past18a:
X+ $!
X+ $!  NNTP_TCPCMU
X+ $!
X+ $ if no_wintcp .and. no_multinettcp then $ goto past14a
X+ $ goto past14
X+ $past14a:
X  $ if f$search("NNTP_TCPCMU.OBJ").eqs."" then $ goto do5
X  $ if f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPCMU.C","rdt")).gts.-
X    f$cvtime(f$file_attributes("NNTP_TCPCMU.OBJ","rdt")) then $ goto do5
X**************
X*** 343,349
X    add_transform,newsrtl,[-.news_src]options_c_link/opt
X  $ purge nntp_tcpcmu.*,[-.news_dist]nntp_tcpcmu.*
X  $past14:
X! $ if no_wintcp then $ goto pastpa3
X  $!
X  $! NNTP_TCPWIN
X  $!
X--- 392,398 -----
X    add_transform,newsrtl,[-.news_src]options_c_link/opt
X  $ purge nntp_tcpcmu.*,[-.news_dist]nntp_tcpcmu.*
X  $past14:
X! $ if no_wintcp .and. no_multinettcp then $ goto pastpa3
X  $!
X  $! NNTP_TCPWINMULTINET
X  $!
X**************
X*** 345,351
X  $past14:
X  $ if no_wintcp then $ goto pastpa3
X  $!
X! $! NNTP_TCPWIN
X  $!
X  $ if f$search("NNTP_TCPWIN.OBJ").eqs."" then $ goto dopa2
X  $ if f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPWIN.C","rdt")).gts.-
X--- 394,400 -----
X  $past14:
X  $ if no_wintcp .and. no_multinettcp then $ goto pastpa3
X  $!
X! $! NNTP_TCPWINMULTINET
X  $!
X  $ if f$search("NNTP_TCPWINMULTINET.OBJ").eqs."" then $ goto dopa2
V  $ if f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPWINMULTINET.C","rdt"))
X.gts.-
X**************
X*** 347,355
X  $!
X  $! NNTP_TCPWIN
X  $!
X! $ if f$search("NNTP_TCPWIN.OBJ").eqs."" then $ goto dopa2
X! $ if f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPWIN.C","rdt")).gts.-
X!   f$cvtime(f$file_attributes("NNTP_TCPWIN.OBJ","rdt")) then $ goto dopa2
X  $ goto pastpa2
X  $dopa2:
X  $ set def [-.news_src]
X--- 396,404 -----
X  $!
X  $! NNTP_TCPWINMULTINET
X  $!
X! $ if f$search("NNTP_TCPWINMULTINET.OBJ").eqs."" then $ goto dopa2
V! $ if f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPWINMULTINET.C","rdt"))
X.gts.-
V!   f$cvtime(f$file_attributes("NNTP_TCPWINMULTINET.OBJ","rdt")) then $ goto
X dopa2
X  $ goto pastpa2
X  $ dopa2:
X  $ set def [-.news_src]
X**************
X*** 351,357
X  $ if f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPWIN.C","rdt")).gts.-
X    f$cvtime(f$file_attributes("NNTP_TCPWIN.OBJ","rdt")) then $ goto dopa2
X  $ goto pastpa2
X! $dopa2:
X  $ set def [-.news_src]
X  $ write sys$output "$ cc nntp_tcpwin"
X  $ cc/nolis/object=[-.news_build]nntp_tcpwin nntp_tcpwin
X--- 400,406 -----
V  $ if f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPWINMULTINET.C","rdt"))
X.gts.-
V    f$cvtime(f$file_attributes("NNTP_TCPWINMULTINET.OBJ","rdt")) then $ goto
X dopa2
X  $ goto pastpa2
X! $ dopa2:
X  $ set def [-.news_src]
X  $ write sys$output "$ cc nntp_tcpwinmultinet"
X  $ cc/nolis/object=[-.news_build]nntp_tcpwinmultinet nntp_tcpwinmultinet
X**************
X*** 353,360
X  $ goto pastpa2
X  $dopa2:
X  $ set def [-.news_src]
X! $ write sys$output "$ cc nntp_tcpwin"
X! $ cc/nolis/object=[-.news_build]nntp_tcpwin nntp_tcpwin
X  $ set def [-.news_build]
X  $ purge nntp_tcpwin.*,[-.news_src]nntp_tcpwin.*
X  $pastpa2:
X--- 402,409 -----
X  $ goto pastpa2
X  $ dopa2:
X  $ set def [-.news_src]
X! $ write sys$output "$ cc nntp_tcpwinmultinet"
X! $ cc/nolis/object=[-.news_build]nntp_tcpwinmultinet nntp_tcpwinmultinet
X  $ set def [-.news_build]
X  $ purge nntp_tcpwinmultinet.*,[-.news_src]nntp_tcpwinmultinet.*
X  $pastpa2:
X**************
X*** 356,362
X  $ write sys$output "$ cc nntp_tcpwin"
X  $ cc/nolis/object=[-.news_build]nntp_tcpwin nntp_tcpwin
X  $ set def [-.news_build]
X! $ purge nntp_tcpwin.*,[-.news_src]nntp_tcpwin.*
X  $pastpa2:
X  $ if f$search("[-.NEWS_DIST]NNTP_TCPWIN.EXE").eqs."" then $ goto dopa3
X  $ if f$cvtime(f$file_attributes("NNTP_TCPWIN.OBJ","rdt")).gts.-
X--- 405,411 -----
X  $ write sys$output "$ cc nntp_tcpwinmultinet"
X  $ cc/nolis/object=[-.news_build]nntp_tcpwinmultinet nntp_tcpwinmultinet
X  $ set def [-.news_build]
X! $ purge nntp_tcpwinmultinet.*,[-.news_src]nntp_tcpwinmultinet.*
X  $pastpa2:
V  $ if f$search("[-.NEWS_DIST]NNTP_TCPWINMULTINET.EXE").eqs."" then $ goto do
Xpa3
X  $ if f$cvtime(f$file_attributes("NNTP_TCPWINMULTINET.OBJ","rdt")).gts.-
X**************
X*** 358,366
X  $ set def [-.news_build]
X  $ purge nntp_tcpwin.*,[-.news_src]nntp_tcpwin.*
X  $pastpa2:
X! $ if f$search("[-.NEWS_DIST]NNTP_TCPWIN.EXE").eqs."" then $ goto dopa3
X! $ if f$cvtime(f$file_attributes("NNTP_TCPWIN.OBJ","rdt")).gts.-
V!   f$cvtime(f$file_attributes("[-.NEWS_DIST]NNTP_TCPWIN.EXE","rdt")) then $
X goto dopa3
X  $ if f$cvtime(f$file_attributes("NNTP_SERVER.OBJ","rdt")).gts.-
V    f$cvtime(f$file_attributes("[-.NEWS_DIST]NNTP_TCPWIN.EXE","rdt")) then $
X goto dopa3
X  $ goto pastpa3
X--- 407,415 -----
X  $ set def [-.news_build]
X  $ purge nntp_tcpwinmultinet.*,[-.news_src]nntp_tcpwinmultinet.*
X  $pastpa2:
V! $ if f$search("[-.NEWS_DIST]NNTP_TCPWINMULTINET.EXE").eqs."" then $ goto do
Xpa3
X! $ if f$cvtime(f$file_attributes("NNTP_TCPWINMULTINET.OBJ","rdt")).gts.-
V!   f$cvtime(f$file_attributes("[-.NEWS_DIST]NNTP_TCPWINMULTINET.EXE","rdt"))
X then $ goto dopa3
X  $ if f$cvtime(f$file_attributes("NNTP_SERVER.OBJ","rdt")).gts.-
V    f$cvtime(f$file_attributes("[-.NEWS_DIST]NNTP_TCPWINMULTINET.EXE","rdt"))
X then $ goto dopa3
X  $ goto pastpa3
X**************
X*** 362,368
-+-+-+-+-+ End of part 2 +-+-+-+-+-