projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor clarification in mh-alias(5)
[mmh]
/
sbr
/
m_getfld.c
diff --git
a/sbr/m_getfld.c
b/sbr/m_getfld.c
index
2ebb44a
..
3539ed4
100644
(file)
--- a/
sbr/m_getfld.c
+++ b/
sbr/m_getfld.c
@@
-8,6
+8,8
@@
#include <h/mh.h>
#include <h/utils.h>
#include <h/mh.h>
#include <h/utils.h>
+#include <ctype.h>
+#include <sysexits.h>
/*
** This module has a long and checkered history.
/*
** This module has a long and checkered history.
@@
-137,7
+139,7
@@
int ismbox = FALSE;
** is used in m_Eom because the first character of the string
** has been read and matched before m_Eom is called.
*/
** is used in m_Eom because the first character of the string
** has been read and matched before m_Eom is called.
*/
-char *msg_delim = "";
+static char *msg_delim = "";
static unsigned char *fdelim;
static unsigned char *delimend;
static unsigned char *fdelim;
static unsigned char *delimend;
@@
-154,14
+156,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
@@
-171,8
+165,8
@@
int
m_getfld(int state, unsigned char *name, unsigned char *buf,
int bufsz, FILE *iob)
{
m_getfld(int state, unsigned char *name, unsigned char *buf,
int bufsz, FILE *iob)
{
- register unsigned char *bp, *cp, *ep, *sp;
- register int cnt, c, i, j;
+ unsigned char *bp, *cp, *ep, *sp;
+ int cnt, c, i, j;
if ((c = getc(iob)) < 0) {
msg_count = 0;
if ((c = getc(iob)) < 0) {
msg_count = 0;
@@
-431,8
+425,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;
@@
-570,7
+564,7
@@
m_getfld(int state, unsigned char *name, unsigned char *buf,
break;
default:
break;
default:
- adios(NULL, "m_getfld() called with bogus state of %d", state);
+ adios(EX_SOFTWARE, NULL, "m_getfld() called with bogus state of %d", state);
}
finish:
*cp = 0;
}
finish:
*cp = 0;
@@
-582,11
+576,16
@@
finish:
void
thisisanmbox(FILE *iob)
{
void
thisisanmbox(FILE *iob)
{
- register int c;
- register long pos;
+ int c;
char text[10];
char text[10];
- register char *cp;
- register char *delimstr;
+ char *cp;
+ char *delimstr;
+
+ c = getc(iob);
+ if (feof(iob)) {
+ return;
+ }
+ ungetc(c, iob);
/*
** Figure out what the message delimitter string is for this
/*
** Figure out what the message delimitter string is for this
@@
-600,12
+599,11
@@
thisisanmbox(FILE *iob)
** abort.
*/
** abort.
*/
- pos = ftell(iob);
if (fread(text, sizeof(*text), 5, iob) != 5) {
if (fread(text, sizeof(*text), 5, iob) != 5) {
- adios(NULL, "Read error");
+ adios(EX_IOERR, NULL, "Read error");
}
if (strncmp(text, "From ", 5)!=0) {
}
if (strncmp(text, "From ", 5)!=0) {
- adios(NULL, "No Unix style (mbox) maildrop.");
+ adios(EX_USAGE, NULL, "No Unix style (mbox) maildrop.");
}
ismbox = TRUE;
delimstr = "\nFrom ";
}
ismbox = TRUE;
delimstr = "\nFrom ";
@@
-623,14
+621,14
@@
thisisanmbox(FILE *iob)
strcpy(msg_delim, delimstr);
delimend = (unsigned char *)msg_delim + edelimlen;
if (edelimlen <= 1)
strcpy(msg_delim, delimstr);
delimend = (unsigned char *)msg_delim + edelimlen;
if (edelimlen <= 1)
- adios(NULL, "maildrop delimiter must be at least 2 bytes");
+ adios(EX_DATAERR, NULL, "maildrop delimiter must be at least 2 bytes");
/*
** build a Boyer-Moore end-position map for the matcher in m_getfld.
** N.B. - we don't match just the first char (since it's the newline
** separator) or the last char (since the matchc would have found it
** if it was a real delim).
*/
/*
** build a Boyer-Moore end-position map for the matcher in m_getfld.
** N.B. - we don't match just the first char (since it's the newline
** separator) or the last char (since the matchc would have found it
** if it was a real delim).
*/
- pat_map = (unsigned char **) calloc(256, sizeof(unsigned char *));
+ pat_map = (unsigned char **) mh_xcalloc(256, sizeof(unsigned char *));
for (cp = (char *) fdelim + 1; cp < (char *) delimend; cp++ )
pat_map[(unsigned char)*cp] = (unsigned char *) cp;
for (cp = (char *) fdelim + 1; cp < (char *) delimend; cp++ )
pat_map[(unsigned char)*cp] = (unsigned char *) cp;
@@
-644,8
+642,8
@@
thisisanmbox(FILE *iob)
static int
m_Eom(int c, FILE *iob)
{
static int
m_Eom(int c, FILE *iob)
{
- register long pos = 0L;
- register int i;
+ long pos = 0L;
+ int i;
char text[10];
pos = ftell(iob);
char text[10];
pos = ftell(iob);
@@
-676,11
+674,11
@@
m_Eom(int c, FILE *iob)
static unsigned char *
matchc(int patln, char *pat, int strln, char *str)
{
static unsigned char *
matchc(int patln, char *pat, int strln, char *str)
{
- register char *es = str + strln - patln;
- register char *sp;
- register char *pp;
- register char *ep = pat + patln;
- register char pc = *pat++;
+ char *es = str + strln - patln;
+ char *sp;
+ char *pp;
+ char *ep = pat + patln;
+ char pc = *pat++;
for(;;) {
while (pc != *str++)
for(;;) {
while (pc != *str++)