aboutsummaryrefslogtreecommitdiffstats
path: root/testing/mmh/musl-fixes.patch
blob: a1c0c8fe1c44ac7b6aa561078e05edb09c5ef355 (plain)
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
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
diff -upr mmh-0.2.orig/sbr/m_getfld.c mmh-0.2/sbr/m_getfld.c
--- mmh-0.2.orig/sbr/m_getfld.c	2015-12-21 03:36:00.060760463 +0100
+++ mmh-0.2/sbr/m_getfld.c	2015-12-21 03:38:04.080205306 +0100
@@ -149,26 +149,81 @@ static int edelimlen;
 
 static int (*eom_action)(int) = NULL;
 
-#ifdef _FSTDIO
-# define _ptr _p  /* Gag   */
-# define _cnt _r  /* Retch */
-# define _filbuf __srget  /* Puke  */
-# define DEFINED__FILBUF_TO_SOMETHING_SPECIFIC
-#endif
-
-#ifndef DEFINED__FILBUF_TO_SOMETHING_SPECIFIC
-extern int  _filbuf(FILE*);
-#endif
+/*
+** This replaces the old approach, which included direct access to
+** stdio internals.  It uses one fread() to load a buffer that we
+** manage.
+*/
+#define MSG_INPUT_SIZE 8192
+static struct m_getfld_buffer {
+	unsigned char msg_buf[2 * MSG_INPUT_SIZE];
+	unsigned char *readpos;
+	unsigned char *end;  /* One past the last character read in. */
+} m;
+
+static void
+setup_buffer(FILE *iob, struct m_getfld_buffer *m)
+{
+	/*
+	** Rely on Restrictions that m_getfld() calls on different file
+	** streams are not interleaved, and no other file stream read
+	** methods are used.  And, the first call to m_getfld (), etc., on
+	** a stream always reads at least 1 byte.
+	** I don't think it's necessary to use ftello() because we just
+	** need to determine whether the current offset is 0 or not.
+	*/
+	if (ftell(iob) == 0) {
+		/* A new file stream, so reset the buffer state. */
+		m->readpos = m->end = m->msg_buf;
+	}
+}
+
+static size_t
+read_more(struct m_getfld_buffer *m, FILE *iob)
+{
+	size_t num_read;
+
+	/* Move any leftover at the end of buf to the beginning. */
+	if (m->end > m->readpos) {
+		memmove(m->msg_buf, m->readpos, m->end - m->readpos);
+	}
+	m->readpos = m->msg_buf + (m->end - m->readpos);
+	num_read = fread(m->readpos, 1, MSG_INPUT_SIZE, iob);
+	m->end = m->readpos + num_read;
 
+	return num_read;
+}
+
+static int
+Getc(FILE *iob)
+{
+	if (m.end - m.readpos < 1) {
+		if (read_more(&m, iob) == 0) {
+			/*
+			**  Pretend that we read a character.
+			** That's what stdio does.
+			*/
+			++m.readpos;
+			return EOF;
+		}
+	}
+	return (m.readpos < m.end) ? *m.readpos++ : EOF;
+}
+
+static int
+Ungetc(int c, FILE *iob)
+{
+	return (m.readpos == m.msg_buf) ? EOF : (*--m.readpos = c);
+}
 
 int
 m_getfld(int state, unsigned char *name, unsigned char *buf,
 	int bufsz, FILE *iob)
 {
 	unsigned char  *bp, *cp, *ep, *sp;
-	int cnt, c, i, j;
+	int cnt, c, i, j, k;
 
-	if ((c = getc(iob)) < 0) {
+	if ((c = Getc(iob)) < 0) {
 		msg_count = 0;
 		*buf = 0;
 		return FILEEOF;
@@ -176,10 +231,10 @@ m_getfld(int state, unsigned char *name,
 	if (eom(c, iob)) {
 		if (! eom_action) {
 			/* flush null messages */
-			while ((c = getc(iob)) >= 0 && eom(c, iob))
+			while ((c = Getc(iob)) >= 0 && eom(c, iob))
 				;
 			if (c >= 0)
-				ungetc(c, iob);
+				Ungetc(c, iob);
 		}
 		msg_count = 0;
 		*buf = 0;
@@ -192,16 +247,16 @@ m_getfld(int state, unsigned char *name,
 	case FLD:
 		if (c == '\n' || c == '-') {
 			/* we hit the header/body separator */
-			while (c != '\n' && (c = getc(iob)) >= 0)
+			while (c != '\n' && (c = Getc(iob)) >= 0)
 				;
 
-			if (c < 0 || (c = getc(iob)) < 0 || eom(c, iob)) {
+			if (c < 0 || (c = Getc(iob)) < 0 || eom(c, iob)) {
 				if (!eom_action) {
 					/* flush null messages */
-					while ((c = getc(iob)) >= 0 && eom(c, iob))
+					while ((c = Getc(iob)) >= 0 && eom(c, iob))
 						;
 					if (c >= 0)
-						ungetc(c, iob);
+						Ungetc(c, iob);
 				}
 				msg_count = 0;
 				*buf = 0;
@@ -218,47 +273,28 @@ m_getfld(int state, unsigned char *name,
 		cp = name;
 		i = NAMESZ - 1;
 		for (;;) {
-#ifdef LINUX_STDIO
-			bp = sp = (unsigned char *) iob->_IO_read_ptr - 1;
-			j = (cnt = ((long) iob->_IO_read_end -
-				(long) iob->_IO_read_ptr)  + 1) < i ? cnt : i;
-#elif defined(__DragonFly__)
-			bp = sp = (unsigned char *) ((struct __FILE_public *)iob)->_p - 1;
-			j = (cnt = ((struct __FILE_public *)iob)->_r+1) < i ? cnt : i;
-#else
-			bp = sp = (unsigned char *) iob->_ptr - 1;
-			j = (cnt = iob->_cnt+1) < i ? cnt : i;
-#endif
+			/* Store current pos, ungetting the last char. */
+			bp = sp = (unsigned char *) m.readpos - 1;
+			j = ((cnt = m.end - m.readpos + 1) < i) ? cnt : i;
+
 			while (--j >= 0 && (c = *bp++) != ':' && c != '\n')
 				*cp++ = c;
 
 			j = bp - sp;
 			if ((cnt -= j) <= 0) {
-#ifdef LINUX_STDIO
-				iob->_IO_read_ptr = iob->_IO_read_end;
-				if (__underflow(iob) == EOF) {
-#elif defined(__DragonFly__)
-				if (__srget(iob) == EOF) {
-#else
-				if (_filbuf(iob) == EOF) {
-#endif
+				/*
+				** Used to explicitly force refill of the
+				** buffer here, but Getc() will do that
+				** if necessary.
+				*/
+				if (Getc (iob) == EOF) {
 					*cp = *buf = 0;
 					advise(NULL, "eof encountered in field \"%s\"", name);
 					return FMTERR;
 				}
-#ifdef LINUX_STDIO
-				iob->_IO_read_ptr++; /* NOT automatic in __underflow()! */
-#endif
 			} else {
-#ifdef LINUX_STDIO
-				iob->_IO_read_ptr = bp + 1;
-#elif defined(__DragonFly__)
-				((struct __FILE_public *)iob)->_p = bp + 1;
-				((struct __FILE_public *)iob)->_r = cnt - 1;
-#else
-				iob->_ptr = bp + 1;
-				iob->_cnt = cnt - 1;
-#endif
+				/* Restore the current offset. */
+				m.readpos = bp + 1;
 			}
 			if (c == ':')
 				break;
@@ -312,7 +348,14 @@ m_getfld(int state, unsigned char *name,
 				** that should be harmless enough, right?
 				** This is a corrupt message anyway.
 				*/
-				fseek(iob, ftell(iob) - 2, SEEK_SET);
+				/* emulates:  fseek(iob, ftell(iob) -(-2 + cnt + 1), SEEK_SET) */
+				m.readpos += cnt - 1;
+				/*
+				** Reset file stream position so caller,
+				** e.g., get_content, can use ftell(), etc.
+				*/
+				fseek(iob, -cnt - 1, SEEK_CUR);
+
 				return BODY;
 			}
 			if ((i -= j) <= 0) {
@@ -336,16 +379,9 @@ m_getfld(int state, unsigned char *name,
 		*/
 		cp = buf; i = bufsz-1;
 		for (;;) {
-#ifdef LINUX_STDIO
-			cnt = (long) iob->_IO_read_end - (long) iob->_IO_read_ptr;
-			bp = (unsigned char *) --iob->_IO_read_ptr;
-#elif defined(__DragonFly__)
-			cnt = ((struct __FILE_public *)iob)->_r++;
-			bp = (unsigned char *) --((struct __FILE_public *)iob)->_p;
-#else
-			cnt = iob->_cnt++;
-			bp = (unsigned char *) --iob->_ptr;
-#endif
+			/* Set and save the current pos and update cnt. */
+			cnt = m.end - m.readpos;
+			bp = --m.readpos;
 			c = cnt < i ? cnt : i;
 			while ((ep = locc( c, bp, '\n' ))) {
 				/*
@@ -353,21 +389,14 @@ m_getfld(int state, unsigned char *name,
 				** return.
 				*/
 				if ((j = *++ep) != ' ' && j != '\t') {
-#ifdef LINUX_STDIO
-					j = ep - (unsigned char *) iob->_IO_read_ptr;
-					memcpy(cp, iob->_IO_read_ptr, j);
-					iob->_IO_read_ptr = ep;
-#elif defined(__DragonFly__)
-					j = ep - (unsigned char *) ((struct __FILE_public *)iob)->_p;
-					memcpy(cp, ((struct __FILE_public *)iob)->_p, j);
-					((struct __FILE_public *)iob)->_p = ep;
-					((struct __FILE_public *)iob)->_r -= j;
-#else
-					j = ep - (unsigned char *) iob->_ptr;
-					memcpy(cp, iob->_ptr, j);
-					iob->_ptr = ep;
-					iob->_cnt -= j;
-#endif
+					/*
+					** Save the text and update the
+					** current position.
+					*/
+					j = ep - m.readpos;
+					memcpy (cp, m.readpos, j);
+					m.readpos = ep;
+
 					cp += j;
 					state = FLD;
 					goto finish;
@@ -379,64 +408,33 @@ m_getfld(int state, unsigned char *name,
 			** end of input or dest buffer - copy what
 			** we've found.
 			*/
-#ifdef LINUX_STDIO
-			c += bp - (unsigned char *) iob->_IO_read_ptr;
-			memcpy(cp, iob->_IO_read_ptr, c);
-#elif defined(__DragonFly__)
-			c += bp - (unsigned char *) ((struct __FILE_public *)iob)->_p;
-			memcpy(cp, ((struct __FILE_public *)iob)->_p, c);
-#else
-			c += bp - (unsigned char *) iob->_ptr;
-			memcpy(cp, iob->_ptr, c);
-#endif
-			i -= c;
-			cp += c;
+			c += bp - m.readpos;
+			for (k = 0; k < c; ++k, --i) {
+				*cp++ = Getc (iob);
+			}
 			if (i <= 0) {
 				/* the dest buffer is full */
-#ifdef LINUX_STDIO
-				iob->_IO_read_ptr += c;
-#elif defined(__DragonFly__)
-				((struct __FILE_public *)iob)->_r -= c;
-				((struct __FILE_public *)iob)->_p += c;
-#else
-				iob->_cnt -= c;
-				iob->_ptr += c;
-#endif
-				state = FLDPLUS;
 				break;
 			}
 			/*
 			** There's one character left in the input
-			** buffer.  Copy it & fill the buffer.
-			** If the last char was a newline and the
-			** next char is not whitespace, this is
-			** the end of the field.  Otherwise loop.
+			** buffer.  Copy it & fill the buffer (that
+			** fill used to be explicit, but now Getc()
+			** does it). If the last char was a newline
+			** and the next char is not whitespace, this
+			** is the end of the field.  Otherwise loop.
 			*/
 			--i;
-#ifdef LINUX_STDIO
-			*cp++ = j = *(iob->_IO_read_ptr + c);
-			iob->_IO_read_ptr = iob->_IO_read_end;
-			c = __underflow(iob);
-			iob->_IO_read_ptr++;  /* NOT automatic! */
-#elif defined(__DragonFly__)
-			*cp++ =j = *(((struct __FILE_public *)iob)->_p + c);
-			c = __srget(iob);
-#else
-			*cp++ = j = *(iob->_ptr + c);
-			c = _filbuf(iob);
-#endif
+			*cp++ = j = Getc(iob);
+			c = Getc(iob);
 			if (c == EOF || ((j == '\0' || j == '\n')
 					&& c != ' ' && c != '\t')) {
 				if (c != EOF) {
-#ifdef LINUX_STDIO
-					--iob->_IO_read_ptr;
-#elif defined(__DragonFly__)
-					--((struct __FILE_public *)iob)->_p;
-					++((struct __FILE_public *)iob)->_r;
-#else
-					--iob->_ptr;
-					++iob->_cnt;
-#endif
+					/*
+					** Put the character back for
+					** the next call.
+					*/
+					--m.readpos;
 				}
 				state = FLD;
 				break;
@@ -454,17 +452,10 @@ m_getfld(int state, unsigned char *name,
 		** don't add an eos.
 		*/
 		i = (bufsz < 0) ? -bufsz : bufsz-1;
-#ifdef LINUX_STDIO
-		bp = (unsigned char *) --iob->_IO_read_ptr;
-		cnt = (long) iob->_IO_read_end - (long) iob->_IO_read_ptr;
-#elif defined(__DragonFly__)
-		bp = (unsigned char *) --((struct __FILE_public *)iob)->_p;
-		cnt = ++((struct __FILE_public *)iob)->_r;
-#else
-		bp = (unsigned char *) --iob->_ptr;
-		cnt = ++iob->_cnt;
-#endif
-		c = (cnt < i ? cnt : i);
+		/* Back up and store the current position and update cnt. */
+		bp = --m.readpos;
+		cnt = m.end - m.readpos;
+		c = (cnt < i) ? cnt : i;
 		if (ismbox && c > 1) {
 			/*
 			** packed maildrop - only take up to the (possible)
@@ -547,15 +538,8 @@ m_getfld(int state, unsigned char *name,
 			}
 		}
 		memcpy( buf, bp, c );
-#ifdef LINUX_STDIO
-		iob->_IO_read_ptr += c;
-#elif defined(__DragonFly__)
-		((struct __FILE_public *)iob)->_r -= c;
-		((struct __FILE_public *)iob)->_p += c;
-#else
-		iob->_cnt -= c;
-		iob->_ptr += c;
-#endif
+		/* Advance the current position to reflect the copy out. */
+		m.readpos += c;
 		if (bufsz < 0) {
 			msg_count = c;
 			return (state);
@@ -581,11 +565,13 @@ thisisanmbox(FILE *iob)
 	char *cp;
 	char *delimstr;
 
-	c = getc(iob); 
+	setup_buffer(iob, &m);
+
+	c = Getc(iob); 
 	if (feof(iob)) {
 		return;
 	}
-	ungetc(c, iob);
+	Ungetc(c, iob);
 
 	/*
 	** Figure out what the message delimitter string is for this
@@ -599,7 +585,12 @@ thisisanmbox(FILE *iob)
 	** abort.
 	*/
 
-	if (fread(text, sizeof(*text), 5, iob) != 5) {
+	for (c=0, cp=text; c<5; ++c, ++cp) {
+		if ((*cp = Getc(iob)) == EOF) {
+			break;
+		}
+	}
+	if (c != 5) {
 		adios(EX_IOERR, NULL, "Read error");
 	}
 	if (strncmp(text, "From ", 5)!=0) {
@@ -607,7 +598,7 @@ thisisanmbox(FILE *iob)
 	}
 	ismbox = TRUE;
 	delimstr = "\nFrom ";
-	while ((c = getc(iob)) != '\n' && c >= 0) {
+	while ((c = Getc(iob)) != '\n' && c >= 0) {
 		continue;
 	}
 	c = strlen(delimstr);
@@ -630,8 +621,9 @@ thisisanmbox(FILE *iob)
 	*/
 	pat_map = (unsigned char **) mh_xcalloc(256, sizeof(unsigned char *));
 
-	for (cp = (char *) fdelim + 1; cp < (char *) delimend; cp++ )
+	for (cp = (char *) fdelim + 1; cp < (char *) delimend; cp++) {
 		pat_map[(unsigned char)*cp] = (unsigned char *) cp;
+	}
 }
 
 
@@ -645,24 +637,31 @@ m_Eom(int c, FILE *iob)
 	long pos = 0L;
 	int i;
 	char text[10];
+	char *cp;
 
-	pos = ftell(iob);
-	if ((i = fread(text, sizeof *text, edelimlen, iob)) != edelimlen ||
-			(strncmp(text, (char *)edelim, edelimlen)!=0)) {
-		if (i == 0 && ismbox)
+	pos = m.readpos; /* ftell */
+	for (i=0, cp=text; i<edelimlen; ++i, ++cp) {
+		if ((*cp = Getc(iob)) == EOF) {
+			break;
+		}
+	}
+
+	if (i != edelimlen ||
+		(strncmp(text, (char *)edelim, edelimlen)!=0)) {
+		if (i == 0 && ismbox) {
 			/*
 			** the final newline in the (brain damaged) unix-format
 			** maildrop is part of the delimitter - delete it.
 			*/
 			return 1;
-
-		fseek(iob, (long)(pos-1), SEEK_SET);
-		getc(iob);  /* should be OK */
+		}
+		m.readpos = pos - 1;  /* fseek(iob, pos - 1, SEEK_SET) */
+		Getc(iob);  /* should be OK */
 		return 0;
 	}
 
 	if (ismbox) {
-		while ((c = getc(iob)) != '\n' && c >= 0) {
+		while ((c = Getc(iob)) != '\n' && c >= 0) {
 			continue;
 		}
 	}