Browse Source

Plan 9 from Bell Labs 2003-02-23

David du Colombier 18 years ago
parent
commit
9ae8df2f05
5 changed files with 14 additions and 4 deletions
  1. 3 3
      dist/replica/plan9.db
  2. 3 0
      dist/replica/plan9.log
  3. 1 0
      sys/lib/mimetype
  4. 6 0
      sys/src/libmemlayer/draw.c
  5. 1 1
      sys/src/libsunrpc/client.c

+ 3 - 3
dist/replica/plan9.db

@@ -3777,7 +3777,7 @@ sys/lib/man/preface4 - 664 sys sys 1020082276 1758
 sys/lib/man/secindex - 775 sys sys 956337727 322
 sys/lib/man/title - 664 sys sys 1019915894 746
 sys/lib/man/trademarks - 664 sys sys 958527089 1838
-sys/lib/mimetype - 664 sys sys 1045504324 5269
+sys/lib/mimetype - 664 sys sys 1045933187 5318
 sys/lib/newuser - 775 sys sys 1018386991 1229
 sys/lib/plumb - 20000000775 sys sys 944957365 0
 sys/lib/plumb/basic - 664 sys sys 1032058379 2908
@@ -11422,7 +11422,7 @@ sys/src/libmemdraw/times - 664 sys sys 944961742 586
 sys/src/libmemdraw/unload.c - 664 sys sys 944961742 435
 sys/src/libmemdraw/write.c - 664 sys sys 1014930217 4375
 sys/src/libmemlayer - 20000000775 sys sys 984710301 0
-sys/src/libmemlayer/draw.c - 664 sys sys 1039752978 3947
+sys/src/libmemlayer/draw.c - 664 sys sys 1045933975 4082
 sys/src/libmemlayer/lalloc.c - 664 sys sys 1039752979 1760
 sys/src/libmemlayer/layerop.c - 664 sys sys 1039752979 2641
 sys/src/libmemlayer/ldelete.c - 664 sys sys 1039752979 1183
@@ -11675,7 +11675,7 @@ sys/src/libstdio/vsprintf.c - 664 sys sys 1022112162 246
 sys/src/libsunrpc - 20000000775 sys sys 1045589225 0
 sys/src/libsunrpc/COPYING - 664 sys sys 1045589219 1269
 sys/src/libsunrpc/authunix.c - 664 sys sys 1045589219 1477
-sys/src/libsunrpc/client.c - 664 sys sys 1045674219 8858
+sys/src/libsunrpc/client.c - 664 sys sys 1045941140 8862
 sys/src/libsunrpc/emalloc.c - 664 sys sys 1045589220 397
 sys/src/libsunrpc/error.c - 664 sys sys 1045589221 819
 sys/src/libsunrpc/fd.c - 664 sys sys 1045589221 1734

+ 3 - 0
dist/replica/plan9.log

@@ -17958,3 +17958,6 @@
 1045777959 0 c 386/bin/fossil/flfmt - 775 sys sys 1045777851 225383
 1045777959 1 c sys/man/4/fossil - 664 sys sys 1045777955 8690
 1045855868 0 m cron - 20000000777 sys sys 1039727915 0
+1045933242 0 c sys/lib/mimetype - 664 sys sys 1045933187 5318
+1045935042 0 c sys/src/libmemlayer/draw.c - 664 sys sys 1045933975 4082
+1045941599 0 c sys/src/libsunrpc/client.c - 664 sys sys 1045941140 8862

+ 1 - 0
sys/lib/mimetype

@@ -37,6 +37,7 @@
 .executable	application	octet-stream	-		n # DOS executable
 .exz		application	octet-stream	gzip		n # gzipped DOS executable
 .f		text		plain		-		y # fortran-77 program
+.fm		application	octet-stream	-		y # frame maker
 .f90		text		plain		-		y # fortran-90 program
 .flc		video		x-flc		-		m
 .fli		video		x-fli		-		m

+ 6 - 0
sys/src/libmemlayer/draw.c

@@ -150,6 +150,12 @@ if(drawdebug)	iprint("drawclip dstcr %R srccr %R maskcr %R\n", dst->clipr, src->
 	if(sl){
 		if(sl->clear){
 			src = sl->screen->image;
+			if(dl != nil){
+				r.min.x -= dl->delta.x;
+				r.min.y -= dl->delta.y;
+				r.max.x -= dl->delta.x;
+				r.max.y -= dl->delta.y;
+			}
 			goto Top;
 		}
 		/* relatively rare case; use save area */

+ 1 - 1
sys/src/libsunrpc/client.c

@@ -248,7 +248,7 @@ if(cli->chatty) print("resend %lux %lud %lud\n", o->xid, t, o->t);
 			for(i=0; i<nout; i++){
 				o = out[i];
 				if(o->tag == tag){
-					o[i--] = o[--nout];
+					out[i--] = out[--nout];
 					strcpy(o->err, "flushed");
 					free(o->p);
 					o->p = nil;