projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made the RPATHS config option the default and removed the #ifdefs.
[mmh]
/
sbr
/
m_getfld.c
diff --git
a/sbr/m_getfld.c
b/sbr/m_getfld.c
index
d64457f
..
534f896
100644
(file)
--- a/
sbr/m_getfld.c
+++ b/
sbr/m_getfld.c
@@
-615,10
+615,7
@@
finish:
return (state);
}
return (state);
}
-
-#ifdef RPATHS
static char unixbuf[BUFSIZ] = "";
static char unixbuf[BUFSIZ] = "";
-#endif /* RPATHS */
void
m_unknown(FILE *iob)
void
m_unknown(FILE *iob)
@@
-648,15
+645,10
@@
m_unknown(FILE *iob)
&& strncmp(text, "From ", 5) == 0) {
msg_style = MS_MBOX;
delimstr = "\nFrom ";
&& strncmp(text, "From ", 5) == 0) {
msg_style = MS_MBOX;
delimstr = "\nFrom ";
-#ifndef RPATHS
- while ((c = getc(iob)) != '\n' && c >= 0)
- ;
-#else /* RPATHS */
cp = unixbuf;
while ((c = getc(iob)) != '\n' && cp - unixbuf < BUFSIZ - 1)
*cp++ = c;
*cp = 0;
cp = unixbuf;
while ((c = getc(iob)) != '\n' && cp - unixbuf < BUFSIZ - 1)
*cp++ = c;
*cp = 0;
-#endif /* RPATHS */
} else {
/* not a Unix style maildrop */
adios(NULL, "No Unix style (mbox) maildrop.");
} else {
/* not a Unix style maildrop */
adios(NULL, "No Unix style (mbox) maildrop.");
@@
-696,9
+688,7
@@
m_Eom(int c, FILE *iob)
register long pos = 0L;
register int i;
char text[10];
register long pos = 0L;
register int i;
char text[10];
-#ifdef RPATHS
register char *cp;
register char *cp;
-#endif /* RPATHS */
pos = ftell(iob);
if ((i = fread(text, sizeof *text, edelimlen, iob)) != edelimlen
pos = ftell(iob);
if ((i = fread(text, sizeof *text, edelimlen, iob)) != edelimlen
@@
-716,23
+706,16
@@
m_Eom(int c, FILE *iob)
}
if (msg_style == MS_MBOX) {
}
if (msg_style == MS_MBOX) {
-#ifndef RPATHS
- while ((c = getc(iob)) != '\n')
- if (c < 0)
- break;
-#else /* RPATHS */
cp = unixbuf;
while ((c = getc(iob)) != '\n' && c >= 0 && cp - unixbuf < BUFSIZ - 1)
*cp++ = c;
*cp = 0;
cp = unixbuf;
while ((c = getc(iob)) != '\n' && c >= 0 && cp - unixbuf < BUFSIZ - 1)
*cp++ = c;
*cp = 0;
-#endif /* RPATHS */
}
return 1;
}
}
return 1;
}
-#ifdef RPATHS
/*
** Return the Return-Path and Delivery-Date
** header information.
/*
** Return the Return-Path and Delivery-Date
** header information.
@@
-790,7
+773,6
@@
get_returnpath(char *rp, int rplen, char *dd, int ddlen)
unixbuf[0] = 0;
return 1;
}
unixbuf[0] = 0;
return 1;
}
-#endif /* RPATHS */
static unsigned char *
static unsigned char *