From d7ed8ae7d7525b4e2e6896f5980fd2069656fcc6 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Sat, 9 Nov 2002 21:55:24 +0000
Subject: [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>

---
 file.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'file.c')

diff --git a/file.c b/file.c
index 960f2af..fbf9f1c 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.113 2002/11/08 15:46:06 ukai Exp $ */
+/* $Id: file.c,v 1.114 2002/11/09 21:55:24 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
@@ -163,7 +163,7 @@ static struct compression_decoder {
     int type;
     char *ext;
     char *mime_type;
-    int libfile_p;
+    int auxbin_p;
     char *cmd;
     char *name;
     char *encoding;
@@ -372,7 +372,7 @@ examineFile(char *path, URLFile *uf)
 #define S_IXANY	(S_IXUSR|S_IXGRP|S_IXOTH)
 
 int
-check_command(char *cmd, int libfile_p)
+check_command(char *cmd, int auxbin_p)
 {
     static char *path = NULL;
     Str dirs;
@@ -382,8 +382,8 @@ check_command(char *cmd, int libfile_p)
 
     if (path == NULL)
 	path = getenv("PATH");
-    if (libfile_p)
-	dirs = Strnew_charp(w3m_lib_dir());
+    if (auxbin_p)
+	dirs = Strnew_charp(w3m_auxbin_dir());
     else
 	dirs = Strnew_charp(path);
     for (p = dirs->ptr; p != NULL; p = np) {
@@ -413,7 +413,7 @@ acceptableEncoding()
 	return encodings->ptr;
     l = newTextList();
     for (d = compression_decoders; d->type != CMP_NOCOMPRESS; d++) {
-	if (check_command(d->cmd, d->libfile_p)) {
+	if (check_command(d->cmd, d->auxbin_p)) {
 	    pushText(l, d->encoding);
 	}
     }
@@ -514,7 +514,7 @@ xface2xpm(char *xface)
     struct stat st;
 
     xpm = tmpfname(TMPF_DFL, ".xpm")->ptr;
-    f = popen(Sprintf("%s > %s", libFile(XFACE2XPM), xpm)->ptr, "w");
+    f = popen(Sprintf("%s > %s", auxbinFile(XFACE2XPM), xpm)->ptr, "w");
     if (!f)
 	return NULL;
     fprintf(f, "%s", xface);
@@ -7383,8 +7383,8 @@ uncompress_stream(URLFile *uf)
     }
     for (d = compression_decoders; d->type != CMP_NOCOMPRESS; d++) {
 	if (uf->compression == d->type) {
-	    if (d->libfile_p)
-		expand_cmd = libFile(d->cmd);
+	    if (d->auxbin_p)
+		expand_cmd = auxbinFile(d->cmd);
 	    else
 		expand_cmd = d->cmd;
 	    expand_name = d->name;
-- 
cgit v1.2.3