projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../mmh
[mmh]
/
sbr
/
m_getfld.c
diff --git
a/sbr/m_getfld.c
b/sbr/m_getfld.c
index
2ebb44a
..
059e0e3
100644
(file)
--- a/
sbr/m_getfld.c
+++ b/
sbr/m_getfld.c
@@
-154,14
+154,6
@@
static int (*eom_action)(int) = NULL;
# define DEFINED__FILBUF_TO_SOMETHING_SPECIFIC
#endif
# define DEFINED__FILBUF_TO_SOMETHING_SPECIFIC
#endif
-#ifdef SCO_5_STDIO
-# define _ptr __ptr
-# define _cnt __cnt
-# define _base __base
-# define _filbuf(fp) ((fp)->__cnt = 0, __filbuf(fp))
-# define DEFINED__FILBUF_TO_SOMETHING_SPECIFIC
-#endif
-
#ifndef DEFINED__FILBUF_TO_SOMETHING_SPECIFIC
extern int _filbuf(FILE*);
#endif
#ifndef DEFINED__FILBUF_TO_SOMETHING_SPECIFIC
extern int _filbuf(FILE*);
#endif
@@
-431,8
+423,8
@@
m_getfld(int state, unsigned char *name, unsigned char *buf,
*cp++ = j = *(iob->_ptr + c);
c = _filbuf(iob);
#endif
*cp++ = j = *(iob->_ptr + c);
c = _filbuf(iob);
#endif
- if (c == EOF ||
- ((j == '\0' || j == '\n') && c != ' ' && c != '\t')) {
+ if (c == EOF || ((j == '\0' || j == '\n')
+ && c != ' ' && c != '\t')) {
if (c != EOF) {
#ifdef LINUX_STDIO
--iob->_IO_read_ptr;
if (c != EOF) {
#ifdef LINUX_STDIO
--iob->_IO_read_ptr;
@@
-583,11
+575,16
@@
void
thisisanmbox(FILE *iob)
{
register int c;
thisisanmbox(FILE *iob)
{
register int c;
- register long pos;
char text[10];
register char *cp;
register char *delimstr;
char text[10];
register char *cp;
register char *delimstr;
+ c = getc(iob);
+ if (feof(iob)) {
+ return;
+ }
+ ungetc(c, iob);
+
/*
** Figure out what the message delimitter string is for this
** maildrop. (This used to be part of m_Eom but I didn't like
/*
** Figure out what the message delimitter string is for this
** maildrop. (This used to be part of m_Eom but I didn't like
@@
-600,7
+597,6
@@
thisisanmbox(FILE *iob)
** abort.
*/
** abort.
*/
- pos = ftell(iob);
if (fread(text, sizeof(*text), 5, iob) != 5) {
adios(NULL, "Read error");
}
if (fread(text, sizeof(*text), 5, iob) != 5) {
adios(NULL, "Read error");
}