[Mew-dist 1473] offical patch 1 for IM 55
Kazu Yamamoto ( 山本和彦 )
Kazu at example.com
1997年 8月 6日 (水) 19:12:56 JST
Please apply the following patch ONLY to IM 55. I'm very sorry for
your inconvenience.
--Kazu
diff -crN im-55/00changes im-56/00changes
*** im-55/00changes Wed Aug 6 15:30:25 1997
--- im-56/00changes Wed Aug 6 19:06:09 1997
***************
*** 1,3 ****
--- 1,17 ----
+
+ * Delete 'use IM::Debug' from Recipient.pm
+ SAKAI Kiyotaka <ksakai at example.com>
+ * Alias.pm patch
+ SAKAI Kiyotaka <ksakai at example.com>
+ * Iso2022jp.pm typo fixes.
+ SAKAI Kiyotaka <ksakai at example.com>
+ * ScanSBR patch.
+ Makoto MATSUSHITA <matusita at example.com>
+ * Typo fixes.
+ NAKAMURA Motonori <motonori at example.com>
+ * Delete an old CV variable from imstore.
+ Tomoaki Tsumura <tsumura at example.com>
+
55 (97/08/06) mew-dist release
* Deleted the --batch option imget.
diff -crN im-55/IM.in/Alias.pm.in im-56/IM.in/Alias.pm.in
*** im-55/IM.in/Alias.pm.in Mon Aug 4 09:24:01 1997
--- im-56/IM.in/Alias.pm.in Wed Aug 6 18:59:00 1997
***************
*** 34,40 ****
use IM::Alias;
! &open_aliases(mail_alias_paths,host_alias_paths);
$result = &alias_lookup(user_name);
$result = &host_completion(mail_address);
&list_mail_aliases(prefix_string);
--- 34,40 ----
use IM::Alias;
! &open_aliases(mail_alias_paths, host_alias_paths);
$result = &alias_lookup(user_name);
$result = &host_completion(mail_address);
&list_mail_aliases(prefix_string);
***************
*** 43,49 ****
=head1 DESCRIPTION
! open_aliases("$HOME/Mail/aliases", "$HOME/.hostaliases");
$result = alias_lookup('u');
print "$result\n" if ($result);
--- 43,49 ----
=head1 DESCRIPTION
! open_aliases("$HOME/.im/Aliases", "$HOME/.hostaliases");
$result = alias_lookup('u');
print "$result\n" if ($result);
***************
*** 70,76 ****
local (*ALIAS);
unless ($mail_aliases) {
! $mail_aliases = "aliases";
}
unless ($host_aliases) {
$host_aliases = "~/.hostaliases";
--- 70,76 ----
local (*ALIAS);
unless ($mail_aliases) {
! $mail_aliases = "~/.im/Aliases";
}
unless ($host_aliases) {
$host_aliases = "~/.hostaliases";
***************
*** 123,151 ****
}
sub list_mail_aliases {
! local ($h, *ALIAS);
! local (@list);
! $list = ();
foreach $h (@MA_HANDLES) {
*ALIAS = $h;
im_warn("searching $str with $h.\n") if (&debug("alias"));
seek(ALIAS, 0, 0);
while (<ALIAS>) {
chomp;
! while (/([^\s]*)\s*\\$/) {
my $cont;
$_ = $1;
! unless ($cont = <ALIAS>) {
im_warn("EOF encountered on the entry: $_.\n");
return ();
}
chomp($cont);
! $cont =~ s/^\s+/ /;
$_ .= $cont;
}
! next if (/^[#;]/);
! if (/^(.*):\s*(.+)/) {
push (@list, $_);
}
}
--- 123,154 ----
}
sub list_mail_aliases {
! my $str = shift;
! my @list = ();
! my $h;
! local *ALIAS;
! $str = "" unless defined($str);
foreach $h (@MA_HANDLES) {
*ALIAS = $h;
im_warn("searching $str with $h.\n") if (&debug("alias"));
seek(ALIAS, 0, 0);
while (<ALIAS>) {
+ next if (/^[#;]/);
chomp;
! next if (/^$/);
! while (/^(.*\S)\s*\\$/) {
my $cont;
$_ = $1;
! unless (defined($cont = <ALIAS>)) {
im_warn("EOF encountered on the entry: $_.\n");
return ();
}
chomp($cont);
! $cont =~ s/^\s*/ /;
$_ .= $cont;
}
! if (/^$str.*:/) {
push (@list, $_);
}
}
***************
*** 154,171 ****
}
sub list_host_aliases {
! my ($str) = @_;
! local ($h, *ALIAS);
! local (@list);
- $list = ();
foreach $h (@HA_HANDLES) {
*ALIAS = $h;
im_warn("searching $str with $h.\n") if (&debug("alias"));
seek(ALIAS, 0, 0);
while (<ALIAS>) {
- chomp;
next if (/^#/);
if (/^($str.*)\t\s*(.+)/) {
push (@list, $_);
}
--- 157,174 ----
}
sub list_host_aliases {
! my $str = shift;
! my @list = ();
! my $h;
! local *ALIAS;
foreach $h (@HA_HANDLES) {
*ALIAS = $h;
im_warn("searching $str with $h.\n") if (&debug("alias"));
seek(ALIAS, 0, 0);
while (<ALIAS>) {
next if (/^#/);
+ chomp;
if (/^($str.*)\t\s*(.+)/) {
push (@list, $_);
}
***************
*** 183,190 ****
#
sub alias_lookup {
my ($addr) = @_;
! my ($a);
! local ($h, *ALIAS);
return "" if ($addr =~ /[\@%!:]/o);
# if ($Alias_lookup_count++ == 100) {
# &error_log(0, "May be alias loop: $addr\n");
--- 186,193 ----
#
sub alias_lookup {
my ($addr) = @_;
! my ($a, $h);
! local *ALIAS;
return "" if ($addr =~ /[\@%!:]/o);
# if ($Alias_lookup_count++ == 100) {
# &error_log(0, "May be alias loop: $addr\n");
***************
*** 196,214 ****
seek(ALIAS, 0, 0);
while (<ALIAS>) {
# im_warn("$_.\n") if (&debug("alias"));
chomp;
! while (/([^\s]*)\s*\\$/) {
my $cont;
$_ = $1;
! unless ($cont = <ALIAS>) {
im_warn("EOF encountered on the entry: $_.\n");
return "";
}
chomp($cont);
! $cont =~ s/^\s+/ /;
$_ .= $cont;
}
- next if (/^[#;]/);
if (/^$addr\s*[:=]\s*(.+)$/) {
im_warn("found $addr -> $1\n") if (&debug("alias"));
$a = $1;
--- 199,218 ----
seek(ALIAS, 0, 0);
while (<ALIAS>) {
# im_warn("$_.\n") if (&debug("alias"));
+ next if (/^[#;]/);
chomp;
! next if (/^$/);
! while (/(.*\S)\s*\\$/) {
my $cont;
$_ = $1;
! unless (defined($cont = <ALIAS>)) {
im_warn("EOF encountered on the entry: $_.\n");
return "";
}
chomp($cont);
! $cont =~ s/^\s*/ /;
$_ .= $cont;
}
if (/^$addr\s*[:=]\s*(.+)$/) {
im_warn("found $addr -> $1\n") if (&debug("alias"));
$a = $1;
***************
*** 218,225 ****
# }
# $a = &struct_iso2022jp_mimefy($a)
# if ($main::Iso2022jp_header_mime_conv);
## endif
- im_warn("return: $a\n") if (&debug("alias"));
return "$a";
}
}
--- 222,229 ----
# }
# $a = &struct_iso2022jp_mimefy($a)
# if ($main::Iso2022jp_header_mime_conv);
+ # im_warn("return: $a\n") if (&debug("alias"));
## endif
return "$a";
}
}
diff -crN im-55/IM.in/Iso2022jp.pm.in im-56/IM.in/Iso2022jp.pm.in
*** im-55/IM.in/Iso2022jp.pm.in Mon Aug 4 09:24:03 1997
--- im-56/IM.in/Iso2022jp.pm.in Wed Aug 6 18:59:16 1997
***************
*** 142,148 ****
next;
} elsif ($c eq ")") {
im_err("Unbalanced comment parenthesis ('(', ')'): "
! ."$lineout$linework -- $c -- $linein\n");
# &error_exit;
return "";
} elsif ($c eq "<") {
--- 142,148 ----
next;
} elsif ($c eq ")") {
im_err("Unbalanced comment parenthesis ('(', ')'): "
! ."$lineout$line_work -- $c -- $line_in\n");
# &error_exit;
return "";
} elsif ($c eq "<") {
diff -crN im-55/IM.in/Message.pm.in im-56/IM.in/Message.pm.in
*** im-55/IM.in/Message.pm.in Wed Aug 6 10:51:26 1997
--- im-56/IM.in/Message.pm.in Wed Aug 6 19:00:46 1997
***************
*** 770,776 ****
require Sys::Hostname && import Sys::Hostname;
# host information
! my $myhostname = hostname;
unless ($myhostname =~ /\./) {
my ($h) = gethostbyname($myhostname);
$myhostname = $h if ($h);
--- 770,776 ----
require Sys::Hostname && import Sys::Hostname;
# host information
! my $myhostname = hostname();
unless ($myhostname =~ /\./) {
my ($h) = gethostbyname($myhostname);
$myhostname = $h if ($h);
diff -crN im-55/IM.in/Recipient.pm.in im-56/IM.in/Recipient.pm.in
*** im-55/IM.in/Recipient.pm.in Tue Aug 5 15:17:07 1997
--- im-56/IM.in/Recipient.pm.in Wed Aug 6 18:58:47 1997
***************
*** 19,25 ****
require Exporter;
use IM::Config;
- use IM::Debug;
use IM::Address;
use IM::Alias;
use IM::Iso2022jp;
--- 19,24 ----
diff -crN im-55/IM.in/Scan.pm.in im-56/IM.in/Scan.pm.in
*** im-55/IM.in/Scan.pm.in Mon Aug 4 09:24:04 1997
--- im-56/IM.in/Scan.pm.in Wed Aug 6 18:59:45 1997
***************
*** 423,429 ****
##
## Call user defined function
##
! &scan_sub(\%Head) if (defined(&scan_sub));
}
sub disp_msg {
--- 423,429 ----
##
## Call user defined function
##
! &scan_sub($href) if (defined(&scan_sub));
}
sub disp_msg {
diff -crN im-55/dot.im/scan.sbr im-56/dot.im/scan.sbr
*** im-55/dot.im/scan.sbr Fri Jul 25 15:47:35 1997
--- im-56/dot.im/scan.sbr Wed Aug 6 19:00:14 1997
***************
*** 2,16 ****
$symbol_table{'a'} = 'anno:';
sub scan_sub {
! local (*Header) = shift;
! if ($Header{'replied'} ne '') {
! $Header{'anno:'} = 'R';
! } elsif ($Header{'forwarded'} ne '') {
! $Header{'anno:'} = 'F';
! } elsif ($Header{'resent'} ne '') {
! $Header{'anno:'} = 'r';
} else {
! $Header{'anno:'} = ' ';
}
}
--- 2,16 ----
$symbol_table{'a'} = 'anno:';
sub scan_sub {
! local ($href) = shift;
! if (${$href}{'replied'} ne '') {
! ${$href}{'anno:'} = 'R';
! } elsif (${$href}{'forwarded'} ne '') {
! ${$href}{'anno:'} = 'F';
! } elsif (${$href}{'resent'} ne '') {
! ${$href}{'anno:'} = 'r';
} else {
! ${$href}{'anno:'} = ' ';
}
}
diff -crN im-55/imget.in im-56/imget.in
*** im-55/imget.in Wed Aug 6 15:29:33 1997
--- im-56/imget.in Wed Aug 6 19:00:47 1997
***************
*** 102,108 ****
&set_scan_form($opt_form, $opt_width, $opt_jissafe);
! if ($opt_ossoc ne '') {
foreach $assoc (split(';', $opt_assoc)) {
my ($dst, $src) = split('=', $assoc);
my $m = &get_sub($src, $dst, $opt_mode);
--- 102,108 ----
&set_scan_form($opt_form, $opt_width, $opt_jissafe);
! if ($opt_assoc ne '') {
foreach $assoc (split(';', $opt_assoc)) {
my ($dst, $src) = split('=', $assoc);
my $m = &get_sub($src, $dst, $opt_mode);
diff -crN im-55/imstore.in im-56/imstore.in
*** im-55/imstore.in Mon Aug 4 12:15:50 1997
--- im-56/imstore.in Wed Aug 6 19:05:25 1997
***************
*** 1,4 ****
! #! @im_cv_path_perl@
################################################################
###
### imstore
--- 1,4 ----
! #! @im_path_perl@
################################################################
###
### imstore
Mew-dist メーリングリストの案内