lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / ali.c

diff --git a/uip/ali.c b/uip/ali.c
index 534c25d886fdec0a267a6e05823ea2b8b234bf47..43e9f5a73aa39600aa95db7d364ef6304187d3b5 100644 (file)
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -1,6 +1,4 @@
-
-/*
- * ali.c -- list nmh mail aliases
+/* ali.c -- list nmh mail aliases

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -15,7 +13,7 @@
 
 #define ALI_SWITCHES \
     X("alias aliasfile", 0, ALIASW) \
 
 #define ALI_SWITCHES \
     X("alias aliasfile", 0, ALIASW) \

-    X("noalias", -7, NALIASW) \
+    X("noalias", 0, NALIASW) \

     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \
     X("user", 0, USERSW) \
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \
     X("user", 0, USERSW) \


@@ -38,31 +36,28 @@ extern struct aka *akahead;
 /*
  * prototypes
  */
 /*
  * prototypes
  */

-static void print_aka (char *, int, int);
-static void print_usr (char *, int);
+static void print_aka (char *, bool, int);
+static void print_usr (char *, bool);

 
 
 int
 main (int argc, char **argv)
 {
 
 
 int
 main (int argc, char **argv)
 {

-    int i, vecp = 0, inverted = 0, list = 0;
-    int noalias = 0;
+    int i, vecp = 0;
+    bool inverted, list, noalias;

     char *cp, **ap, **argp, buf[BUFSIZ];
     /* Really only need to allocate for argc-1, but must allocate at least 1,
        so go ahead and allocate for argc char pointers. */
     char **vec = mh_xmalloc (argc * sizeof (char *)), **arguments;
     struct aka *ak;
 
     char *cp, **ap, **argp, buf[BUFSIZ];
     /* Really only need to allocate for argc-1, but must allocate at least 1,
        so go ahead and allocate for argc char pointers. */
     char **vec = mh_xmalloc (argc * sizeof (char *)), **arguments;
     struct aka *ak;
 

-    setlocale(LC_ALL, "");
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }

 
 

-    mts_init (invo_name);
+    mts_init ();

     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 

+    inverted = list = noalias = false;

     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {


@@ -88,21 +83,21 @@ main (int argc, char **argv)
                        adios (NULL, "aliasing error in %s - %s", cp, akerror (i));
                    continue;
                case NALIASW: 
                        adios (NULL, "aliasing error in %s - %s", cp, akerror (i));
                    continue;
                case NALIASW: 

-                   noalias++;
+                   noalias = true;

                    continue;
 
                case LISTSW: 
                    continue;
 
                case LISTSW: 

-                   list++;
+                   list = true;

                    continue;
                case NLISTSW: 
                    continue;
                case NLISTSW: 

-                   list = 0;
+                   list = false;

                    continue;
 
                case USERSW: 
                    continue;
 
                case USERSW: 

-                   inverted++;
+                   inverted = true;

                    continue;
                case NUSERSW: 
                    continue;
                case NUSERSW: 

-                   inverted = 0;
+                   inverted = false;

                    continue;
            }
        }
                    continue;
            }
        }


@@ -121,11 +116,10 @@ main (int argc, char **argv)
        if ((cp = context_find ("Aliasfile"))) {
            char *dp = NULL;
 
        if ((cp = context_find ("Aliasfile"))) {
            char *dp = NULL;
 

-           for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; ap++)
+           for (ap = brkstring(dp = mh_xstrdup(cp), " ", "\n"); ap && *ap; ap++)

                if ((i = alias (*ap)) != AK_OK)
                    adios (NULL, "aliasing error in %s - %s", *ap, akerror (i));
                if ((i = alias (*ap)) != AK_OK)
                    adios (NULL, "aliasing error in %s - %s", *ap, akerror (i));

-           if (dp)
-               free(dp);
+            free(dp);

        }
        alias (AliasFile);
     }
        }
        alias (AliasFile);
     }


@@ -148,9 +142,13 @@ main (int argc, char **argv)
        } else {
            /* print them all */
            for (ak = akahead; ak; ak = ak->ak_next) {
        } else {
            /* print them all */
            for (ak = akahead; ak; ak = ak->ak_next) {

+                char *res;
+

                printf ("%s: ", ak->ak_name);
                pos += strlen (ak->ak_name) + 1;
                printf ("%s: ", ak->ak_name);
                pos += strlen (ak->ak_name) + 1;

-               print_aka (akresult (ak), list, pos);
+                res = akresult(ak);
+               print_aka(res, list, pos);
+                free(res);

            }
        }
     }
            }
        }
     }


@@ -161,12 +159,12 @@ main (int argc, char **argv)
 }
 
 static void
 }
 
 static void

-print_aka (char *p, int list, int margin)
+print_aka (char *p, bool list, int margin)

 {
     char c;
 
     if (p == NULL) {
 {
     char c;
 
     if (p == NULL) {

-       printf ("<empty>\n");
+       puts("<empty>");

        return;
     }
 
        return;
     }
 


@@ -201,11 +199,11 @@ print_aka (char *p, int list, int margin)
 }
 
 static void
 }
 
 static void

-print_usr (char *s, int list)
+print_usr (char *s, bool list)

 {
 {

-    register char *cp, *pp, *vp;
-    register struct aka *ak;
-    register struct mailname *mp, *np;
+    char *cp, *pp, *vp;
+    struct aka *ak;
+    struct mailname *mp, *np;

 
     if ((pp = getname (s)) == NULL)
        adios (NULL, "no address in \"%s\"", s);
 
     if ((pp = getname (s)) == NULL)
        adios (NULL, "no address in \"%s\"", s);


@@ -220,10 +218,10 @@ print_usr (char *s, int list)
        while ((cp = getname (pp))) {
            if ((np = getm (cp, NULL, 0, NULL, 0)) == NULL)
                continue;
        while ((cp = getname (pp))) {
            if ((np = getm (cp, NULL, 0, NULL, 0)) == NULL)
                continue;

-           if (!strcasecmp (mp->m_host ? mp->m_host : "",
-                            np->m_host ? np->m_host : "")  &&
-               !strcasecmp (mp->m_mbox ? mp->m_mbox : "",
-                            np->m_mbox ? np->m_mbox : "")) {
+           if (!strcasecmp (FENDNULL(mp->m_host),
+                            FENDNULL(np->m_host))  &&
+               !strcasecmp (FENDNULL(mp->m_mbox),
+                            FENDNULL(np->m_mbox))) {

                vp = vp ? add (ak->ak_name, add (",", vp))
                    : getcpy (ak->ak_name);
                mnfree (np);
                vp = vp ? add (ak->ak_name, add (",", vp))
                    : getcpy (ak->ak_name);
                mnfree (np);


@@ -238,6 +236,5 @@ print_usr (char *s, int list)
 
     print_aka (vp ? vp : s, list, 0);
 
 
     print_aka (vp ? vp : s, list, 0);
 

-    if (vp)
-       free (vp);
+    free(vp);

 }
 }