code: drawterm

Info  •  Files  •  Log

kernel: fix namelenerror(), avoid memrchr() and make it static (from 9front)

make sure the loop terminates and doesnt get stuck at
name == aname. avoid memrchr() as it conflicts with
libc on unix (drawterm). declare namelenerror() as
static.

--- a/kern/chan.c

+++ b/kern/chan.c

@@ -1089,19 +1089,7 @@

 	}

 }

-void*

-memrchr(void *va, int c, long n)

-{

-	uchar *a, *e;

-

-	a = va;

-	for(e=a+n-1; e>a; e--)

-		if(*e == c)

-			return e;

-	return nil;

-}

-

-void

+static void

 namelenerror(char *aname, int len, char *err)

 {

 	char *ename, *name, *next;

@@ -1122,9 +1110,11 @@

 		next = ename;

 		do{

 			name = next;

-			next = memrchr(aname, '/', name-aname);

-			if(next == nil)

-				next = aname;

+			if(next == aname)

+				break;

+			while(next > aname)

+				if(*--next == '/')

+					break;

 			len = ename-next;

 		}while(len < ERRMAX/3 || len + errlen < 2*ERRMAX/3);