Index: Changelog.local =================================================================== RCS file: Changelog.local diff -N Changelog.local --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Changelog.local 14 Jan 2008 15:39:36 -0000 1.31 @@ -0,0 +1,297 @@ + + $Id: Changelog.local,v 1.31 2008-01-14 15:39:36 izumi Exp $ + +ローカルな変更点。 + checkin されている最新の正規版との差(パッチ)は + % cvs -q diff -Npu -r w3m + で得られるはず。 + + w3m 0.4.2 に適用するパッチは + % cvs -q diff -Npu -r w3m-0_4_2 + + インストール + Debian 3.1 では Boem GC が libgc1, libgc-dev パッケージで入手できるので + configure で --with-gc=/gc を指定しなくてもよい。 + + % ./configure \ + --enable-japanese=E \ + --enable-image \ + --with-migemo="/usr/bin/migemo -t egrep /usr/share/migemo/migemo-dict" \ + --with-editor=/usr/bin/editor \ + --enable-keymap=lynx \ + --with-browser=/usr/bin/galeon + % make + % make install install-helpfiles + install-helpfiles しないと LIST_KEYBIND で説明文が出ない。 + + --with-imagelib は指定しなくても gtk2 gdk-pixbuf imlib imlib2 から + 適当に見繕ってくれる。特にどれかを強制したいのでなければ指定は不要。 + pkg-config と libgdk-pixbuf{2,-gnome2}, libimlib2-dev + あたりのパッケージを入れておけばよさそう。 + libgdk-pixbuf ならアニメーションを扱える。 + +[変更点] + * FORM の INPUT 要素で ACCESSKEY を使えるようにした。 + - US-ASCII 限定(HTML 4.01 では ISO10646 の1文字)。 + - TEXTAREA も対象外。 + - LEGEND, LABEL 等は全く見ない。 + * w3mbookmark コマンドに description も渡すようにした。 + * 半ページスクロールするためのコマンド(NEXT_HALFPAGE, PREV_HALFPAGE)を + 導入した。 + * META 要素の NAME, CONTENT を情報パネルに表示するように変更した。 + * 文字列操作関数 StrXXX の char * 型の仮引数に const 修飾子をつけた。 + * RFC2396 に準拠した URI の解釈。(indep.c) + 今ではほとんど不要かも。 + * 文字実体参照では大文字小文字を区別する。 + * HTTP の通信記録をファイルに残す(-DHTTPLOG オプションでコンパイル)。 + * LIST_KEYBIND コマンドでキー割り当ての一覧を表示する。 + * scripts/w3mmail.cgi.in + - ブロックする問題を修正。 + - Base64 エンコードの障害を回避。 + - In-Reply-To が指定されても大丈夫なようにした。 + - malto:?to=xxx の形式に対応した。 + * scripts/w3mman/w3mman2html.cgi.in + :: を含むマニュアルも参照できるように変更。 + * make install する際に strip する。 + * COMMAND (M-c), DEFINE_KEY (M-k) コマンドでコマンド名を補完できるように変更。 + ファイル名の補完処理に強引に埋め込んだだけで細部の調整はしていない。 + PIPE_SOURCE コマンドでのフィルタ名の補完機能もつけてみた。 + 特に、 + - / を含むコマンドはないので、/ の扱いを考慮していない。 + 入力文字列が / を含む場合には問題が生じるかも。 + - 文字コードの変換もしていない。 + - フィルタ名の補完は /cgi-bin/ の中のみで、 + file:///$LIB/ か file:///cgi-bin/ の後ろを補完する。 + /cgi-bin/ の場合は /cgi-bin で表されるディレクトリを対象にする。 + ディレクトリが複数指定されていても最初の1つだけを使う。 + +[希望] + * リロードした際に Content-Type が変化していればそれを反映させる。 + * HEAD, TRACE, OPTIONS メソッドを送って結果を確認する機能が欲しい。 + * リンク一覧にあらゆるリンクを含める。 + OBJECT の DATA, SCRIPT の SRC など。 + * LINK 要素の ACCESSKEY にも対応する。 + * Q 要素の扱い。文脈に応じて適当な引用符をつける。 + w3m 0.4.2 では対応された様子。 + - まずは「」をつける。 + - 引用中の引用を『』で表せると嬉しいかもしれない。 + - LANG 属性に応じて ` ' " < > なども使うか。 + * リンク一覧とページ情報のページから fragment ID だけの URI + <... HREF="#fragment" ...>をたどれない問題を解決する。 + * フィルタ機能 (doc-jp/README.filter 参照) + 外部フィルタでページを処理できるようにしたい。 + Local CGI でほぼ間に合うが、細部を考えると + 専用のインタフェースがあることが望ましく思える。 + - 相対 URI の解決。 + - リファラーをどうするか? + フィルタ処理で画像(IMG)を追加した場合、 + - リロード。 + * 画像のリロードを可能にしたい。 + また、 Expose イベントを処理できるようにもしたい。 + +2007年 10月 14日 + * この変更で UTF-8 の端末でフォーム入力関連の文字化けが起こる現象を + 修正できると思う。 + +2007年 8月 14日 + * 一時ファイルを置くディレクトリ階層を設けた。 + /tmp が使えれば使う。 + 使えなければエラーメッセージを出すが動作は従来通り rc_dir を使う。 + +2007年 7月 24日 + * w3m-0.5.2 に更新した。 + +2007年 3月 26日 + * Form がないページで ACCESSKEY を使おうとすると SIGSEGV が発生する問題を + 修正した。 + +2007年 2月 12日 + * ACCESSKEY のメニューで、 FORM 要素の ID 属性を NAME 属性より + 優先して使うように修正した。 + +2007年 2月 7日 + * INPUT 要素の ACCESSKEY 属性に対応した。 + +2007年 2月 4日 + * w3mbookmark コマンドに description も渡すようにした。 + +2006年 12月 27日 + * 半ページスクロールするためのコマンド(NEXT_HALFPAGE, PREV_HALFPAGE)を + 導入した。 + keybind_lynx.c での SPC, \M-SPC をこれに割り当てるように変更した。 + keybind_lynx.c main.c proto.h + cvs diff -pu -D2006-12-27 -D'2006-12-27 20:00:00' で差分が採れる。 + * META 要素の NAME, CONTENT を情報パネルに表示するように変更した。 + buffer.c file.c fm.h html.c map.c + +2006年 11月 28日 + * w3m-0.5.1 をマージした際にうまく更新できていないファイルが + あるようだったので更新した。 + +2004年 5月 10日 + * タグ名 w3m-orig-0_3 を w3m-0_3 に変更し、 + 関係するログの文面からも -orig を削除しておく。 + % cvs rtag -r w3m-orig-0_3 w3m-0_3 www/ua/w3m + % cvs rtag -d w3m-orig-0_3 www/ua/w3m + はいいのだが、 + % cvs admin -mw3m-0_3:"$( w3m + w3m-0_2_2-inu-1_1 => w3m-inu + リリースタグも + w3m-orig-0_2_2-inu-1_1 => w3m-0_2_2-inu-1_1 + w3m-orig-0_2_1 => w3m-0_2_1 + に変更した。 + + * w3m-0.2.2-inu-1.1 に変更をマージした。 + % cvs import -ko www/ua/w3m w3m-0_2_2-inu-1_1 w3m-orig-0_2_2-inu-1_1 + w3m-iz-0_2_2-inu_1_1 のタグで登録する。 + +Nov 30 2001 + +ローカルを枝として扱っていたところ、 link.c の管理で cvs が + +cvs: rcs.c:4350: RCS_checkout: Assertion `rev == ((void *)0) || (__ctype_b[(int) (((unsigned char) *rev))] & (unsigned short int) _ISdigit)' failed. + +のエラーを吐いて異常終了するようになった。 +面倒なのでローカルの版を幹として扱うようにする。 +0.1.11-pre で使っていたパッチを 0.2.1 に当て、いくつかの機能変更も追加した。 + +w3m-orig-0_2_1 のタグ名で import し、 w3m-iz-0_2_1 のタグで登録する。 + +% cvs import -ko www/ua/w3m w3m-0_2_1 w3m-orig-0_2_1 + +変更内容 + + * パスの解釈を RFC 2396 に合わせた(#define RFC2396 した場合)。 + + * HTTPLOG を #define してコンパイルした場合に + 指定されたファイルに HTTP のログを残す機能を追加した。 + ファイルはオプション設定画面で設定する。 + + - cc のコンパイルオプションに -DHTTPLOG を追加した。 + + - HTTP のログを残す機能で Multipart/Form-Data の場合の + Request Body を記録する/しないを指定できるように変更した。 + + * LINK 要素を扱う機能を追加した。 + 情報パネルに LINK 要素を反映させる。 + + * XMakefile がない場合は XMakefile.dist からコピーするように修正した。 + + * キーバインドを変更した。 + C-e, C-y は vi と同様の動作をする。 + ESC / で逆向き検索。 + ESC C-a, ESC C-e で文書の先頭/末尾に飛ぶ。 + + * Referer URL を正規化するようにした。 + url.c:otherinfo() 参照。 + + * nntp スキームの場合にも Subject を MIME デコードするようにした。 + file.c + + * 複数行に跨る MIME デコードの復号化方法を変更した(mimehead.c)。 + + * 文字実体参照の扱い(indep.c) + lt,gt, ... の扱いを小文字に限る。 + + +インストール + + % ./configure + + % make Index: Makefile.in =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/Makefile.in,v retrieving revision 1.1.1.3 diff -u -p -u -r1.1.1.3 Makefile.in --- Makefile.in 23 Jul 2007 13:06:50 -0000 1.1.1.3 +++ Makefile.in 8 Oct 2007 22:17:36 -0000 @@ -43,7 +43,7 @@ DEFS = @DEFS@ -DAUXBIN_DIR=\"$(AUXBIN_DI -DCGIBIN_DIR=\"$(CGIBIN_DIR)\" -DHELP_DIR=\"$(HELP_DIR)\" \ -DETC_DIR=\"$(ETC_DIR)\" -DCONF_DIR=\"$(CONF_DIR)\" \ -DRC_DIR=\"$(RC_DIR)\" \ - -DLOCALEDIR=\"$(localedir)\" + -DLOCALEDIR=\"$(localedir)\" -DHTTPLOG LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ EXT_LIBS = -L. -lindep @LIBINTL@ @LIBGC@ @@ -71,6 +71,7 @@ MKDIR=mkdir -p MV=mv RM=rm AR=ar +STRIP=strip INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ INSTALL_SCRIPT=@INSTALL_SCRIPT@ @@ -87,12 +88,11 @@ MODEL=@W3M_TARGET@-@W3M_LANG@ 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 \ symbol.c entity.c terms.c url.c ftp.c mimehead.c regex.c news.c \ - func.c cookie.c history.c backend.c $(KEYBIND_SRC) + func.c cookie.c history.c backend.c keymap.c filter.c $(KEYBIND_SRC) OBJS=main.o file.o buffer.o display.o etc.o search.o linein.o table.o local.o\ form.o map.o frame.o rc.o menu.o mailcap.o image.o \ symbol.o entity.o terms.o url.o ftp.o mimehead.o regex.o news.o \ - func.o cookie.o history.o backend.o $(KEYBIND_OBJ) -LSRCS=anchor.c parsetagx.c tagtable.c istream.c + func.o cookie.o history.o backend.o keymap.o filter.o $(KEYBIND_OBJ) LOBJS=anchor.o parsetagx.o tagtable.o istream.o LLOBJS=version.o ALIBOBJS=Str.o indep.o regex.o textlist.o parsetag.o myctype.o hash.o @@ -117,7 +117,7 @@ HELP_TARGET=w3mhelp.html HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \ w3mhelp-lynx_en.html w3mhelp-lynx_ja.html -DEFUNS=$(top_srcdir)/main.c $(top_srcdir)/menu.c +DEFUNS=$(top_srcdir)/main.c $(top_srcdir)/menu.c $(top_srcdir)/filter.c SCRIPTSUBDIRS= scripts SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc po .PHONY: $(SUBDIRS) @@ -214,6 +214,7 @@ install-core: $(TARGETS) -$(MKDIR) $(DESTDIR)$(HELP_DIR) -$(MKDIR) $(DESTDIR)$(mandir)/man1 -$(MKDIR) $(DESTDIR)$(mandir)/ja/man1 + $(STRIP) $(TARGET) $(BOOKMARKER) $(HELPER) $(IMGDISPLAY) $(INFLATE) $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET) $(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/$(HELP_TARGET) $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(mandir)/man1/$(MAN1_TARGET) @@ -237,6 +238,12 @@ install-helpfile: do \ $(INSTALL_DATA) $$file $(DESTDIR)$(HELP_DIR)/$$file; \ done + [ -d $(DESTDIR)$(HELP_DIR)/en ] || $(MKDIR) $(DESTDIR)$(HELP_DIR)/en + cp doc/*.* $(DESTDIR)$(HELP_DIR)/en + cp doc/README $(DESTDIR)$(HELP_DIR)/en + [ -d $(DESTDIR)$(HELP_DIR)/ja ] || $(MKDIR) $(DESTDIR)$(HELP_DIR)/ja + cp doc-jp/*.* $(DESTDIR)$(HELP_DIR)/ja + cp doc-jp/README $(DESTDIR)$(HELP_DIR)/ja install-po: NLSTARGET="$(NLSTARGET)"; for subdir in $$NLSTARGET; \ Index: Str.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/Str.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -p -u -r1.1.1.4 -r1.2 --- Str.c 27 Feb 2003 09:01:25 -0000 1.1.1.4 +++ Str.c 4 Apr 2004 19:04:51 -0000 1.2 @@ -56,7 +56,7 @@ Strnew_size(int n) } Str -Strnew_charp(char *p) +Strnew_charp(const char *p) { Str x; int n; @@ -73,7 +73,7 @@ Strnew_charp(char *p) } Str -Strnew_m_charp(char *p, ...) +Strnew_m_charp(const char *p, ...) { va_list ap; Str r = Strnew(); @@ -87,7 +87,7 @@ Strnew_m_charp(char *p, ...) } Str -Strnew_charp_n(char *p, int n) +Strnew_charp_n(const char *p, int n) { Str x; @@ -140,7 +140,7 @@ Strcopy(Str x, Str y) } void -Strcopy_charp(Str x, char *y) +Strcopy_charp(Str x, const char *y) { int len; @@ -160,7 +160,7 @@ Strcopy_charp(Str x, char *y) } void -Strcopy_charp_n(Str x, char *y, int n) +Strcopy_charp_n(Str x, const char *y, int n) { int len = n; @@ -180,7 +180,7 @@ Strcopy_charp_n(Str x, char *y, int n) } void -Strcat_charp_n(Str x, char *y, int n) +Strcat_charp_n(Str x, const char *y, int n) { int newlen; @@ -209,7 +209,7 @@ Strcat(Str x, Str y) } void -Strcat_charp(Str x, char *y) +Strcat_charp(Str x, const char *y) { if (y == NULL) return; @@ -301,7 +301,7 @@ Strinsert_char(Str s, int pos, char c) } void -Strinsert_charp(Str s, int pos, char *p) +Strinsert_charp(Str s, int pos, const char *p) { STR_LENGTH_CHECK(s); while (*p) @@ -425,12 +425,12 @@ Stralign_center(Str s, int width) #define SP_PREC2 2 Str -Sprintf(char *fmt, ...) +Sprintf(const char *fmt, ...) { int len = 0; int status = SP_NORMAL; int p = 0; - char *f; + const char *f; Str s; va_list ap; Index: Str.h =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/Str.h,v retrieving revision 1.1.1.5 retrieving revision 1.3 diff -u -p -u -r1.1.1.5 -r1.3 --- Str.h 23 Jul 2007 13:06:50 -0000 1.1.1.5 +++ Str.h 23 Jul 2007 16:31:19 -0000 1.3 @@ -30,22 +30,22 @@ typedef struct _Str { Str Strnew(void); Str Strnew_size(int); -Str Strnew_charp(char *); -Str Strnew_charp_n(char *, int); -Str Strnew_m_charp(char *, ...); +Str Strnew_charp(const char *); +Str Strnew_charp_n(const char *, int); +Str Strnew_m_charp(const char *, ...); Str Strdup(Str); void Strclear(Str); void Strfree(Str); void Strcopy(Str, Str); -void Strcopy_charp(Str, char *); -void Strcopy_charp_n(Str, char *, int); -void Strcat_charp_n(Str, char *, int); +void Strcopy_charp(Str, const char *); +void Strcopy_charp_n(Str, const char *, int); +void Strcat_charp_n(Str, const char *, int); void Strcat(Str, Str); -void Strcat_charp(Str, char *); +void Strcat_charp(Str, const char *); void Strcat_m_charp(Str, ...); Str Strsubstr(Str, int, int); void Strinsert_char(Str, int, char); -void Strinsert_charp(Str, int, char *); +void Strinsert_charp(Str, int, const char *); void Strdelete(Str, int, int); void Strtruncate(Str, int); void Strlower(Str); @@ -59,7 +59,7 @@ Str Stralign_left(Str, int); Str Stralign_right(Str, int); Str Stralign_center(Str, int); -Str Sprintf(char *fmt, ...); +Str Sprintf(const char *fmt, ...); Str Strfgets(FILE *); Str Strfgetall(FILE *); Index: anchor.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/anchor.c,v retrieving revision 1.1.1.8 retrieving revision 1.3 diff -u -p -u -r1.1.1.8 -r1.3 --- anchor.c 23 Jul 2007 13:06:50 -0000 1.1.1.8 +++ anchor.c 23 Jul 2007 16:31:19 -0000 1.3 @@ -90,12 +90,17 @@ registerForm(Buffer *buf, FormList *flis { Anchor *a; FormItemList *fi; + char *key; fi = formList_addInput(flist, tag); if (fi == NULL) return NULL; + key = NULL; + parsedtag_get_value(tag, ATTR_ACCESSKEY, &key); buf->formitem = putAnchor(buf->formitem, (char *)fi, flist->target, &a, - NULL, NULL, '\0', line, pos); + NULL, NULL, + (key != NULL)? *(unsigned char *)key: '\0', + line, pos); return a; } Index: backend.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/backend.c,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -p -u -r1.1.1.6 -r1.2 --- backend.c 9 Oct 2005 21:25:24 -0000 1.1.1.6 +++ backend.c 11 Feb 2007 22:48:35 -0000 1.2 @@ -181,8 +181,8 @@ post(TextList *argv) url = p; } if (url) { - request = - newFormList(NULL, "post", charset, enctype, target, NULL, NULL); + request = newFormList(NULL, "post", charset, enctype, target, + NULL, NULL, NULL); request->body = body; request->boundary = boundary; request->length = (length > 0) ? length : (body ? strlen(body) : 0); Index: buffer.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/buffer.c,v retrieving revision 1.1.1.6 retrieving revision 1.4 diff -u -p -u -r1.1.1.6 -r1.4 --- buffer.c 9 Oct 2005 21:25:24 -0000 1.1.1.6 +++ buffer.c 27 Dec 2006 14:06:15 -0000 1.4 @@ -30,11 +30,14 @@ newBuffer(int width) if (n == NULL) return NULL; bzero((void *)n, sizeof(Buffer)); + n->metalist = NULL; n->width = width; n->COLS = COLS; n->LINES = LASTLINE; n->currentURL.scheme = SCM_UNKNOWN; n->baseURL = NULL; + n->origURL = NULL; + n->orig_source = NULL; n->baseTarget = NULL; n->buffername = ""; n->bufferprop = BP_NORMAL; @@ -533,6 +536,7 @@ reshapeBuffer(Buffer *buf) buf->formitem = NULL; buf->formlist = NULL; buf->linklist = NULL; + buf->metalist = NULL; buf->maplist = NULL; if (buf->hmarklist) buf->hmarklist->nmark = 0; Index: config.local =================================================================== RCS file: config.local diff -N config.local --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ config.local 27 Nov 2006 19:22:30 -0000 1.5 @@ -0,0 +1,13 @@ +#!/bin/sh + +#GCDIR=$HOME/lib/gc + +set -x +exec ./configure \ + --enable-japanese=E \ + --enable-image \ + --with-imagelib="imlib2" \ + --with-migemo="/usr/bin/migemo -t egrep /usr/share/migemo/migemo-dict" \ + --with-editor=/usr/bin/editor \ + --enable-keymap=lynx \ + --with-browser=/usr/bin/galeon Index: entity.h =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/entity.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -p -u -r1.1.1.2 -r1.2 --- entity.h 23 Mar 2002 15:46:31 -0000 1.1.1.2 +++ entity.h 30 Mar 2002 22:37:17 -0000 1.2 @@ -78,7 +78,7 @@ static HashItem_si MyHashItem[] = { /* 74 */ {"Aacute", 0xC1, NULL}, /* 75 */ {"crarr", 0x21B5, &MyHashItem[76]}, /* 76 */ {"Ouml", 0xD6, &MyHashItem[77]}, - /* 77 */ {"GT", 0x3E, NULL}, + /* 77 */ {"<\0GT\0>", 0x3E, NULL}, /* 78 */ {"clubs", 0x2663, NULL}, /* 79 */ {"scaron", 0x0161, &MyHashItem[80]}, /* 80 */ {"part", 0x2202, NULL}, @@ -88,7 +88,7 @@ static HashItem_si MyHashItem[] = { /* 84 */ {"ugrave", 0xF9, NULL}, /* 85 */ {"darr", 0x2193, &MyHashItem[86]}, /* 86 */ {"uuml", 0xFC, &MyHashItem[87]}, - /* 87 */ {"QUOT", 0x22, NULL}, + /* 87 */ {"<\0QUOT\0>", 0x22, NULL}, /* 88 */ {"Prime", 0x2033, NULL}, /* 89 */ {"zwj", 0x200D, &MyHashItem[90]}, /* 90 */ {"lfloor", 0x230A, &MyHashItem[91]}, @@ -104,7 +104,7 @@ static HashItem_si MyHashItem[] = { /* 100 */ {"mu", 0x03BC, NULL}, /* 101 */ {"or", 0x2228, &MyHashItem[102]}, /* 102 */ {"plusmn", 0xB1, &MyHashItem[103]}, - /* 103 */ {"LT", 0x3C, NULL}, + /* 103 */ {"<\0LT\0>", 0x3C, NULL}, /* 104 */ {"nu", 0x03BD, &MyHashItem[105]}, /* 105 */ {"ograve", 0xF2, &MyHashItem[106]}, /* 106 */ {"AElig", 0xC6, NULL}, @@ -250,7 +250,7 @@ static HashItem_si MyHashItem[] = { /* 246 */ {"there4", 0x2234, &MyHashItem[247]}, /* 247 */ {"larr", 0x2190, &MyHashItem[248]}, /* 248 */ {"uml", 0xA8, &MyHashItem[249]}, - /* 249 */ {"AMP", 0x26, NULL}, + /* 249 */ {"<\0AMP\0>", 0x26, NULL}, /* 250 */ {"Sigma", 0x03A3, &MyHashItem[251]}, /* 251 */ {"Aring", 0xC5, NULL}, /* 252 */ {"yen", 0xA5, NULL}, Index: etc.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/etc.c,v retrieving revision 1.1.1.8 diff -u -p -u -r1.1.1.8 etc.c --- etc.c 23 Jul 2007 13:06:53 -0000 1.1.1.8 +++ etc.c 13 Oct 2007 07:18:23 -0000 @@ -494,6 +494,7 @@ int calcPosition(char *l, Lineprop *pr, int len, int pos, int bpos, int mode) { static int *realColumn = NULL; + // i-th byte corresponds to realColumn[i]-th column width. static int size = 0; static char *prevl = NULL; int i, j; Index: file.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/file.c,v retrieving revision 1.1.1.9 retrieving revision 1.16 diff -u -p -u -r1.1.1.9 -r1.16 --- file.c 23 Jul 2007 13:07:17 -0000 1.1.1.9 +++ file.c 23 Jul 2007 16:31:20 -0000 1.16 @@ -41,6 +41,9 @@ static Buffer *loadcmdout(char *cmd, static void addnewline(Buffer *buf, char *line, Lineprop *prop, Linecolor *color, int pos, int width, int nlines); static void addLink(Buffer *buf, struct parsed_tag *tag); +static int addMetaEntry(Buffer *buf, struct parsed_tag *tag); +static MetaEntryList *appendMetaEntry(Buffer *buf, + const char *name, const char *content); static JMP_BUF AbortLoading; @@ -588,6 +591,12 @@ readHeader(URLFile *uf, Buffer *newBuf, char *tmpf; FILE *src = NULL; Lineprop *propBuffer; +#ifdef HTTPLOG + extern int AppendLog(char *str, int len, char *path); + + /* NOTE: Since StrmyUFgets() removes \r we use here \n instead of \r\n. */ + HTTPLogType > 0 && AppendLog("\n-- Response\n", -1, NULL); +#endif headerlist = newBuf->document_header = newTextList(); if (uf->scheme == SCM_HTTP @@ -610,6 +619,11 @@ readHeader(URLFile *uf, Buffer *newBuf, newBuf->header_source = tmpf; } while ((tmp = StrmyUFgets(uf))->length) { + +#ifdef HTTPLOG + HTTPLogType > 0 && AppendLog(tmp->ptr, -1, NULL); +#endif + #ifdef USE_NNTP if (uf->scheme == SCM_NEWS && tmp->ptr[0] == '.') Strshrinkfirst(tmp, 1); @@ -1679,6 +1693,50 @@ checkRedirection(ParsedURL *pu) return TRUE; } +#ifdef USE_IMAGE +/* + * Haphazard quick hack. + * Since image URL is interpretted as soon as img element appears, + * it is too late to override Buffer->baseURL after a Buffer is created. + */ +static ParsedURL *originalURL = NULL; +#endif + +Buffer * +loadFilterCGI(Str uri, ParsedURL *orig, const char *src) +{ + Buffer *buf; + +#ifdef USE_IMAGE + originalURL = orig; +#endif + + /* conversion required? */ + buf = loadGeneralFile(Str_conv_to_system(uri)->ptr, + NULL, NO_REFERER, 0, NULL); + + if (buf != NULL) { + buf->filename = uri->ptr; + buf->origURL = parsedURL2Str(orig)->ptr; + + if (buf->baseURL == NULL) { + /* Override base URL */ + buf->baseURL = orig; + } + + buf->orig_source = src; + if (buf->buffername == NULL) { + buf->buffername = Sprintf("<%s> filtered by %s", + Currentbuf->buffername, uri->ptr)->ptr; + } + + if (buf->type == NULL) + buf->type = "text/plain"; + } + + return buf; +} + /* * loadGeneralFile: load file to buffer */ @@ -2105,7 +2163,12 @@ loadGeneralFile(char *path, ParsedURL *v proc = loadBuffer; #ifdef USE_IMAGE cur_baseURL = New(ParsedURL); - copyParsedURL(cur_baseURL, &pu); + if (originalURL) { + copyParsedURL(cur_baseURL, originalURL); + originalURL = NULL; + } else { + copyParsedURL(cur_baseURL, &pu); + } #endif current_content_length = 0; @@ -3527,7 +3590,7 @@ Str process_input(struct parsed_tag *tag) { int i, w, v, x, y, z, iw, ih; - char *q, *p, *r, *p2, *s; + char *q, *p, *r, *p2, *s, *key; Str tmp = NULL; char *qq = ""; int qlen = 0; @@ -3551,6 +3614,8 @@ process_input(struct parsed_tag *tag) parsedtag_get_value(tag, ATTR_MAXLENGTH, &i); p2 = NULL; parsedtag_get_value(tag, ATTR_ALT, &p2); + key = NULL; + parsedtag_get_value(tag, ATTR_ACCESSKEY, &key); x = parsedtag_exists(tag, ATTR_CHECKED); y = parsedtag_exists(tag, ATTR_ACCEPT); z = parsedtag_exists(tag, ATTR_READONLY); @@ -3568,6 +3633,7 @@ process_input(struct parsed_tag *tag) break; case FORM_INPUT_RESET: q = "RESET"; + key = NULL; /* RESET should not have an accesskey */ break; /* if no VALUE attribute is specified in * tag, then the value "on" is used @@ -3600,6 +3666,9 @@ process_input(struct parsed_tag *tag) Strcat(tmp, Sprintf("linklist = l; } +/* + * Returns the number of entry (0 or 1) actually added. + */ +static int +addMetaEntry(Buffer *buf, struct parsed_tag *tag) +{ + char *name = NULL, *content = NULL; + int ret = 0; + + parsedtag_get_value(tag, ATTR_NAME, &name); + if (name != NULL) { + parsedtag_get_value(tag, ATTR_CONTENT, &content); + appendMetaEntry(buf, name, content); + ret++; + } + + return ret; +} + +static MetaEntryList * +appendMetaEntry(Buffer *buf, const char *name, const char *content) +{ + MetaEntryList **p, *entry; + + for (p = &buf->metalist; *p != NULL; p = &(*p)->next) + ; + + entry = New(MetaEntryList); + entry->name = (name != NULL)? Strnew_charp(name)->ptr: NULL; + entry->content = (content != NULL)? Strnew_charp(content)->ptr: NULL; + entry->next = NULL; + + *p = entry; + + return entry; +} + void HTMLlineproc2(Buffer *buf, TextLineList *tl) { @@ -8342,6 +8456,7 @@ reloadBuffer(Buffer *buf) is_redisplay = TRUE; buf->allLine = 0; buf->href = NULL; + buf->linklist = NULL; buf->name = NULL; buf->img = NULL; buf->formitem = NULL; Index: filter.c =================================================================== RCS file: filter.c diff -N filter.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ filter.c 27 Nov 2006 19:22:31 -0000 1.3 @@ -0,0 +1,180 @@ +/* $Id: filter.c,v 1.3 2006-11-27 19:22:31 izumi Exp $ */ + +#include "fm.h" +#include +#include +#include +#include "myctype.h" + +static void savePageInfo(const char *path, Buffer *buff); +static int saveW3mEnvs(FILE *fp); +extern Buffer *loadFilterCGI(Str uri, ParsedURL *orig, const char *src); + +/* + * process current resource. + * For example, convert character encoding, translation, ... + * + * Current source information is passed to the user specified CGI program. + * 1. Related information is stored in a temporary file. + * 2. Given Local CGI program is invoked. + * The name of the temporary file is given as a PATH_INFO. + * It contains the original URI and its source file name and header info. + * Previous two can be obtained from environment W3M_URL, W3M_SOURCEFILE. + * + */ +DEFUN(pipeSrc, PIPE_SOURCE, "Process current resource") +{ + Str uri; + ParsedURL *orig; /* Original URI Ref */ + const char *src, *cmd, *h; + char *newsrc; + Buffer *buf; + + if (Currentbuf->sourcefile == NULL) + return; + + CurrentKeyData = NULL; /* not allowed in w3m-control: */ + + src = Currentbuf->orig_source? Currentbuf->orig_source: Currentbuf->sourcefile; + if (access(src, R_OK) < 0) { + Str err = Sprintf("Can't access to source file \"%s\": %s", + src, strerror(errno)); + disp_message(err->ptr, TRUE); + return; + } + cmd = searchKeyData(); + if (cmd == NULL || *cmd == '\0') { + cmd = inputLineHist("Pipe source to: ", "file:///cgi-bin/", IN_CGINAME, ShellHist); + if (cmd == NULL || *cmd == '\0') { + displayBuffer(Currentbuf, B_NORMAL); + return; + } + } + + orig = New(ParsedURL); + copyParsedURL(orig, &Currentbuf->currentURL); + + h = tmpfname(TMPF_DFL, NULL)->ptr; + newsrc = tmpfname(TMPF_SRC, strrchr(src, '.'))->ptr; + link(src, newsrc); + + savePageInfo(h, Currentbuf); + if (strncmp(cmd, "file:", 5) == 0) { + uri = Strnew_charp(cmd); + } else { + uri = Sprintf("file:///cgi-bin/%s", cmd); + /* Str_form_quote(Strnew_charp(h))->ptr */ + } + + buf = loadFilterCGI(uri, orig, newsrc); + /* + * Though, we don't have to unlink h here, + * I prefer to clear unnecessary file. + unlink(h); + */ + + if (buf != NULL) { + pushBuffer(buf); + displayBuffer(Currentbuf, B_FORCE_REDRAW); + } else { + disp_message(Sprintf("Failed to execute \"%s\".", uri->ptr)->ptr, TRUE); + } +} + +static void savePageInfo(const char *path, Buffer *buff) +{ + FILE *fp; + + if ((fp = fopen(path, "wt")) != NULL) { + const TextList *header; + + /* + * Should convert to system character encoding? + */ + /* First, target URI and */ + fprintf(fp, "URI: %s\n", parsedURL2Str(&buff->currentURL)->ptr); + if (buff->baseURL) { + fprintf(fp, "Base: %s\n", parsedURL2Str(buff->baseURL)->ptr); + } + /* + * Note that when executing Local CGI, w3m (child process) chdirs. + * So here I've assumed that buff->sourcefile is an absolute path. + */ + fprintf(fp, "Body-Path: %s\n", buff->sourcefile); + saveW3mEnvs(fp); + fprintf(fp, "--------\n\n"); + + /* Output header information */ + if ((header = buff->document_header) != NULL) { + TextListItem *p; + int j; + + for (j = 0, p = header->first; j < header->nitem; j++, p = p->next) { + fputs(p->ptr, fp); + fputc('\n', fp); + } + } + fclose(fp); + } else { + disp_message("Failed to save page info.", TRUE); + } +} + +static int saveW3mEnvs(FILE *fp) +{ + const char *keys[] = { + "W3M_URL", "W3M_SOURCEFILE", + "W3M_TITLE", "W3M_FILENAME", + "W3M_TYPE", "W3M_CHARSET", + }; + int cnt, j; + + cnt = 0; + for (j = 0; j < sizeof keys/sizeof keys[0]; j++) { + const char *val; + if ((val = getenv(keys[j])) != NULL) { + /* + * Since val may contain strange char, + * it should be escaped. + */ + fprintf(fp, "%s: %s\n", keys[j], val); + cnt++; + } + } + + return cnt; +} + +#if 0 +static char *escapeString(const char *str) +{ + char *p; + + for (p = GC_MALLOC_ATOMIC(strlen(str)*2+1); (*p = *str++) != '\0'; p++) { + switch (*p) { + case '\n': + *p++ = '\\'; + *p = 'n'; + break; + case '\r': + *p++ = '\\'; + *p = 'r'; + break; + case '\t': + *p++ = '\\'; + *p = 't'; + break; + case '\f': + *p++ = '\\'; + *p = 'f'; + break; + case '\\': + *p++ = '\\'; + *p = '\\'; + break; + } + } + + return p; +} +#endif Index: fm.h =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/fm.h,v retrieving revision 1.1.1.8 retrieving revision 1.14 diff -u -p -u -r1.1.1.8 -r1.14 --- fm.h 23 Jul 2007 13:07:18 -0000 1.1.1.8 +++ fm.h 23 Jul 2007 16:31:20 -0000 1.14 @@ -240,6 +240,8 @@ extern int REV_LB[]; #define CPL_ON 0x2 #define CPL_ALWAYS 0x4 #define CPL_URL 0x8 +#define CPL_CGINAME 0x10 /* Complete Local-CGI */ +#define CPL_FUNCNAME 0x20 /* Flags for inputLine() */ #define IN_STRING 0x10 @@ -248,6 +250,8 @@ extern int REV_LB[]; #define IN_COMMAND 0x80 #define IN_URL 0x100 #define IN_CHAR 0x200 +#define IN_CGINAME 0x400 +#define IN_FUNCNAME 0x1000 #define IMG_FLAG_SKIP 1 #define IMG_FLAG_AUTO 2 @@ -421,6 +425,12 @@ typedef struct _LinkList { struct _LinkList *next; } LinkList; +typedef struct _MetaEntryList { + char *name; + char *content; + struct _MetaEntryList *next; +} MetaEntryList; + typedef struct _Buffer { char *filename; char *buffername; @@ -450,6 +460,7 @@ typedef struct _Buffer { AnchorList *name; AnchorList *img; AnchorList *formitem; + MetaEntryList *metalist; LinkList *linklist; FormList *formlist; MapList *maplist; @@ -457,9 +468,13 @@ typedef struct _Buffer { HmarkerList *imarklist; ParsedURL currentURL; ParsedURL *baseURL; + char *origURL; /* Original absolute URIRef + (NULL for nonfiltered page) */ char *baseTarget; int real_scheme; char *sourcefile; + char *orig_source; /* Filterd sourcefile + (NULL for nonfiltered page) */ struct frameset *frameset; struct frameset_queue *frameQ; int *clone; @@ -957,6 +972,10 @@ global char *ExtBrowser init(DEF_EXT_BRO global char *ExtBrowser2 init(NULL); global char *ExtBrowser3 init(NULL); global int BackgroundExtViewer init(TRUE); +#ifdef HTTPLOG +global char *HTTPLogfile init(NULL); +global int HTTPLogType init(FALSE); +#endif global int disable_secret_security_check init(FALSE); global char *passwd_file init(PASSWD_FILE); global char *pre_form_file init(PRE_FORM_FILE); Index: form.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/form.c,v retrieving revision 1.1.1.7 retrieving revision 1.11 diff -u -p -u -r1.1.1.7 -r1.11 --- form.c 9 Oct 2005 21:25:29 -0000 1.1.1.7 +++ form.c 13 Oct 2007 09:04:55 -0000 1.11 @@ -36,7 +36,7 @@ struct { struct form_list * newFormList(char *action, char *method, char *charset, char *enctype, - char *target, char *name, struct form_list *_next) + char *target, char *id, char *name, struct form_list *_next) { struct form_list *l; Str a = Strnew_charp(action); @@ -74,6 +74,7 @@ newFormList(char *action, char *method, #endif l->enctype = e; l->target = target; + l->id = id; l->name = name; l->next = _next; l->nitems = 0; @@ -105,6 +106,7 @@ formList_addInput(struct form_list *fl, item->name = NULL; item->value = item->init_value = NULL; item->readonly = 0; + item->accesskey = '\0'; if (parsedtag_get_value(tag, ATTR_TYPE, &p)) { item->type = formtype(p); if (item->size < 0 && @@ -117,10 +119,13 @@ formList_addInput(struct form_list *fl, item->name = Strnew_charp(p); if (parsedtag_get_value(tag, ATTR_VALUE, &p)) item->value = item->init_value = Strnew_charp(p); + parsedtag_get_value(tag, ATTR_MAXLENGTH, &item->maxlength); item->checked = item->init_checked = parsedtag_exists(tag, ATTR_CHECKED); item->accept = parsedtag_exists(tag, ATTR_ACCEPT); parsedtag_get_value(tag, ATTR_SIZE, &item->size); parsedtag_get_value(tag, ATTR_MAXLENGTH, &item->maxlength); + if (parsedtag_get_value(tag, ATTR_ACCESSKEY, &p)) + item->accesskey = (unsigned char)*p; item->readonly = parsedtag_exists(tag, ATTR_READONLY); if (parsedtag_get_value(tag, ATTR_TEXTAREANUMBER, &i)) item->value = item->init_value = textarea_str[i]; @@ -403,6 +408,7 @@ form_update_line(Line *line, char **str, line->lineBuf = buf; line->propBuf = prop; line->len = len; + line->size = len; return pos; } Index: form.h =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/form.h,v retrieving revision 1.1.1.4 retrieving revision 1.7 diff -u -p -u -r1.1.1.4 -r1.7 --- form.h 9 Oct 2005 21:25:29 -0000 1.1.1.4 +++ form.h 11 Feb 2007 22:48:36 -0000 1.7 @@ -47,6 +47,11 @@ typedef struct form_list { Str action; char *target; char *name; + /* HTML 4.01 Spec. + * name attribute exists for backward compatibility. + * Applications should use the id attribute to identify elements. + */ + char *id; #ifdef USE_M17N wc_ces charset; #endif @@ -87,6 +92,12 @@ typedef struct form_item_list { int rows; int maxlength; int readonly; + /* XXX: According to HTML 4.01 specification, an accesskey is a single + * character from ISO10646. So an unsigned char is insufficient. + * Note that neither SELECT nor OPTION element takes an accesskey, + * but AREA, BUTTON, LABEL, LEGEND etc. does. + */ + unsigned char accesskey; #ifdef MENU_SELECT FormSelectOptionItem *select_option; Str label, init_label; Index: html.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/html.c,v retrieving revision 1.1.1.8 retrieving revision 1.11 diff -u -p -u -r1.1.1.8 -r1.11 --- html.c 23 Jul 2007 13:07:19 -0000 1.1.1.8 +++ html.c 23 Jul 2007 16:31:20 -0000 1.11 @@ -37,8 +37,9 @@ unsigned char ALST_TABLE[] = ATTR_CELLPADDING, ATTR_VSPACE, ATTR_CORE }; #define MAXA_TABLE MAXA_CORE + 6 -unsigned char ALST_META[] = { ATTR_HTTP_EQUIV, ATTR_CONTENT, ATTR_CORE }; -#define MAXA_META MAXA_CORE + 2 +unsigned char ALST_META[] = + { ATTR_HTTP_EQUIV, ATTR_CONTENT, ATTR_NAME, ATTR_CORE }; +#define MAXA_META MAXA_CORE + 3 unsigned char ALST_FRAME[] = { ATTR_SRC, ATTR_NAME, ATTR_CORE }; #define MAXA_FRAME MAXA_CORE + 2 unsigned char ALST_FRAMESET[] = { ATTR_COLS, ATTR_ROWS, ATTR_CORE }; @@ -53,9 +54,9 @@ unsigned char ALST_FORM[] = unsigned char ALST_INPUT[] = { ATTR_TYPE, ATTR_VALUE, ATTR_NAME, ATTR_CHECKED, ATTR_ACCEPT, ATTR_SIZE, ATTR_MAXLENGTH, ATTR_ALT, ATTR_READONLY, ATTR_SRC, ATTR_WIDTH, ATTR_HEIGHT, - ATTR_CORE + ATTR_ACCESSKEY, ATTR_CORE }; -#define MAXA_INPUT MAXA_CORE + 12 +#define MAXA_INPUT (sizeof ALST_INPUT/sizeof ALST_INPUT[0]) unsigned char ALST_TEXTAREA[] = { ATTR_COLS, ATTR_ROWS, ATTR_NAME, ATTR_READONLY, ATTR_CORE }; #define MAXA_TEXTAREA MAXA_CORE + 4 @@ -108,9 +109,10 @@ unsigned char ALST_INPUT_ALT[] = { ATTR_HSEQ, ATTR_FID, ATTR_NO_EFFECT, ATTR_TYPE, ATTR_NAME, ATTR_VALUE, ATTR_CHECKED, ATTR_ACCEPT, ATTR_SIZE, ATTR_MAXLENGTH, ATTR_READONLY, ATTR_TEXTAREANUMBER, - ATTR_SELECTNUMBER, ATTR_ROWS, ATTR_TOP_MARGIN, ATTR_BOTTOM_MARGIN + ATTR_SELECTNUMBER, ATTR_ROWS, ATTR_TOP_MARGIN, ATTR_BOTTOM_MARGIN, + ATTR_ACCESSKEY }; -#define MAXA_INPUT_ALT 16 +#define MAXA_INPUT_ALT (sizeof ALST_INPUT_ALT/sizeof ALST_INPUT_ALT[0]) unsigned char ALST_IMG_ALT[] = { ATTR_SRC, ATTR_WIDTH, ATTR_HEIGHT, ATTR_USEMAP, ATTR_ISMAP, ATTR_HSEQ, ATTR_XOFFSET, ATTR_YOFFSET, ATTR_TOP_MARGIN, ATTR_BOTTOM_MARGIN, Index: indep.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/indep.c,v retrieving revision 1.1.1.8 retrieving revision 1.10 diff -u -p -u -r1.1.1.8 -r1.10 --- indep.c 23 Jul 2007 13:07:19 -0000 1.1.1.8 +++ indep.c 23 Jul 2007 16:31:20 -0000 1.10 @@ -152,6 +152,193 @@ currentdir() return path; } +#define RFC2396 +#ifdef RFC2396 + +static char *shiftstr(char *str, int off); +static char *lastSegment(const char *path); +static int reduceCurrent(char *path); +static int reduceParent(char *path); +static int removeLeadingDots(char *path); + +/* + * If you don't want absolute path to begin with "/..", + * set following variable to 1. + */ +static int discardLeadingDots = 0; + +/* + * Resolves relative path according to RFC2396 5.2 6) c)-f). + * Given path must begin with '/' and must not contain + * fragment identifier. + * + * "/abc/def/g/h/.././x" => "/abc/def/g/x" + */ +char * +cleanupName(char *path) +{ + char *buff, *query; + int c = 0; + + buff = allocStr(path, -1); + + /* erase query part before resolve. */ + if ((query = strchr(path, '?')) != NULL) { + /* Remove query part for a while */ + buff[query - path] = '\0'; + } + + /* remove "." segments. */ + c += reduceCurrent(buff); + + /* remove ".." segments. */ + c += reduceParent(buff); + + if (discardLeadingDots) { + removeLeadingDots(buff); + } + + /* recover query part */ + if (query != NULL) { + strcat(buff, query); + } + + return buff; +} + +/* + * remove "." segments. + */ +static int +reduceCurrent(char *path) +{ + char *p; + int cnt = 0; + + p = path; + /* c) All occurrences of ./ are removed */ + while (*p != '\0') { + if (strncmp(p, "./", 2) == 0 && (p <= path || *(p-1) == '/')) { + shiftstr(p, 2); + cnt++; + } else { + p++; + } + } + + /* d) remove trailing "." */ + if (p > path && *(p-1) == '.') { + if (p > path + 1) { + if (*(p-2) == '/') { + *(p-1) = '\0'; + cnt++; + } + } else { + /* empty string (Original path was "././." or so) */ + *(p-1) = '\0'; + cnt++; + } + } + + return cnt; +} + +/* memmove might be used */ +static char * +shiftstr(char *str, int off) +{ + char *p = str + off; + while ((*str++ = *p++) != '\0'); +} + +/* + * remove ".." segments. + */ +static int +reduceParent(char *path) +{ + char *p, *q; + char *seg; + int cnt = 0; + int len; + + q = path; + + /* e) All occurrences of /../ ( != "..") are removed */ + while ((p = strstr(q, "/../")) != NULL) { + if (p > q) { + *p = '\0'; + seg = lastSegment(q); + if (discardLeadingDots || strcmp(seg, "..") != 0) { + shiftstr(seg, p+4-seg); + cnt++; + } else { + /* + * path begins with "../../" (or "//../). + * we don't want to change this path. + */ + /* restore '/' */ + *p = '/'; + q = p + 4; + } + } else { + /* path begins with "/../". skip it. */ + q = p + 3; + } + } + + /* d) remove trailing /.. ( != "..") */ + len = strlen(path) - 3; + if (len > 0 && strcmp(path+len, "/..") == 0) { + path[len] = '\0'; + seg = lastSegment(path); + if (discardLeadingDots || strcmp(seg, "..") != 0) { + *seg = '\0'; + cnt++; + } else { + path[len] = '/'; + } + } + + return cnt; +} + +/* + * Find last path segment. + */ +static char * +lastSegment(const char *path) +{ + char *p; + + return ((p = strrchr(path, '/')) != NULL)? p + 1: (char *)path; +} + +/* + * Remove leading "/.." from absolute path. + * Returns the number of removed "/..". + */ +static int +removeLeadingDots(char *path) +{ + char *p; + int cnt = 0; + + for (p = path; strncmp(p, "/..", 3) == 0 && (p[3] == '\0' || p[3] == '/'); p += 3) + cnt++; + + if (p > path) { + shiftstr(path, p-path); + if (path[0] == '\0') { + path[0] = '/'; + path[1] = '\0'; + } + } + + return cnt; +} + +#else /* RFC2396 */ char * cleanupName(char *name) { @@ -214,6 +401,7 @@ cleanupName(char *name) } return buf; } +#endif char * expandPath(char *name) @@ -448,7 +636,16 @@ getescapechar(char **str) q = p; for (p++; IS_ALNUM(*p); p++) ; q = allocStr(q, p - q); - if (strcasestr("lt gt amp quot nbsp", q) && *p != '=') { +#if 1 + /* + * A character entity SHOULD be terminated with ";". + * HTML 4.01 specification insists so, + * but the trailing ";" is not mandatory. + */ + if (*p == ';') + p++; +#else + if (strstr("lt gt amp quot nbsp", q) && *p != '=') { /* a character entity MUST be terminated with ";". However, * there's MANY web pages which uses < , > or something * like them as <, >, etc. Therefore, we treat the most @@ -465,6 +662,8 @@ getescapechar(char **str) *str = p; return -1; } +#endif + *str = p; return getHash_si(&entity, q, -1); } Index: keybind_lynx.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/keybind_lynx.c,v retrieving revision 1.1.1.5 retrieving revision 1.8 diff -u -p -u -r1.1.1.5 -r1.8 --- keybind_lynx.c 23 Jul 2007 13:07:19 -0000 1.1.1.5 +++ keybind_lynx.c 23 Jul 2007 16:31:20 -0000 1.8 @@ -23,7 +23,7 @@ unsigned char GlobalKeymap[128] = { /* C-x C-y C-z C-[ C-\ C-] C-^ C-_ */ nulcmd, nulcmd, susp, escmap, nulcmd, nulcmd, nulcmd, nulcmd, /* SPC ! " # $ % & ' */ - pgFore, execsh, reMark, pipesh, linend, nulcmd, nulcmd, nulcmd, + pgHalfFore, execsh, reMark, pipesh, linend, nulcmd, nulcmd, nulcmd, /* ( ) * + , - . / */ undoPos, redoPos, nulcmd, pgFore, col1L, pgBack, col1R, srchfor, /* 0 1 2 3 4 5 6 7 */ @@ -58,7 +58,7 @@ unsigned char EscKeymap[128] = { /* C-x C-y C-z C-[ C-\ C-] C-^ C-_ */ nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, /* SPC ! " # $ % & ' */ - nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, + pgHalfBack, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, /* ( ) * + , - . / */ nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, /* 0 1 2 3 4 5 6 7 */ Index: keymap.c =================================================================== RCS file: keymap.c diff -N keymap.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ keymap.c 17 Mar 2004 16:43:15 -0000 1.5 @@ -0,0 +1,190 @@ +/* + * Display Current Key Bindings. + * + * $Id: keymap.c,v 1.5 2004-03-17 16:43:15 izumi Exp $ + */ + +#include + +#include "fm.h" + +#define KEYMAP_LEN 128 + +static int numberOfFunctions(); + +static char *descFile(); +static char **ReadDescription(const char *filename); +static char **DescriptionList(FILE *fp); +static Str ListKeyBind(const char *prefix, + const unsigned char keymap[], int size, char **desc); +static char *Description(int code, char **desc); +static Str CharString(int code); + +static int MaxFunc = 0; + +Str +ListKeyBindings() +{ + Str list; + char **descriptions; + char *path; + + path = descFile(); + descriptions = ReadDescription(path); + + list = Strnew(); + Strcat_charp(list, "Current Key Bindings\n"); + Strcat_charp(list, "\n"); + Strcat_charp(list, "

