xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

npage: recover from failing pipeline

Browse source
This commit is contained in:
cinap_lenrek 2011-09-12 04:40:22 +02:00
parent f97c0fc1c9
commit 1e9e10b68e
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sys/src/cmd/npage.c
View file

@ -151,6 +151,18 @@ createtmp(ulong id, char *pfx)
return create(nam, OEXCL|ORCLOSE|ORDWR, 0600); return create(nam, OEXCL|ORCLOSE|ORDWR, 0600);
} }
int
catchnote(void *, char *msg)
{
if(strstr(msg, "sys: write on closed pipe"))
return 1;
if(strstr(msg, "hangup"))
return 1;
if(strstr(msg, "alarm"))
return 1;
return 0;
}
void void
pipeline(int fd, char *fmt, ...) pipeline(int fd, char *fmt, ...)
{ {
@ -179,6 +191,7 @@ pipeline(int fd, char *fmt, ...)
va_start(arg, fmt); va_start(arg, fmt);
vsnprint(buf, sizeof buf, fmt, arg); vsnprint(buf, sizeof buf, fmt, arg);
va_end(arg); va_end(arg);
argv[0] = "rc"; argv[0] = "rc";
argv[1] = "-c"; argv[1] = "-c";
argv[2] = buf; argv[2] = buf;
@ -261,7 +274,12 @@ popenpdf(Page *p)
while((n = read(gs->pdat, buf, sizeof buf)) > 0){ while((n = read(gs->pdat, buf, sizeof buf)) > 0){
if(memcmp(buf, "THIS IS NOT AN INFERNO BITMAP\n", 30) == 0) if(memcmp(buf, "THIS IS NOT AN INFERNO BITMAP\n", 30) == 0)
break; break;
write(pfd[1], buf, n); if(pfd[1] < 0)
continue;
if(write(pfd[1], buf, n) != n){
close(pfd[1]);
pfd[1]=-1;
}
} }
qunlock(gs); qunlock(gs);
exits(nil); exits(nil);
@ -415,7 +433,8 @@ popengs(Page *p)
if((ofd = createtmp((ulong)p, nam)) < 0) if((ofd = createtmp((ulong)p, nam)) < 0)
ofd = dup(nullfd, -1); ofd = dup(nullfd, -1);
} }
write(ofd, buf, n); if(write(ofd, buf, n) != n)
break;
} }
if(ofd >= 0) if(ofd >= 0)
close(ofd); close(ofd);
@ -604,7 +623,7 @@ loadpage(Page *p)
close(fd); close(fd);
} }
if(p->image == nil && p->text == nil) if(p->image == nil && p->text == nil)
p->text = smprint("error: %r"); p->text = smprint("%s: %r", p->label);
} }
p->gen = pagegen; p->gen = pagegen;
} }
@ -1007,6 +1026,7 @@ main(int argc, char *argv[])
*/ */
rfork(RFNOTEG|RFNAMEG|RFREND); rfork(RFNOTEG|RFNAMEG|RFREND);
atexit(killcohort); atexit(killcohort);
atnotify(catchnote, 1);
if(newwin > 0){ if(newwin > 0){
s = smprint("-pid %d", getpid()); s = smprint("-pid %d", getpid());
if(newwindow(s) < 0) if(newwindow(s) < 0)