X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fali.c;fp=uip%2Fali.c;h=2c80147e5e49021312e8a32b5fea3d0ba0a2a2c0;hp=b5bbfbe3a9704cbeb5612dc88bfaa6a3c6086714;hb=4d83cd450b889b65ffab1c352d6580bd5632aae1;hpb=9fca5fd33b87291cdcb326c7aab6ab9574244289

diff --git a/uip/ali.c b/uip/ali.c
index b5bbfbe..2c80147 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -17,25 +17,23 @@
 #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
+#define NLISTSW    2
 	{ "nolist", 2 },
-#define NORMSW     4
+#define NORMSW     3
 	{ "normalize", 0 },
-#define NNORMSW    5
+#define NNORMSW    4
 	{ "nonormalize", 2 },
-#define USERSW     6
+#define USERSW     5
 	{ "user", 0 },
-#define NUSERSW    7
+#define NUSERSW    6
 	{ "nouser", 2 },
-#define VERSIONSW  8
+#define VERSIONSW  7
 	{ "Version", 0 },
-#define HELPSW     9
+#define HELPSW     8
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -55,7 +53,7 @@ int
 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;
@@ -87,14 +85,12 @@ main(int argc, char **argv)
 				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:
@@ -122,16 +118,19 @@ main(int argc, char **argv)
 		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(etcpath(*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);
 		}
 	}