projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unset MM_CHARSET in tests/scan/test-scan-multibyte
[mmh]
/
uip
/
rcvdist.c
diff --git
a/uip/rcvdist.c
b/uip/rcvdist.c
index
53cc0f0
..
d08058b
100644
(file)
--- a/
uip/rcvdist.c
+++ b/
uip/rcvdist.c
@@
-85,7
+85,7
@@
main(int argc, char **argv)
continue;
}
}
continue;
}
}
- addrs = addrs ? add(cp, add(", ", addrs)) : getcpy(cp);
+ addrs = addrs ? add(cp, add(", ", addrs)) : mh_xstrdup(cp);
}
if (!addrs) {
}
if (!addrs) {
@@
-126,13
+126,9
@@
main(int argc, char **argv)
/* very similar to routine in replsbr.c */
/* very similar to routine in replsbr.c */
-#define SBUFSIZ 256
-
static struct format *fmt;
static int ncomps = 0;
static struct format *fmt;
static int ncomps = 0;
-static char **compbuffers = 0;
-static struct comp **used_buf = 0;
static int dat[5];
static int dat[5];
@@
-156,10
+152,12
@@
static char *addrcomps[] = {
static void
rcvdistout(FILE *inb, char *form, char *addrs)
{
static void
rcvdistout(FILE *inb, char *form, char *addrs)
{
- int char_read = 0, format_len, i, state;
- char *tmpbuf, **nxtbuf, **ap;
- char *cp, *scanl, name[NAMESZ];
- struct comp *cptr, **savecomp;
+ int char_read = 0, format_len, i;
+ enum state state;
+ struct field f = {{0}};
+ char **ap;
+ char *cp, *scanl;
+ struct comp *cptr;
FILE *out;
if (!(out = fopen(drft, "w"))) {
FILE *out;
if (!(out = fopen(drft, "w"))) {
@@
-170,19
+168,6
@@
rcvdistout(FILE *inb, char *form, char *addrs)
cp = new_fs(form ? form : rcvdistcomps, NULL);
format_len = strlen(cp);
ncomps = fmt_compile(cp, &fmt) + 1;
cp = new_fs(form ? form : rcvdistcomps, NULL);
format_len = strlen(cp);
ncomps = fmt_compile(cp, &fmt) + 1;
- nxtbuf = compbuffers =
- (char **) mh_xcalloc((size_t) ncomps, sizeof(char *));
- savecomp = used_buf =
- (struct comp **) mh_xcalloc((size_t) (ncomps + 1),
- sizeof(struct comp *));
- savecomp += ncomps + 1;
- *--savecomp = 0;
-
- for (i = ncomps; i--;) {
- *nxtbuf++ = mh_xmalloc(SBUFSIZ);
- }
- nxtbuf = compbuffers;
- tmpbuf = *nxtbuf++;
for (ap = addrcomps; *ap; ap++) {
FINDCOMP(cptr, *ap);
for (ap = addrcomps; *ap; ap++) {
FINDCOMP(cptr, *ap);
@@
-195,22
+180,19
@@
rcvdistout(FILE *inb, char *form, char *addrs)
if (cptr) {
cptr->c_text = addrs;
}
if (cptr) {
cptr->c_text = addrs;
}
- state = FLD;
+ state = FLD2;
while (1) {
while (1) {
- state = m_getfld(state, name, tmpbuf, SBUFSIZ, inb);
+ state = m_getfld2(state, &f, inb);
switch (state) {
switch (state) {
- case FLD:
- case FLDPLUS:
- if ((cptr = wantcomp[CHASH(name)])) {
+ case FLD2:
+ if ((cptr = wantcomp[CHASH(f.name)])) {
do {
do {
- if (mh_strcasecmp(name, cptr->c_name)!=0) {
+ if (mh_strcasecmp(f.name, cptr->c_name)!=0) {
continue;
}
continue;
}
- char_read += msg_count;
+ char_read += strlen(f.value);
if (!cptr->c_text) {
if (!cptr->c_text) {
- cptr->c_text = tmpbuf;
- *--savecomp = cptr;
- tmpbuf = *nxtbuf++;
+ cptr->c_text = mh_xstrdup(f.value);
} else {
cp = cptr->c_text;
i = strlen(cp) - 1;
} else {
cp = cptr->c_text;
i = strlen(cp) - 1;
@@
-222,27
+204,18
@@
rcvdistout(FILE *inb, char *form, char *addrs)
cp = add("\t", cp);
}
}
cp = add("\t", cp);
}
}
- cptr->c_text = add(tmpbuf, cp);
- }
- while (state == FLDPLUS) {
- state = m_getfld(state, name, tmpbuf, SBUFSIZ, inb);
- cptr->c_text = add(tmpbuf, cptr->c_text);
- char_read += msg_count;
+ cptr->c_text = add(f.value, cp);
}
break;
} while ((cptr = cptr->c_next));
}
}
break;
} while ((cptr = cptr->c_next));
}
-
- while (state == FLDPLUS) {
- state = m_getfld(state, name, tmpbuf,
- SBUFSIZ, inb);
- }
break;
break;
- case LENERR:
- case FMTERR:
- case BODY:
- case FILEEOF:
+ case LENERR2:
+ case FMTERR2:
+ case IOERR2:
+ case BODY2:
+ case FILEEOF2:
goto finished;
default:
goto finished;
default:
@@
-252,7
+225,7
@@
rcvdistout(FILE *inb, char *form, char *addrs)
finished: ;
i = format_len + char_read + 256;
finished: ;
i = format_len + char_read + 256;
- scanl = mh_xmalloc((size_t) i + 2);
+ scanl = mh_xcalloc(i + 2, sizeof(char));
dat[0] = dat[1] = dat[2] = dat[4] = 0;
dat[3] = OUTPUTLINELEN;
fmt_scan(fmt, scanl, i, dat);
dat[0] = dat[1] = dat[2] = dat[4] = 0;
dat[3] = OUTPUTLINELEN;
fmt_scan(fmt, scanl, i, dat);
@@
-263,16
+236,7
@@
finished: ;
}
fclose(out);
}
fclose(out);
- free(scanl);
- for (nxtbuf = compbuffers, i = ncomps; (cptr = *savecomp++);
- nxtbuf++, i--) {
- free(cptr->c_text);
- }
- while (i-- > 0) {
- free(*nxtbuf++);
- }
- free(compbuffers);
- free(used_buf);
+ mh_free0(&scanl);
}
}