#include <h/mh.h>
#include <h/addrsbr.h>
#include <h/aliasbr.h>
-#include <h/mts.h>
#include <h/utils.h>
/*
#define NVEC 50
static struct swit switches[] = {
-#define ALIASW 0
- { "alias aliasfile", 0 },
-#define NALIASW 1
- { "noalias", -7 },
-#define LISTSW 2
+#define FILESW 0
+ { "file aliasfile", 0 },
+#define LISTSW 1
{ "list", 0 },
-#define NLISTSW 3
- { "nolist", 0 },
-#define NORMSW 4
+#define NLISTSW 2
+ { "nolist", 2 },
+#define NORMSW 3
{ "normalize", 0 },
-#define NNORMSW 5
- { "nonormalize", 0 },
-#define USERSW 6
+#define NNORMSW 4
+ { "nonormalize", 2 },
+#define USERSW 5
{ "user", 0 },
-#define NUSERSW 7
- { "nouser", 0 },
-#define VERSIONSW 8
- { "version", 0 },
-#define HELPSW 9
+#define NUSERSW 6
+ { "nouser", 2 },
+#define VERSIONSW 7
+ { "Version", 0 },
+#define HELPSW 8
{ "help", 0 },
{ NULL, 0 }
};
main(int argc, char **argv)
{
int i, vecp = 0, inverted = 0, list = 0;
- int noalias = 0, normalize = AD_NHST;
+ int deffiles = 1, normalize = AD_NHST;
char *cp, **ap, **argp, buf[BUFSIZ];
char *vec[NVEC], **arguments;
struct aka *ak;
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
- mts_init(invo_name);
arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
print_version(invo_name);
done(1);
- case ALIASW:
+ case FILESW:
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s", argp[-2]);
if ((i = alias(cp)) != AK_OK)
- adios(NULL, "aliasing error in %s - %s", cp, akerror(i));
- continue;
- case NALIASW:
- noalias++;
+ adios(NULL, "aliasing error in %s: %s", cp, akerror(i));
+ deffiles = 0;
continue;
case LISTSW:
vec[vecp++] = cp;
}
- if (!noalias) {
- /* allow Aliasfile: profile entry */
- if ((cp = context_find("Aliasfile"))) {
- char *dp = NULL;
+ /* process default Aliasfile: profile entry */
+ if (deffiles && (cp = context_find("Aliasfile"))) {
+ char *dp = NULL;
- for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; ap++)
- if ((i = alias(*ap)) != AK_OK)
- adios(NULL, "aliasing error in %s - %s", *ap, akerror(i));
- if (dp)
- free(dp);
+ for (ap = brkstring(dp=getcpy(cp), " ", "\n");
+ ap && *ap; ap++) {
+ if ((i = alias(etcpath(*ap))) != AK_OK) {
+ adios(NULL, "aliasing error in %s: %s",
+ *ap, akerror(i));
+ }
+ }
+ if (dp) {
+ free(dp);
}
}