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
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
|
See https://github.com/BuGlessRB/procmail/pull/7
diff --git a/initmake b/initmake
index 82d718d..e44ee67 100755
--- a/initmake
+++ b/initmake
@@ -124,7 +124,7 @@ else
fi
cat >_autotst.c <<HERE
-main()
+int main()
{ return 0;
}
HERE
@@ -200,7 +200,7 @@ cat >_autotst.c <<HERE
#include <sys/types.h>
#include <stdio.h>
#include <sys/stat.h>
-main()
+int main()
{ struct stat buf;return!&buf;
}
HERE
diff --git a/src/autoconf b/src/autoconf
index 1cb4c42..995d8bb 100755
--- a/src/autoconf
+++ b/src/autoconf
@@ -363,6 +363,7 @@ cat >_autotst.c <<HERE
#include <unistd.h> /* getpid() getppid() */
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <time.h>
#include <fcntl.h>
#include <signal.h> /* SIGKILL */
@@ -416,6 +417,16 @@ cat >_autotst.c <<HERE
int dolock,child[NR_of_forks],timeout,fdcollect;
char dirlocktest[]="_locktest";
+int killchildren()
+{ int i;
+ i=NR_of_forks;
+ do
+ if(child[--i]>0)
+ kill(child[i],SIGTERM),child[i]=0;
+ while(i);
+ return 0;
+}
+
void stimeout()
{ timeout=1;close(fdcollect);killchildren();
}
@@ -437,7 +448,79 @@ unsigned sfork()
return pid;
}
-int main(argc,argv)char*argv[];
+static int oldfdlock;
+#ifdef F_SETLKW
+static struct flock flck; /* why can't it be a local variable? */
+#endif
+#ifdef F_LOCK
+static off_t oldlockoffset;
+#endif
+
+int fdlock(int fd)
+{ int i;unsigned gobble[GOBBLE>>2];
+ for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */
+ oldfdlock=fd;fd=0;
+ if(MSK_fcntl&dolock)
+#ifdef F_SETLKW
+ { static unsigned extra;
+ flck.l_type=F_WRLCK;flck.l_whence=SEEK_SET;flck.l_start=tell(oldfdlock);
+ if(!extra--)
+ extra=MIN_locks/4,flck.l_len=2,i|=fcntl(oldfdlock,F_SETLK,&flck);
+ flck.l_len=0;fd|=fcntl(oldfdlock,F_SETLKW,&flck);
+ }
+#else
+ fd=1;
+#endif
+ if(MSK_lockf&dolock)
+#ifdef F_LOCK
+ oldlockoffset=tell(oldfdlock),fd|=lockf(oldfdlock,F_LOCK,(off_t)0);
+#else
+ fd=1;
+#endif
+ if(MSK_flock&dolock)
+#ifdef LOCK_EX
+ fd|=flock(oldfdlock,LOCK_EX);
+#else
+ fd=1;
+#endif
+ return fd;
+}
+
+int sfdlock(int fd)
+{ int i;unsigned gobble[GOBBLE>>2];
+ for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */
+ return fdlock(fd);
+}
+
+int fdunlock()
+{ int i;unsigned gobble[GOBBLE];
+ for(i=GOBBLE;i;gobble[--i]=~(unsigned)0); /* some SunOS libs mess this up */
+ if(MSK_flock&dolock)
+#ifdef LOCK_EX
+ i|=flock(oldfdlock,LOCK_UN);
+#else
+ i=1;
+#endif
+ if(MSK_lockf&dolock)
+#ifdef F_LOCK
+ { lseek(oldfdlock,oldlockoffset,SEEK_SET);
+ i|=lockf(oldfdlock,F_LOCK,(off_t)2);i|=lockf(oldfdlock,F_ULOCK,(off_t)0);
+ }
+#else
+ i=1;
+#endif
+ if(MSK_fcntl&dolock)
+#ifdef F_SETLKW
+ flck.l_type=F_UNLCK,flck.l_len=0,i|=fcntl(oldfdlock,F_SETLK,&flck);
+#else
+ i=1;
+#endif
+ if(!i)
+ for(i=GOBBLE;i&&gobble[--i]==~(unsigned)0;);
+ return i;
+}
+
+int main(argc,argv)int argc;char*argv[];
{ int goodlock,testlock,i,pip[2],pipw[2];time_t otimet;unsigned dtimet;
static char filename[]="_locktst.l0";
close(0);goodlock=0;testlock=FIRST_lock;signal(SIGPIPE,SIG_DFL);
@@ -576,88 +659,6 @@ skip_tests:
puts("Kernel-locking tests completed.");fprintf(stderr,"\n");
return EXIT_SUCCESS;
}
-
-int killchildren()
-{ int i;
- i=NR_of_forks;
- do
- if(child[--i]>0)
- kill(child[i],SIGTERM),child[i]=0;
- while(i);
- return 0;
-}
-
-int sfdlock(fd)
-{ int i;unsigned gobble[GOBBLE>>2];
- for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */
- return fdlock(fd);
-}
-
-static oldfdlock;
-#ifdef F_SETLKW
-static struct flock flck; /* why can't it be a local variable? */
-#endif
-#ifdef F_LOCK
-static off_t oldlockoffset;
-#endif
-
-int fdlock(fd)
-{ int i;unsigned gobble[GOBBLE>>2];
- for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */
- oldfdlock=fd;fd=0;
- if(MSK_fcntl&dolock)
-#ifdef F_SETLKW
- { static unsigned extra;
- flck.l_type=F_WRLCK;flck.l_whence=SEEK_SET;flck.l_start=tell(oldfdlock);
- if(!extra--)
- extra=MIN_locks/4,flck.l_len=2,i|=fcntl(oldfdlock,F_SETLK,&flck);
- flck.l_len=0;fd|=fcntl(oldfdlock,F_SETLKW,&flck);
- }
-#else
- fd=1;
-#endif
- if(MSK_lockf&dolock)
-#ifdef F_LOCK
- oldlockoffset=tell(oldfdlock),fd|=lockf(oldfdlock,F_LOCK,(off_t)0);
-#else
- fd=1;
-#endif
- if(MSK_flock&dolock)
-#ifdef LOCK_EX
- fd|=flock(oldfdlock,LOCK_EX);
-#else
- fd=1;
-#endif
- return fd;
-}
-
-int fdunlock()
-{ int i;unsigned gobble[GOBBLE];
- for(i=GOBBLE;i;gobble[--i]=~(unsigned)0); /* some SunOS libs mess this up */
- if(MSK_flock&dolock)
-#ifdef LOCK_EX
- i|=flock(oldfdlock,LOCK_UN);
-#else
- i=1;
-#endif
- if(MSK_lockf&dolock)
-#ifdef F_LOCK
- { lseek(oldfdlock,oldlockoffset,SEEK_SET);
- i|=lockf(oldfdlock,F_LOCK,(off_t)2);i|=lockf(oldfdlock,F_ULOCK,(off_t)0);
- }
-#else
- i=1;
-#endif
- if(MSK_fcntl&dolock)
-#ifdef F_SETLKW
- flck.l_type=F_UNLCK,flck.l_len=0,i|=fcntl(oldfdlock,F_SETLK,&flck);
-#else
- i=1;
-#endif
- if(!i)
- for(i=GOBBLE;i&&gobble[--i]==~(unsigned)0;);
- return i;
-}
HERE
if $MAKE _autotst >_autotst.rrr 2>&1
@@ -1033,6 +1034,10 @@ cat >_autotst.c <<HERE
#ifndef NO_COMSAT
#include "network.h"
#endif
+#include <string.h>
+#include <unistd.h>
+int setrgid();
+int setresgid();
int main(){char a[2];
endpwent();endgrent();memmove(a,"0",1);bcopy("0",a,1);strcspn(a,"0");
strtol("0",(char**)0,10);strchr("0",'0');strpbrk(a,"0");rename(a,"0");
@@ -1059,7 +1064,7 @@ echo 'Testing for memmove, strchr, strpbrk, strcspn, strtol, strstr,'
echo ' rename, setrgid, setegid, pow, opendir, mkdir, waitpid, fsync,'
echo ' ftruncate, strtod, strncasecmp, strerror, strlcat,'
echo ' memset, bzero, and _exit'
-if $MAKE _autotst.$O >$DEVNULL 2>&1
+if $MAKE _autotst.$O >_autotst.rrr 2>&1
then
:
else
diff --git a/src/foldinfo.c b/src/foldinfo.c
index 10fe406..33e7bff 100644
--- a/src/foldinfo.c
+++ b/src/foldinfo.c
@@ -18,6 +18,7 @@ static /*const*/char rcsid[]=
#include "goodies.h"
#include "locking.h"
#include "foldinfo.h"
+#include "acommon.h"
static const char
maildirtmp[]=MAILDIRtmp,maildircur[]=MAILDIRcur;
diff --git a/src/mailfold.c b/src/mailfold.c
index 917b502..9e3d386 100644
--- a/src/mailfold.c
+++ b/src/mailfold.c
@@ -371,7 +371,7 @@ void concon(ch)const int ch; /* flip between concatenated and split fields */
}
}
-void readmail(rhead,tobesent)const long tobesent;
+void readmail(rhead,tobesent)const long tobesent; int rhead;
{ char*chp,*pastend;static size_t contlengthoffset;
;{ long dfilled;
if(rhead==2) /* already read, just examine what we have */
|
