projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New changes: Sender: cannot be blank, Sender: always overrides From:
[mmh]
/
sbr
/
readconfig.c
diff --git
a/sbr/readconfig.c
b/sbr/readconfig.c
index
9e0382e
..
5674926
100644
(file)
--- a/
sbr/readconfig.c
+++ b/
sbr/readconfig.c
@@
-3,14
+3,13
@@
* readconfig.c -- base routine to read nmh configuration files
* -- such as nmh profile, context file, or mhn.defaults.
*
* readconfig.c -- base routine to read nmh configuration files
* -- such as nmh profile, context file, or mhn.defaults.
*
- * $Id$
- *
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
*/
#include <h/mh.h>
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
*/
#include <h/mh.h>
+#include <h/utils.h>
struct procstr {
char *procname;
struct procstr {
char *procname;
@@
-23,6
+22,7
@@
static struct procstr procs[] = {
{ "buildmimeproc", &buildmimeproc },
{ "faceproc", &faceproc },
{ "fileproc", &fileproc },
{ "buildmimeproc", &buildmimeproc },
{ "faceproc", &faceproc },
{ "fileproc", &fileproc },
+ { "formatproc", &formatproc },
{ "incproc", &incproc },
{ "installproc", &installproc },
{ "lproc", &lproc },
{ "incproc", &incproc },
{ "installproc", &installproc },
{ "lproc", &lproc },
@@
-32,7
+32,6
@@
static struct procstr procs[] = {
{ "mshproc", &mshproc },
{ "packproc", &packproc },
{ "postproc", &postproc },
{ "mshproc", &mshproc },
{ "packproc", &packproc },
{ "postproc", &postproc },
- { "rmfproc", &rmfproc },
{ "rmmproc", &rmmproc },
{ "sendproc", &sendproc },
{ "showmimeproc", &showmimeproc },
{ "rmmproc", &rmmproc },
{ "sendproc", &sendproc },
{ "showmimeproc", &showmimeproc },
@@
-65,8
+64,7
@@
readconfig (struct node **npp, FILE *ib, char *file, int ctx)
case FLD:
case FLDPLUS:
case FLDEOF:
case FLD:
case FLDPLUS:
case FLDEOF:
- if (!(np = (struct node *) malloc (sizeof(*np))))
- adios (NULL, "unable to allocate profile storage");
+ np = (struct node *) mh_xmalloc (sizeof(*np));
*npp = np;
*(npp = &np->n_next) = NULL;
np->n_name = getcpy (name);
*npp = np;
*(npp = &np->n_next) = NULL;
np->n_name = getcpy (name);