Browse Source

Plan 9 from Bell Labs 2006-09-01

David du Colombier 14 years ago
parent
commit
267f1e3bc4
4 changed files with 12 additions and 10 deletions
  1. 3 5
      dist/replica/_plan9.db
  2. 1 1
      dist/replica/plan9.db
  3. 1 0
      dist/replica/plan9.log
  4. 7 4
      sys/src/cmd/htmlroff/char.c

+ 3 - 5
dist/replica/_plan9.db

@@ -1277,7 +1277,7 @@ lib/face/48x48x2/x - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/y - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/z - 20000000775 sys sys 1020895710 0
 lib/face/48x48x4 - 20000000775 sys sys 944941894 0
-lib/face/48x48x4/.dict - 664 sys sys 1150202436 3276
+lib/face/48x48x4/.dict - 664 sys sys 1156993280 3337
 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
@@ -1391,7 +1391,7 @@ lib/face/48x48x4/x/xigh.1 - 664 sys sys 1142019024 1204
 lib/face/48x48x4/y - 20000000775 sys sys 944941894 0
 lib/face/48x48x4/z - 20000000775 sys sys 944941894 0
 lib/face/48x48x8 - 20000000775 sys sys 944941834 0
-lib/face/48x48x8/.dict - 664 sys sys 1142017869 2523
+lib/face/48x48x8/.dict - 664 sys sys 1156993289 2648
 lib/face/48x48x8/Z - 20000000775 sys sys 944941832 0
 lib/face/48x48x8/a - 20000000775 sys sys 944941832 0
 lib/face/48x48x8/a/axel.1 - 664 sys sys 1056983599 473
@@ -12259,7 +12259,7 @@ sys/src/cmd/htmlfmt/mkfile - 664 sys sys 1034015650 297
 sys/src/cmd/htmlfmt/util.c - 664 sys sys 1015364025 1765
 sys/src/cmd/htmlroff - 20000000775 sys sys 1138396082 0
 sys/src/cmd/htmlroff/a.h - 664 sys sys 1138396079 3200
-sys/src/cmd/htmlroff/char.c - 664 sys sys 1138396079 2178
+sys/src/cmd/htmlroff/char.c - 664 sys sys 1157078288 2295
 sys/src/cmd/htmlroff/html.c - 664 sys sys 1147180952 3992
 sys/src/cmd/htmlroff/input.c - 664 sys sys 1138396079 3147
 sys/src/cmd/htmlroff/main.c - 664 sys sys 1138396080 1065
@@ -15655,5 +15655,3 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-lib/face/48x48x4/.dict - 664 sys sys 1156993280 3337
-lib/face/48x48x8/.dict - 664 sys sys 1156993289 2648

+ 1 - 1
dist/replica/plan9.db

@@ -12259,7 +12259,7 @@ sys/src/cmd/htmlfmt/mkfile - 664 sys sys 1034015650 297
 sys/src/cmd/htmlfmt/util.c - 664 sys sys 1015364025 1765
 sys/src/cmd/htmlroff - 20000000775 sys sys 1138396082 0
 sys/src/cmd/htmlroff/a.h - 664 sys sys 1138396079 3200
-sys/src/cmd/htmlroff/char.c - 664 sys sys 1138396079 2178
+sys/src/cmd/htmlroff/char.c - 664 sys sys 1157078288 2295
 sys/src/cmd/htmlroff/html.c - 664 sys sys 1147180952 3992
 sys/src/cmd/htmlroff/input.c - 664 sys sys 1138396079 3147
 sys/src/cmd/htmlroff/main.c - 664 sys sys 1138396080 1065

+ 1 - 0
dist/replica/plan9.log

@@ -30335,3 +30335,4 @@
 1156983145 0 c 386/bin/ip/imap4d - 775 sys sys 1156976707 238121
 1156995007 0 c lib/face/48x48x4/.dict - 664 sys sys 1156993280 3337
 1156995007 1 c lib/face/48x48x8/.dict - 664 sys sys 1156993289 2648
+1157079606 0 c sys/src/cmd/htmlroff/char.c - 664 sys sys 1157078288 2295

+ 7 - 4
sys/src/cmd/htmlroff/char.c

@@ -27,19 +27,22 @@ rune2html(Rune r)
 			sysfatal("fork: %r");
 		case 0:
 			dup(p[0], 0);
-			dup(p[0], 1);
+			dup(p[1], 1);
+			close(p[0]);
 			close(p[1]);
 			execl("/bin/tcs", "tcs", "-t", "html", nil);
 			_exits(0);
 		default:
-			close(p[0]);
 			fd = p[1];
-			Binit(&b, fd, OREAD);
+			Binit(&b, p[0], OREAD);
 			break;
 		}
 	}
-	fprint(fd, "%C\n", r);
+	/* HACK: extra newlines force rune+\n through tcs now */
+	fprint(fd, "%C\n\n\n\n", r);
 	q = Brdline(&b, '\n');
+	while (q != nil && *q == '\n')
+		q = Brdline(&b, '\n');
 	if(q == nil)
 		sysfatal("tcs: early eof");
 	q[Blinelen(&b)-1] = 0;