キー割り当て一覧

\n"); + Strcat_charp(list, "\n"); + Strcat_charp(list, "

キー	機能	説明\n"); + Strcat(list, ListKeyBind(" ", GlobalKeymap, KEYMAP_LEN, descriptions)); + Strcat_charp(list, "
━━━━ ESC- ━━━━━━━━━━━━━━━\n"); + Strcat(list, ListKeyBind(" M-", EscKeymap, KEYMAP_LEN, descriptions)); + Strcat_charp(list, "
━━━━ ^[OX (矢印) ━━━━━━━━━━━━\n"); + Strcat(list, ListKeyBind("^[O", EscBKeymap, KEYMAP_LEN, descriptions)); + Strcat_charp(list, "
━━━━ ^[[X~D (Home 他) ━━━━━━━━━\n"); + Strcat(list, ListKeyBind(" ", EscDKeymap, KEYMAP_LEN, descriptions)); + Strcat_charp(list, "

\n"); + Strcat_charp(list, "\n"); + + /* fputs(list->ptr, stderr); */ + return list; +} + +static char * +descFile() +{ + char file[32]; + + sprintf(file, "%s/README.func", (LANG == JA)? "ja": "en"); + return expandPath(Strnew_m_charp(w3m_help_dir(), "/", file, NULL)->ptr); +} + +static char ** +ReadDescription(const char *filename) +{ + char **list; + FILE *fp; + + list = NULL; + if ((fp = fopen(filename, "rt")) != NULL) { + list = DescriptionList(fp); + fclose(fp); + } else { + } + + return list; +} + +static char ** +DescriptionList(FILE *fp) +{ + char **list; + int j; + + MaxFunc = numberOfFunctions(); + list = GC_MALLOC(sizeof(char*)*MaxFunc); + for (j = 0; j < MaxFunc; j++) { + list[j] = NULL; + } + + while (!feof(fp)) { + Str q; + q = Strfgets(fp); + if (q->length > 0) { + int code; + char *desc; + + if ((desc = strpbrk(q->ptr, " \t")) != NULL) { + for (; IS_SPACE(*desc) && *desc; desc++) { + *desc = '\0'; + } + } + + if ((code = getFuncList(q->ptr)) >= 0 && code < MaxFunc) { + list[code] = desc; + } + } + } + + return list; +} + +static Str +ListKeyBind(const char *prefix, const unsigned char keymap[], int size, char **desc) +{ + int j; + Str list; + + list = Strnew(); + + for (j = 0; j < size; j++) { + int code; + const char *p; + + code = keymap[j]; + if ((p = w3mFuncList[code].id) != NULL && strcmp(p, "@@@") != 0) { + Strcat_charp(list, ""); + Strcat_charp(list, (char *)prefix); + Strcat(list, CharString(j)); + + Strcat_charp(list, ""); + Strcat_charp(list, (char *)p); + + Strcat_charp(list, ""); + if ((p = Description(code, desc)) != NULL) { + Strcat_charp(list, html_quote((char *)p)); + } else { + Strcat_char(list, '\n'); + } + } + } + + return list; +} + +static char *Description(int code, char **desc) +{ + char *d; + + return (0 <= code && code < MaxFunc && (d = desc[code]) != NULL)? d: NULL; +} + +static Str +CharString(int code) +{ + Str ch = Strnew_size(8); + + if (code == 0x00) { + Strcat_charp(ch, "C-@"); + } else if (code < 0x20) { + Strcat_charp(ch, "C-"); + Strcat_char(ch, code+0x40); + } else if (code == 0x20) { + Strcat_charp(ch, "SPC"); + } else if (code < 0x7F) { + Strcat_char(ch, code); + } else if (code == 0x7F) { + Strcat_charp(ch, "DEL"); + } + + return ch; +} + +static int numberOfFunctions() +{ + if (MaxFunc <= 0) { + FuncList *p; + + /* Find NULL terminatotr */ + for (p = w3mFuncList; p->id != NULL; p++) + ; + + MaxFunc = p - w3mFuncList; + } + + return MaxFunc; +} Index: linein.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/linein.c,v retrieving revision 1.1.1.8 retrieving revision 1.5 diff -u -p -u -r1.1.1.8 -r1.5 --- linein.c 23 Jul 2007 13:07:19 -0000 1.1.1.8 +++ linein.c 23 Jul 2007 16:31:20 -0000 1.5 @@ -23,8 +23,6 @@ extern int do_getch(); static Str strBuf; static Lineprop strProp[STR_LEN]; -static Str CompleteBuf; -static Str CFileName; static Str CBeforeBuf; static Str CAfterBuf; static Str CDirBuf; @@ -48,6 +46,7 @@ static int terminated(unsigned char c); static void next_compl(int next); static void next_dcompl(int next); static Str doComplete(Str ifn, int *status, int next); +static int pathPos(const char *url); /* *INDENT-OFF* */ void (*InputKeymap[32]) () = { @@ -116,6 +115,10 @@ inputLineHistSearch(char *prompt, char * } else if (flag & IN_COMMAND) cm_mode = CPL_ON; + else if (flag & IN_CGINAME) + cm_mode = CPL_ON | CPL_CGINAME; + else if (flag & IN_FUNCNAME) + cm_mode = CPL_ON | CPL_FUNCNAME; else cm_mode = CPL_OFF; opos = get_strwidth(prompt); @@ -764,13 +767,12 @@ next_dcompl(int next) if (d->length > 0 && Strlastchar(d) != '/') Strcat_char(d, '/'); if (cm_mode & CPL_URL && d->ptr[0] == 'f') { + int w; + p = d->ptr; - if (strncmp(p, "file://localhost/", 17) == 0) - p = &p[16]; - else if (strncmp(p, "file:///", 8) == 0) - p = &p[7]; - else if (strncmp(p, "file:/", 6) == 0 && p[6] != '/') - p = &p[5]; + if ((w = pathPos(d->ptr)) > 0) { + p += w; + } d = Strnew_charp(p); } @@ -891,77 +893,273 @@ unescape_spaces(Str s) return s; } -static Str -doComplete(Str ifn, int *status, int next) +typedef struct _ListEntries ListEntries; +typedef struct _Candidate Candidate; + +struct _Candidate { + const char *parent; /* Parent component */ + const char *last; /* Last component */ + const char *starts; /* Starts with this string (user input) */ + void *data; /* Internally used data */ +}; + +struct _ListEntries { + Candidate *(*initialize)(const char *cand, const char *in); + const char *(*next)(Candidate *c); + int (*finalize)(Candidate *c); + int (*matches)(Candidate *c, const char *cand); +}; + +static Candidate *openCommandDir(const char *dir, const char *in); +static const char *cgiPath(); +static Candidate *openDir(const char *dir, const char *in); +static const char *nextFile(Candidate *c); +static int closeDir(Candidate *c); +static Candidate *initCommandName(const char *dir, const char *in); +static const char *nextCommandName(Candidate *c); +static int endCommandName(Candidate *c); +static int startsWith(const char *str, const char *start); +static const char *tailOf(const char *str, int ch); + +static ListEntries fileEntries = { + openDir, nextFile, closeDir, NULL +}; +static ListEntries localCGIEntries = { + openCommandDir, nextFile, closeDir, NULL +}; +static ListEntries commandEntries = { + initCommandName, nextCommandName, endCommandName, NULL +}; + +static Candidate *openCommandDir(const char *dir, const char *in) +{ + Str path; + int w; + + path = Strnew_charp(dir); + if ((w = pathPos(dir)) > 0) { + if (strncmp(dir+w, "/cgi-bin", 8) == 0 + && (strlen(dir+w) == 8 || dir[w+8] == '/')) { + path = Strnew_charp(cgiPath()); + Strcat_charp(path, dir+w+8); + } else if (strncmp(dir+w, "/$LIB", 5) == 0 + && (strlen(dir+w) == 5 || dir[w+5] == '/')) { + path = Strnew_charp(w3m_lib_dir()); + Strcat_charp(path, dir+w+5); + } + } + + return openDir(path->ptr, in); +} + +static const char *cgiPath() +{ + const char *p = NULL; + + if (cgi_bin != NULL) { + /* FIXME: This code implies that ':' can not be escaped */ + if ((p = strchr(cgi_bin, ':')) != NULL) { + p = allocStr(cgi_bin, p - cgi_bin); + } + } + + return p != NULL? p: cgi_bin; +} + +static Candidate *openDir(const char *dir, const char *in) +{ + static DIR *d; + Candidate *c = NULL; + + if (dir[0] == '\0') { + dir = "."; + } + if ((d = opendir(expandPath((char *)dir))) != NULL) { + c = New(Candidate); + c->data = d; + c->parent = dir; + c->starts = in; + c->last = tailOf(in, '/'); + } + + return c; +} + +static const char *nextFile(Candidate *c) { - int fl, i; - char *fn, *p; DIR *d; + int stat = 0; Directory *dir; + const char *file = NULL; + + d = (DIR *)c->data; + + if (d == NULL) { + return file; + } + while ((dir = readdir(d)) != NULL) { + if (c->last[0] == '\0' + && (strcmp(dir->d_name, ".") == 0 || strcmp(dir->d_name, "..") == 0)) + continue; + file = dir->d_name; + break; + } + + return file; +} + +static int closeDir(Candidate *c) +{ + DIR *d; + int stat = 0; + + d = (DIR *)c->data; + + if (d != NULL) { + stat = (closedir(d) == 0)? 1: 0; + d = NULL; + } + + return stat; +} + +static Candidate *initCommandName(const char *dir, const char *in) +{ + Candidate *c = New(Candidate); + static int sub; + + if ((c = New(Candidate)) != NULL) { + char *p; + + c = New(Candidate); + sub = 1; /* Skip 0th entry */ + c->data = ⊂ + c->parent = dir; + c->starts = in; + c->last = tailOf(tailOf(in, ';'), ' '); + } + + return c; +} + +static const char *nextCommandName(Candidate *c) +{ + int *sub = (int *)c->data; + const char *p; + + if ((p = w3mFuncList[*sub].id) != NULL) { + (*sub)++; + } + return p; +} + +static int endCommandName(Candidate *c) +{ + return 1; +} + +static int startsWith(const char *str, const char *start) +{ + while (*start && *start == *str) { + start++; + str++; + } + + return *start? 0: 1; +} + +static const char *tailOf(const char *str, int ch) +{ + const char *p; + + if ((p = strrchr(str, ch)) != NULL) { + p++; + } else { + p = str; + } + + return p; +} + +static char *leadingComponent(const char *in) +{ + int len; + + /* remove the last component. */ + for (len = strlen(in); len > 0 && in[len-1] != '/'; len--) + ; + + return allocStr(in, len); +} + +static Str +doComplete(Str ifn, int *status, int next) +{ + static Str CompleteBuf; + static Str CFileName; + int i; + char *p; struct stat st; if (!cm_next) { + ListEntries *list; + const char *entry; + Candidate *c; + + list = &fileEntries; + if (cm_mode & CPL_FUNCNAME) { + list = &commandEntries; + } else if (cm_mode & CPL_CGINAME) { + list = &localCGIEntries; + } NCFileBuf = 0; ifn = Str_conv_to_system(ifn); if (cm_mode & CPL_ON) ifn = unescape_spaces(ifn); - CompleteBuf = Strdup(ifn); - while (Strlastchar(CompleteBuf) != '/' && CompleteBuf->length > 0) - Strshrink(CompleteBuf, 1); - CDirBuf = Strdup(CompleteBuf); - if (cm_mode & CPL_URL) { - if (strncmp(CompleteBuf->ptr, "file://localhost/", 17) == 0) - Strdelete(CompleteBuf, 0, 16); - else if (strncmp(CompleteBuf->ptr, "file:///", 8) == 0) - Strdelete(CompleteBuf, 0, 7); - else if (strncmp(CompleteBuf->ptr, "file:/", 6) == 0 && - CompleteBuf->ptr[6] != '/') - Strdelete(CompleteBuf, 0, 5); - else { - CompleteBuf = Strdup(ifn); - *status = CPL_FAIL; - return Str_conv_to_system(CompleteBuf); + CDirBuf = Strnew_charp(leadingComponent(ifn->ptr)); + CompleteBuf = Strdup(CDirBuf); + if (!(cm_mode&(CPL_FUNCNAME|CPL_CGINAME))) { + if (cm_mode & CPL_URL) { + int w; + + if ((w = pathPos(CompleteBuf->ptr)) > 0) { + Strdelete(CompleteBuf, 0, w); + } + else { + CompleteBuf = Strdup(ifn); + *status = CPL_FAIL; + return Str_conv_to_system(CompleteBuf); + } } } - if (CompleteBuf->length == 0) { - Strcat_char(CompleteBuf, '.'); - } if (Strlastchar(CompleteBuf) == '/' && CompleteBuf->length > 1) { Strshrink(CompleteBuf, 1); } - if ((d = opendir(expandPath(CompleteBuf->ptr))) == NULL) { + if ((c = (*list->initialize)(CompleteBuf->ptr, ifn->ptr)) == NULL) { CompleteBuf = Strdup(ifn); *status = CPL_FAIL; if (cm_mode & CPL_ON) CompleteBuf = escape_spaces(CompleteBuf); return CompleteBuf; } - fn = lastFileName(ifn->ptr); - fl = strlen(fn); CFileName = Strnew(); - for (;;) { - dir = readdir(d); - if (dir == NULL) - break; - if (fl == 0 - && (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))) - continue; - if (!strncmp(dir->d_name, fn, fl)) { /* match */ + while ((entry = (*list->next)(c)) != NULL) { + if (startsWith(entry, c->last)) { /* match */ NCFileBuf++; CFileBuf = New_Reuse(char *, CFileBuf, NCFileBuf); CFileBuf[NCFileBuf - 1] = - NewAtom_N(char, strlen(dir->d_name) + 1); - strcpy(CFileBuf[NCFileBuf - 1], dir->d_name); + NewAtom_N(char, strlen(entry) + 1); + strcpy(CFileBuf[NCFileBuf - 1], entry); if (NCFileBuf == 1) { - CFileName = Strnew_charp(dir->d_name); + CFileName = Strnew_charp(entry); } else { - for (i = 0; CFileName->ptr[i] == dir->d_name[i]; i++) ; + for (i = 0; CFileName->ptr[i] == entry[i]; i++) ; Strtruncate(CFileName, i); } } } - closedir(d); + (*list->finalize)(c); if (NCFileBuf == 0) { CompleteBuf = Strdup(ifn); *status = CPL_FAIL; @@ -991,12 +1189,12 @@ doComplete(Str ifn, int *status, int nex if (*status != CPL_AMBIG) { p = CompleteBuf->ptr; if (cm_mode & CPL_URL) { - if (strncmp(p, "file://localhost/", 17) == 0) - p = &p[16]; - else if (strncmp(p, "file:///", 8) == 0) - p = &p[7]; - else if (strncmp(p, "file:/", 6) == 0 && p[6] != '/') - p = &p[5]; + int w; + + w = pathPos(CompleteBuf->ptr); + if (w > 0) { + p += w; + } } if (stat(expandPath(p), &st) != -1 && S_ISDIR(st.st_mode)) Strcat_char(CompleteBuf, '/'); @@ -1006,6 +1204,21 @@ doComplete(Str ifn, int *status, int nex return Str_conv_from_system(CompleteBuf); } +static int pathPos(const char *url) +{ + int width; + + width = -1; + if (strncmp(url, "file://localhost/", 17) == 0) + width = 16; + else if (strncmp(url, "file:///", 8) == 0) + width = 7; + else if (strncmp(url, "file:/", 6) == 0 && url[6] != '/') + width = 5; + + return width; +} + static void _prev(void) { Index: main.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/main.c,v retrieving revision 1.1.1.8 retrieving revision 1.15 diff -u -p -u -r1.1.1.8 -r1.15 --- main.c 23 Jul 2007 13:07:20 -0000 1.1.1.8 +++ main.c 23 Jul 2007 16:31:20 -0000 1.15 @@ -85,6 +85,8 @@ static void keyPressEventProc(int c); int show_params_p = 0; void show_params(FILE * fp); +static const char *pageDescription(const Buffer *buf); + static char *getCurWord(Buffer *buf, int *spos, int *epos, const char *badchars); @@ -935,7 +937,7 @@ main(int argc, char **argv, char **envp) fclose(fp); request = newFormList(NULL, "post", NULL, NULL, NULL, NULL, - NULL); + NULL, NULL); request->body = body->ptr; request->boundary = NULL; request->length = body->length; @@ -1406,7 +1408,7 @@ saveBufferInfo() } #endif -static void +void pushBuffer(Buffer *buf) { Buffer *b; @@ -1571,6 +1573,33 @@ DEFUN(pgBack, PREV_PAGE, "Move to previo * (Currentbuf->LINES - 1)), prec_num ? B_SCROLL : B_NORMAL); } +/* Move half page forward */ +DEFUN(pgHalfFore, NEXT_HALFPAGE, "Move to next page") +{ + int n = (Currentbuf->LINES - 1)/2; + if (n <= 0) { + n = 1; + } + if (vi_prec_num) + nscroll(searchKeyNum() * n, B_NORMAL); + else + nscroll(prec_num ? searchKeyNum() : searchKeyNum() * n, prec_num ? B_SCROLL : B_NORMAL); +} + +/* Move half page backward */ +DEFUN(pgHalfBack, PREV_HALFPAGE, "Move to previous page") +{ + int n = (Currentbuf->LINES - 1)/2; + if (n <= 0) { + n = 1; + } + if (vi_prec_num) + nscroll(-searchKeyNum() * n, B_NORMAL); + else + nscroll(-(prec_num ? searchKeyNum() : searchKeyNum() * n), + prec_num ? B_SCROLL : B_NORMAL); +} + /* 1 line up */ DEFUN(lup1, UP, "Scroll up one line") { @@ -4146,11 +4175,30 @@ DEFUN(ldBmark, BOOKMARK VIEW_BOOKMARK, " } +/* + * const char *STR + */ +#ifdef USE_M17N +#if LANG == JA + /* FIXME: For backward compatibility WC_CES_EUC_JP is hardcoded. + * w3mbookmark takes arguments as EUC-JP only? + */ +#define TO_BOOKMARK_STR(STR) \ + wc_conv_strict((STR), InnerCharset, WC_CES_EUC_JP) +#else +#define TO_BOOKMARK_STR(STR) \ + wc_conv_strict((STR), InnerCharset, SystemCharset) +#endif +#else +#define TO_BOOKMARK_STR(STR) Strnew_charp(STR) +#endif + /* Add current to bookmark */ DEFUN(adBmark, ADD_BOOKMARK, "Add current page to bookmark") { Str tmp; FormList *request; + const char *desc; tmp = Sprintf("mode=panel&cookie=%s&bmark=%s&url=%s&title=%s" #ifdef USE_M17N @@ -4169,13 +4217,34 @@ DEFUN(adBmark, ADD_BOOKMARK, "Add curren #else (Str_form_quote(Strnew_charp(Currentbuf->buffername)))->ptr); #endif - request = newFormList(NULL, "post", NULL, NULL, NULL, NULL, NULL); + + request = newFormList(NULL, "post", NULL, NULL, NULL, NULL, NULL, NULL); + if ((desc = pageDescription(Currentbuf)) != NULL) { + Strcat_charp(tmp, "&description="); + Strcat(tmp, TO_BOOKMARK_STR(desc)); + } + request->body = tmp->ptr; request->length = tmp->length; cmd_loadURL("file:///$LIB/" W3MBOOKMARK_CMDNAME, NULL, NO_REFERER, request); } +static const char * +pageDescription(const Buffer *buf) +{ + const MetaEntryList *meta; + const char *desc = NULL; + + for (meta = buf->metalist; meta != NULL && desc == NULL; meta = meta->next) { + if (strcasecmp(meta->name, "description") == 0) { + desc = meta->content; + } + } + + return desc; +} + /* option setting */ DEFUN(ldOpt, OPTIONS, "Option setting panel") { @@ -4759,6 +4828,14 @@ DEFUN(reload, RELOAD, "Reload buffer") #endif SearchHeader = FALSE; DefaultType = NULL; + if (Currentbuf->orig_source != NULL && buf != NULL) { + buf->orig_source = Currentbuf->orig_source; + buf->origURL = Currentbuf->origURL; + if (buf->origURL != NULL && buf->baseURL == NULL) { + buf->baseURL = New(ParsedURL); + parseURL2(buf->origURL, buf->baseURL, NULL); + } + } if (multipart) unlink(request->body); @@ -5630,10 +5707,23 @@ set_buffer_environ(Buffer *buf) if (buf == NULL) return; if (buf != prev_buf) { - set_environ("W3M_SOURCEFILE", buf->sourcefile); + if (Currentbuf->orig_source != NULL) { + /* + * Restore original value(s). + * Here I restore only sourcefile. + * Ideally, Content-Type, URL, etc... should be restored. + */ + set_environ("W3M_SOURCEFILE", buf->orig_source); + } else { + set_environ("W3M_SOURCEFILE", buf->sourcefile); + } set_environ("W3M_FILENAME", buf->filename); set_environ("W3M_TITLE", buf->buffername); - set_environ("W3M_URL", parsedURL2Str(&buf->currentURL)->ptr); + if (Currentbuf->origURL != NULL) { + set_environ("W3M_URL", buf->origURL); + } else { + set_environ("W3M_URL", parsedURL2Str(&buf->currentURL)->ptr); + } set_environ("W3M_TYPE", buf->real_type ? buf->real_type : "unknown"); #ifdef USE_M17N set_environ("W3M_CHARSET", wc_ces_to_charset(buf->document_charset)); @@ -5773,7 +5863,7 @@ DEFUN(execCmd, COMMAND, "Execute w3m com CurrentKeyData = NULL; /* not allowed in w3m-control: */ data = searchKeyData(); if (data == NULL || *data == '\0') { - data = inputStrHist("command [; ...]: ", "", TextHist); + data = inputLineHist("command [; ...]: ", "", IN_STRING|IN_FUNCNAME, TextHist); if (data == NULL) { displayBuffer(Currentbuf, B_NORMAL); return; @@ -5970,7 +6060,7 @@ DEFUN(defKey, DEFINE_KEY, CurrentKeyData = NULL; /* not allowed in w3m-control: */ data = searchKeyData(); if (data == NULL || *data == '\0') { - data = inputStrHist("Key definition: ", "", TextHist); + data = inputLineHist("Key definition: ", "", IN_STRING|IN_FUNCNAME, TextHist); if (data == NULL || *data == '\0') { displayBuffer(Currentbuf, B_NORMAL); return; @@ -5980,6 +6070,21 @@ DEFUN(defKey, DEFINE_KEY, displayBuffer(Currentbuf, B_NORMAL); } +/* List current key bindings */ +DEFUN(keyList, LIST_KEYBIND, "List current key bindings") +{ + Buffer *buf; + extern Str ListKeyBindings(); + + buf = loadHTMLString(ListKeyBindings()); + if (buf != NULL) { +#ifdef JP_CHARSET + buf->document_code = Currentbuf->document_code; +#endif /* JP_CHARSET */ + cmd_loadBuffer(buf, BP_NORMAL, LB_NOLINK); + } +} + TabBuffer * newTab(void) { Index: map.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/map.c,v retrieving revision 1.1.1.6 retrieving revision 1.10 diff -u -p -u -r1.1.1.6 -r1.10 --- map.c 9 Oct 2005 21:25:31 -0000 1.1.1.6 +++ map.c 27 Dec 2006 14:06:16 -0000 1.10 @@ -394,6 +394,23 @@ newMapArea(char *url, char *target, char return a; } +static void +append_meta_info(Buffer *buf, Str tmp, MetaEntryList *metalist) +{ + MetaEntryList *meta; + + for (meta = metalist; meta != NULL; meta = meta->next) { + const char *ename, *econtent; + + ename = (meta->name != NULL)? html_quote(meta->name): ""; + econtent = (meta->content != NULL)? html_quote(meta->content): ""; + + Strcat_m_charp(tmp, "", ename, + "", econtent, + NULL); + } +} + /* append image map links */ static void append_map_info(Buffer *buf, Str tmp, FormItemList *fi) @@ -583,6 +600,8 @@ page_info_panel(Buffer *buf) "Transferred bytes", Sprintf("%d", buf->trbyte)->ptr, NULL); + append_meta_info(buf, tmp, buf->metalist); + a = retrieveCurrentAnchor(buf); if (a != NULL) { parseURL2(a->url, &pu, baseURL(buf)); Index: menu.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/menu.c,v retrieving revision 1.1.1.8 diff -u -p -u -r1.1.1.8 menu.c --- menu.c 23 Jul 2007 13:07:21 -0000 1.1.1.8 +++ menu.c 14 Jan 2008 15:37:41 -0000 @@ -1877,12 +1877,18 @@ link_menu(Buffer *buf) } /* --- LinkMenu (END) --- */ +static int countAccessKeys(const AnchorList *al); +static char *getFormItemText(const Buffer *buf, const AnchorList *al, + const Anchor *a); +static int formNo(const FormList *fl, const FormList *fi); +const char *fieldType(int type); Anchor * accesskey_menu(Buffer *buf) { Menu menu; AnchorList *al = buf->href; + AnchorList *fl = buf->formitem; Anchor *a; Anchor **ap; int i, n, nitem = 0, key = -1; @@ -1890,29 +1896,38 @@ accesskey_menu(Buffer *buf) char *t; unsigned char c; - if (!al) - return NULL; - for (i = 0; i < al->nanchor; i++) { - a = &al->anchors[i]; - if (!a->slave && a->accesskey && IS_ASCII(a->accesskey)) - nitem++; - } + nitem = countAccessKeys(al) + countAccessKeys(fl); if (!nitem) return NULL; label = New_N(char *, nitem + 1); ap = New_N(Anchor *, nitem); - for (i = 0, n = 0; i < al->nanchor; i++) { - a = &al->anchors[i]; - if (!a->slave && a->accesskey && IS_ASCII(a->accesskey)) { - t = getAnchorText(buf, al, a); - label[n] = Sprintf("%c: %s", a->accesskey, t ? t : "")->ptr; - ap[n] = a; - n++; + if (al != NULL) { + for (i = 0, n = 0; i < al->nanchor; i++) { + a = &al->anchors[i]; + if (!a->slave && a->accesskey && IS_ASCII(a->accesskey)) { + t = getAnchorText(buf, al, a); + label[n] = Sprintf("%c: %s", a->accesskey, t ? t : "")->ptr; + ap[n] = a; + n++; + } + } + } + + if (fl != NULL) { + for (i = 0; i < fl->nanchor; i++) { + a = &fl->anchors[i]; + if (!a->slave && a->accesskey && IS_ASCII(a->accesskey)) { + t = getFormItemText(buf, fl, a); + label[n] = Sprintf("%c: %s", a->accesskey, t ? t : "")->ptr; + ap[n] = a; + n++; + } } } label[nitem] = NULL; + set_menu_frame(); new_option_menu(&menu, label, &key, NULL); menu.initial = 0; @@ -1939,21 +1954,150 @@ accesskey_menu(Buffer *buf) menu.keyselect[(int)c] = i; } - a = retrieveCurrentAnchor(buf); - if (a && a->accesskey && IS_ASCII(a->accesskey)) { - for (i = 0; i < nitem; i++) { - if (a->hseq == ap[i]->hseq) { - menu.initial = i; - break; + if ((a = retrieveCurrentAnchor(buf)) != NULL + || (a = retrieveCurrentForm(buf)) != NULL) { + if (a->accesskey && IS_ASCII(a->accesskey)) { + for (i = 0; i < nitem; i++) { + if (a->hseq == ap[i]->hseq) { + menu.initial = i; + break; + } } } } popup_menu(NULL, &menu); + /* returning ap[key]->hseq would be enough... */ return (key >= 0) ? ap[key] : NULL; } +static int +countAccessKeys(const AnchorList *al) +{ + int c = 0; + + if (al != NULL) { + const Anchor *a; + int j; + + for (j = 0, a = al->anchors; j < al->nanchor; j++, a++) { + if (!a->slave && a->accesskey && IS_ASCII(a->accesskey)) + c++; + } + } + + return c; +} + +/* + * Construct a name which consists of + * FIELD-NAME@FORM-NAME [FIELD-TYPE] + * XXX: Should I convert character encoding? + * Using the alt attribute of input element may be more logical. + * It would be fantastic, if I could retrieve LABEL or LEGEND + * element for this element. + */ +static char * +getFormItemText(const Buffer *buf, const AnchorList *al, const Anchor *a) +{ + const FormItemList *fi; + const FormList *form; + Str name, desc; + const char *field; /* input field name */ + const char *type; /* input field type */ + const char *fname; /* form name */ + + fi = (FormItemList *)a->url; + + field = (fi->name != NULL)? fi->name->ptr: NULL; + if (field == NULL || field[0] == '\0') { + /* submit, reset fields are often anonymous */ + field = ""; + } + name = Strnew_charp(field); + if (fi->type == FORM_INPUT_RADIO || fi->type == FORM_INPUT_SUBMIT + || fi->type == FORM_INPUT_RESET ) { + /* This kind of control often has duplicated name (or no name). */ + if (fi->init_value != NULL && fi->init_value->ptr != NULL) { + /* I wish this value does not contain weird characters. */ + Strcat_m_charp(name, "=\"", fi->init_value->ptr, "\"", NULL); + } else { + Strcat_charp(name, "=\"\""); + } + } + if (name->ptr[0] == '\0') { + Strcat_charp(name, "(noname)"); + } + + if ((type = fieldType(fi->type)) == NULL) { + type = "unknown control"; + } + + form = fi->parent; + desc = Sprintf(" (%s in form[%d]", type, formNo(buf->formlist, form)); + + if (form->id != NULL) { + Strcat_m_charp(desc, " \"", form->id, "\")", NULL); + } else if (form->name != NULL) { + Strcat_m_charp(desc, " \"", form->name, "\")", NULL); + } else { + Strcat_m_charp(desc, ")", NULL); + } + Strcat(name, desc); + + return name->ptr; +} + +const char * +fieldType(int type) +{ + const struct { + const char *name; + int code; + } typecodes[] = { + { "INPUT", FORM_INPUT_TEXT }, + { "PASSWORD", FORM_INPUT_PASSWORD }, + { "CHECKBOX", FORM_INPUT_CHECKBOX }, + { "RADIO", FORM_INPUT_RADIO }, + { "SUBMIT", FORM_INPUT_SUBMIT }, + { "RESET", FORM_INPUT_RESET }, + { "HIDDEN", FORM_INPUT_HIDDEN }, + { "IMAGE", FORM_INPUT_IMAGE }, + { "SELECT", FORM_SELECT }, + { "TEXTAREA", FORM_TEXTAREA }, + { "BUTTON", FORM_INPUT_BUTTON }, + { "FILE", FORM_INPUT_FILE }, + }; + int j; + const char *typename = NULL; + + for (j = 0; j < sizeof typecodes/sizeof typecodes[0]; j++) { + if (typecodes[j].code == type) { + typename = typecodes[j].name; + } + } + + return typename; +} + +static int +formNo(const FormList *fl, const FormList *fi) +{ + int no; + int c; + + no = -1; + for (c = 0; fl != NULL; c++, fl = fl->next) { + if (fl == fi) { + no = c; + } + } + + /* FormList is linked in reverse order? */ + return (no >= 0)? c - no: 0; +} + static char lmKeys[] = "abcdefgimopqrstuvwxyz"; static char lmKeys2[] = "1234567890ABCDEFGHILMOPQRSTUVWXYZ"; #define nlmKeys (sizeof(lmKeys) - 1) @@ -2025,7 +2169,6 @@ list_menu(Buffer *buf) label[nitem] = NULL; set_menu_frame(); - set_menu_frame(); new_option_menu(&menu, label, &key, NULL); menu.initial = 0; Index: mimehead.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/mimehead.c,v retrieving revision 1.1.1.5 retrieving revision 1.7 diff -u -p -u -r1.1.1.5 -r1.7 --- mimehead.c 9 Oct 2005 21:25:31 -0000 1.1.1.5 +++ mimehead.c 27 Nov 2006 19:22:31 -0000 1.7 @@ -305,6 +305,15 @@ decodeMIME0(Str orgstr) default: break; } + } else if (*org == '\n' && org[1] != '\0' || + *org == '\r' && org[1] == '\n' && org[2] != '\0') { + /* skip (CR)LF and following space(s) */ + org += (*org == '\n')? 1: 2; + while (*org == ' ' || *org == '\t') { + org++; + } + /* I don't know if next line is necessary. */ + Strcat_char(cnv, ' '); } else { if (cnv != NULL) Index: proto.h =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/proto.h,v retrieving revision 1.1.1.8 diff -u -p -u -r1.1.1.8 proto.h --- proto.h 23 Jul 2007 13:07:21 -0000 1.1.1.8 +++ proto.h 14 Jan 2008 15:37:41 -0000 @@ -11,6 +11,8 @@ extern void pushEvent(int cmd, void *dat extern MySignalHandler intTrap(SIGNAL_ARG); extern void pgFore(void); extern void pgBack(void); +extern void pgHalfFore(void); +extern void pgHalfBack(void); extern void lup1(void); extern void ldown1(void); extern void ctrCsrV(void); @@ -29,6 +31,7 @@ extern void col1L(void); extern void setEnv(void); extern void pipeBuf(void); extern void pipesh(void); +extern void pipeSrc(void); extern void readsh(void); extern void execsh(void); extern void ldfile(void); @@ -125,6 +128,7 @@ extern AlarmEvent *setAlarmEvent(AlarmEv #endif extern void reinit(void); extern void defKey(void); +extern void keyList(void); extern void newT(void); extern void closeT(void); extern void nextT(void); @@ -381,8 +385,8 @@ extern void feed_table1(struct table *tb int width); extern void pushTable(struct table *, struct table *); extern struct form_list *newFormList(char *action, char *method, char *charset, - char *enctype, char *target, char *name, - struct form_list *_next); + char *enctype, char *target, char *id, + char *name, struct form_list *_next); extern struct form_item_list *formList_addInput(struct form_list *fl, struct parsed_tag *tag); extern char *form2str(FormItemList *fi); Index: rc.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/rc.c,v retrieving revision 1.1.1.8 diff -u -p -u -r1.1.1.8 rc.c --- rc.c 23 Jul 2007 13:07:21 -0000 1.1.1.8 +++ rc.c 8 Oct 2007 22:16:50 -0000 @@ -57,6 +57,7 @@ static wc_ces OptionCharset = WC_CES_US_ static int OptionEncode = FALSE; #endif + #define CMT_HELPER N_("External Viewer Setup") #define CMT_TABSTOP N_("Tab width in characters") #define CMT_INDENT_INCR N_("Indent for HTML rendering") @@ -158,6 +159,10 @@ static int OptionEncode = FALSE; #else #define CMT_BGEXTVIEW N_("Run external viewer in the background") #endif +#ifdef HTTPLOG +#define CMT_LOGFILE N_("Log file name of HTTP request/response") +#define CMT_LOGDATA N_("What to log") +#endif #define CMT_EXT_DIRLIST N_("Use external program for directory listing") #define CMT_DIRLIST_CMD N_("URL of directory listing command") #ifdef USE_DICT @@ -259,6 +264,16 @@ static struct sel_c colorstr[] = { {8, "terminal", N_("terminal")}, {0, NULL, NULL} }; +#endif /* COLOR */ + +#ifdef HTTPLOG +static struct sel_c logtypes[] = +{ + {0, "0", "None"}, + {1, "1", "Exclude form-data"}, + {2, "2", "Include form-data"}, + {0, NULL, NULL} +}; #endif /* USE_COLOR */ #if 1 /* ANSI-C ? */ @@ -273,7 +288,6 @@ static char n_s[][2] = { #define N_S(x) (x), n_s[(x)] #endif - static struct sel_c defaulturls[] = { {N_S(DEFAULT_URL_EMPTY), N_("none")}, {N_S(DEFAULT_URL_CURRENT), N_("current URL")}, @@ -483,6 +497,10 @@ struct param_ptr params3[] = { CMT_PRESERVE_TIMESTAMP, NULL}, {"keymap_file", P_STRING, PI_TEXT, (void *)&keymap_file, CMT_KEYMAP_FILE, NULL}, +#ifdef HTTPLOG + {"logfile", P_STRING, PI_TEXT, (void *)&HTTPLogfile, CMT_LOGFILE, NULL}, + {"logformdata", P_INT, PI_SEL_C, (void *) &HTTPLogType, CMT_LOGDATA, logtypes}, +#endif {NULL, 0, 0, NULL, NULL, NULL}, }; @@ -698,6 +716,9 @@ struct param_section sections[] = { }; static Str to_str(struct param_ptr *p); +static char *ensureTmpdir(); +static int ensureDirectory(const char *dir); +static int isDirectory(const char *path); static int compare_table(struct rc_search_table *a, struct rc_search_table *b) @@ -1229,7 +1250,7 @@ init_rc(void) goto rc_dir_err; } no_rc_dir = FALSE; - tmp_dir = rc_dir; + tmp_dir = ensureTmpdir(); if (config_file == NULL) config_file = rcFile(CONFIG_FILE); @@ -1260,6 +1281,36 @@ init_rc(void) tmp_dir = "/tmp"; } +static char *ensureTmpdir() +{ + Str dir = Strnew_charp(rc_dir); + + /* use the subdirectory if it exists and read/writable */ + Strcat_charp(dir, "/tmp"); + return ensureDirectory(dir->ptr)? dir->ptr: rc_dir; +} + +static int ensureDirectory(const char *dir) +{ + if (!isDirectory(dir)) { + /* record_err_message(char *s) */ + fprintf(stderr, "\"%s\" is not a directory\n", dir); + dir = NULL; + } else if (access(dir, R_OK|W_OK)) { + fprintf(stderr, "Temporary directory \"%s\" is not read/writable.\n", dir); + dir = NULL; + } + + return dir? TRUE: FALSE; +} + +static int isDirectory(const char *path) +{ + struct stat buf; + + return (stat(path, &buf) == 0 && S_ISDIR(buf.st_mode)); +} + static char optionpanel_src1[] = "Option Setting Panel\ Index: terms.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/terms.c,v retrieving revision 1.1.1.7 retrieving revision 1.5 diff -u -p -u -r1.1.1.7 -r1.5 --- terms.c 23 Jul 2007 13:07:22 -0000 1.1.1.7 +++ terms.c 23 Jul 2007 16:31:21 -0000 1.5 @@ -399,10 +399,6 @@ char *ttyname(int); #define L_NEED_CE 0x04 #define L_CLRTOEOL 0x08 -#define ISDIRTY(d) ((d) & L_DIRTY) -#define ISUNUSED(d) ((d) & L_UNUSED) -#define NEED_CE(d) ((d) & L_NEED_CE) - typedef unsigned short l_prop; typedef struct scline { Index: ucs_eucjp.h =================================================================== RCS file: ucs_eucjp.h diff -N ucs_eucjp.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ucs_eucjp.h 23 Mar 2002 15:46:37 -0000 1.1.1.2 @@ -0,0 +1,119 @@ +/* $Id: ucs_eucjp.h,v 1.3 2001/11/24 02:01:26 ukai Exp $ */ +static entity_map ucs_eucjp_map[] = { + {0x0152, "OE"}, + {0x0153, "oe"}, + {0x0178, "Y:"}, + {0x0192, "f"}, + {0x02C6, "^"}, + {0x02DC, "~"}, + {0x0391, "Α"}, + {0x0392, "Β"}, + {0x0393, "Γ"}, + {0x0394, "Δ"}, + {0x0395, "Ε"}, + {0x0396, "Ζ"}, + {0x0397, "Η"}, + {0x0398, "Θ"}, + {0x0399, "Ι"}, + {0x039A, "Κ"}, + {0x039B, "Λ"}, + {0x039C, "Μ"}, + {0x039D, "Ν"}, + {0x039E, "Ξ"}, + {0x039F, "Ο"}, + {0x03A0, "Π"}, + {0x03A1, "Ρ"}, + {0x03A3, "Σ"}, + {0x03A4, "Τ"}, + {0x03A5, "Υ"}, + {0x03A6, "Φ"}, + {0x03A7, "Χ"}, + {0x03A8, "Ψ"}, + {0x03A9, "Ω"}, + {0x03B1, "α"}, + {0x03B2, "β"}, + {0x03B3, "γ"}, + {0x03B4, "δ"}, + {0x03B5, "ε"}, + {0x03B6, "ζ"}, + {0x03B7, "η"}, + {0x03B8, "θ"}, + {0x03B9, "ι"}, + {0x03BA, "κ"}, + {0x03BB, "λ"}, + {0x03BC, "μ"}, + {0x03BD, "ν"}, + {0x03BE, "ξ"}, + {0x03BF, "ο"}, + {0x03C0, "π"}, + {0x03C1, "ρ"}, + {0x03C2, "σ"}, + {0x03C3, "σ"}, + {0x03C4, "τ"}, + {0x03C5, "υ"}, + {0x03C6, "φ"}, + {0x03C7, "χ"}, + {0x03C8, "ψ"}, + {0x03C9, "ω"}, + {0x2002, " "}, + {0x2003, " "}, + {0x2013, "‐"}, + {0x2014, "－"}, + {0x2018, "‘"}, + {0x2019, "’"}, + {0x201A, ","}, + {0x201C, "“"}, + {0x201D, "”"}, + {0x201E, ",,"}, + {0x2020, "†"}, + {0x2021, "‡"}, + {0x2022, "・"}, + {0x2026, "…"}, + {0x2030, "‰"}, + {0x2032, "′"}, + {0x2033, "″"}, + {0x2039, "＜"}, + {0x203A, "＞"}, + {0x203E, "￣"}, + {0x2044, "/"}, + {0x20AC, "=C="}, + {0x2122, "TM"}, + {0x2190, "←"}, + {0x2191, "↑"}, + {0x2192, "→"}, + {0x2193, "↓"}, + {0x21D2, "⇒"}, + {0x21D4, "⇔"}, + {0x2200, "∀"}, + {0x2202, "∂"}, + {0x2203, "∃"}, + {0x2205, "φ"}, + {0x2207, "∇"}, + {0x2208, "∈"}, + {0x220B, "∋"}, + {0x220F, "Π"}, + {0x2211, "Σ"}, + {0x2212, "－"}, + {0x221A, "√"}, + {0x221D, "∝"}, + {0x221E, "∞"}, + {0x2220, "∠"}, + {0x2227, "∧"}, + {0x2228, "∨"}, + {0x2229, "∩"}, + {0x222A, "∪"}, + {0x222B, "∫"}, + {0x2234, "∴"}, + {0x223C, "～"}, + {0x2260, "≠"}, + {0x2261, "≡"}, + {0x2264, "≦"}, + {0x2265, "≧"}, + {0x2282, "⊂"}, + {0x2283, "⊃"}, + {0x2286, "⊆"}, + {0x2287, "⊇"}, + {0x22A5, "⊥"}, + {0x25CA, "◇"}, + {0x2666, "◆"}, +}; Index: ucs_latin1.h =================================================================== RCS file: ucs_latin1.h diff -N ucs_latin1.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ucs_latin1.h 23 Mar 2002 15:46:37 -0000 1.1.1.2 @@ -0,0 +1,36 @@ +/* $Id: ucs_latin1.h,v 1.3 2001/11/24 02:01:26 ukai Exp $ */ +static entity_map ucs_latin1_map[] = { + {0x0152, "OE"}, + {0x0153, "oe"}, + {0x0178, "Y:"}, + {0x0192, "f"}, + {0x02C6, "^"}, + {0x02DC, "~"}, + {0x03BC, "\xB5"}, + {0x2002, " "}, + {0x2003, " "}, + {0x2013, "\xAD"}, + {0x2014, "-"}, + {0x2018, "`"}, + {0x2019, "'"}, + {0x201A, "\xB8"}, + {0x201C, "\""}, + {0x201D, "\""}, + {0x201E, ",,"}, + {0x2022, "*"}, + {0x2030, "0/00"}, + {0x2032, "'"}, + {0x2033, "\""}, + {0x2039, "<"}, + {0x203A, ">"}, + {0x2044, "/"}, + {0x20AC, "=C="}, + {0x2122, "TM"}, + {0x2205, "\xF8"}, + {0x2212, "-"}, + {0x223C, "~"}, + {0x2260, "!="}, + {0x2261, "="}, + {0x2264, "<="}, + {0x2265, ">="}, +}; Index: url.c =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/url.c,v retrieving revision 1.1.1.8 retrieving revision 1.11 diff -u -p -u -r1.1.1.8 -r1.11 --- url.c 23 Jul 2007 13:07:22 -0000 1.1.1.8 +++ url.c 23 Jul 2007 16:31:21 -0000 1.11 @@ -429,6 +429,31 @@ write_from_file(int sock, char *file) } } +#ifdef HTTPLOG +int AppendLog(char *str, int len, char *path) +{ + FILE *fp; + + if (HTTPLogfile == NULL || HTTPLogType <= 0) { + return 0; + } + + if ((fp = fopen(HTTPLogfile,"a")) != NULL) { + if (len < 0) + len = strlen(str); + fwrite(str, sizeof(char), len, fp); + if (path != NULL && HTTPLogType > 1) { + fflush(fp); + /* Append request body of multipart/form-data */ + write_from_file(fileno(fp), path); + } + fclose(fp); + } + + return 1; +} +#endif + ParsedURL * baseURL(Buffer *buf) { @@ -1314,12 +1339,14 @@ otherinfo(ParsedURL *target, ParsedURL * Strcat_charp(s, "\r\n"); } else if (referer != NULL && referer != NO_REFERER) { - char *p = strchr(referer, '#'); + char *ref = cleanupName(referer); + char *p; + + if ((p = strchr(ref, '#')) != NULL) { + *p = '\0'; + } Strcat_charp(s, "Referer: "); - if (p) - Strcat_charp_n(s, referer, p - referer); - else - Strcat_charp(s, referer); + Strcat_charp(s, ref); Strcat_charp(s, "\r\n"); } } @@ -1696,6 +1723,15 @@ openURL(char *url, ParsedURL *pu, Parsed tmp = HTTPrequest(pu, current, hr, extra_header); *status = HTST_NORMAL; } + +#ifdef HTTPLOG + if (HTTPLogfile != NULL) { + AppendLog("-- Request\r\n", -1, NULL); + AppendLog(tmp->ptr, tmp->length, (hr && hr->request && hr->request->method == HR_COMMAND_POST + && request->enctype == FORM_ENCTYPE_MULTIPART)? + request->body: NULL); + } +#endif #ifdef USE_SSL if (pu->scheme == SCM_HTTPS) { uf.stream = newSSLStream(sslh, sock); Index: doc/README.func =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/doc/README.func,v retrieving revision 1.1.1.7 retrieving revision 1.3 diff -u -p -u -r1.1.1.7 -r1.3 --- doc/README.func 9 Oct 2005 21:25:33 -0000 1.1.1.7 +++ doc/README.func 27 Nov 2006 19:22:39 -0000 1.3 @@ -48,6 +48,7 @@ LINK_BEGIN Go to the first link LINK_END Go to the last link LINK_MENU Popup link element menu LIST Show all links and images +LIST_KEYBIND List key bindings LIST_MENU Popup link list menu and go to selected link LOAD Load local file MAIN_MENU Popup menu @@ -91,6 +92,7 @@ PEEK_IMG Peek image URL PEEK_LINK Peek link URL PIPE_BUF Send rendered document to pipe PIPE_SHELL Execute shell command and browse +PIPE_SOURCE Invoke filter command (local-CGI) PREV Move to previous buffer PREV_LINK Move to previous link PREV_MARK Move to previous mark Index: doc-jp/README.filter =================================================================== RCS file: doc-jp/README.filter diff -N doc-jp/README.filter --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ doc-jp/README.filter 14 Jan 2008 15:39:42 -0000 1.4 @@ -0,0 +1,113 @@ + + $Id: README.filter,v 1.4 2008-01-14 15:39:42 izumi Exp $ + +◎フィルタ機能 + +【背景】 +文字コードの変換や壊れた HTML ソースコードの修正など、 +リソースを変換したい場合がよくあるので、 +外部フィルタでページを処理できるようにしたい。 + +Local CGI で間に合う場合も多いが、 +次のような点を考えると専用のインタフェースがあることが望ましく思える。 + +- 相対 URI の解決。 + Local CGI で変換すると相対 URI の解釈ができなくなる。 + +- リロード。 + W3M_SOURCEFILE を元にした Local CGI だとリロードできなくなる。 + +【検討】 + +理想としては w3m バッファ制御用のコマンドと SGML (XML)を用意したいが、 +それでは余りに根本的過ぎる。 + +フィルタは W3M_SOURCEFILE を元に出力を生成する Local CGI とする。 +相対 URI は BASE 要素が指定されているのと同様に扱う。 + +フィルタ元のファイルはリロードに備えて処理後も保管しておく必要がある。 + +残りの環境は配慮しない。 + +W3M_URL が file: スキームになるのでリファラーはなくなる。 + +- リファラー + 変換して新たに発生したリンクや画像を HTTP で要求する際には + リファラーをつけるべきではないが、 + 元リソースに含まれているリンクの場合はリファラーをつけて + 要求してよい。 + +- ソースコードの保存 + フィルタ元のソースコードをどう保存するか。 + 元のソースキャッシュファイルは消されている可能性がある。 + +※ バッファ情報を上書きするコマンドをいくつか用意すれば + W3m-Control ヘッダで操作できるようになるので、 + Local CGI で済む見込みがある。 + + SET_BUFINFO Title <つけ直したい題> + SET_BUFINFO Base-URI <元の URIRef> + SET_BUFINFO Document-Type <元の Content-Type> + + の様なコマンドを処理できれば、 + 相対 URI の解釈の問題などは回避できるだろう。 + これならフィルタ以外の従来の Local CGI でも利用できる。 + + w3m の内部の挙動などが不透明なのでこの方が明解でいいかも。 + この場合でも元のソースコードと URI(Ref) を保存し、 + Local CGI に伝える機構を用意する必要がある。 + +※ フィルタ用のスキームを導入する手もあるかも。 + +の様な URI を扱えるようにする。 +この場合だとリソースが状況に依存せず、 +リロードで元ファイルもとり直す可能性が広がる。 + +【実装】 +変更量が少なく、 CGI プログラムをそのまま流用できる次の方法で実装してみた。 + +Buffer 構造体に orig_source, origURL メンバを追加した。 +const 修飾子をつけたかったが、 set_environ() その他の関数が +仮引数に const 修飾子をつけていないのであきらめた。 + +origURL はフィルタ元の URIRef (絶対 URI Ref)を想定。 +orig_source はソースコード(w3msrcXXXX-X)のパス。 +baseURL を上書きすることで相対 URI の解決の問題を回避している。 +baseURL が設定されていればそのままとするが、 +NULL なら origURL を元に設定する。 +このため、通常、 CGI プログラムは BASE 要素等をつける必要はない。 + +ただし、画像の処理は HTML の解析時に絶対 URI に展開してしまうので +loadGeneralFile() を呼び出す際にグローバル変数 originalURL を設けて、 + cur_baseURL を指定するように変更した。 +結構なさけない。 + +Current URL はフィルタ(CGI)の URL となる。 + +元のソースコードはリロード等にそなえて link (2) して保存する。 +これは discardBuffer() 関数で削除するのが理想的だが、 +リロードを繰り返す場合の処理(リロード時にも link する)を +省略するため、削除していない。 + +この結果としてソースコード(Buffer->orig_source)が w3m の終了時まで +削除されずに溜ってしまう。 + +【バグ】 +* リロードする際に Content-Type, Charset, URL 等の情報も +元ページの値に戻しておきたいが、 +面倒なので URL とソースファイルだけ戻しておいた。 +このため、リロードすると Title, Charset など +他の情報は変化してしまうことがある。 + +* 文字コードの変換(Str_conv_to_system() 等の利用)も余り配慮していない。 + +* フィルタプログラムを呼ぶ際に元リソースの情報(URI や HTTP 応答ヘッダ)を +別ファイルに記録しているが、 +今のところこれをプログラムに伝えてはいない。 +これを使うことでも、上記 Content-Type, Charset 等の問題を解決でき、 +orig_source, origURL をなくすこともできよう。 + +* filter.c は、 getenv, link 等システムに依存しそうなコードを含んでいる。 + +* 処理するフィルタプログラムは file:///cgi-bin/ の下に限る。 +$LIB も対象に。 Index: doc-jp/README.func =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/doc-jp/README.func,v retrieving revision 1.1.1.7 retrieving revision 1.5 diff -u -p -u -r1.1.1.7 -r1.5 --- doc-jp/README.func 9 Oct 2005 21:25:34 -0000 1.1.1.7 +++ doc-jp/README.func 27 Nov 2006 19:22:42 -0000 1.5 @@ -48,6 +48,7 @@ LINK_BEGIN 最初のリンクに移動します LINK_END 最後のリンクに移動します LINK_MENU Link 要素一覧のメニューを立ち上げます LIST リンクと画像の一覧を表示します +LIST_KEYBIND キー割当の一覧を表示します LIST_MENU リンク先一覧のメニューを立ち上げ、リンク先の文書を読みこみます LOAD ローカルファイルを指定して開きます MAIN_MENU メニューを立ち上げます @@ -91,6 +92,7 @@ PEEK_IMG 現在カーソルがあるリンクを含む� PEEK_LINK リンクが指す先のURLを表示します PIPE_BUF バッファの内容をパイプに渡します PIPE_SHELL コマンドを実行し，結果を読みこみながら表示します +PIPE_SOURCE ソースの内容を local-CGI に渡します PREV 前のバッファを表示します PREV_LINK 前のリンクに移動します PREV_MARK 一つ前のマークに移動します Index: po/ja.po =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/po/ja.po,v retrieving revision 1.1.1.2 retrieving revision 1.4 diff -u -p -u -r1.1.1.2 -r1.4 --- po/ja.po 23 Jul 2007 13:07:29 -0000 1.1.1.2 +++ po/ja.po 14 Jan 2008 15:40:03 -0000 1.4 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: w3m 0.5.2\n" "Report-Msgid-Bugs-To: satodai@w3m.jp\n" -"POT-Creation-Date: 2007-05-07 10:49+0900\n" +"POT-Creation-Date: 2007-05-28 19:49+0900\n" "PO-Revision-Date: 2007-05-07 10:52+0900\n" "Last-Translator: Fumitoshi UKAI \n" "Language-Team: Japanese\n" @@ -445,6 +445,12 @@ msgstr "外部ビューアをバックグラウンドで msgid "Use external program for directory listing" msgstr "ディレクトリリストに外部コマンドを使う" +msgid "Log file name of HTTP request/response" +msgstr "HTTP 通信のログファイル名" + +msgid "What to log" +msgstr "ログを取る対象" + #: rc.c:162 msgid "URL of directory listing command" msgstr "ディレクトリリスト用コマンド" @@ -826,6 +832,6 @@ msgstr "文字コードの設定" #. * header. For example, ja.po should translate it as #. * "ja;q=1.0, en;q=0.5" like that. #. -#: rc.c:1163 +#: rc.c:1169 msgid "en;q=1.0" msgstr "ja;q=1.0, en;q=0.5" Index: scripts/w3mhelp.cgi.in =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/scripts/w3mhelp.cgi.in,v retrieving revision 1.1.1.6 retrieving revision 1.3 diff -u -p -u -r1.1.1.6 -r1.3 --- scripts/w3mhelp.cgi.in 23 Jul 2007 13:07:30 -0000 1.1.1.6 +++ scripts/w3mhelp.cgi.in 23 Jul 2007 16:31:24 -0000 1.3 @@ -146,7 +146,7 @@ print "

$head\ &show_keymap("File/Stream operation", split(" ", "goURL gorURL tabURL tabrURL ldfile readsh pipesh - pipeBuf")); + pipeBuf pipeSrc")); &show_keymap("Buffer operation", split(" ", "backBf nextBf prevBf selMn selBuf vwSrc svSrc svBuf @@ -168,7 +168,7 @@ print "

$head\ split(" ", "_mark nextMk prevMk reMark")); &show_keymap("Miscellany", - split(" ", "mainMn ldhelp ldOpt dispVer cooLst ldHist ldDL + split(" ", "mainMn ldhelp keyList ldOpt dispVer cooLst ldHist ldDL docCSet defCSet msgs msToggle wrapToggle execCmd setAlarm setOpt setEnv defKey reinit execsh susp qquitfm quitfm")); Index: scripts/w3mmail.cgi.in =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/scripts/w3mmail.cgi.in,v retrieving revision 1.1.1.4 retrieving revision 1.6 diff -u -p -u -r1.1.1.4 -r1.6 --- scripts/w3mmail.cgi.in 23 Jul 2007 13:07:30 -0000 1.1.1.4 +++ scripts/w3mmail.cgi.in 23 Jul 2007 16:31:24 -0000 1.6 @@ -28,7 +28,7 @@ if ($query =~ s/^\w+://) { $to = &url_unquote($to); %opt = &parse_opt($opt); - @to = ($to); + @to = ($to ne '')? ($to): (); push(@to, $opt{'to'}) if ($opt{'to'}); $opt{'to'} = join(',', @to); if ($ENV{'REQUEST_METHOD'} eq 'POST') { @@ -298,40 +298,42 @@ sub conv_nkf { if ($use_NKF) { return nkf(@opt); } - local($body) = pop(@opt); - $body =~ s/\r+\n/\n/g; - $| = 1; - pipe(R, W2); - pipe(R2, W); - if (! fork()) { - close(F); - close(R); - close(W); - open(STDIN, "<&R2"); - open(STDOUT, ">&W2"); - exec "nkf", @opt; - die; - } - close(R2); - close(W2); - print W $body; - close(W); - $body = ''; - while() { - $body .= $_; - } - close(R); - return $body; -}; + local($body) = undef; + + local($pid) = open(R, "-|"); + if (defined($pid)) { + if ($pid > 0) { + local($/) = undef; + $body = ; + close(R); + # Remove trailing NL + $body =~ s/\n$//; + } else { + $| = 1; + $body = pop(@opt); + if (open (NKF, "|nkf @opt")) { + $body =~ s/\r+\n/\n/g; + # nkf -M (at least version 1.9) requires trailing NL + print NKF $body, "\n"; + close(NKF) || die qq|$prog: nkf failed: |, $!; + exit; + } + die qq|$prog: Can't execute "nkf": |, $@; + } + } else { + warn qq|$prog: fork() failed: |, $!; + } + return $body; +} sub parse_opt { local($opt) = @_; local(%opt) = (); if ($opt) { foreach $o (split('&', $opt)) { - if ($o =~ /(\w+)=(.*)/) { + if ($o =~ /(\w[\w\-]*)=(.*)/) { $opt{"\L$1"} = &url_unquote($2); } } Index: scripts/w3mman/w3mman2html.cgi.in =================================================================== RCS file: /home/izumi/cvsroot/www/ua/w3m/scripts/w3mman/w3mman2html.cgi.in,v retrieving revision 1.1.1.5 retrieving revision 1.3 diff -u -p -u -r1.1.1.5 -r1.3 --- scripts/w3mman/w3mman2html.cgi.in 23 Jul 2007 13:07:30 -0000 1.1.1.5 +++ scripts/w3mman/w3mman2html.cgi.in 23 Jul 2007 16:31:24 -0000 1.3 @@ -91,9 +91,10 @@ if ($query{"local"}) { } $section =~ s:([^-\w\200-\377.,])::g; - $man =~ s:([^-\w\200-\377.,])::g; + $man =~ s/([^-\w\200-\377.,:])//g; open(F, "$MAN $section $man 2> /dev/null |"); } + $ok = 0; undef $header; $blank = -1; Index: w3m-doc/developement.html.in =================================================================== RCS file: w3m-doc/developement.html.in diff -N w3m-doc/developement.html.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ w3m-doc/developement.html.in 27 Nov 2006 19:22:57 -0000 1.3 @@ -0,0 +1,77 @@ + + + +@include define.wd +@include contain.wd + + + +DEVELOPEMENT -$B3+H/%I%-%e%a%s%H(B- + + + + +