Browse Source

Plan 9 from Bell Labs 2002-12-16

David du Colombier 18 years ago
parent
commit
7513b34716

+ 13 - 12
dist/replica/plan9.db

@@ -9,12 +9,12 @@
 386/9loaddebug - 775 sys sys 1039914699 259921
 386/9loadlite - 775 sys sys 1032215927 124616
 386/9loadlitedebug - 775 sys sys 1039914699 183617
-386/9pc - 775 sys sys 1039764767 1783420
-386/9pc.gz - 664 sys sys 1039764768 614091
-386/9pccpu - 775 sys sys 1039764770 1429714
-386/9pccpu.gz - 664 sys sys 1039764771 498997
-386/9pcdisk - 775 sys sys 1039766107 1987341
-386/9pcdisk.gz - 664 sys sys 1039766104 703132
+386/9pc - 775 sys sys 1040006337 1783420
+386/9pc.gz - 664 sys sys 1040006338 614078
+386/9pccpu - 775 sys sys 1040006340 1448231
+386/9pccpu.gz - 664 sys sys 1040006341 504177
+386/9pcdisk - 775 sys sys 1040006344 1987341
+386/9pcdisk.gz - 664 sys sys 1040006345 703136
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/8a - 775 sys sys 1039758526 113387
@@ -1178,7 +1178,7 @@ lib/face/48x48x2/x - 20000000755 sys sys 944941683 0
 lib/face/48x48x2/y - 20000000755 sys sys 944941683 0
 lib/face/48x48x2/z - 20000000755 sys sys 944941683 0
 lib/face/48x48x4 - 20000000775 sys sys 944941894 0
-lib/face/48x48x4/.dict - 664 sys sys 1019530375 1600
+lib/face/48x48x4/.dict - 664 sys sys 1039965405 1750
 lib/face/48x48x4/Z - 20000000775 sys sys 944945342 0
 lib/face/48x48x4/a - 20000000775 sys sys 944945701 0
 lib/face/48x48x4/a/adb.1 - 664 sys sys 944941890 962
@@ -3166,7 +3166,7 @@ sys/doc/venti/venti.pdf - 755 sys sys 1020384352 139090
 sys/doc/venti/venti.ps - 664 sys sys 1019852320 2012620
 sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
-sys/games/lib/fortunes - 664 sys sys 1039720623 237691
+sys/games/lib/fortunes - 664 sys sys 1040004323 237819
 sys/include - 20000000775 sys sys 1016902416 0
 sys/include/9p.h - 664 sys sys 1032324435 4127
 sys/include/String.h - 664 sys sys 1014929061 1133
@@ -5094,6 +5094,7 @@ sys/src/9/pc/fns.h - 664 sys sys 1026847643 4216
 sys/src/9/pc/hcwAMC.h - 664 sys sys 1026860163 166004
 sys/src/9/pc/i8253.c - 664 sys sys 1032052919 6791
 sys/src/9/pc/i8259.c - 664 sys sys 1015014519 4423
+sys/src/9/pc/init9.c - 664 sys sys 1040002518 94
 sys/src/9/pc/initcode.s - 664 sys sys 1015014519 282
 sys/src/9/pc/io.h - 664 sys sys 1015014519 7956
 sys/src/9/pc/kbd.c - 664 sys sys 1039753498 9134
@@ -5101,7 +5102,7 @@ sys/src/9/pc/l.s - 664 sys sys 1026847645 20867
 sys/src/9/pc/main.c - 664 sys sys 1034202255 14255
 sys/src/9/pc/mem.h - 664 sys sys 1018553448 4573
 sys/src/9/pc/memory.c - 664 sys sys 1032303986 12994
-sys/src/9/pc/mkfile - 664 sys sys 1039911473 2994
+sys/src/9/pc/mkfile - 664 sys sys 1040002514 2995
 sys/src/9/pc/mmu.c - 664 sys sys 1018553449 10008
 sys/src/9/pc/mouse.c - 664 sys sys 1020369766 6315
 sys/src/9/pc/mp.c - 664 sys sys 1018974174 17091
@@ -5128,7 +5129,7 @@ sys/src/9/pc/sd53c8xx.n - 664 sys sys 1032059019 12455
 sys/src/9/pc/sdata.c - 664 sys sys 1032487085 44555
 sys/src/9/pc/sdmylex.c - 664 sys sys 1015014523 27750
 sys/src/9/pc/sdscsi.c - 664 sys sys 1015014523 7412
