X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=contacts-n9k2mutt;h=fb3ef2168db532d7d2e3255d9bba5e96147cbcbc;hp=d9641398277fd4ba1e52b12607f3fc7ea4760f59;hb=dc95c42776248b09813d8722216e1cef47310163;hpb=c2ccb5629c0279276229ad9cfd4082fd452bb218

diff --git a/contacts-n9k2mutt b/contacts-n9k2mutt
index d964139..fb3ef21 100755
--- a/contacts-n9k2mutt
+++ b/contacts-n9k2mutt
@@ -40,14 +40,21 @@ while (<>) {
 			my($name,$mail,$attr,$iscompany)=map(($data->{$_}),qw(name mail attr iscompany));
 			$name=~s/,.*$//s;
 			my @nicks=();
-			push @nicks,$1 while $name=~s/"([^"]*)"//s;
+			my $name_force;
+			while ($name=~s/"([^"]*)"([!])?//s) {
+				push @nicks,$1;
+				$name_force=$1 if $2;
+				}
 			$name=~s/\s*$//s;
 			$name=~s/^(\w+)\s+(\w+)$/$2 $1/s if !$iscompany;
-			(my $nick=$name.(!$attr ? "" : ".$attr"))=~s/\s+/./gs;
-			push @nicks,$nick;
+			push @nicks,$name if !$name_force;
+			for (@nicks) {
+				$_.=".$attr" if $attr;
+				s/\s+/./gs;
+				}
 			map({
 					"nick"=>$_,
-					"obj"=>Mail::Address->new($name,$mail),
+					"obj"=>Mail::Address->new(($name_force || $name),$mail),
 					},@nicks);
 			} @data);
 	for (@nicked) {