git: 9front

Info  •  Files  •  Log  •  Branches

upas/fs: catch alarm note (used in pop3 code)

--- a/sys/src/cmd/upas/fs/fs.c

+++ b/sys/src/cmd/upas/fs/fs.c

@@ -145,10 +145,9 @@

 }

 void

-notifyf(void *a, char *s)

+notifyf(void *, char *s)

 {

-	USED(a);

-	if(strncmp(s, "interrupt", 9) == 0)

+	if(strstr(s, "alarm") || strstr(s, "interrupt"))

 		noted(NCONT);

 	noted(NDFLT);

 }

--- a/sys/src/cmd/upas/fs/pop3.c

+++ b/sys/src/cmd/upas/fs/pop3.c

@@ -83,13 +83,13 @@

 	char *p;

 	alarm(60*1000);

-	if((s = Brdstr(&pop->bin, '\n', 0)) == nil){

+	s = Brdstr(&pop->bin, '\n', 0);

+	alarm(0);

+	if(s == nil){

 		close(pop->fd);

 		pop->fd = -1;

-		alarm(0);

 		return "unexpected eof";

 	}

-	alarm(0);

 	p = s+strlen(s)-1;

 	while(p >= s && (*p == '\r' || *p == '\n'))

-- 

⑨