-sys/src/9/pc/trap.c - 664 sys sys 1036812833 19279
+sys/src/9/pc/trap.c - 664 sys sys 1040002517 19364
 sys/src/9/pc/uarti8250.c - 664 sys sys 1020369766 12671
 sys/src/9/pc/uartpci.c - 664 sys sys 1015014524 2709
 sys/src/9/pc/usb.h - 664 sys sys 1015014524 3505
@@ -5200,7 +5201,7 @@ sys/src/9/port/edf.c - 664 sys sys 1037669300 24710
 sys/src/9/port/edf.h - 664 sys sys 1037669301 4398
 sys/src/9/port/error.h - 664 sys sys 1014931175 2583
 sys/src/9/port/fault.c - 664 sys sys 1032052807 6557
-sys/src/9/port/initcode.c - 664 sys sys 1039753332 446
+sys/src/9/port/initcode.c - 664 sys sys 1040002543 465
 sys/src/9/port/latin1.c - 664 sys sys 1015278339 1418
 sys/src/9/port/latin1.h - 664 sys sys 1015278339 3524
 sys/src/9/port/lib.h - 664 sys sys 1014931175 5676
@@ -11611,7 +11612,7 @@ sys/src/libventi/mkfile - 664 sys sys 1036005853 447
 sys/src/libventi/pack.c - 664 sys sys 1036005839 2834
 sys/src/libventi/packet.c - 664 sys sys 1019678692 13253
 sys/src/libventi/packet.h - 664 sys sys 1019678692 641
-sys/src/libventi/plan9.c - 664 sys sys 1036470162 8463
+sys/src/libventi/plan9.c - 664 sys sys 1039964807 8481
 sys/src/libventi/score.c - 664 sys sys 1019678692 255
 sys/src/libventi/session.h - 664 sys sys 1036470162 913
 sys/src/libventi/sha1-plan9.c - 664 sys sys 1036005838 1058

+ 14 - 0
dist/replica/plan9.log

@@ -16768,3 +16768,17 @@
 1039915920 4 c 386/bin/vtdump - 775 sys sys 1039914698 163327
 1039915920 5 c 386/bin/vac - 775 sys sys 1039914697 173711
 1039915920 6 c 386/bin/vacfs - 775 sys sys 1039914697 179912
+1039966368 0 c lib/face/48x48x4/.dict - 664 sys sys 1039965405 1750
+1039966368 1 c sys/games/lib/fortunes - 664 sys sys 1039964876 237788
+1039966368 2 c sys/src/libventi/plan9.c - 664 sys sys 1039964807 8481
+1040002607 0 c sys/src/9/pc/mkfile - 664 sys sys 1040002514 2995
+1040002607 1 c sys/src/9/pc/trap.c - 664 sys sys 1040002517 19364
+1040002607 2 a sys/src/9/pc/init9.c - 664 sys sys 1040002518 94
+1040002607 3 c sys/src/9/port/initcode.c - 664 sys sys 1040002543 465
+1040005891 0 c sys/games/lib/fortunes - 664 sys sys 1040004323 237819
+1040006354 0 c 386/9pc - 775 sys sys 1040006337 1783420
+1040006354 1 c 386/9pc.gz - 664 sys sys 1040006338 614078
+1040006354 2 c 386/9pccpu - 775 sys sys 1040006340 1448231
+1040006354 3 c 386/9pccpu.gz - 664 sys sys 1040006341 504177
+1040006354 4 c 386/9pcdisk - 775 sys sys 1040006344 1987341
+1040006354 5 c 386/9pcdisk.gz - 664 sys sys 1040006345 703136

+ 6 - 0
lib/face/48x48x4/.dict

@@ -59,10 +59,16 @@ astro/tor t/tor.1
 astro/tsalamon t/tsalamon.1
 astro/va v/va.1
 astro/wmc w/wmc.1
+bell-labs.com/ehg e/ehg.1
+bell-labs.com/trickey h/howard.1
 cs.utwente.nl/sape s/sape.1
 delbarton.org/rsc r/rsc.1
 delbarton.org/unknown d/delbarton.1
+google.com/r r/rob.1
+google.com/sean s/seanq.1
+harvard.edu/rsc r/rsc.1
 microsoft.com/cwf c/cwf.1
+mit.edu/rsc r/rsc.1
 pixar.com/td t/td.1
 rentec.com/pjw p/pjw.1
 research.att.com/aek a/aek.1

+ 3 - 1
sys/games/lib/fortunes

