projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust the tests to less tolerant m_getfld2()
[mmh]
/
uip
/
scansbr.c
diff --git
a/uip/scansbr.c
b/uip/scansbr.c
index
c566de2
..
ade3a28
100644
(file)
--- a/
uip/scansbr.c
+++ b/
uip/scansbr.c
@@
-12,19
+12,15
@@
#include <h/scansbr.h>
#include <h/tws.h>
#include <h/utils.h>
#include <h/scansbr.h>
#include <h/tws.h>
#include <h/utils.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <sysexits.h>
#ifdef _FSTDIO
# define _ptr _p /* Gag */
# define _cnt _w /* Wretch */
#endif
#ifdef _FSTDIO
# define _ptr _p /* Gag */
# define _cnt _w /* Wretch */
#endif
-#ifdef SCO_5_STDIO
-# define _ptr __ptr
-# define _cnt __cnt
-# define _base __base
-# define _filbuf(fp) ((fp)->__cnt = 0, __filbuf(fp))
-#endif
-
#define MAXSCANL 256 /* longest possible scan line */
/*
#define MAXSCANL 256 /* longest possible scan line */
/*
@@
-47,7
+43,7
@@
char *scanl = NULL; /* text of most recent scanline */
#define FPUTS(buf) {\
if (fputs(buf, scnout) == EOF)\
#define FPUTS(buf) {\
if (fputs(buf, scnout) == EOF)\
- adios(scnmsg, "write error on");\
+ adios(EX_IOERR, scnmsg, "write error on");\
}
/*
}
/*
@@
-102,14
+98,14
@@
scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
datecomp = NULL;
}
datecomp = NULL;
}
- nxtbuf = compbuffers = (char **) calloc((size_t) ncomps,
+ nxtbuf = compbuffers = (char **) mh_xcalloc((size_t) ncomps,
sizeof(char *));
if (!nxtbuf)
sizeof(char *));
if (!nxtbuf)
- adios(NULL, "unable to allocate component buffers");
- used_buf = (struct comp **) calloc((size_t) (ncomps+1),
+ adios(EX_OSERR, NULL, "unable to allocate component buffers");
+ used_buf = (struct comp **) mh_xcalloc((size_t) (ncomps+1),
sizeof(struct comp *));
if (!used_buf)
sizeof(struct comp *));
if (!used_buf)
- adios(NULL, "unable to allocate component buffer stack");
+ adios(EX_OSERR, NULL, "unable to allocate component buffer stack");
/* NULL-terminate array */
used_buf += ncomps;
*used_buf = NULL;
/* NULL-terminate array */
used_buf += ncomps;
*used_buf = NULL;
@@
-147,7
+143,7
@@
scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
if (*scnmsg == '?') /* msg num out of range */
return SCNNUM;
if (!(scnout = fopen(scnmsg, "w")))
if (*scnmsg == '?') /* msg num out of range */
return SCNNUM;
if (!(scnout = fopen(scnmsg, "w")))
- adios(scnmsg, "unable to write");
+ adios(EX_IOERR, scnmsg, "unable to write");
}
/* scan - main loop */
}
/* scan - main loop */
@@
-238,7
+234,7
@@
body:;
goto finished;
default:
goto finished;
default:
- adios(NULL, "getfld() returned %d", state);
+ adios(EX_SOFTWARE, NULL, "getfld() returned %d", state);
}
}
}
}
@@
-252,10
+248,10
@@
finished:
if (incing) {
if ((dat[2] = ftell(scnout)) == EOF)
if (incing) {
if ((dat[2] = ftell(scnout)) == EOF)
- adios(scnmsg, "write error on");
+ adios(EX_IOERR, scnmsg, "write error on");
} else if (!scanfolder) {
if ((dat[2] = ftell(inb)) == EOF)
} else if (!scanfolder) {
if ((dat[2] = ftell(inb)) == EOF)
- adios(scnmsg, "write error on");
+ adios(EX_IOERR, scnmsg, "write error on");
dat[2] -= fpos;
}
dat[2] -= fpos;
}
@@
-267,9
+263,9
@@
finished:
if (datecomp && !datecomp->c_text) {
if (!datecomp->c_text) {
if (!datecomp->c_tws)
if (datecomp && !datecomp->c_text) {
if (!datecomp->c_text) {
if (!datecomp->c_tws)
- datecomp->c_tws = (struct tws *) calloc((size_t) 1, sizeof(*datecomp->c_tws));
+ datecomp->c_tws = (struct tws *) mh_xcalloc((size_t) 1, sizeof(*datecomp->c_tws));
if (!datecomp->c_tws)
if (!datecomp->c_tws)
- adios(NULL, "unable to allocate tws buffer");
+ adios(EX_OSERR, NULL, "unable to allocate tws buffer");
*datecomp->c_tws = *dlocaltime((time_t *) &st.st_mtime);
datecomp->c_flags |= CF_DATEFAB|CF_TRUE;
} else {
*datecomp->c_tws = *dlocaltime((time_t *) &st.st_mtime);
datecomp->c_flags |= CF_DATEFAB|CF_TRUE;
} else {
@@
-290,7
+286,7
@@
finished:
*--nxtbuf = tmpbuf;
if (incing && (ferror(scnout) || fclose(scnout) == EOF))
*--nxtbuf = tmpbuf;
if (incing && (ferror(scnout) || fclose(scnout) == EOF))
- adios(scnmsg, "write error on");
+ adios(EX_IOERR, scnmsg, "write error on");
return (state != FILEEOF ? SCNERR : SCNMSG);
}
return (state != FILEEOF ? SCNERR : SCNMSG);
}