1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
*** ../work.old/makefile Mon Sep 26 16:21:40 1994
--- ./makefile Sat Oct 1 11:35:43 1994
***************
*** 16,22 ****
# System V bug fix
SHELL=/bin/sh
! build: msub sub mx libcnews.a pgms
: everything built successfully
lib: libcnews.a
--- 16,22 ----
# System V bug fix
SHELL=/bin/sh
! build all: msub sub mx libcnews.a pgms
: everything built successfully
lib: libcnews.a
*** ../work.old/util/dostatfs.c Thu Sep 8 13:06:30 1994
--- ./util/dostatfs.c Sat Oct 1 11:27:59 1994
***************
*** 6,11 ****
--- 6,12 ----
#include <string.h>
#include <sys/types.h>
+ #include <sys/param.h>
#include <sys/mount.h>
#ifndef MNAMELEN
***************
*** 19,26 ****
#include <sys/statfs.h>
#endif
- #define f_fsize f_bsize /* idiotic incompatible naming in 4.4 */
#endif /* MNAMELEN */
extern int debug;
--- 20,30 ----
#include <sys/statfs.h>
#endif
#endif /* MNAMELEN */
+
+ #if BSD4_4 >= 1
+ #define f_fsize f_bsize /* idiotic incompatible naming in 4.4 */
+ #endif
extern int debug;
*** ./maint/makefile Tue Sep 20 21:56:32 1994
--- ../cnews/maint/makefile Thu Sep 29 09:40:58 1994
***************
*** 77,83 ****
echo 'Message-ID: <legal>' >>arts/bar/ugh/12
echo '<bar.ugh/13@trash> 0~0 bar.ugh/13' >>history.good
echo 'Message-ID: illegal' >arts/bar/ugh/13
! sed $(FIXMIDFIELD) history.good | sort -o history.good
r: $(PROGS) rclean rsetup
: "mkhistory"
--- 77,84 ----
echo 'Message-ID: <legal>' >>arts/bar/ugh/12
echo '<bar.ugh/13@trash> 0~0 bar.ugh/13' >>history.good
echo 'Message-ID: illegal' >arts/bar/ugh/13
! sed $(FIXMIDFIELD) history.good | sort -o history.good2
! mv history.good2 history.good
r: $(PROGS) rclean rsetup
: "mkhistory"
***************
*** 93,99 ****
: "addmissing"
echo '<missing> 9999~- bar.ugh/14' >>history.good
echo 'Message-ID: <missing>' >arts/bar/ugh/14
! sed $(FIXMIDFIELD) history.good | sort -o history.good
sleep 2 # ensure article looks older than addmissing startup
$(HERE) ./addmissing -v >addm.out 2>addm.diag
sed $(FIXMIDFIELD) history | sort >history.fixed
--- 94,101 ----
: "addmissing"
echo '<missing> 9999~- bar.ugh/14' >>history.good
echo 'Message-ID: <missing>' >arts/bar/ugh/14
! sed $(FIXMIDFIELD) history.good | sort -o history.good2
! mv history.good2 history.good
sleep 2 # ensure article looks older than addmissing startup
$(HERE) ./addmissing -v >addm.out 2>addm.diag
sed $(FIXMIDFIELD) history | sort >history.fixed
***************
*** 106,112 ****
: "cnewsdo, using addmissing as test command"
echo '<missing2> 9999~- bar.ugh/15' >>history.good
echo 'Message-ID: <missing2>' >arts/bar/ugh/15
! sed $(FIXMIDFIELD) history.good | sort -o history.good
sleep 2 # ensure article looks older than addmissing startup
touch active
$(HERE) ./cnewsdo addmissing >addm.out 2>addm.diag
--- 108,115 ----
: "cnewsdo, using addmissing as test command"
echo '<missing2> 9999~- bar.ugh/15' >>history.good
echo 'Message-ID: <missing2>' >arts/bar/ugh/15
! sed $(FIXMIDFIELD) history.good | sort -o history.good2
! mv history.good2 history.good
sleep 2 # ensure article looks older than addmissing startup
touch active
$(HERE) ./cnewsdo addmissing >addm.out 2>addm.diag
*** batch/usenntpxmit.old Thu Sep 22 17:28:37 1994
--- batch/usenntpxmit Fri Sep 30 12:30:17 1994
***************
*** 15,21 ****
tmp=/tmp/nntp$$
cat >$tmp
! nntpxmit $site:$tmp
if test -s $tmp
then
cat $tmp >>$NEWSSITEDIR/togo.leftover
--- 15,21 ----
tmp=/tmp/nntp$$
cat >$tmp
! nntpxmit -s $site:$tmp
if test -s $tmp
then
cat $tmp >>$NEWSSITEDIR/togo.leftover
*** nov/mkov.c.old Sun Sep 18 17:55:05 1994
--- nov/mkov.c Fri Sep 30 13:39:22 1994
***************
*** 305,317 ****
putfld(hdrp->h_bytes);
putfld(hdrp->h_lines);
/* put Xref in only if there is more than one locator in it */
! p = strchr(hdrp->h_xref, ' '); /* p -> space after relayer */
! if (p != NULL)
p = strchr(p, ':'); /* p -> colon in first location */
! if (p != NULL)
p = strchr(p+1, ':'); /* p -> colon in second location */
! if (p != NULL) /* at least two locations! */
putextfld("xref", hdrp->h_xref);
/* step 3 of 4: add new header output before this line */
(void) putchar('\n');
}
--- 305,319 ----
putfld(hdrp->h_bytes);
putfld(hdrp->h_lines);
/* put Xref in only if there is more than one locator in it */
! if (hdrp->h_xref != NULL) {
! p = strchr(hdrp->h_xref, ' '); /* p -> space after relayer */
! if (p != NULL)
p = strchr(p, ':'); /* p -> colon in first location */
! if (p != NULL)
p = strchr(p+1, ':'); /* p -> colon in second location */
! if (p != NULL) /* at least two locations! */
putextfld("xref", hdrp->h_xref);
+ }
/* step 3 of 4: add new header output before this line */
(void) putchar('\n');
}
*** util/report.old Thu Sep 15 13:24:57 1994
--- util/report Fri Sep 30 16:57:05 1994
***************
*** 65,70 ****
else
cat $r
fi
! ) | mail $args # some sites might want "/usr/lib/sendmail -t" instead
# and the trap handles the exit status
--- 65,70 ----
else
cat $r
fi
! ) | /usr/sbin/sendmail -t $args # some sites might want "mail" instead
# and the trap handles the exit status
*** expire/doexpire.old Sun Sep 18 17:49:21 1994
--- expire/doexpire Fri Sep 30 19:47:39 1994
***************
*** 10,16 ****
dor='?'
opts=
histdir=$NEWSCTL
! for dummy
do
case "$1" in
-r) dor=yes ; opts="$opts -r" ;;
--- 10,16 ----
dor='?'
opts=
histdir=$NEWSCTL
! while test $# -ne 0
do
case "$1" in
-r) dor=yes ; opts="$opts -r" ;;
|