@@ -3852,4 +3852,6 @@ Do not be distracted by meaningless messages.
 c++ -O2 -fno-exceptions -fno-check-new -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long -fno-builtin -O -pipe -DBSD -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT -DQT_NO_ASCII_CAST -o konq main.o mainwindow.o -Wl,-export-dynamic  ../kdesrc/kio/http/kcookiejar/.libs/libkcookiejar.a -L/usr/X11R6/lib -ljpeg -L/usr/local/lib -ljpeg -L/usr/lib -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg ../kdesrc/kio/.libs/libkio.a -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg ../kdesrc/kparts/.libs/libkparts.a -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg ../kdesrc/khtml/.libs/libkhtml.a -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg ../kdesrc/kio/http/.libs/libkiohttp.a -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg ../dropin/kparts/.libs/libkpartsdropin.a -ljpeg -ljpeg -ljpeg ../kdesrc/khtml/ecma/.libs/kjs_html.a -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -lssl -lcrypto -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -lqt2 -lpng -lz -ljpeg -lXext -lX11 -lSM -lICE -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -ljpeg -lm -ljpeg -lgcc -lstdc++
 Please browse the site to see our full range of services, we can remain customer focused and goal-directed, innovate and be an inside-out organization which facilitates sticky web-readiness transforming turnkey eyeballs to brand 24/365 paradigms with benchmark turnkey channels implementing viral e-services and dot-com action-items while we take that action item off-line and raise a red flag and remember touch base as you think about the red tape outside of the box and seize B2B e-tailers and re-envisioneer innovative partnerships that evolve dot-com initiatives delivering synergistic earballs to incentivize. - www.anadrom.net
 If you're calling to report a death, please press or say, "One".
-i'm running windows xp under vmware in a vnc on linux being viewed from plan 9. (got that?)
+i'm running windows xp under vmware in a vnc on linux being viewed from plan 9. (got that?) - rob
+User: support@games.yahoo.com send to you mail with virus.  Please check mail in attach ! 
+Subject: I NEED YOUR ASSISTANT

+ 7 - 0
sys/src/9/pc/init9.c

@@ -0,0 +1,7 @@
+extern void startboot(char*, char**);
+
+void
+_main(char *argv0)
+{
+	startboot(argv0, &argv0);
+}

+ 3 - 2
sys/src/9/pc/mkfile

@@ -94,9 +94,10 @@ devusb.$O usbuhci.$O usbohci.$O:	usb.h
 sd53c8xx.i:	sd53c8xx.n
 	aux/na $prereq > $target
 
-init.h:	../port/initcode.c /sys/src/libc/9syscall/sys.h
+init.h:	../port/initcode.c init9.c
 	$CC ../port/initcode.c
-	$LD -l -R1 -o init.out initcode.$O /386/lib/libc.a
+	$CC init9.c
+	$LD -l -R1 -o init.out init9.$O initcode.$O /386/lib/libc.a
 	{echo 'uchar initcode[]={'
 	 strip < init.out | xd -1x |
 		sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'

+ 2 - 0
sys/src/9/pc/trap.c

@@ -607,6 +607,8 @@ syscall(Ureg* ureg)
 		e = up->syserrstr;
 		up->syserrstr = up->errstr;
 		up->errstr = e;
+		if(0 && up->pid == 1)
+			print("syscall %lud error %s\n", scallnr, up->syserrstr);
 	}
 	if(up->nerrlab){
 		print("bad errstack [%uld]: %d extra\n", scallnr, up->nerrlab);

+ 2 - 2
sys/src/9/port/initcode.c

@@ -12,7 +12,7 @@ char srv[] = "/srv";
 char env[] = "/env";
 
 void
-main(void)
+startboot(char *argv0, char **argv)
 {
 	open(cons, OREAD);
 	open(cons, OWRITE);
@@ -21,6 +21,6 @@ main(void)
 	bind(ec, env, MAFTER);
 	bind(e, env, MCREATE|MAFTER);
 	bind(s, srv, MREPL|MCREATE);
-	execl(boot, boot, nil);
+	exec(boot, argv);
 	for(;;);
 }

+ 3 - 1
sys/src/libventi/plan9.c

@@ -136,13 +136,15 @@ char*
 vtSetError(char* fmt, ...)
 {
 	Thread *p;
+	char *s;
 	va_list args;
 
 	p = threadLookup();
 
 	va_start(args, fmt);
+	s = vsmprint(fmt, args);
 	vtMemFree(p->error);
-	p->error = vsmprint(fmt, args);
+	p->error = s;
 	va_end(args);
 	if(ERROR)
 		fprint(2, "vtSetError: %s\n", p->error);