w3m

commit 475bf005755b81023bd4619248870897473f7591
parent 4f9588f6b3c55fb1e9c57871eae0d69ca917c923
Author: ukai <ukai>
Date:   Tue, 24 Sep 2002 17:06:04 +0000

[w3m-dev 03319] mailto
* main.c (followA): mailto
* main.c (cmd_loadURL): mailto
* url.c (_parsedURL2Str): mailto: query
From: AIDA Shinra <aida-s@jcom.home.ne.jp>

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
main.c
 | 
26
++++++++++++++++++++++++--
M
url.c
 | 
4
++++

3 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,12 @@
 2002-09-25  AIDA Shinra <aida-s@jcom.home.ne.jp>
 
+	* [w3m-dev 03319] mailto
+	* main.c (followA): mailto
+	* main.c (cmd_loadURL): mailto
+	* url.c (_parsedURL2Str): mailto: query
+
+2002-09-25  AIDA Shinra <aida-s@jcom.home.ne.jp>
+
 	* [w3m-dev 03318] Re: Passwords
 	* etc.c (struct auth_path): added
 		(passwords): added
diff --git a/main.c b/main.c
@@ -2729,11 +2729,22 @@ followA(void)
 #endif
 	) {
 	/* invoke external mailer */
+	Str to = Strnew_charp(a->url + 7);
+#ifndef USE_W3MMAILER
+	char *pos;
+	if (!non_null(Mailer)) {
+	    disp_err_message("no mailer is specified", TRUE);
+	    return;
+	}
+	if ((pos = strchr(to->ptr, '?')) != NULL)
+	    Strtruncate(to, pos - to->ptr);
+#endif
 	fmTerm();
-	system(myExtCommand(Mailer, shell_quote(url_unquote(a->url + 7)),
+	system(myExtCommand(Mailer, shell_quote(url_unquote(to->ptr)),
 			    FALSE)->ptr);
 	fmInit();
 	displayBuffer(Currentbuf, B_FORCE_REDRAW);
+	pushHashHist(URLHist, a->url);
 	return;
     }
 #ifdef USE_NNTP
@@ -3691,11 +3702,22 @@ cmd_loadURL(char *url, ParsedURL *current, char *referer)
 #endif
 	) {
 	/* invoke external mailer */
+	Str to = Strnew_charp(url + 7);
+#ifndef USE_W3MMAILER
+	char *pos;
+	if (!non_null(Mailer)) {
+	    disp_err_message("no mailer is specified", TRUE);
+	    return;
+	}
+	if ((pos = strchr(to->ptr, '?')) != NULL)
+	    Strtruncate(to, pos - to->ptr);
+#endif
 	fmTerm();
-	system(myExtCommand(Mailer, shell_quote(url_unquote(url + 7)),
+	system(myExtCommand(Mailer, shell_quote(url_unquote(to->ptr)),
 			    FALSE)->ptr);
 	fmInit();
 	displayBuffer(Currentbuf, B_FORCE_REDRAW);
+	pushHashHist(URLHist, url);
 	return;
     }
 #ifdef USE_NNTP
diff --git a/url.c b/url.c
@@ -1114,6 +1114,10 @@ _parsedURL2Str(ParsedURL *pu, int pass)
 #ifndef USE_W3MMAILER
     if (pu->scheme == SCM_MAILTO) {
 	Strcat_charp(tmp, pu->file);
+	if (pu->query) {
+	    Strcat_char(tmp, '?');
+	    Strcat_charp(tmp, pu->query);
+	}
 	return tmp;
     }
 #endif