git: plan9front

Info  •  Files  •  Log  •  Branches

upas/Mail: clean up child counting, fix off by one.

--- a/sys/src/cmd/upas/Mail/mbox.c

+++ b/sys/src/cmd/upas/Mail/mbox.c

@@ -159,9 +159,8 @@

 	n = 0;

 	for(i = 0; i < m->nchild; i++){

 		c = m->child[i];

-		n += nsub(c);

 		if(!(c->state & (Sdummy|Shide)))

-			n++;

+			n += nsub(c)+1;

 	}

 	return n;

 }

@@ -184,9 +183,7 @@

 		for(i = 0; i < p->nchild; i++){

 			if(p->child[i] == m)

 				break;

-			o += nsub(p->child[i]);

-			if(!(p->state & (Sdummy|Shide)))

-				o++;

+			o += nsub(p->child[i]) + 1;

 		}

 		if(!(p->state & (Sdummy|Shide))){

 			o++;

@@ -204,7 +201,6 @@

 			if(!(m->state & (Sdummy|Szap|Shide)))

 				n++;

 		}

-

 	}

 	if(depth != nil)

 		*depth = d;

-- 

⑨