diff options
| -rw-r--r-- | file.c | 8 | ||||
| -rw-r--r-- | image.c | 36 | 
2 files changed, 22 insertions, 22 deletions
| @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.211 2003/01/29 17:10:32 ukai Exp $ */ +/* $Id: file.c,v 1.212 2003/01/29 17:26:51 ukai Exp $ */  #include "fm.h"  #include <sys/types.h>  #include "myctype.h" @@ -6615,12 +6615,12 @@ loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src, int internal)      if (htmlenv1.title)  	newBuf->buffername = htmlenv1.title;      if (w3m_halfdump) { -        TRAP_OFF; +	TRAP_OFF;  	print_internal_information(&htmlenv1);  	return;      }      if (w3m_backend) { -        TRAP_OFF; +	TRAP_OFF;  	print_internal_information(&htmlenv1);  	backend_halfdump_buf = htmlenv1.buf;  	return; @@ -6650,7 +6650,7 @@ loadHTMLString(Str page)      newBuf = newBuffer(INIT_BUFFER_WIDTH);      if (SETJMP(AbortLoading) != 0) { -        TRAP_OFF; +	TRAP_OFF;  	discardBuffer(newBuf);  	return NULL;      } @@ -1,4 +1,4 @@ -/* $Id: image.c,v 1.30 2003/01/29 17:10:40 ukai Exp $ */ +/* $Id: image.c,v 1.31 2003/01/29 17:26:52 ukai Exp $ */  #include "fm.h"  #include <sys/types.h> @@ -344,13 +344,13 @@ loadImage(Buffer *buf, int flag)  	    continue;  	if (cache->pid) {  	    kill(cache->pid, SIGKILL); -/* -#ifdef HAVE_WAITPID -	    waitpid(cache->pid, &wait_st, 0); -#else -	    wait(&wait_st); -#endif -*/ +	    /* +	     * #ifdef HAVE_WAITPID +	     * waitpid(cache->pid, &wait_st, 0); +	     * #else +	     * wait(&wait_st); +	     * #endif +	     */  	    cache->pid = 0;  	}  	if (!stat(cache->file, &st)) { @@ -373,13 +373,13 @@ loadImage(Buffer *buf, int flag)  	    continue;  	if (cache->pid) {  	    kill(cache->pid, SIGKILL); -/* -#ifdef HAVE_WAITPID -	    waitpid(cache->pid, &wait_st, 0); -#else -	    wait(&wait_st); -#endif -*/ +	    /* +	     * #ifdef HAVE_WAITPID +	     * waitpid(cache->pid, &wait_st, 0); +	     * #else +	     * wait(&wait_st); +	     * #endif +	     */  	    cache->pid = 0;  	}  	unlink(cache->touch); @@ -427,9 +427,9 @@ loadImage(Buffer *buf, int flag)  	flush_tty();  	if ((cache->pid = fork()) == 0) {  	    Buffer *b; -/* -	    setup_child(TRUE, 0, -1); -*/ +	    /* +	     * setup_child(TRUE, 0, -1); +	     */  	    setup_child(FALSE, 0, -1);  	    image_source = cache->file;  	    b = loadGeneralFile(cache->url, cache->current, NULL, 0, NULL); | 
