}
if (dp == pp)
- free ((char *) pp);
+ free(pp);
else
*drops = pp;
return (dp - pp);
* Change the "Return-Path:" field (if in first line)
* back to "From ".
*/
- if (!strncmp (buffer, "Return-Path:", 12)) {
+ if (has_prefix(buffer, "Return-Path:")) {
char tmpbuffer[BUFSIZ];
char *tp, *ep, *fp;
tp = dctime(dlocaltimenow());
snprintf (buffer, sizeof(buffer), "From %.*s %s",
(int)(fp - ep), ep, tp);
- } else if (!strncmp (buffer, "X-Envelope-From:", 16)) {
+ } else if (has_prefix(buffer, "X-Envelope-From:")) {
/*
* Change the "X-Envelope-From:" field
* (if first line) back to "From ".
strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));
ep = tmpbuffer + 17;
snprintf (buffer, sizeof(buffer), "From %s", ep);
- } else if (strncmp (buffer, "From ", 5)) {
+ } else if (!has_prefix(buffer, "From ")) {
/*
* If there is already a "From " line,
* then leave it alone. Else we add one.
* If this is not first line, and begins with
* "From ", then prepend line with ">".
*/
- if (j != 0 && strncmp (buffer, "From ", 5) == 0) {
+ if (j != 0 && has_prefix(buffer, "From ")) {
if (write (md, ">", 1) < 0) {
advise (mailbox, "write");
}
if ((i = read (md, (char *) (dp + 1), msgp * sizeof(*dp))) <
(int) sizeof(*dp)) {
i = 0;
- free ((char *) dp);
+ free(dp);
} else {
#ifdef NTOHLSWAP
struct drop *tdp;
return NOTOK;
}
}
- free ((char *) rp);
+ free(rp);
fclose (fp);
break;
}