projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed make_bcc_file () to use contents of From: in draft, if draft_from masquerade...
[mmh]
/
uip
/
aliasbr.c
diff --git
a/uip/aliasbr.c
b/uip/aliasbr.c
index
8ea8c13
..
aadd676
100644
(file)
--- a/
uip/aliasbr.c
+++ b/
uip/aliasbr.c
@@
-3,10
+3,15
@@
* aliasbr.c -- new aliasing mechanism
*
* $Id$
* aliasbr.c -- new aliasing mechanism
*
* $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>
#include <h/aliasbr.h>
*/
#include <h/mh.h>
#include <h/aliasbr.h>
+#include <h/utils.h>
#include <grp.h>
#include <pwd.h>
#include <grp.h>
#include <pwd.h>
@@
-42,11
+47,10
@@
static char *getalias (char *);
static void add_aka (struct aka *, char *);
static struct aka *akalloc (char *);
static struct home *hmalloc (struct passwd *);
static void add_aka (struct aka *, char *);
static struct aka *akalloc (char *);
static struct home *hmalloc (struct passwd *);
-#ifndef MMDFMTS
struct home *seek_home (char *);
struct home *seek_home (char *);
-#endif
+/* Do mh alias substitution on 's' and return the results. */
char *
akvalue (char *s)
{
char *
akvalue (char *s)
{
@@
-450,11
+454,12
@@
getalias (char *addrs)
if (*qp == ',')
*qp++ = 0;
for (cp = qp, qp--; qp > pp; qp--)
if (*qp == ',')
*qp++ = 0;
for (cp = qp, qp--; qp > pp; qp--)
- if (*qp != 0)
+ if (*qp != 0) {
if (isspace (*qp))
*qp = 0;
else
break;
if (isspace (*qp))
*qp = 0;
else
break;
+ }
return pp;
}
return pp;
}
@@
-469,9
+474,7
@@
add_aka (struct aka *ak, char *pp)
if (!strcmp (pp, ad->ad_text))
return;
if (!strcmp (pp, ad->ad_text))
return;
- ad = (struct adr *) malloc (sizeof(*ad));
- if (ad == NULL)
- return;
+ ad = (struct adr *) mh_xmalloc (sizeof(*ad));
ad->ad_text = getcpy (pp);
ad->ad_local = strchr(pp, '@') == NULL && strchr(pp, '!') == NULL;
ad->ad_next = NULL;
ad->ad_text = getcpy (pp);
ad->ad_local = strchr(pp, '@') == NULL && strchr(pp, '!') == NULL;
ad->ad_next = NULL;
@@
-516,8
+519,7
@@
akalloc (char *id)
{
register struct aka *p;
{
register struct aka *p;
- if (!(p = (struct aka *) malloc (sizeof(*p))))
- return NULL;
+ p = (struct aka *) mh_xmalloc (sizeof(*p));
p->ak_name = getcpy (id);
p->ak_visible = 0;
p->ak_name = getcpy (id);
p->ak_visible = 0;
@@
-538,8
+540,7
@@
hmalloc (struct passwd *pw)
{
register struct home *p;
{
register struct home *p;
- if (!(p = (struct home *) malloc (sizeof(*p))))
- return NULL;
+ p = (struct home *) mh_xmalloc (sizeof(*p));
p->h_name = getcpy (pw->pw_name);
p->h_uid = pw->pw_uid;
p->h_name = getcpy (pw->pw_name);
p->h_uid = pw->pw_uid;
@@
-558,7
+559,6
@@
hmalloc (struct passwd *pw)
}
}
-#ifndef MMDFMTS
struct home *
seek_home (char *name)
{
struct home *
seek_home (char *name)
{
@@
-595,4
+595,3
@@
seek_home (char *name)
return NULL;
}
return NULL;
}
-#endif /* MMDFMTS */