storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround of GC crash on Cygwin64

Browse Source 
Patch from <http://www.j10n.org/files/w3m-cvs-1.1055-win64gc.patch>,
[w3m-dev:04469] on 2013-10-14.
This commit is contained in:
AIDA Shinra
2013-10-14 22:31:01 +09:00
committed by Tatsuya Kinoshita
parent dbd52ac2ca
commit ec81194f38
13 changed files with 447 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
image.c
View File

@@ -90,17 +90,18 @@ termImage()
static int
openImgdisplay()
{
char *cmd;
if (!strchr(Imgdisplay, '/'))
cmd = Strnew_m_charp(w3m_auxbin_dir(), "/", Imgdisplay, NULL)->ptr;
else
cmd = Imgdisplay;
Imgdisplay_pid = open_pipe_rw(&Imgdisplay_rf, &Imgdisplay_wf);
if (Imgdisplay_pid < 0)
goto err0;
if (Imgdisplay_pid == 0) {
/* child */
char *cmd;
setup_child(FALSE, 2, -1);
if (!strchr(Imgdisplay, '/'))
cmd = Strnew_m_charp(w3m_auxbin_dir(), "/", Imgdisplay, NULL)->ptr;
else
cmd = Imgdisplay;
myExec(cmd);
/* XXX: ifdef __EMX__, use start /f ? */
}
@@ -333,6 +334,9 @@ loadImage(Buffer *buf, int flag)
struct stat st;
int i, draw = FALSE;
/* int wait_st; */
#ifdef DONT_CALL_GC_AFTER_FORK
char *loadargs[7];
#endif
if (maxLoadImage > MAX_LOAD_IMAGE)
maxLoadImage = MAX_LOAD_IMAGE;
@@ -433,6 +437,24 @@ loadImage(Buffer *buf, int flag)
image_cache[i] = cache;
flush_tty();
#ifdef DONT_CALL_GC_AFTER_FORK
loadargs[0] = MyProgramName;
loadargs[1] = "-$$getimage";
loadargs[2] = conv_to_system(cache->url);
loadargs[3] = conv_to_system(parsedURL2Str(cache->current)->ptr);
loadargs[4] = cache->file;
loadargs[5] = cache->touch;
loadargs[6] = NULL;
if ((cache->pid = fork()) == 0) {
setup_child(FALSE, 0, -1);
execvp(MyProgramName, loadargs);
exit(1);
}
else if (cache->pid < 0) {
cache->pid = 0;
return;
}
#else /* !DONT_CALL_GC_AFTER_FORK */
if ((cache->pid = fork()) == 0) {
Buffer *b;
/*
@@ -458,6 +480,7 @@ loadImage(Buffer *buf, int flag)
cache->pid = 0;
return;
}
#endif /* !DONT_CALL_GC_AFTER_FORK */
}
}