X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=abook.c;h=9c42c08d802c87043eeea74922bafe436568672a;hb=ddc79c208a4b434fc9a314cc41ced960563fa07e;hp=57db4e46be931493510da3f2e981595020e126ad;hpb=8aec8ef9c11d69cc6f68847d831a63d0d3e02035;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index 57db4e4..9c42c08 100644
--- a/abook.c
+++ b/abook.c
@@ -284,7 +284,7 @@ make_mailstr(int item)
 
 	ret = *database[item][EMAIL] ?
 		mkstr("%s <%s>", name, email) :
-		name;
+		strdup(name);
 
 	free(name);
 	
@@ -295,23 +295,26 @@ void
 launch_mutt(int item)
 {
 	char *cmd = NULL, *mailstr = NULL;
+	char *mutt_command = options_get_str("mutt_command");
+
+	if(mutt_command == NULL || !*mutt_command)
+		return;
 
 	if( is_valid_item(item) )
 		mailstr = make_mailstr(item);
-
-	/*
-	 * need to implement for multiple addresses
-	 */
-		/*
-	} else {
+	else {
 		struct db_enumerator e = init_db_enumerator(ENUM_SELECTED);
+		char *tmp = NULL;
 		db_enumerate_items(e) {
 			tmp = mailstr;
-			mailstr = strconcat(tmp, make_mailstr(e.item);
-			
-	}*/
+			mailstr = tmp ?
+				strconcat(tmp, ",", make_mailstr(e.item), NULL):
+				strconcat(make_mailstr(e.item), NULL);
+			free(tmp);
+		}
+	}
 
-	cmd = strconcat(options_get_str("mutt_command"), " \'", mailstr,
+	cmd = strconcat(mutt_command, " \'", mailstr,
 				"\'", NULL);
 	free(mailstr);
 #ifdef DEBUG