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

[w3m-dev 03055] LIB_DIR -> w3m_lib_dir()

Browse Source 
* image.c (getCharSize): s/LIB_DIR/w3m_lib_dir()/
* image.c (openImgdisplay): ditto
* image.c (getImageSize): ditto
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-02-14 03:50:03 +00:00
parent 9e8ad273fc
commit 7c9198f5a1
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,10 @@
2002-02-14 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03055] LIB_DIR -> w3m_lib_dir()
* image.c (getCharSize): s/LIB_DIR/w3m_lib_dir()/
* image.c (openImgdisplay): ditto
* image.c (getImageSize): ditto
2002-02-14 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> 2002-02-14 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03048] garbage of images on the right edge of termical. * [w3m-dev 03048] garbage of images on the right edge of termical.
@@ -2931,4 +2938,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.317 2002/02/14 03:47:48 ukai Exp $ $Id: ChangeLog,v 1.318 2002/02/14 03:50:03 ukai Exp $

8
image.c
View File

@@ -1,4 +1,4 @@
/* $Id: image.c,v 1.6 2002/02/09 15:24:58 ukai Exp $ */ /* $Id: image.c,v 1.7 2002/02/14 03:50:03 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <sys/types.h> #include <sys/types.h>
@@ -53,7 +53,7 @@ getCharSize()
tmp = Strnew(); tmp = Strnew();
if (!strchr(Imgdisplay, '/')) if (!strchr(Imgdisplay, '/'))
Strcat_m_charp(tmp, LIB_DIR, "/", NULL); Strcat_m_charp(tmp, w3m_lib_dir(), "/", NULL);
Strcat_m_charp(tmp, Imgdisplay, " -test 2> /dev/null", NULL); Strcat_m_charp(tmp, Imgdisplay, " -test 2> /dev/null", NULL);
f = popen(tmp->ptr, "r"); f = popen(tmp->ptr, "r");
if (!f) if (!f)
@@ -115,7 +115,7 @@ openImgdisplay()
dup2(fdr[1], 1); dup2(fdr[1], 1);
close(2); close(2);
if (!strchr(Imgdisplay, '/')) if (!strchr(Imgdisplay, '/'))
cmd = Strnew_m_charp(LIB_DIR, "/", Imgdisplay, NULL)->ptr; cmd = Strnew_m_charp(w3m_lib_dir(), "/", Imgdisplay, NULL)->ptr;
else else
cmd = Imgdisplay; cmd = Imgdisplay;
execl("/bin/sh", "sh", "-c", cmd, NULL); execl("/bin/sh", "sh", "-c", cmd, NULL);
@@ -594,7 +594,7 @@ getImageSize(ImageCache * cache)
return FALSE; return FALSE;
tmp = Strnew(); tmp = Strnew();
if (!strchr(Imgsize, '/')) if (!strchr(Imgsize, '/'))
Strcat_m_charp(tmp, LIB_DIR, "/", NULL); Strcat_m_charp(tmp, w3m_lib_dir(), "/", NULL);
Strcat_m_charp(tmp, Imgsize, " ", shell_quote(cache->file), Strcat_m_charp(tmp, Imgsize, " ", shell_quote(cache->file),
" 2> /dev/null", NULL); " 2> /dev/null", NULL);
f = popen(tmp->ptr, "r"); f = popen(tmp->ptr, "r");