diff options
| author | Masafumi Max NAKANE <max@FreeBSD.org> | 1997-01-12 04:02:20 +0000 |
|---|---|---|
| committer | Masafumi Max NAKANE <max@FreeBSD.org> | 1997-01-12 04:02:20 +0000 |
| commit | ca126fc83a7e55939d9fa855516fdf6ab4dcd0eb (patch) | |
| tree | ed60eeb2c95e834e42b9fc22779a9f47740772e2 /news/nntpbtr | |
| parent | Merge the patch to btrspc.c submitted as part of PR #2428: (diff) | |
Move the patch to nntpbtr.c that used to be a part of patch-aa into this file.
Merge patches to nntpbtr.c submitted as PR #2428:
From: Dmitry Kohmanyuk <dk@genesyslab.com>
Subject: nntpbtr patch - looping in NEWNEWS
patch from serge@freenet.kiev.ua - locking when sleep + decl fix
patch from me (dk@farm.org): UDP time either closed on firewalls or unreliable
over dial-up, TCP time better anyway
Submiteed by: dk@farm.org
(Closing PR #2428.)
Notes
Notes:
svn path=/head/; revision=5316
Diffstat (limited to 'news/nntpbtr')
| -rw-r--r-- | news/nntpbtr/files/patch-ad | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/news/nntpbtr/files/patch-ad b/news/nntpbtr/files/patch-ad new file mode 100644 index 000000000000..bc102f117794 --- /dev/null +++ b/news/nntpbtr/files/patch-ad @@ -0,0 +1,67 @@ +This patch contains: +From: Dmitry Kohmanyuk <dk@genesyslab.com> +Subject: nntpbtr patch - looping in NEWNEWS + +patch from serge@freenet.kiev.ua - locking when sleep + decl fix + +patch from me (dk@farm.org): UDP time either closed on firewalls or unreliable +over dial-up, TCP time better anyway + +--- nntpbtr.c.orig Sun Jun 11 18:16:08 1995 ++++ nntpbtr.c Sun Jan 12 12:33:02 1997 +@@ -49,12 +49,16 @@ + struct passwd *getpwnam(); + #endif + +-off_t bytecount = 0; + off_t bfdpos; ++ ++#ifndef RNEWS + char batchtmp[] = BATCHTMP; ++#endif + + #endif + ++off_t bytecount = 0; ++ + long MINfree = MINFREE; + int MAXINfiles = MAXINFILES; + char *host, *hosts[4], **hostp, *group = "*", *distribution = ""; +@@ -273,9 +277,11 @@ + submit(1); + close_history(); + printstat(); +- if( rnum && (time_flag >= 0) ) { ++ if( time_flag >= 0 ) { + title("PAUSE before next run"); ++ getlock(host,oldtime); + sleep(PAUSETIME); ++ unlock(host); + goto repeat; + } + exit(0); +@@ -472,6 +478,7 @@ + #endif + log_err("connect time out expired"); + } ++#if 0 /* disabled UDP time - unreliable */ + if((server = udp_open(host, "time")) < 0) + log_err("UDP open error"); + signal(SIGALRM, alarm_hdlr); +@@ -486,6 +493,7 @@ + goto finish; + } + close(server); ++#endif /* 0 */ + if((server = tcp_open(host, "time")) < 0) { + sleep(60); + goto repeat; +@@ -920,6 +928,8 @@ + log_warn("send NEWNEWS error"); + rep2: + fflush(fd); rewind(fd); ftruncate(fileno(fd),(off_t)0); ++ title("SLEEPING - NEWNEWS failed"); ++ sleep(60); + hfd = reconnect(host); + goto repeat; + } |