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

[w3m-dev 03398] auxbindir

Browse Source 
* 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>
This commit is contained in:
Fumitoshi UKAI
2002-11-09 21:55:24 +00:00
parent f5c7af1d39
commit d7ed8ae7d7
11 changed files with 123 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+28 -1
View File
@@ -1,3 +1,30 @@
2002-11-10 Fumitoshi UKAI <ukai@debian.or.jp>
* [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/)
2002-11-09 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> 2002-11-09 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03396] Re: meta refresh problem * [w3m-dev 03396] Re: meta refresh problem
@@ -4446,4 +4473,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.490 2002/11/08 17:32:50 ukai Exp $ $Id: ChangeLog,v 1.491 2002/11/09 21:55:24 ukai Exp $
NEWS
+2
View File
@@ -1,5 +1,7 @@
w3m 0.3.3 or 0.4? w3m 0.3.3 or 0.4?
* separate auxbindir and libdir (local-CGI, file:///$LIB/)
* configure: -auxbindir
* rc: disable_secret_security_check (for windows?) * rc: disable_secret_security_check (for windows?)
* tab browsing * tab browsing
* rc: open_tab_blank, close_tab_back * rc: open_tab_blank, close_tab_back
XMakefile
+18 -8
View File
@@ -1,4 +1,4 @@
# $Id: XMakefile,v 1.30 2002/11/06 03:50:49 ukai Exp $ # $Id: XMakefile,v 1.31 2002/11/09 21:55:24 ukai Exp $
SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \ SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
form.c map.c frame.c rc.c menu.c mailcap.c image.c\ form.c map.c frame.c rc.c menu.c mailcap.c image.c\
func.c cookie.c history.c backend.c $(KEYBIND_SRC) func.c cookie.c history.c backend.c $(KEYBIND_SRC)
@@ -21,7 +21,7 @@ INFLATE=inflate$(EXT)
IMGDISPLAY=w3mimgdisplay$(EXT) IMGDISPLAY=w3mimgdisplay$(EXT)
MAN1=doc/w3m.1 MAN1=doc/w3m.1
MAN1_JA=doc-jp/w3m.1 MAN1_JA=doc-jp/w3m.1
TARGETS=$(TARGET) $(EXT_TARGETS) TARGETS=$(TARGET) $(LIB_TARGETS) $(AUXBIN_TARGETS)
HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \ HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \
w3mhelp-lynx_en.html w3mhelp-lynx_ja.html w3mhelp-lynx_en.html w3mhelp-lynx_ja.html
@@ -121,6 +121,7 @@ install: install-core install-scripts
install-core: $(TARGETS) install-core: $(TARGETS)
-$(MKDIR) $(DESTDIR)$(BIN_DIR) -$(MKDIR) $(DESTDIR)$(BIN_DIR)
-$(MKDIR) $(DESTDIR)$(AUXBIN_DIR)
-$(MKDIR) $(DESTDIR)$(LIB_DIR) -$(MKDIR) $(DESTDIR)$(LIB_DIR)
-$(MKDIR) $(DESTDIR)$(HELP_DIR) -$(MKDIR) $(DESTDIR)$(HELP_DIR)
-$(MKDIR) $(DESTDIR)$(MAN1_DIR) -$(MKDIR) $(DESTDIR)$(MAN1_DIR)
@@ -129,13 +130,18 @@ install-core: $(TARGETS)
$(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html $(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
$(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1_DIR)/$(TARGET).1 $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1_DIR)/$(TARGET).1
$(INSTALL_DATA) $(MAN1_JA) $(DESTDIR)$(MAN1_JA_DIR)/$(TARGET).1 $(INSTALL_DATA) $(MAN1_JA) $(DESTDIR)$(MAN1_JA_DIR)/$(TARGET).1
for file in $(EXT_TARGETS); \ for file in $(AUXBIN_TARGETS); \
do \ do \
case $$file in \ case $$file in \
$(IMGDISPLAY)) $(INSTALL_W3MIMGDISPLAY) $$file $(DESTDIR)$(LIB_DIR)/$$file;; \ $(IMGDISPLAY)) $(INSTALL_W3MIMGDISPLAY) $$file $(DESTDIR)$(AUXBIN_DIR)/$$file;; \
*) $(INSTALL_PROGRAM) $$file $(DESTDIR)$(LIB_DIR)/$$file;; \ *) $(INSTALL_PROGRAM) $$file $(DESTDIR)$(AUXBIN_DIR)/$$file;; \
esac; \ esac; \
done done
for file in $(LIB_TARGETS); \
do \
$(INSTALL_PROGRAM) $$file $(DESTDIR)$(LIB_DIR)/$$file;; \
done
install-helpfile: install-helpfile:
-$(MKDIR) $(DESTDIR)$(HELP_DIR) -$(MKDIR) $(DESTDIR)$(HELP_DIR)
@@ -147,19 +153,23 @@ install-helpfile:
all-scripts: all-scripts:
for dir in $(SCRIPTSUBDIRS); \ for dir in $(SCRIPTSUBDIRS); \
do \ do \
(cd $$dir; $(MAKE) PERL='$(PERL)' BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' RC_DIR='$(RC_DIR)' KEYBIND_SRC='$(KEYBIND_SRC)'); \ (cd $$dir; $(MAKE) PERL='$(PERL)' BIN_DIR='$(BIN_DIR)' AUXBIN_DIR='$(AUXBIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' RC_DIR='$(RC_DIR)' KEYBIND_SRC='$(KEYBIND_SRC)'); \
done done
install-scripts: all-scripts install-scripts: all-scripts
topdir=`pwd`; \ topdir=`pwd`; \
for dir in $(SCRIPTSUBDIRS); \ for dir in $(SCRIPTSUBDIRS); \
do \ do \
(cd $$dir; $(MAKE) PERL='$(PERL)' MKDIR='$(MKDIR)' BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' MAN_DIR='$(MAN_DIR)' DESTDIR='$(DESTDIR)' INSTALL="sh $$topdir/install-sh" install); \ (cd $$dir; $(MAKE) PERL='$(PERL)' MKDIR='$(MKDIR)' BIN_DIR='$(BIN_DIR)' AUXBIN_DIR='$(AUXBIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' MAN_DIR='$(MAN_DIR)' DESTDIR='$(DESTDIR)' INSTALL="sh $$topdir/install-sh" install); \
done done
uninstall: uninstall:
-rm -f $(BIN_DIR)/$(TARGET) -rm -f $(BIN_DIR)/$(TARGET)
-for file in $(EXT_TARGETS); \ -for file in $(AUXBIN_TARGETS); \
do \
rm -f $(AUXBIN_DIR)/$$file; \
done
-for file in $(LIB_TARGETS); \
do \ do \
rm -f $(LIB_DIR)/$$file; \ rm -f $(LIB_DIR)/$$file; \
done done
config.h.dist
+6 -3
View File
@@ -65,7 +65,8 @@
#ifdef makefile_parameter #ifdef makefile_parameter
BIN_DIR = /usr/local/bin BIN_DIR = /usr/local/bin
LIB_DIR = /usr/local/lib/w3m AUXBIN_DIR = /usr/local/lib/w3m
LIB_DIR = /usr/local/lib/w3m/cgi-bin
HELP_DIR = /usr/local/share/w3m HELP_DIR = /usr/local/share/w3m
MAN_DIR = /usr/local/man MAN_DIR = /usr/local/man
MAN1_DIR = $(MAN_DIR)/man1 MAN1_DIR = $(MAN_DIR)/man1
@@ -84,7 +85,8 @@ EXT=
MATHLIB=-lm MATHLIB=-lm
Z_CFLAGS=-I/usr/include Z_CFLAGS=-I/usr/include
ZLIB=-L/usr/lib -lz ZLIB=-L/usr/lib -lz
EXT_TARGETS=$(BOOKMARKER) $(HELPER) $(INFLATE) AUXBIN_TARGETS=$(INFLATE)
LIB_TARGETS=$(BOOKMARKER) $(HELPER)
IMGCFLAGS= IMGCFLAGS=
IMGLDFLAGS= IMGLDFLAGS=
IMGX11CFLAGS= IMGX11CFLAGS=
@@ -150,7 +152,8 @@ INSTALL_W3MIMGDISPLAY=$(INSTALL_PROGRAM)
/* for USE_MIGEMO */ /* for USE_MIGEMO */
#define DEF_MIGEMO_COMMAND "migemo -t egrep /usr/share/migemo/migemo-dict" #define DEF_MIGEMO_COMMAND "migemo -t egrep /usr/share/migemo/migemo-dict"
#define LIB_DIR "/usr/local/lib/w3m" #define AUXBIN_DIR "/usr/local/lib/w3m"
#define LIB_DIR "/usr/local/lib/w3m/cgi-bin"
#define HELP_DIR "/usr/local/lib/w3m" #define HELP_DIR "/usr/local/lib/w3m"
#define ETC_DIR "/usr/local/etc/w3m" #define ETC_DIR "/usr/local/etc/w3m"
#define HELP_FILE "w3mhelp.html" #define HELP_FILE "w3mhelp.html"
configure
Vendored
+31 -7
View File
@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $Id: configure,v 1.84 2002/11/06 14:58:03 ukai Exp $ # $Id: configure,v 1.85 2002/11/09 21:55:24 ukai Exp $
# Configuration. # Configuration.
# #
@@ -58,6 +58,9 @@ do
-bindir=*|--bindir=*) -bindir=*|--bindir=*)
bindir=`expr "$1" : "-*bindir=\(.*\)"` bindir=`expr "$1" : "-*bindir=\(.*\)"`
;; ;;
-auxbindir=*|--auxbindir=*)
auxbindir=`expr "$1" : "-*auxbindir=\(.*\)"`
;;
-libdir=*|--libdir=*) -libdir=*|--libdir=*)
libdir=`expr "$1" : "-*libdir=\(.*\)"` libdir=`expr "$1" : "-*libdir=\(.*\)"`
;; ;;
@@ -123,7 +126,8 @@ do
echo "-yes, -nonstop Set all parameters to the default" echo "-yes, -nonstop Set all parameters to the default"
echo "-prefix=DIR Specify prefix (default: /usr/local)" echo "-prefix=DIR Specify prefix (default: /usr/local)"
echo "-bindir=DIR user executable in DIR (default: PREFIX/bin)" echo "-bindir=DIR user executable in DIR (default: PREFIX/bin)"
echo "-libdir=DIR program executables in DIR (default: PREFIX/lib/w3m)" echo "-auxbindir=DIR support programs in DIR (default: PREFIX/lib/w3m)"
echo "-libdir=DIR local cgi in DIR (default: PREFIX/lib/w3m/cgi-bin)"
echo "-helpdir=DIR help file in DIR (default: PREFIX/share/w3m)" echo "-helpdir=DIR help file in DIR (default: PREFIX/share/w3m)"
echo "-mandir=DIR manual in DIR (default: PREFIX/man)" echo "-mandir=DIR manual in DIR (default: PREFIX/man)"
echo "-sysconfdir=DIR w3mconfig in DIR [PREFIX/etc/w3m]" echo "-sysconfdir=DIR w3mconfig in DIR [PREFIX/etc/w3m]"
@@ -577,18 +581,35 @@ readdir "$d_bindir"
bindir=$_dir bindir=$_dir
echo "bindir='$bindir'" >> config.param echo "bindir='$bindir'" >> config.param
d_libdir=$libdir d_auxbindir=$auxbindir
if [ -z "$d_libdir" ]; then if [ -z "$d_auxbindir" ]; then
case "$sysname" in case "$sysname" in
*BSD) *BSD)
d_libdir="$topdir/libexec/w3m" d_auxbindir="$topdir/libexec/w3m"
;; ;;
*) *)
d_libdir="$topdir/lib/w3m" d_auxbindir="$topdir/lib/w3m"
;; ;;
esac esac
fi fi
echo "Which directory do you want to put the support binary files?" echo "Which directory do you want to put the support binary files?"
Echo "(default: $d_auxbindir) "
readdir "$d_auxbindir"
auxbindir=$_dir
echo "auxbindir='$auxbindir'" >> config.param
d_libdir=$libdir
if [ -z "$d_libdir" ]; then
case "$sysname" in
*BSD)
d_libdir="$topdir/libexec/w3m/cgi-bin"
;;
*)
d_libdir="$topdir/lib/w3m/cgi-bin"
;;
esac
fi
echo "Which directory do you want to use local cgi?"
Echo "(default: $d_libdir) " Echo "(default: $d_libdir) "
readdir "$d_libdir" readdir "$d_libdir"
libdir=$_dir libdir=$_dir
@@ -2292,6 +2313,7 @@ $def_matrix
#ifdef makefile_parameter #ifdef makefile_parameter
BIN_DIR = $bindir BIN_DIR = $bindir
AUXBIN_DIR = $auxbindir
LIB_DIR = $libdir LIB_DIR = $libdir
HELP_DIR = $helpdir HELP_DIR = $helpdir
MAN_DIR = $mandir MAN_DIR = $mandir
@@ -2312,7 +2334,8 @@ EXT=$extension
MATHLIB=$mathlib MATHLIB=$mathlib
Z_CFLAGS=$z_cflags Z_CFLAGS=$z_cflags
ZLIB=$zlib ZLIB=$zlib
EXT_TARGETS=\$(BOOKMARKER) \$(HELPER) $inflate $imgtarget AUXBIN_TARGETS=$inflate $imgtarget
LIB_TARGETS=\$(BOOKMARKER) \$(HELPER)
IMGCFLAGS=$imgx11cflags $imgfbcflags IMGCFLAGS=$imgx11cflags $imgfbcflags
IMGLDFLAGS=$imgx11ldflags $imgfbldflags IMGLDFLAGS=$imgx11ldflags $imgfbldflags
IMGX11CFLAGS=$imgx11cflags IMGX11CFLAGS=$imgx11cflags
@@ -2380,6 +2403,7 @@ $def_use_xface
/* for USE_MIGEMO */ /* for USE_MIGEMO */
#define DEF_MIGEMO_COMMAND "$def_migemo_command" #define DEF_MIGEMO_COMMAND "$def_migemo_command"
#define AUXBIN_DIR "$auxbindir"
#define LIB_DIR "$libdir" #define LIB_DIR "$libdir"
#define HELP_DIR "$helpdir" #define HELP_DIR "$helpdir"
#define ETC_DIR "$sysconfdir" #define ETC_DIR "$sysconfdir"
file.c
+9 -9
View File
@@ -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 "fm.h"
#include <sys/types.h> #include <sys/types.h>
#include "myctype.h" #include "myctype.h"
@@ -163,7 +163,7 @@ static struct compression_decoder {
int type; int type;
char *ext; char *ext;
char *mime_type; char *mime_type;
int libfile_p; int auxbin_p;
char *cmd; char *cmd;
char *name; char *name;
char *encoding; char *encoding;
@@ -372,7 +372,7 @@ examineFile(char *path, URLFile *uf)
#define S_IXANY (S_IXUSR|S_IXGRP|S_IXOTH) #define S_IXANY (S_IXUSR|S_IXGRP|S_IXOTH)
int int
check_command(char *cmd, int libfile_p) check_command(char *cmd, int auxbin_p)
{ {
static char *path = NULL; static char *path = NULL;
Str dirs; Str dirs;
@@ -382,8 +382,8 @@ check_command(char *cmd, int libfile_p)
if (path == NULL) if (path == NULL)
path = getenv("PATH"); path = getenv("PATH");
if (libfile_p) if (auxbin_p)
dirs = Strnew_charp(w3m_lib_dir()); dirs = Strnew_charp(w3m_auxbin_dir());
else else
dirs = Strnew_charp(path); dirs = Strnew_charp(path);
for (p = dirs->ptr; p != NULL; p = np) { for (p = dirs->ptr; p != NULL; p = np) {
@@ -413,7 +413,7 @@ acceptableEncoding()
return encodings->ptr; return encodings->ptr;
l = newTextList(); l = newTextList();
for (d = compression_decoders; d->type != CMP_NOCOMPRESS; d++) { 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); pushText(l, d->encoding);
} }
} }
@@ -514,7 +514,7 @@ xface2xpm(char *xface)
struct stat st; struct stat st;
xpm = tmpfname(TMPF_DFL, ".xpm")->ptr; 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) if (!f)
return NULL; return NULL;
fprintf(f, "%s", xface); fprintf(f, "%s", xface);
@@ -7383,8 +7383,8 @@ uncompress_stream(URLFile *uf)
} }
for (d = compression_decoders; d->type != CMP_NOCOMPRESS; d++) { for (d = compression_decoders; d->type != CMP_NOCOMPRESS; d++) {
if (uf->compression == d->type) { if (uf->compression == d->type) {
if (d->libfile_p) if (d->auxbin_p)
expand_cmd = libFile(d->cmd); expand_cmd = auxbinFile(d->cmd);
else else
expand_cmd = d->cmd; expand_cmd = d->cmd;
expand_name = d->name; expand_name = d->name;
image.c
+3 -3
View File
@@ -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 "fm.h"
#include <sys/types.h> #include <sys/types.h>
@@ -57,7 +57,7 @@ getCharSize()
tmp = Strnew(); tmp = Strnew();
if (!strchr(Imgdisplay, '/')) 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); Strcat_m_charp(tmp, Imgdisplay, " -test 2> /dev/null", NULL);
f = popen(tmp->ptr, "r"); f = popen(tmp->ptr, "r");
if (!f) if (!f)
@@ -127,7 +127,7 @@ openImgdisplay()
for (i = 3; i < FOPEN_MAX; i++) for (i = 3; i < FOPEN_MAX; i++)
close(i); close(i);
if (!strchr(Imgdisplay, '/')) if (!strchr(Imgdisplay, '/'))
cmd = Strnew_m_charp(w3m_lib_dir(), "/", Imgdisplay, NULL)->ptr; cmd = Strnew_m_charp(w3m_auxbin_dir(), "/", Imgdisplay, NULL)->ptr;
else else
cmd = Imgdisplay; cmd = Imgdisplay;
execl("/bin/sh", "sh", "-c", cmd, NULL); execl("/bin/sh", "sh", "-c", cmd, NULL);
indep.c
+7 -1
View File
@@ -1,4 +1,4 @@
/* $Id: indep.c,v 1.24 2002/08/27 16:35:15 ukai Exp $ */ /* $Id: indep.c,v 1.25 2002/11/09 21:55:24 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <stdio.h> #include <stdio.h>
#include <pwd.h> #include <pwd.h>
@@ -748,6 +748,12 @@ w3m_dir(const char *name, char *dft)
#endif #endif
} }
char *
w3m_auxbin_dir()
{
return w3m_dir("W3M_AUXBIN_DIR", AUXBIN_DIR);
}
char * char *
w3m_lib_dir() w3m_lib_dir()
{ {
indep.h
+2 -1
View File
@@ -1,4 +1,4 @@
/* $Id: indep.h,v 1.9 2002/08/20 17:49:39 ukai Exp $ */ /* $Id: indep.h,v 1.10 2002/11/09 21:55:24 ukai Exp $ */
#ifndef INDEP_H #ifndef INDEP_H
#define INDEP_H #define INDEP_H
#include "gc.h" #include "gc.h"
@@ -50,6 +50,7 @@ extern Str Str_form_quote(Str x);
extern Str Str_form_unquote(Str x); extern Str Str_form_unquote(Str x);
extern char *shell_quote(char *str); extern char *shell_quote(char *str);
extern char *w3m_auxbin_dir();
extern char *w3m_lib_dir(); extern char *w3m_lib_dir();
extern char *w3m_etc_dir(); extern char *w3m_etc_dir();
extern char *w3m_help_dir(); extern char *w3m_help_dir();
proto.h
+2 -1
View File
@@ -1,4 +1,4 @@
/* $Id: proto.h,v 1.52 2002/11/06 03:50:49 ukai Exp $ */ /* $Id: proto.h,v 1.53 2002/11/09 21:55:24 ukai Exp $ */
/* /*
* This file was automatically generated by version 1.7 of cextract. * This file was automatically generated by version 1.7 of cextract.
* Manual editing not recommended. * Manual editing not recommended.
@@ -528,6 +528,7 @@ extern void panel_set_option(struct parsed_tagarg *);
extern void sync_with_option(void); extern void sync_with_option(void);
extern char *rcFile(char *base); extern char *rcFile(char *base);
extern char *etcFile(char *base); extern char *etcFile(char *base);
extern char *auxbinFile(char *base);
extern char *libFile(char *base); extern char *libFile(char *base);
extern char *helpFile(char *base); extern char *helpFile(char *base);
extern void setLocalCookie(void); extern void setLocalCookie(void);
rc.c
+15 -1
View File
@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.59 2002/11/06 03:27:04 ukai Exp $ */ /* $Id: rc.c,v 1.60 2002/11/09 21:55:24 ukai Exp $ */
/* /*
* Initialization file etc. * Initialization file etc.
*/ */
@@ -1483,6 +1483,16 @@ rcFile(char *base)
} }
} }
char *
auxbinFile(char *base)
{
Str file = Strnew_charp(w3m_auxbin_dir());
Strcat_char(file, '/');
Strcat_charp(file, base);
return expandName(file->ptr);
}
#if 0 /* not used */
char * char *
libFile(char *base) libFile(char *base)
{ {
@@ -1491,6 +1501,7 @@ libFile(char *base)
Strcat_charp(file, base); Strcat_charp(file, base);
return expandName(file->ptr); return expandName(file->ptr);
} }
#endif
char * char *
etcFile(char *base) etcFile(char *base)
@@ -1501,6 +1512,7 @@ etcFile(char *base)
return expandName(file->ptr); return expandName(file->ptr);
} }
#ifndef USE_HELP_CGI
char * char *
helpFile(char *base) helpFile(char *base)
{ {
@@ -1509,3 +1521,5 @@ helpFile(char *base)
Strcat_charp(file, base); Strcat_charp(file, base);
return expandName(file->ptr); return expandName(file->ptr);
} }
#endif