diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-11-09 21:55:24 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-11-09 21:55:24 +0000 |
| commit | d7ed8ae7d7525b4e2e6896f5980fd2069656fcc6 (patch) | |
| tree | 6a233307a4025b421101836f0a12b17e57d280e1 /image.c | |
| parent | [w3m-dev 03396] Re: meta refresh problem (diff) | |
| download | w3m-d7ed8ae7d7525b4e2e6896f5980fd2069656fcc6.tar.gz w3m-d7ed8ae7d7525b4e2e6896f5980fd2069656fcc6.zip | |
[w3m-dev 03398] auxbindir
* XMakefile: EXT_TARGETS -> LIB_TARGETS, AUXBIN_TARGETS
* config.h.dist: add AUXBIN_DIR
LIB_DIR is cgi-bin
* configure: add -auxbindir
add AUXBIN_DIR
LIB_DIR is cgi-bin
EXT_TARGETS -> LIB_TARGETS, AUXBIN_TARGETS
* file.c (compression_decoder): libfile_p -> auxbin_p
(check_command): libfile_p -> auxbin_p
use w3m_auxbin_dir() instead of w3m_lib_dir()
(acceptableEncoding): libfile_p -> auxbin_p
(xface2xpm): use auxbinFile() instead of libFile()
(uncompress_stream): libfile_p -> auxbin_p
use auxbinFile() instead of libFile()
* image.c (getCharSize): use w3m_auxbin_dir() instead of w3m_lib_dir()
(openImgdisplay): use w3m_auxbin_dir() instead of w3m_lib_dir()
* indep.c (w3m_auxbin_dir): added
* indep.h (w3m_auxbin_dir): added
* proto.h (auxbinFile): added
* rc.c (auxbinFile): added
(libFile): #if 0, no longer used
(helpFile): used only #ifndef USE_HELP_CGI
* NEWS: separate auxbindir and libdir (local-CGI, file:///$LIB/)
From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat (limited to 'image.c')
| -rw-r--r-- | image.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: image.c,v 1.15 2002/11/06 15:05:35 ukai Exp $ */ +/* $Id: image.c,v 1.16 2002/11/09 21:55:24 ukai Exp $ */ #include "fm.h" #include <sys/types.h> @@ -57,7 +57,7 @@ getCharSize() tmp = Strnew(); if (!strchr(Imgdisplay, '/')) - Strcat_m_charp(tmp, w3m_lib_dir(), "/", NULL); + Strcat_m_charp(tmp, w3m_auxbin_dir(), "/", NULL); Strcat_m_charp(tmp, Imgdisplay, " -test 2> /dev/null", NULL); f = popen(tmp->ptr, "r"); if (!f) @@ -127,7 +127,7 @@ openImgdisplay() for (i = 3; i < FOPEN_MAX; i++) close(i); if (!strchr(Imgdisplay, '/')) - cmd = Strnew_m_charp(w3m_lib_dir(), "/", Imgdisplay, NULL)->ptr; + cmd = Strnew_m_charp(w3m_auxbin_dir(), "/", Imgdisplay, NULL)->ptr; else cmd = Imgdisplay; execl("/bin/sh", "sh", "-c", cmd, NULL); |