Browse Source

Plan 9 from Bell Labs 2011-05-07

David du Colombier 13 years ago
parent
commit
389665b47d
4 changed files with 9 additions and 18 deletions
  1. 1 1
      rc/bin/fshalt
  2. 1 12
      sys/man/1/soelim
  3. 1 1
      sys/src/9/ip/ip.c
  4. 6 4
      sys/src/libc/port/pool.c

+ 1 - 1
rc/bin/fshalt

@@ -22,7 +22,7 @@ setrtc
 
 # turn off graphics, if any
 if (test -e '#v/vgactl' && test -e '#P/realmode') {
-	prompt=()
+	prompt=''
 	kill rio | rc -i &
 	sleep 2
 	aux/vga -l text

+ 1 - 12
sys/man/1/soelim

@@ -23,19 +23,8 @@ using programs such as
 that do not normally do this, allowing
 placement of individual tables or other text objects in separate files
 to be run as a part of a large document.
-.PP
-Note that inclusion can be suppressed by using
-.L '
-instead of
-.L .
-at the
-start of the line as in:
-.sp
-.ti +2m
-.B "\&'so /usr/share/lib/tmac/tmac.s
 .SH SOURCE
 .B /rc/bin/soelim
 .SH "SEE ALSO"
+.IR deroff (1),
 .IR troff (1)
-.SH BUGS
-The shell script was written by Sape Mullender.

+ 1 - 1
sys/src/9/ip/ip.c

@@ -384,7 +384,7 @@ ipiput4(Fs *f, Ipifc *ifc, Block *bp)
 		}
 
 		/* don't forward to source's network */
-		memmove(&conv, ifc->conv, sizeof conv);
+		memset(&conv, 0, sizeof conv);
 		conv.r = nil;
 		r = v4lookup(f, h->dst, &conv);
 		if(r == nil || r->ifc == ifc){

+ 6 - 4
sys/src/libc/port/pool.c

@@ -142,7 +142,6 @@ static ulong	dsize2bsize(Pool*, ulong);
 static ulong	getdsize(Alloc*);
 static Alloc*	trim(Pool*, Alloc*, ulong);
 static Free*	listadd(Free*, Free*);
-static Free*	listdelete(Free*, Free*);
 static void		logstack(Pool*);
 static Free**	ltreewalk(Free**, ulong);
 static void		memmark(void*, int, ulong);
@@ -350,13 +349,16 @@ listadd(Free *list, Free *node)
 
 /* listdelete: remove node from a doubly linked list */
 static Free*
-listdelete(Free *list, Free *node)
+listdelete(Pool *p, Free *list, Free *node)
 {
 	if(node->next == node) {	/* singular list */
 		node->prev = node->next = Poison;
 		return nil;
 	}
-
+	if(node->next == nil)
+		p->panic(p, "pool->next");
+	if(node->prev == nil)
+		p->panic(p, "pool->prev");
 	node->next->prev = node->prev;
 	node->prev->next = node->next;
 
@@ -405,7 +407,7 @@ pooldel(Pool *p, Free *node)
 	olst = *parent;
 	assert(olst != nil /* pooldel */);
 
-	lst = listdelete(olst, node);
+	lst = listdelete(p, olst, node);
 	if(lst == nil)
 		*parent = treedelete(*parent, olst);
 	else if(lst != olst)