X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9e4dbc2d5379b96a8d90e28cf8fce803d6cc1ff4..fcaa3047b2a23fc0c36be518d1ca1ea0b0cb3b66:/uip/aliasbr.c

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index b3978ef4..aaf0c7f1 100644
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -5,10 +5,13 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/aliasbr.h>
-#include <h/addrsbr.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/concat.h"
+#include "sbr/vfgets.h"
+#include "sbr/getcpy.h"
+#include "h/aliasbr.h"
+#include "h/addrsbr.h"
+#include "h/utils.h"
 #include <pwd.h>
 
 static int akvis;
@@ -20,15 +23,9 @@ struct aka *akatail = NULL;
 /*
  * prototypes
  */
-int alias (char *);
-int akvisible (void);
-char *akresult (struct aka *);
-char *akvalue (char *);
-char *akerror (int);
-
 static  char *akval (struct aka *, char *);
-static bool aleq (char *, char *);
-static char *scanp (char *);
+static bool aleq (char *, char *) PURE;
+static char *scanp (char *) PURE;
 static char *getp (char *);
 static char *seekp (char *, char *, char **);
 static int addfile (struct aka *, char *);
@@ -160,7 +157,7 @@ aleq (char *string, char *aliasent)
         aliasent++;
     }
 
-    return (*aliasent == 0 || *aliasent == '*');
+    return *aliasent == 0 || *aliasent == '*';
 }
 
 
@@ -184,7 +181,7 @@ alias (char *file)
     while (vfgets (fp, &ap) == OK) {
 	bp = ap;
 	switch (*(pp = scanp (bp))) {
-	    case '<': 		/* recurse a level */
+	    case '<':		/* recurse a level */
 		if (!*(cp = getp (pp + 1))) {
 		    akerrst = "'<' without alias-file";
 		    fclose (fp);
@@ -195,8 +192,8 @@ alias (char *file)
 		    return i;
 		}
 		continue;
-	    case ':': 		/* comment */
-	    case ';': 
+	    case ':':		/* comment */
+	    case ';':
 	    case '#':
 	    case 0: 
 		continue;
@@ -226,11 +223,11 @@ alias (char *file)
 	}
 
 	switch (*(pp = scanp (ap))) {
-	    case 0: 		/* EOL */
+	    case 0:		/* EOL */
 		fclose (fp);
 		return AK_ERROR;
 
-	    case '<': 		/* read values from file */
+	    case '<':		/* read values from file */
 		if (!*(cp = getp (pp + 1))) {
 		    fclose (fp);
 		    return AK_ERROR;
@@ -241,7 +238,7 @@ alias (char *file)
 		}
 		break;
 
-	    default: 		/* list */
+	    default:		/* list */
 		while ((cp = getalias (pp)))
 		    add_aka (ak, cp);
 		break;
@@ -349,13 +346,13 @@ getalias (char *addrs)
     if (cp == NULL)
 	cp = addrs;
     else if (*cp == 0)
-        return (cp = NULL);
+        return cp = NULL;
 
     /* Remove leading any space from the address. */
     for (pp = cp; isspace ((unsigned char) *pp); pp++)
 	continue;
     if (*pp == 0)
-	return (cp = NULL);
+	return cp = NULL;
     /* Find the end of the address. */
     for (qp = pp; *qp != 0 && *qp != ','; qp++)
 	continue;