From 2af8f6fd2e7e7c7967b425111b00f63dda598e3c Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Sun, 20 Jan 2002 17:06:42 +0000 Subject: [w3m-dev 02876] w3mmail.cgi.in backport from w3mmee * action='file://$0' * don't add \n to $body's tail * $body =~ s/\r+\n/\n/g; * s/@cmd/@opt/ * url_unquote: + should be unquote too From: Fumitoshi UKAI --- ChangeLog | 11 ++++++++++- scripts/w3mmail.cgi.in | 11 ++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64a7783..a76c9d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-01-21 Fumitoshi UKAI + + * [w3m-dev 02876] w3mmail.cgi.in backport from w3mmee + * action='file://$0' + * don't add \n to $body's tail + * $body =~ s/\r+\n/\n/g; + * s/@cmd/@opt/ + * url_unquote: + should be unquote too + 2002-01-18 Hironori Sakamoto * [w3m-dev 02873] delete "decode MIME-body" in doc{,-jp}/README @@ -2140,4 +2149,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.243 2002/01/18 13:09:07 ukai Exp $ +$Id: ChangeLog,v 1.244 2002/01/20 17:06:42 ukai Exp $ diff --git a/scripts/w3mmail.cgi.in b/scripts/w3mmail.cgi.in index c79f413..30d098e 100755 --- a/scripts/w3mmail.cgi.in +++ b/scripts/w3mmail.cgi.in @@ -1,6 +1,6 @@ #!@PERL@ -$rcsid = q$Id: w3mmail.cgi.in,v 1.3 2002/01/15 17:46:01 ukai Exp $; +$rcsid = q$Id: w3mmail.cgi.in,v 1.4 2002/01/20 17:06:42 ukai Exp $; ($id = $rcsid) =~ s/^.*,v ([\d\.]*).*/$1/; ($prog=$0) =~ s/.*\///; @@ -35,7 +35,7 @@ if ($query =~ s/^\w+://) { print "\r\n"; print "W3M Mailer: $qurl\n"; print "

W3M Mailer: $qurl

\n"; - print "

\n"; + print "\n"; print "\n"; print "\n"; if ($opt{'from'}) { @@ -108,7 +108,7 @@ if ($query =~ s/^\w+://) { print "User-Agent: $ENV{'SERVER_SOFTWARE'} $prog/$id\n"; print "\n"; print $body; - print "\n"; + print "\n" if ($body !~ /\n$/); print "\n"; print "\n"; print "

\n"; @@ -256,6 +256,7 @@ sub conv_nkf { return nkf(@opt); } local($body) = pop(@opt); + $body =~ s/\r+\n/\n/g; $| = 1; pipe(R, W2); pipe(R2, W); @@ -265,7 +266,7 @@ sub conv_nkf { close(W); open(STDIN, "<&R2"); open(STDOUT, ">&W2"); - exec "nkf", @cmd; + exec "nkf", @opt; die; } close(R2); @@ -309,6 +310,6 @@ sub html_quote { sub url_unquote { local($_) = @_; - s/%([0-9A-Fa-f][0-9A-Fa-f])/chr(hex($1))/ge; + s/\+|%([0-9A-Fa-f][0-9A-Fa-f])/$& eq '+' ? ' ' : chr(hex($1))/ge; return $_; } -- cgit v1.2.3