Renamed -version switch to -Version to remove the conflict with -verbose.

[mmh] / uip / ali.c

diff --git a/uip/ali.c b/uip/ali.c
index e07c847..73f7166 100644 (file)
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -9,7 +9,6 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/aliasbr.h>
-#include <h/mts.h>
 #include <h/utils.h>
 
 /*
@@ -35,7 +34,7 @@ static struct swit switches[] = {
 #define NUSERSW    7
        { "nouser", 0 },
 #define VERSIONSW  8
-       { "version", 0 },
+       { "Version", 0 },
 #define HELPSW     9
        { "help", 0 },
        { NULL, 0 }
@@ -69,7 +68,6 @@ main(int argc, char **argv)
        /* read user profile/context */
        context_read();
 
-       mts_init(invo_name);
        arguments = getarguments(invo_name, argc, argv, 1);
        argp = arguments;
 
@@ -132,7 +130,7 @@ main(int argc, char **argv)
                        char *dp = NULL;
 
                        for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; ap++)
-                               if ((i = alias(*ap)) != AK_OK)
+                               if ((i = alias(etcpath(*ap))) != AK_OK)
                                        adios(NULL, "aliasing error in %s - %s", *ap, akerror(i));
                        if (dp)
                                free(dp);
@@ -244,12 +242,7 @@ print_usr(char *s, int list, int norm)
        }
        mnfree(mp);
 
-#if 0
-       printf("%s: ", s);
-       print_aka(vp ? vp : s, list, pos += strlen(s) + 1);
-#else
        print_aka(vp ? vp : s, list, 0);
-#endif
 
        if (vp)
                free(vp);