shithub: riscv

Info  •  Files  •  Log  •  Branches

page: generalize html support

--- a/sys/src/cmd/page.c

+++ b/sys/src/cmd/page.c

@@ -148,7 +148,7 @@

 {

 	char nam[64];

-	snprint(nam, sizeof nam, "%s%s%.12d%.8lux", pagespool, pfx, getpid(), id ^ 0xcafebabe);

+	snprint(nam, sizeof nam, "%s%s%.12d%.8lux", pagespool, pfx, getpid(), id);

 	return create(nam, OEXCL|ORCLOSE|ORDWR, 0600);

 }

@@ -323,10 +323,10 @@

 		addpage(p, shortname(buf), popenfile, strdup(buf), -1);

 	}

 	close(fd);

+	p->text = strdup(p->label);

 	return -1;

 }

-

 typedef struct Ghost Ghost;

 struct Ghost

 {

@@ -623,7 +623,9 @@

 		p->data = "lp -dstdout";

 		p->open = popengs;

 	}

-	else if(memcmp(buf, "<?xml", 5) == 0){

+	else if(cistrncmp(buf, "<?xml", 5) == 0 ||

+		cistrncmp(buf, "<!DOCTYPE", 9) == 0 ||

+		cistrncmp(buf, "<HTML", 5) == 0){

 		p->data = "htmlfmt -c utf8 | lp -dstdout";

 		p->open = popengs;

 	}