From 7c9198f5a17c5cd8f28cf4c28a4d6a6db0ff031b Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Thu, 14 Feb 2002 03:50:03 +0000 Subject: [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 From: Hironori Sakamoto --- ChangeLog | 9 ++++++++- image.c | 8 ++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index efb1d80..bf8edda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-02-14 Hironori Sakamoto + + * [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 * [w3m-dev 03048] garbage of images on the right edge of termical. @@ -2931,4 +2938,4 @@ * release-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 $ diff --git a/image.c b/image.c index 831b803..c184b6a 100644 --- a/image.c +++ b/image.c @@ -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 @@ -53,7 +53,7 @@ getCharSize() tmp = Strnew(); 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); f = popen(tmp->ptr, "r"); if (!f) @@ -115,7 +115,7 @@ openImgdisplay() dup2(fdr[1], 1); close(2); if (!strchr(Imgdisplay, '/')) - cmd = Strnew_m_charp(LIB_DIR, "/", Imgdisplay, NULL)->ptr; + cmd = Strnew_m_charp(w3m_lib_dir(), "/", Imgdisplay, NULL)->ptr; else cmd = Imgdisplay; execl("/bin/sh", "sh", "-c", cmd, NULL); @@ -594,7 +594,7 @@ getImageSize(ImageCache * cache) return FALSE; tmp = Strnew(); 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), " 2> /dev/null", NULL); f = popen(tmp->ptr, "r"); -- cgit v1.2.3