runoff tweaks

4 files changed, 11 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index b4d8ca8..c430bed 100644
--- a/Makefile
+++ b/Makefile
@@ -65,8 +65,8 @@ PRINT =	\
 	types.h param.h defs.h x86.h asm.h elf.h mmu.h spinlock.h\
 	bootasm.S bootother.S main.c init.c spinlock.c\
 	proc.h proc.c setjmp.S kalloc.c\
-	syscall.h trapasm.S traps.h trap.c vectors.pl syscall.c\
-	buf.h dev.h fcntl.h stat.h file.h fs.h fsvar.h fd.c fs.c bio.c ide.c\
+	syscall.h trapasm.S traps.h trap.c vectors.pl syscall.c sysproc.c\
+	buf.h dev.h fcntl.h stat.h file.h fs.h fsvar.h fd.c fs.c bio.c ide.c sysfile.c\
 	pipe.c\
 	mp.h ioapic.h mp.c lapic.c ioapic.c picirq.c\
 	console.c\
diff --git a/runoff b/runoff
index 96cbb18..caa8a11 100755
--- a/runoff
+++ b/runoff
@@ -82,7 +82,8 @@ awk '
 		print $1, $3;
 	}
 ' $files >defs
-9 sed -n 's/^([0-9]+ [a-zA-Z0-9_]+)(.*)$/\1/p' $files |
+
+perl -n -e 'print if s/^([0-9]+ [a-zA-Z0-9_]+)\(.*$/\1/;' $files |
 	egrep -v ' (usage|main|if|for)$' >>defs
 (
 >s.defs
@@ -118,7 +119,7 @@ awk '
 grep Pages: all.ps
 
 # if we have the nice font, use it
-nicefont=/home/am8/rsc/plan9/sys/lib/postscript/font/LucidaSans-Typewriter83
+nicefont=~rsc/plan9/sys/lib/postscript/font/LucidaSans-Typewriter83
 if [ -f $nicefont ]
 then
 	(sed 1q all.ps; cat $nicefont; sed '1d; s/Courier/LucidaSans-Typewriter83/' all.ps) >allf.ps
diff --git a/runoff.list b/runoff.list
index 37bfe2c..93fcae6 100644
--- a/runoff.list
+++ b/runoff.list
@@ -32,19 +32,21 @@ traps.h
 trap.c
 vectors.pl
 syscall.c
+sysproc.c
 
 # file system
 buf.h
 dev.h
 fcntl.h
 stat.h
-fd.h
+file.h
 fs.h
 fsvar.h
-fd.c
-fs.c
-bio.c
 ide.c
+bio.c
+fs.c
+file.c
+sysfile.c
 
 # pipes
 pipe.c
diff --git a/setjmp.S b/setjmp.S
index 39c85b0..aee5590 100644
--- a/setjmp.S
+++ b/setjmp.S
@@ -32,4 +32,3 @@ longjmp:
 
   movl $1, %eax   /* return value (appears to come from setjmp!) */
   ret
-