diff options
84 files changed, 467 insertions, 334 deletions
diff --git a/img/dist/IM/00changes b/img/dist/IM/00changes index 77620975..cc6b27fc 100644 --- a/img/dist/IM/00changes +++ b/img/dist/IM/00changes @@ -1,3 +1,37 @@ +144 (2003/03/22) + +* IM/Util.pm: Fix `$osname' for darwin. (Thanks to WATANABE Hideyuki) +* IM/Scan.pm (parse_body): Regexp fix. +* 00readme: Doc fix. +* imput.in: Doc fix. +* imsetup.in, cnf.im/SiteConfig.in, dot.im/Config: Add comments for + `UseTouchFile' and `TouchFile'. +* Fix im_info messages. +* immknmz.in: Use $ENV{TMPDIR}, $ENV{TEMP}, $ENV{TMP}, or `/tmp'. +* configure.in, configure: New option, `--enable-usecl'. +* configure.in, configure: Bug fix for `--disable_rpop'. +* configure.in, configure: Trimming for `im_fsync_no'. +* cnf.im/SiteConfig.in: Use `@im_fsync_no@'. +* Makefile.in: Set mode to 755 instead of 555 for excutables. + +143 (2002/12/13) + +* The number of the fsync system call is guessed on run time by default. + If `FsyncNumber' is set to non-0 in Config, it is preferred. +* imsetup.in, cnf.im/SiteConfig.in, dot.im/Config: Modify comments for + `FsyncNumber'. +* IM/MsgStore.pm (fsync): Use `preferred_fsync_no', guessed number, and + `fsync_no'. +* IM/Config.pm.in (preferred_fsync_no, fsync_no): Divide from `fsync_no'. + `preferred_fsync_no' uses `$FsyncNumber'. +* imsetup.in, cnf.im/SiteConfig.in, dot.im/Config: Modify comments for + `SshPath'. +* IM/Config.pm.in: Don't export `$SSH_PATH'. +* IM/Ssh.pm: Use `ssh_path()' instead of `$SSH_PATH'. +* IM/Config.pm.in (@CfgConfig): Add `SshPath'. +* IM/Config.pm.in (ssh_path): New subroutine. +* 00diff: New file. + 142 (2002/12/07) * New maintainer, Tatsuya Kinoshita <tats@vega.ocn.ne.jp>. I obtained diff --git a/img/dist/IM/00diff b/img/dist/IM/00diff new file mode 100644 index 00000000..29cd6958 --- /dev/null +++ b/img/dist/IM/00diff @@ -0,0 +1,29 @@ + Differences between IM144 and IM143 + +* Supporting darwin. +* Regexp fix for Form=%b. +* Bug fix for configure options. +* Doc/message fix. + + Differences between IM143 and IM142 + +* The number of the fsync system call is guessed on run time by default. + If `FsyncNumber' is set to non-0 in Config, it is preferred. +* New config variable, `SshPath'. + + Differences between IM142 and IM141 + +* Local security fix for impwagent and immknmz. +* IM/TcpTransaction.pm: Socket6.pm support. +* IM/MD5.pm: Fix 64bit integer problem. +* imsetup: Support `User' and `MBoxStyle=qmail'. +* imsetup: Bug fix for Perl 5.8.0. +* Minor bug fixes. + + Differences between IM141 and IM140 + +* immknmz: New option, `--timestamp'. +* IM/Nntp.pm: Bug fix for NNTP authuser for queue. +* IM/Imap.pm: Bug fix for IMAP login. +* IM/Iso2022jp.pm: Fix word_iso2022jp_mimefy problem. +* IM/Scan.pm: jisx0213 support. diff --git a/img/dist/IM/00readme b/img/dist/IM/00readme index 2b41fd95..83be091d 100644 --- a/img/dist/IM/00readme +++ b/img/dist/IM/00readme @@ -1,25 +1,26 @@ Internet Message Kazu Yamamoto - Sep 5, 1999 + Tatsuya Kinoshita - Modified by Tatsuya Kinoshita on Dec 7, 2002 + Mar 22, 2003 <<<Copyright>>> -This package provides a series of user interface commands (im* -commands) and backend Perl5 modules to integrate E-mail and NetNews -handling. They are designed to be used both from Mew version 1.x and -on command line. +IM (Internet Message) provides a series of user interface commands +(imput, imget, imls, ...) and backend Perl5 modules to integrate +E-mail and NetNews user interface. They are designed to be used both +from Mew version 1.x and on command line. The folder style of IM is exactly the same as that of MH. So, you can replace MH with this package without any migration works. Moreover, you are able to operate your messages both by IM and MH with consistent manner. -IM is free software; you can redistribute it and/or modify it under -the modified BSD license. See 00copyright for more details. +IM is copyrighted by IM developing team. You can redistribute it +and/or modify it under the modified BSD license. See 00copyright for +more details. IM/MD5.pm is derived from md5.pl copyrighted by NAKAMURA, Motonori <motonori@econ.kyoto-u.ac.jp>. It is converted to Perl4 from C version @@ -27,6 +28,7 @@ derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm. install-sh is under the M.I.T. license. + <<<Installing under the root privilege>>> * Install Perl 5.004_04 or later if not installed. For more @@ -96,7 +98,8 @@ Please send comments, bug reports, and patches to <img@mew.org>. You can contact the current maintainer (Tatsuya Kinoshita, since October 2002) by this e-mail address. -See also "IM Official Site" (http://tats.iris.ne.jp/im/). +For the latest news of IM, please see "IM (Internet Message) Official +Site" (http://tats.iris.ne.jp/im/). <<<Programmers>>> diff --git a/img/dist/IM/IM/Address.pm b/img/dist/IM/IM/Address.pm index 089a8b31..b63bc800 100644 --- a/img/dist/IM/IM/Address.pm +++ b/img/dist/IM/IM/Address.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Address.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Address.pm version 20030322(IM144)"; package IM::Address; require 5.003; diff --git a/img/dist/IM/IM/Alias.pm b/img/dist/IM/IM/Alias.pm index ccd30b77..04a50a9f 100644 --- a/img/dist/IM/IM/Alias.pm +++ b/img/dist/IM/IM/Alias.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Alias.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Alias.pm version 20030322(IM144)"; package IM::Alias; require 5.003; diff --git a/img/dist/IM/IM/Config.pm.in b/img/dist/IM/IM/Config.pm.in index 1fc3b263..7045bda6 100644 --- a/img/dist/IM/IM/Config.pm.in +++ b/img/dist/IM/IM/Config.pm.in @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Config.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Config.pm version 20030322(IM144)"; package IM::Config; require 5.003; @@ -32,7 +32,7 @@ use vars qw(@ISA @EXPORT); mail_dir mail_path news_dir news_path queue_dir queue_path inbox_folder draft_folder trash_folder config_cases config_case_inbox preserve_dot - folder_mode msg_mode allowcrlf use_cl no_sync fsync_no + folder_mode msg_mode allowcrlf use_cl no_sync fsync_no preferred_fsync_no addrbook_file aliases_file petname_file context_file getchksbr_file getsbr_file scansbr_file scan_header_pick address addresses_regex @@ -44,7 +44,7 @@ use vars qw(@ISA @EXPORT); expand_path usetouchfile touchfile namazuv2 namazu_lock_dir namazu_lock_path pop_timeout imap_timeout nntp_timeout dns_timeout connect_timeout command_timeout rcv_buf_siz - db_type file_attr $SSH_PATH); + db_type file_attr ssh_path); ## ## Constant @@ -108,6 +108,7 @@ BEGIN { 'usecl;b;;UseCL' => 'Use value of Content-Length header for delimitation', 'nosync;b;;NoSync' => 'Do not need fsync(2) on writing file', 'fsyncnumber;i;;FsyncNumber' => 'System call number of fsync', + 'sshpath;s;;SshPath' => 'Path name of SSH program', 'allowcrlf;b;;AllowCRLF' => 'CRLF may be in saved message', 'preservedot;b;;PreserveDot' => 'Not substitute "." with "/"', 'addrbookfile;s;;AddrBookFile' => 'Address book file', @@ -801,7 +802,11 @@ sub no_sync() { } sub fsync_no() { - return $FsyncNumber || $FSYNC_NO; + return $FSYNC_NO; +} + +sub preferred_fsync_no() { + return $FsyncNumber; } sub addrbook_file() { @@ -956,6 +961,10 @@ sub db_type() { return $IM_DB_TYPE; } +sub ssh_path() { + return $SshPath || $SSH_PATH; +} + sub namazuv2() { return $NamazuV2; } @@ -1098,7 +1107,7 @@ home_dir conf_dir mail_dir mail_path news_dir news_path queue_dir queue_path inbox_folder draft_folder trash_folder config_cases config_case_inbox preserve_dot -folder_mode msg_mode allowcrlf use_cl no_sync fsync_no +folder_mode msg_mode allowcrlf use_cl no_sync fsync_no preferred_fsync_no addrbook_file aliases_file petname_file context_file getchksbr_file getsbr_file scansbr_file scan_header_pick address addresses_regex @@ -1110,7 +1119,7 @@ usepwagent pwagentport pwagent_tmp_dir pwagent_tmp_path usepwfiles pwfiles expand_path usetouchfile touchfile namazuv2 namazu_lock_dir namazu_lock_path pop_timeout imap_timeout nntp_timeout dns_timeout connect_timeout command_timeout rcv_buf_siz -db_type file_attr +db_type file_attr ssh_path =head1 DESCRIPTION diff --git a/img/dist/IM/IM/EncDec.pm b/img/dist/IM/IM/EncDec.pm index 11ac71cb..713a638a 100644 --- a/img/dist/IM/IM/EncDec.pm +++ b/img/dist/IM/IM/EncDec.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::EncDec.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::EncDec.pm version 20030322(IM144)"; package IM::EncDec; require 5.003; diff --git a/img/dist/IM/IM/File.pm b/img/dist/IM/IM/File.pm index 303ab310..9ffb7fb9 100644 --- a/img/dist/IM/IM/File.pm +++ b/img/dist/IM/IM/File.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Jul 7, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::File.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::File.pm version 20030322(IM144)"; package IM::File; require 5.003; diff --git a/img/dist/IM/IM/Folder.pm b/img/dist/IM/IM/Folder.pm index 6170a4ee..c8566742 100644 --- a/img/dist/IM/IM/Folder.pm +++ b/img/dist/IM/IM/Folder.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Folder.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Folder.pm version 20030322(IM144)"; package IM::Folder; require 5.003; diff --git a/img/dist/IM/IM/GetPass.pm b/img/dist/IM/IM/GetPass.pm index 6c4caf5f..050b2470 100644 --- a/img/dist/IM/IM/GetPass.pm +++ b/img/dist/IM/IM/GetPass.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 30, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::GetPass.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::GetPass.pm version 20030322(IM144)"; package IM::GetPass; require 5.003; diff --git a/img/dist/IM/IM/Grep.pm b/img/dist/IM/IM/Grep.pm index 20cfb878..aadaecda 100644 --- a/img/dist/IM/IM/Grep.pm +++ b/img/dist/IM/IM/Grep.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Nov 03, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Grep.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Grep.pm version 20030322(IM144)"; package IM::Grep; require 5.003; diff --git a/img/dist/IM/IM/History.pm b/img/dist/IM/IM/History.pm index 0fd358c2..6ea54363 100644 --- a/img/dist/IM/IM/History.pm +++ b/img/dist/IM/IM/History.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Jul 6, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::History.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::History.pm version 20030322(IM144)"; package IM::History; require 5.003; diff --git a/img/dist/IM/IM/Http.pm b/img/dist/IM/IM/Http.pm index 34949b61..5e63cfa9 100644 --- a/img/dist/IM/IM/Http.pm +++ b/img/dist/IM/IM/Http.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Http.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Http.pm version 20030322(IM144)"; package IM::Http; require 5.003; diff --git a/img/dist/IM/IM/Imap.pm b/img/dist/IM/IM/Imap.pm index cdd056d6..533ab42b 100644 --- a/img/dist/IM/IM/Imap.pm +++ b/img/dist/IM/IM/Imap.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Imap.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Imap.pm version 20030322(IM144)"; package IM::Imap; require 5.003; @@ -534,7 +534,7 @@ sub imap_process($$$$$$$) { } } elsif ($how eq 'get') { if ($msgs > 0) { - im_info("Getting new messages from $host into $dst....\n"); + im_info("Getting new messages from $src at $host into $dst...\n"); my @alluids = &imap_all_uids($HANDLE); return -1 if ($alluids[0] < 0); my $i; diff --git a/img/dist/IM/IM/Iso2022jp.pm b/img/dist/IM/IM/Iso2022jp.pm index bcb37bfb..56e97ac3 100644 --- a/img/dist/IM/IM/Iso2022jp.pm +++ b/img/dist/IM/IM/Iso2022jp.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Iso2022jp.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Iso2022jp.pm version 20030322(IM144)"; package IM::Iso2022jp; require 5.003; diff --git a/img/dist/IM/IM/Japanese.pm b/img/dist/IM/IM/Japanese.pm index f0e1e1bb..165dae76 100644 --- a/img/dist/IM/IM/Japanese.pm +++ b/img/dist/IM/IM/Japanese.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Japanese.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Japanese.pm version 20030322(IM144)"; package IM::Japanese; require 5.003; diff --git a/img/dist/IM/IM/LocalMbox.pm b/img/dist/IM/IM/LocalMbox.pm index 1c27bbee..c260b43a 100644 --- a/img/dist/IM/IM/LocalMbox.pm +++ b/img/dist/IM/IM/LocalMbox.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::LocalMbox.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::LocalMbox.pm version 20030322(IM144)"; package IM::LocalMbox; require 5.003; @@ -119,7 +119,7 @@ sub local_get_msg($$$$$) { if (-d $mbox) { # DIRECTORY - im_info("Getting new messages from maildir into $dst....\n") + im_info("Getting new messages from maildir into $dst...\n") if ($how eq 'get'); my $msgs = 0; @@ -339,7 +339,7 @@ sub process_mbox($$$$$) { local(*MBOX); my($first_line, $FIRST_LINE); - im_info("Getting new messages from local mailbox into $dst....\n") + im_info("Getting new messages from local mailbox into $dst...\n") if ($how eq 'get'); im_warn("opening MBOX ($mbox)\n") if (&verbose); unless (im_open(\*MBOX, "<$mbox")) { diff --git a/img/dist/IM/IM/Log.pm b/img/dist/IM/IM/Log.pm index 256fe9da..fb2e479a 100644 --- a/img/dist/IM/IM/Log.pm +++ b/img/dist/IM/IM/Log.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Log.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Log.pm version 20030322(IM144)"; package IM::Log; require 5.003; diff --git a/img/dist/IM/IM/MD5.pm b/img/dist/IM/IM/MD5.pm index 3c995b28..1cbc4599 100644 --- a/img/dist/IM/IM/MD5.pm +++ b/img/dist/IM/IM/MD5.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::MD5.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::MD5.pm version 20030322(IM144)"; package IM::MD5; require 5.003; diff --git a/img/dist/IM/IM/Message.pm b/img/dist/IM/IM/Message.pm index 04d8e4e4..cc9dca80 100644 --- a/img/dist/IM/IM/Message.pm +++ b/img/dist/IM/IM/Message.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Message.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Message.pm version 20030322(IM144)"; package IM::Message; require 5.003; diff --git a/img/dist/IM/IM/MsgStore.pm b/img/dist/IM/IM/MsgStore.pm index 9e100293..d1789803 100644 --- a/img/dist/IM/IM/MsgStore.pm +++ b/img/dist/IM/IM/MsgStore.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::MsgStore.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::MsgStore.pm version 20030322(IM144)"; package IM::MsgStore; require 5.003; @@ -16,7 +16,7 @@ require Exporter; use Fcntl; use IM::Config qw(getsbr_file msg_mode msgdbfile expand_path - inbox_folder no_sync fsync_no file_attr); + inbox_folder no_sync fsync_no preferred_fsync_no file_attr); use IM::Util; use IM::Folder qw(message_number message_name create_folder touch_folder); use IM::Message qw(gen_date); @@ -294,26 +294,21 @@ sub excl_create(*$) { sub fsync($) { my $fno = shift; - if (fsync_no()) { - # try to use SYS_sync number detected when configure - return syscall(fsync_no(), $fno); + if (preferred_fsync_no()) { + return syscall(preferred_fsync_no(), $fno); } - - # otherwise, try to find from header files + # try to find from header files unless (defined($sys_fsync)) { - my $inc = 'syscall.ph'; # only for BSDs? - my $prefix; - if (-f '/usr/include/sys.s') { # for IRIX... - # create sys.ph from sys.s - require 'sys.ph'; + eval { require 'syscall.ph'; }; + unless ($@) { $sys_fsync = &SYS_fsync if (defined(&SYS_fsync)); } unless ($sys_fsync) { - foreach $prefix (@INC) { - if (-f "$prefix/$inc") { - require "$prefix/$inc"; + if (-f '/usr/include/sys.s') { # for IRIX... + # create sys.ph from sys.s + eval { require 'sys.ph'; }; + unless ($@) { $sys_fsync = &SYS_fsync if (defined(&SYS_fsync)); - last; } } } @@ -330,6 +325,10 @@ sub fsync($) { } } unless ($sys_fsync) { + # try to use SYS_fsync number detected when configure + $sys_fsync = fsync_no(); + } + unless ($sys_fsync) { im_die("Can't find a way to fsync(). Set NoSync=yes in your Config file and be careful on file system overflow if your mail folders are on NFS.\n"); } } diff --git a/img/dist/IM/IM/Nntp.pm b/img/dist/IM/IM/Nntp.pm index 9751d9c5..23b569ac 100644 --- a/img/dist/IM/IM/Nntp.pm +++ b/img/dist/IM/IM/Nntp.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Nntp.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Nntp.pm version 20030322(IM144)"; package IM::Nntp; require 5.003; @@ -97,7 +97,7 @@ sub nntp_close() { # group: news group to be posted in # part: part number to be sent in partial message mode # total: total number of partial messages -# authuser: User name for NNTP authentication +# authuser: User name for NNTP authentication # return value: # 0: success # 1: recoverable error (should be retried) @@ -558,13 +558,13 @@ sub nntp_get_msg($$$$) { if ($how eq 'from') { if ($msgs > 0) { - $msgs = &nntp_xover ($art_start, $art_end); - $msgs = &nntp_head ($art_start, $art_end) if ($msgs < 0); + $msgs = &nntp_xover($art_start, $art_end); + $msgs = &nntp_head($art_start, $art_end) if ($msgs < 0); if ($msgs < 0) { im_warn("can not get article poster information.\n"); return -1; } - im_info("$msgs article(s) in $group at $servers.\n"); + im_info("$msgs article(s) in $group at $servers.\n"); } else { im_info("no news in $group at $servers.\n"); } @@ -575,8 +575,7 @@ sub nntp_get_msg($$$$) { if ($how eq 'get') { my($last); if ($msgs > 0) { - im_info("Getting new messages from $group at $servers " - . "into $dst....\n"); + im_info("Getting new messages from $group at $servers into $dst...\n"); ($msgs, $last) = &nntp_articles($art_start, $art_end, $dst, $limit); if ($msgs < 0) { im_warn("can not get articles.\n"); diff --git a/img/dist/IM/IM/Pop.pm b/img/dist/IM/IM/Pop.pm index 8486edaa..9e8a5618 100644 --- a/img/dist/IM/IM/Pop.pm +++ b/img/dist/IM/IM/Pop.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Pop.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Pop.pm version 20030322(IM144)"; package IM::Pop; require 5.003; @@ -456,7 +456,7 @@ sub pop_inc($$$$$$$$) { } } - im_info("Getting new messages into $dst....\n"); + im_info("Getting new messages from $host into $dst...\n"); for ($i = $last; $i <= $msgs; $i++) { if ($getchk_hook ne '') { $head = &pop_head($i); diff --git a/img/dist/IM/IM/Recipient.pm b/img/dist/IM/IM/Recipient.pm index 7cec8467..e97c425e 100644 --- a/img/dist/IM/IM/Recipient.pm +++ b/img/dist/IM/IM/Recipient.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 27, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Recipient.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Recipient.pm version 20030322(IM144)"; package IM::Recipient; require 5.003; diff --git a/img/dist/IM/IM/Scan.pm b/img/dist/IM/IM/Scan.pm index c31c0e69..07407f84 100644 --- a/img/dist/IM/IM/Scan.pm +++ b/img/dist/IM/IM/Scan.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Scan.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Scan.pm version 20030322(IM144)"; package IM::Scan; require 5.003; @@ -256,17 +256,21 @@ sub parse_body(*$) { } last unless defined($_); - next if /^#/; next if /^\s*\n/; next if /^--/; next if /^- --/; + next if /^=2D/; next if /^\s+[\w*-]+=/; # eg. "boundary="; * = RFC2231 next if /^\s*[\w-]+: /; # Headers and header style citation - next if /^\s*[\w-]*[>|]/; # other citation - next if /:\n$/; - next if /^This is a multi-part message in MIME format./i; - - if (/^In message/ || /^In article/ || /^In <.*>/) { + next if /^\s*[>:|\/_}]/; # other citation + next if /^ /; + next if /^\s*\w+([\'._-]+\w+)*>/; + next if /^\s*(On|At) .*[^.!\s\n]\s*$/; + next if /(:|;|\/)\s*\n$/; + next if /(wrote|writes?|said|says?)[^.!\n]?\s*\n$/; + next if /^This is a multi-part message in MIME format/i; + + if (/^\s*In (message|article|<|\")/i) { if ($mode == 0) { $_ = <HANDLE>; } else { diff --git a/img/dist/IM/IM/Smtp.pm b/img/dist/IM/IM/Smtp.pm index af730a06..1826cf02 100644 --- a/img/dist/IM/IM/Smtp.pm +++ b/img/dist/IM/IM/Smtp.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Smtp.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Smtp.pm version 20030322(IM144)"; package IM::Smtp; require 5.003; diff --git a/img/dist/IM/IM/Ssh.pm b/img/dist/IM/IM/Ssh.pm index 404a8f78..cbdbb3c6 100644 --- a/img/dist/IM/IM/Ssh.pm +++ b/img/dist/IM/IM/Ssh.pm @@ -6,15 +6,15 @@ ### Author: Masatoshi Tsuchiya <tsuchiya@pine.kuee.kyoto-u.ac.jp> ### Internet Message Group <img@mew.org> ### Created: Oct 05, 1999 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Ssh.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Ssh.pm version 20030322(IM144)"; package IM::Ssh; require 5.003; require Exporter; -use IM::Config qw(connect_timeout command_timeout $SSH_PATH); +use IM::Config qw(connect_timeout command_timeout ssh_path); use IM::Util; use strict; use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $SSH $FH @PID); @@ -27,6 +27,7 @@ $FH = "SSH00000"; sub ssh_proxy($$$$) { my($server, $remote, $local, $host) = @_; + my $prog = ssh_path(); unless ($host) { im_err("Missing relay host.\n"); @@ -72,7 +73,7 @@ sub ssh_proxy($$$$) { close $read; open(STDOUT, ">&$write"); open(STDERR, ">&$write"); - exec($SSH_PATH, '-n', '-x', '-o', 'BatchMode yes', + exec($prog, '-n', '-x', '-o', 'BatchMode yes', "-L$local:$server:$remote", $host, sprintf('echo ssh_proxy_connect ; sleep %s', &command_timeout())); @@ -81,7 +82,7 @@ sub ssh_proxy($$$$) { sleep 5; redo FORK; } else { - im_warn("Can't fork $SSH_PATH.\n"); + im_warn("Can't fork $prog.\n"); } } 0; diff --git a/img/dist/IM/IM/Stdio.pm b/img/dist/IM/IM/Stdio.pm index 7d4d9808..645f1c0d 100644 --- a/img/dist/IM/IM/Stdio.pm +++ b/img/dist/IM/IM/Stdio.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: May 7, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Stdio.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Stdio.pm version 20030322(IM144)"; package IM::Stdio; require 5.003; diff --git a/img/dist/IM/IM/TcpTransaction.pm b/img/dist/IM/IM/TcpTransaction.pm index 63d6599c..b0ee4b32 100644 --- a/img/dist/IM/IM/TcpTransaction.pm +++ b/img/dist/IM/IM/TcpTransaction.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::TcpTransaction.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::TcpTransaction.pm version 20030322(IM144)"; package IM::TcpTransaction; require 5.003; diff --git a/img/dist/IM/IM/Util.pm b/img/dist/IM/IM/Util.pm index 68da1a5e..90c98b89 100644 --- a/img/dist/IM/IM/Util.pm +++ b/img/dist/IM/IM/Util.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Util.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Util.pm version 20030322(IM144)"; package IM::Util; require 5.003; @@ -48,13 +48,18 @@ $EXIT_ERROR = 1; my $osname = $^O; -if ($osname =~ /win/i) { - if (Win32::IsWinNT()) { - $OS = 'WNT'; - } elsif (Win32::IsWin95()) { - $OS = 'WIN95'; - } else { - $OS = 'WIN95'; # xxx +if ($osname =~ /win/i && $osname !~ /darwin/i) { + eval { + if (Win32::IsWinNT()) { + $OS = 'WNT'; + } elsif (Win32::IsWin95()) { + $OS = 'WIN95'; + } else { + $OS = 'WIN95'; # xxx + } + }; + if ($@) { + $OS = 'UNIX'; } } elsif ($osname =~ /os2/i) { $OS = 'OS/2'; diff --git a/img/dist/IM/Makefile.PL b/img/dist/IM/Makefile.PL index 9fd61227..3e869818 100644 --- a/img/dist/IM/Makefile.PL +++ b/img/dist/IM/Makefile.PL @@ -2,7 +2,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Nov 12, 2002 +### Revised: Dec 20, 2002 ### ### perl Makefile.PL ### make @@ -163,7 +163,7 @@ uninstall_config:: \$(RM_F) \$(IM_SITECONFIG_DIR)/SiteConfig install_rpop: install - \$(PERL) -e 'chown(0, (getgrnam("mail"))[2], \@ARGV) and chmod(04555, \@ARGV);' \$(INSTALLSCRIPT)/imget + \$(PERL) -e 'chown(0, (getgrnam("mail"))[2], \@ARGV) and chmod(04755, \@ARGV);' \$(INSTALLSCRIPT)/imget }); } else { push (@m, qq{ diff --git a/img/dist/IM/Makefile.in b/img/dist/IM/Makefile.in index b40bfe2b..f54b369d 100644 --- a/img/dist/IM/Makefile.in +++ b/img/dist/IM/Makefile.in @@ -4,7 +4,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Nov 16, 2002 +### Revised: Mar 22, 2003 ### SHELL= /bin/sh @@ -56,7 +56,7 @@ installbin:: fi for f in $(PROG); do \ $(sed) -e '/###DELETE-ON-INSTALL###/d' $${f} > $${f}.tmp ; \ - $(INSTALL) -m 555 $${f}.tmp $(bindir)/$${f} ; \ + $(INSTALL) -m 755 $${f}.tmp $(bindir)/$${f} ; \ $(rm) -f $${f}.tmp ; \ done $(sed) -e '/###DELETE-ON-INSTALL###/d' imget > imget.tmp diff --git a/img/dist/IM/cnf.im/SiteConfig.in b/img/dist/IM/cnf.im/SiteConfig.in index 74adaad9..ab27dc8b 100644 --- a/img/dist/IM/cnf.im/SiteConfig.in +++ b/img/dist/IM/cnf.im/SiteConfig.in @@ -103,7 +103,8 @@ ToDomain=@im_hostname@ # domain when domain part is omitted #Imget.Src=local:${HOME}/Maildir # in case of qmail UseCL=@im_usecl@ # Use value of Content-Length header NoSync=@im_nosync@ # Do not need fsync(2) on writing file -#FsyncNumber=118 # system call number of fsync +#FsyncNumber=@im_fsync_no@ # if 0, system call number of fsync is guessed +#SshPath=/usr/bin/ssh # Path name of SSH program #Imget.Src=pop #PopAccount=/APOP@localhost # account info for POP access @@ -130,6 +131,8 @@ NoSync=@im_nosync@ # Do not need fsync(2) on writing file #UsePwFiles=yes # use password files #PwFiles=password # password files (relative to ~/.im/) +#UseTouchFile=yes # use time-stamp file +#TouchFile=.mew-touch # time-stamp file for message folders #NamazuV2=yes # use Namazu version 2 (1.9.x or late) #NamazuLockDir=nmzlock # lock directory (relative to ~/.im/) diff --git a/img/dist/IM/configure b/img/dist/IM/configure index a6809c77..f8101858 100755 --- a/img/dist/IM/configure +++ b/img/dist/IM/configure @@ -12,15 +12,17 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --enable-rpop Use RPOP (suidperl is needed)" + --enable-rpop Use RPOP (suidperl is needed)" ac_help="$ac_help - --with-fsyncno=NUMBER Use NUMBER as SYS_fsync" + --with-fsyncno=NUMBER Use NUMBER as SYS_fsync" ac_help="$ac_help - --with-perldir=DIR Use DIR as site_perl directory" + --with-perldir=DIR Use DIR as site_perl directory" ac_help="$ac_help - --with-ssh=PATH Use PATH as SSH location" + --enable-usecl Use value of Content-Length header" ac_help="$ac_help - --with-hostname=HOSTNAME Use HOSTNAME as default domain for mail-address" + --with-ssh=PATH Use PATH as SSH location" +ac_help="$ac_help + --with-hostname=DOMAIN Use DOMAIN as default domain for mail-address" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -563,7 +565,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:567: checking for a BSD compatible install" >&5 +echo "configure:569: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -622,7 +624,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:626: checking host system type" >&5 +echo "configure:628: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -645,7 +647,7 @@ echo "$ac_t""$host" 1>&6 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:649: checking for $ac_word" >&5 +echo "configure:651: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -675,7 +677,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:679: checking for $ac_word" >&5 +echo "configure:681: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -726,7 +728,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:730: checking for $ac_word" >&5 +echo "configure:732: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -758,7 +760,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:762: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:764: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -769,12 +771,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 773 "configure" +#line 775 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -800,12 +802,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:806: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:809: checking whether we are using GNU C" >&5 +echo "configure:811: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -814,7 +816,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -833,7 +835,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:837: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:839: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -865,7 +867,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:869: checking how to run the C preprocessor" >&5 +echo "configure:871: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -880,13 +882,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 884 "configure" +#line 886 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -897,13 +899,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 901 "configure" +#line 903 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -914,13 +916,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 918 "configure" +#line 920 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -963,7 +965,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:967: checking for $ac_word" >&5 +echo "configure:969: checking for $ac_word" >&5 if eval "test \"`echo '$''{'im_cv_path_im_path_perl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1004,7 +1006,7 @@ case "$im_path_perl" in exit 1 esac echo $ac_n "checking for site_perl""... $ac_c" 1>&6 -echo "configure:1008: checking for site_perl" >&5 +echo "configure:1010: checking for site_perl" >&5 if eval "test \"`echo '$''{'im_cv_path_im_path_siteperl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1030,7 +1032,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1034: checking for $ac_word" >&5 +echo "configure:1036: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_im_path_chmod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1071,7 +1073,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1075: checking for $ac_word" >&5 +echo "configure:1077: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_im_path_mkdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1112,7 +1114,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1116: checking for $ac_word" >&5 +echo "configure:1118: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_im_path_rm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1153,7 +1155,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1157: checking for $ac_word" >&5 +echo "configure:1159: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_im_path_mv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1194,7 +1196,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1198: checking for $ac_word" >&5 +echo "configure:1200: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_im_path_sed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1231,7 +1233,7 @@ done test -n "$im_path_sed" || im_path_sed="missing_sed" echo $ac_n "checking for DB type""... $ac_c" 1>&6 -echo "configure:1235: checking for DB type" >&5 +echo "configure:1237: checking for DB type" >&5 if eval "test \"`echo '$''{'im_cv_perl_im_db_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1256,12 +1258,15 @@ fi # Check whether --enable-rpop or --disable-rpop was given. if test "${enable_rpop+set}" = set; then enableval="$enable_rpop" + im_rpop="${enableval}" +fi + +if test "x$im_rpop" = 'xyes'; then im_rpop="-o root -m 4755" else im_rpop="-m 755" fi - im_fsync_no=undef # Check whether --with-fsyncno or --without-fsyncno was given. if test "${with_fsyncno+set}" = set; then @@ -1273,17 +1278,17 @@ if test "x$im_fsync_no" = 'xundef'; then im_nosync="undefined" ac_safe=`echo "sys/syscall.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/syscall.h""... $ac_c" 1>&6 -echo "configure:1277: checking for sys/syscall.h" >&5 +echo "configure:1282: checking for sys/syscall.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1282 "configure" +#line 1287 "configure" #include "confdefs.h" #include <sys/syscall.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1313,7 +1318,7 @@ IM_FSYNC_NO=SYS_fsync IM_FSYNC_NO=undef #endif EOF - im_fsync_no=`eval $ac_cpp conftest.c | sed -n -e "s/^IM_FSYNC_NO=//p"` + im_fsync_no=`eval $ac_cpp conftest.c | sed -n -e 's/ *//g' -e 's/^IM_FSYNC_NO=//p'` rm -f conftest.c fi fi @@ -1337,16 +1342,24 @@ else fi -echo $ac_n "checking OS type""... $ac_c" 1>&6 -echo "configure:1342: checking OS type" >&5 -case "$host" in - *-*-solaris2*) - echo "$ac_t""Seems to be a Solaris; Content-Length: should be checked" 1>&6 - im_usecl=yes ;; - *) - echo "$ac_t""Not a Solaris; Content-Length: can be ignored" 1>&6 - im_usecl=no ;; -esac +# Check whether --enable-usecl or --disable-usecl was given. +if test "${enable_usecl+set}" = set; then + enableval="$enable_usecl" + im_usecl="${enableval}" +fi + +if test "x$im_usecl" = 'x'; then + echo $ac_n "checking OS type""... $ac_c" 1>&6 +echo "configure:1354: checking OS type" >&5 + case "$host" in + *-*-solaris2*) + echo "$ac_t""Seems to be a Solaris; Content-Length: should be checked" 1>&6 + im_usecl=yes ;; + *) + echo "$ac_t""Not a Solaris; Content-Length: can be ignored" 1>&6 + im_usecl=no ;; + esac +fi im_path_ssh='' # Check whether --with-ssh or --without-ssh was given. @@ -1359,7 +1372,7 @@ if test "x$im_path_ssh" = 'x'; then # Extract the first word of "ssh", so it can be a program name with args. set dummy ssh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1363: checking for $ac_word" >&5 +echo "configure:1376: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_im_path_ssh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1403,7 +1416,7 @@ fi if test "x$im_hostname" = 'x'; then echo $ac_n "checking domain for mail-address""... $ac_c" 1>&6 -echo "configure:1407: checking domain for mail-address" >&5 +echo "configure:1420: checking domain for mail-address" >&5 im_hostname=`hostname` echo "$ac_t""$im_hostname" 1>&6 fi diff --git a/img/dist/IM/configure.in b/img/dist/IM/configure.in index 74a885d3..59cb01d4 100644 --- a/img/dist/IM/configure.in +++ b/img/dist/IM/configure.in @@ -3,7 +3,7 @@ dnl configure.in dnl dnl Author: Internet Message Group <img@mew.org> dnl Created: Apr 23, 1997 -dnl Revised: Nov 16, 2002 +dnl Revised: Dec 20, 2002 dnl AC_INIT(imget.in) @@ -50,13 +50,17 @@ dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for library functions. AC_ARG_ENABLE(rpop, -[ --enable-rpop Use RPOP (suidperl is needed)], -[im_rpop="-o root -m 4755"], -[im_rpop="-m 755"],) +[ --enable-rpop Use RPOP (suidperl is needed)], +[im_rpop="${enableval}"]) +if test "x$im_rpop" = 'xyes'; then + im_rpop="-o root -m 4755" +else + im_rpop="-m 755" +fi im_fsync_no=undef AC_ARG_WITH(fsyncno, -[ --with-fsyncno=NUMBER Use NUMBER as SYS_fsync], +[ --with-fsyncno=NUMBER Use NUMBER as SYS_fsync], [im_fsync_no="${withval}"]) if test "x$im_fsync_no" = 'xundef'; then dnl check fsync() is in sys/syscall.h @@ -71,7 +75,7 @@ IM_FSYNC_NO=SYS_fsync IM_FSYNC_NO=undef #endif EOF - im_fsync_no=`eval $ac_cpp conftest.c | sed -n -e "s/^IM_FSYNC_NO=//p"` + im_fsync_no=`eval $ac_cpp conftest.c | sed -n -e 's/ *//g' -e 's/^IM_FSYNC_NO=//p'` rm -f conftest.c fi fi @@ -83,7 +87,7 @@ fi im_src_siteperl="use lib '`pwd`'; ###DELETE-ON-INSTALL###" AC_ARG_WITH(perldir, -[ --with-perldir=DIR Use DIR as site_perl directory], +[ --with-perldir=DIR Use DIR as site_perl directory], [im_path_siteperl="${withval}" im_my_siteperl="use lib '${withval}';"], [if test "${prefix}" != "NONE" ; then @@ -92,19 +96,24 @@ dnl prefix is equal to exec_prefix im_path_siteperl='${exec_prefix}/lib' fi]) -AC_MSG_CHECKING([OS type]) -case "$host" in - *-*-solaris2*) - AC_MSG_RESULT([Seems to be a Solaris; Content-Length: should be checked]) - im_usecl=yes ;; - *) - AC_MSG_RESULT([Not a Solaris; Content-Length: can be ignored]) - im_usecl=no ;; -esac +AC_ARG_ENABLE(usecl, +[ --enable-usecl Use value of Content-Length header], +[im_usecl="${enableval}"]) +if test "x$im_usecl" = 'x'; then + AC_MSG_CHECKING([OS type]) + case "$host" in + *-*-solaris2*) + AC_MSG_RESULT([Seems to be a Solaris; Content-Length: should be checked]) + im_usecl=yes ;; + *) + AC_MSG_RESULT([Not a Solaris; Content-Length: can be ignored]) + im_usecl=no ;; + esac +fi im_path_ssh='' AC_ARG_WITH(ssh, -[ --with-ssh=PATH Use PATH as SSH location], +[ --with-ssh=PATH Use PATH as SSH location], [im_path_ssh="${withval}"]) if test "x$im_path_ssh" = 'x'; then AC_PATH_PROG(im_path_ssh, ssh, '/usr/local/bin/ssh') @@ -112,7 +121,7 @@ fi im_hostname='' AC_ARG_WITH(hostname, -[ --with-hostname=HOSTNAME Use HOSTNAME as default domain for mail-address], +[ --with-hostname=DOMAIN Use DOMAIN as default domain for mail-address], [im_hostname="${withval}"]) if test "x$im_hostname" = 'x'; then AC_MSG_CHECKING([domain for mail-address]) diff --git a/img/dist/IM/dot.im/Config b/img/dist/IM/dot.im/Config index 86ac62c6..80044561 100644 --- a/img/dist/IM/dot.im/Config +++ b/img/dist/IM/dot.im/Config @@ -108,7 +108,8 @@ ToDomain=_domain_when_domain_part_is_omitted_ #Imget.Src=local:${HOME}/Maildir # in case of qmail #UseCL=no # Use value of Content-Length header #NoSync=no # Do not need fsync(2) on writing file -#FsyncNumber=118 # system call number of fsync +#FsyncNumber=0 # if 0, system call number of fsync is guessed +#SshPath=/usr/bin/ssh # Path name of SSH program #Imget.Src=pop #PopAccount=/APOP@localhost # account info for POP access @@ -135,6 +136,8 @@ ToDomain=_domain_when_domain_part_is_omitted_ #UsePwFiles=yes # use password files #PwFiles=password # password files (relative to ~/.im/) +#UseTouchFile=yes # use time-stamp file +#TouchFile=.mew-touch # time-stamp file for message folders #NamazuV2=yes # use Namazu version 2 (1.9.x or late) #NamazuLockDir=nmzlock # lock directory (relative to ~/.im/) diff --git a/img/dist/IM/imali.in b/img/dist/IM/imali.in index 73dea8b3..b86b23b0 100644 --- a/img/dist/IM/imali.in +++ b/img/dist/IM/imali.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imali version 20021207(IM142)"; +my $VERSION = "imali version 20030322(IM144)"; $Prog = 'imali'; diff --git a/img/dist/IM/imcat.in b/img/dist/IM/imcat.in index 0f67ffc9..f7353d9b 100644 --- a/img/dist/IM/imcat.in +++ b/img/dist/IM/imcat.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: May 5, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imcat version 20021207(IM142)"; +my $VERSION = "imcat version 20030322(IM144)"; $Prog = 'imcat'; diff --git a/img/dist/IM/imcd.in b/img/dist/IM/imcd.in index 4feadd76..09370343 100644 --- a/img/dist/IM/imcd.in +++ b/img/dist/IM/imcd.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imcd version 20021207(IM142)"; +my $VERSION = "imcd version 20030322(IM144)"; $Prog = 'imcd'; diff --git a/img/dist/IM/imclean.in b/img/dist/IM/imclean.in index ae3eed3b..66235703 100644 --- a/img/dist/IM/imclean.in +++ b/img/dist/IM/imclean.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imclean version 20021207(IM142)"; +my $VERSION = "imclean version 20030322(IM144)"; $Prog = 'imclean'; diff --git a/img/dist/IM/imget.in b/img/dist/IM/imget.in index 6292ac46..30e36a57 100644 --- a/img/dist/IM/imget.in +++ b/img/dist/IM/imget.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Jan 14, 1996 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imget version 20021207(IM142)"; +my $VERSION = "imget version 20030322(IM144)"; $Prog = 'imget'; diff --git a/img/dist/IM/imgrep.in b/img/dist/IM/imgrep.in index 5fc160c4..4a26f6ba 100644 --- a/img/dist/IM/imgrep.in +++ b/img/dist/IM/imgrep.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imgrep version 20021207(IM142)"; +my $VERSION = "imgrep version 20030322(IM144)"; $Prog = 'imgrep'; diff --git a/img/dist/IM/imhist.in b/img/dist/IM/imhist.in index a2776578..b74f10ea 100644 --- a/img/dist/IM/imhist.in +++ b/img/dist/IM/imhist.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Jul 6, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imhist version 20021207(IM142)"; +my $VERSION = "imhist version 20030322(IM144)"; $Prog = 'imhist'; diff --git a/img/dist/IM/imhsync.in b/img/dist/IM/imhsync.in index 756d6e25..f428a9a8 100644 --- a/img/dist/IM/imhsync.in +++ b/img/dist/IM/imhsync.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Jul 02, 1998 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imhsync version 20021207(IM142)"; +my $VERSION = "imhsync version 20030322(IM144)"; $Prog = 'imhsync'; diff --git a/img/dist/IM/imjoin.in b/img/dist/IM/imjoin.in index 1ef03e93..c8763169 100644 --- a/img/dist/IM/imjoin.in +++ b/img/dist/IM/imjoin.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: May 5, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imjoin version 20021207(IM142)"; +my $VERSION = "imjoin version 20030322(IM144)"; $Prog = 'imjoin'; diff --git a/img/dist/IM/imls.in b/img/dist/IM/imls.in index 5a2faedf..9aa11b1e 100644 --- a/img/dist/IM/imls.in +++ b/img/dist/IM/imls.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Dec 31, 1995 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imls version 20021207(IM142)"; +my $VERSION = "imls version 20030322(IM144)"; $Prog = 'imls'; diff --git a/img/dist/IM/immknmz.in b/img/dist/IM/immknmz.in index fc42e3e6..6882f500 100644 --- a/img/dist/IM/immknmz.in +++ b/img/dist/IM/immknmz.in @@ -7,7 +7,7 @@ ### Author: Shuichi Kitaguchi <kit@Mew.org> ### Internet Message Group <img@mew.org> ### Created: Sep 23, 1999 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -15,7 +15,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "immknmz version 20021207(IM142)"; +my $VERSION = "immknmz version 20030322(IM144)"; $Prog = 'immknmz'; @@ -95,7 +95,7 @@ my $tempdir; my $tempfile; my $timestamp; -$tempdir = $ENV{TMPDIR} || $ENV{TMP} || $ENV{TEMP} || '/tmp'; +$tempdir = $ENV{TMPDIR} || $ENV{TEMP} || $ENV{TMP} || '/tmp'; $tempdir =~ s:\\:/:g; $tempdir =~ s/\/+$//; $tempdir = sprintf("%s/immknmz-%d-%d", $tempdir, $$, time()); diff --git a/img/dist/IM/immv.in b/img/dist/IM/immv.in index 9a466110..8fc34a10 100644 --- a/img/dist/IM/immv.in +++ b/img/dist/IM/immv.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "immv version 20021207(IM142)"; +my $VERSION = "immv version 20030322(IM144)"; $Prog = 'immv'; diff --git a/img/dist/IM/impack.in b/img/dist/IM/impack.in index ad996271..cd98365a 100644 --- a/img/dist/IM/impack.in +++ b/img/dist/IM/impack.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "impack version 20021207(IM142)"; +my $VERSION = "impack version 20030322(IM144)"; $Prog = 'impack'; diff --git a/img/dist/IM/impath.in b/img/dist/IM/impath.in index dfe6f308..5cec8cc4 100644 --- a/img/dist/IM/impath.in +++ b/img/dist/IM/impath.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "impath version 20021207(IM142)"; +my $VERSION = "impath version 20030322(IM144)"; $Prog = 'impath'; diff --git a/img/dist/IM/imput.in b/img/dist/IM/imput.in index 7626daf4..8e64653c 100644 --- a/img/dist/IM/imput.in +++ b/img/dist/IM/imput.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Aug 31, 1995 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -$VERSION = "imput version 20021207(IM142)"; +$VERSION = "imput version 20030322(IM144)"; $Prog = 'imput'; @@ -2081,7 +2081,7 @@ This command is provided by IM (Internet Message). Define "sendmail" environment variable with value "imput". -=item With Mew +=item With Mew 1.x Eval (setq mew-prog-imput "imput"). @@ -2089,7 +2089,7 @@ Eval (setq mew-prog-imput "imput"). Define sendproc in ~/.mh_profile like "sendproc: imput". -=item With sendmail.el (if you are using VM or ....) +=item With sendmail.el (if you are using VM or ...) Eval (setq sendmail-program "imput"). diff --git a/img/dist/IM/impwagent.in b/img/dist/IM/impwagent.in index 1090cf6b..bcaef6e0 100644 --- a/img/dist/IM/impwagent.in +++ b/img/dist/IM/impwagent.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Sep 13, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "impwagent version 20021207(IM142)"; +my $VERSION = "impwagent version 20030322(IM144)"; $Prog = 'impwagent'; diff --git a/img/dist/IM/imrm.in b/img/dist/IM/imrm.in index 74954469..d5c87d57 100644 --- a/img/dist/IM/imrm.in +++ b/img/dist/IM/imrm.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imrm version 20021207(IM142)"; +my $VERSION = "imrm version 20030322(IM144)"; $Prog = 'imrm'; diff --git a/img/dist/IM/imsetup.in b/img/dist/IM/imsetup.in index 78695606..e4ba57df 100644 --- a/img/dist/IM/imsetup.in +++ b/img/dist/IM/imsetup.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: May 9, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imsetup version 20021207(IM142)"; +my $VERSION = "imsetup version 20030322(IM144)"; $Prog = 'imsetup'; @@ -176,12 +176,14 @@ sub read_conf() { . " header like Solaris 2.x,\notherwise answer no.)" , $usecl); - $nosync = &input_config("Does your system can detect write errors without" - . " fsync(2)? (You can answer yes,\n" - . "if your home directory is on local file system," - . " otherwise answer no.)" - , $nosync eq 'undefined' ? 'no' : $nosync) - if ($nosync ne 'yes'); + if ($nosync ne 'yes') { + $nosync = + &input_config("Does your system can detect write errors without" + . " fsync(2)? (You can answer yes,\n" + . "if your home directory is on local file system," + . " otherwise answer no.)" + , $nosync eq 'undefined' ? 'no' : $nosync); + } print "\n"; } @@ -429,7 +431,8 @@ keep=$keep #Imget.Src=local:\${HOME}/Maildir # in case of qmail UseCL=$usecl # Use value of Content-Length header NoSync=$nosync # Do not need fsync(2) on writing file -#FsyncNumber=118 # system call number of fsync +#FsyncNumber=0 # if 0, system call number of fsync is guessed +#SshPath=/usr/bin/ssh # Path name of SSH program --- if ($src =~ /^pop/i) { @@ -474,6 +477,8 @@ keep=$keep #UsePwFiles=yes # use password files #PwFiles=password # password files (relative to ~/.im/) +#UseTouchFile=yes # use time-stamp file +#TouchFile=.mew-touch # time-stamp file for message folders #NamazuV2=yes # use Namazu version 2 (1.9.x or late) #NamazuLockDir=nmzlock # lock directory (relative to ~/.im/) diff --git a/img/dist/IM/imsort.in b/img/dist/IM/imsort.in index 29496cf0..08e52a87 100644 --- a/img/dist/IM/imsort.in +++ b/img/dist/IM/imsort.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Jul 2, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imsort version 20021207(IM142)"; +my $VERSION = "imsort version 20030322(IM144)"; $Prog = 'imsort'; diff --git a/img/dist/IM/imstore.in b/img/dist/IM/imstore.in index 6de905ec..4a3c58e0 100644 --- a/img/dist/IM/imstore.in +++ b/img/dist/IM/imstore.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Dec 31, 1995 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imstore version 20021207(IM142)"; +my $VERSION = "imstore version 20030322(IM144)"; $Prog = 'imstore'; diff --git a/img/dist/IM/imtar.in b/img/dist/IM/imtar.in index 7ab07717..dbb483a1 100644 --- a/img/dist/IM/imtar.in +++ b/img/dist/IM/imtar.in @@ -5,7 +5,7 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 08, 1998 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imtar version 20021207(IM142)"; +my $VERSION = "imtar version 20030322(IM144)"; $Prog = 'imtar'; diff --git a/img/lib/IM/Address.pm b/img/lib/IM/Address.pm index 089a8b31..b63bc800 100644 --- a/img/lib/IM/Address.pm +++ b/img/lib/IM/Address.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Address.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Address.pm version 20030322(IM144)"; package IM::Address; require 5.003; diff --git a/img/lib/IM/Alias.pm b/img/lib/IM/Alias.pm index ccd30b77..04a50a9f 100644 --- a/img/lib/IM/Alias.pm +++ b/img/lib/IM/Alias.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Alias.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Alias.pm version 20030322(IM144)"; package IM::Alias; require 5.003; diff --git a/img/lib/IM/Config.pm.in b/img/lib/IM/Config.pm.in index 1fc3b263..7045bda6 100644 --- a/img/lib/IM/Config.pm.in +++ b/img/lib/IM/Config.pm.in @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Config.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Config.pm version 20030322(IM144)"; package IM::Config; require 5.003; @@ -32,7 +32,7 @@ use vars qw(@ISA @EXPORT); mail_dir mail_path news_dir news_path queue_dir queue_path inbox_folder draft_folder trash_folder config_cases config_case_inbox preserve_dot - folder_mode msg_mode allowcrlf use_cl no_sync fsync_no + folder_mode msg_mode allowcrlf use_cl no_sync fsync_no preferred_fsync_no addrbook_file aliases_file petname_file context_file getchksbr_file getsbr_file scansbr_file scan_header_pick address addresses_regex @@ -44,7 +44,7 @@ use vars qw(@ISA @EXPORT); expand_path usetouchfile touchfile namazuv2 namazu_lock_dir namazu_lock_path pop_timeout imap_timeout nntp_timeout dns_timeout connect_timeout command_timeout rcv_buf_siz - db_type file_attr $SSH_PATH); + db_type file_attr ssh_path); ## ## Constant @@ -108,6 +108,7 @@ BEGIN { 'usecl;b;;UseCL' => 'Use value of Content-Length header for delimitation', 'nosync;b;;NoSync' => 'Do not need fsync(2) on writing file', 'fsyncnumber;i;;FsyncNumber' => 'System call number of fsync', + 'sshpath;s;;SshPath' => 'Path name of SSH program', 'allowcrlf;b;;AllowCRLF' => 'CRLF may be in saved message', 'preservedot;b;;PreserveDot' => 'Not substitute "." with "/"', 'addrbookfile;s;;AddrBookFile' => 'Address book file', @@ -801,7 +802,11 @@ sub no_sync() { } sub fsync_no() { - return $FsyncNumber || $FSYNC_NO; + return $FSYNC_NO; +} + +sub preferred_fsync_no() { + return $FsyncNumber; } sub addrbook_file() { @@ -956,6 +961,10 @@ sub db_type() { return $IM_DB_TYPE; } +sub ssh_path() { + return $SshPath || $SSH_PATH; +} + sub namazuv2() { return $NamazuV2; } @@ -1098,7 +1107,7 @@ home_dir conf_dir mail_dir mail_path news_dir news_path queue_dir queue_path inbox_folder draft_folder trash_folder config_cases config_case_inbox preserve_dot -folder_mode msg_mode allowcrlf use_cl no_sync fsync_no +folder_mode msg_mode allowcrlf use_cl no_sync fsync_no preferred_fsync_no addrbook_file aliases_file petname_file context_file getchksbr_file getsbr_file scansbr_file scan_header_pick address addresses_regex @@ -1110,7 +1119,7 @@ usepwagent pwagentport pwagent_tmp_dir pwagent_tmp_path usepwfiles pwfiles expand_path usetouchfile touchfile namazuv2 namazu_lock_dir namazu_lock_path pop_timeout imap_timeout nntp_timeout dns_timeout connect_timeout command_timeout rcv_buf_siz -db_type file_attr +db_type file_attr ssh_path =head1 DESCRIPTION diff --git a/img/lib/IM/EncDec.pm b/img/lib/IM/EncDec.pm index 11ac71cb..713a638a 100644 --- a/img/lib/IM/EncDec.pm +++ b/img/lib/IM/EncDec.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::EncDec.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::EncDec.pm version 20030322(IM144)"; package IM::EncDec; require 5.003; diff --git a/img/lib/IM/File.pm b/img/lib/IM/File.pm index 303ab310..9ffb7fb9 100644 --- a/img/lib/IM/File.pm +++ b/img/lib/IM/File.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Jul 7, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::File.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::File.pm version 20030322(IM144)"; package IM::File; require 5.003; diff --git a/img/lib/IM/Folder.pm b/img/lib/IM/Folder.pm index 6170a4ee..c8566742 100644 --- a/img/lib/IM/Folder.pm +++ b/img/lib/IM/Folder.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Folder.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Folder.pm version 20030322(IM144)"; package IM::Folder; require 5.003; diff --git a/img/lib/IM/GetPass.pm b/img/lib/IM/GetPass.pm index 6c4caf5f..050b2470 100644 --- a/img/lib/IM/GetPass.pm +++ b/img/lib/IM/GetPass.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 30, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::GetPass.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::GetPass.pm version 20030322(IM144)"; package IM::GetPass; require 5.003; diff --git a/img/lib/IM/Grep.pm b/img/lib/IM/Grep.pm index 20cfb878..aadaecda 100644 --- a/img/lib/IM/Grep.pm +++ b/img/lib/IM/Grep.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Nov 03, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Grep.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Grep.pm version 20030322(IM144)"; package IM::Grep; require 5.003; diff --git a/img/lib/IM/History.pm b/img/lib/IM/History.pm index 0fd358c2..6ea54363 100644 --- a/img/lib/IM/History.pm +++ b/img/lib/IM/History.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Jul 6, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::History.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::History.pm version 20030322(IM144)"; package IM::History; require 5.003; diff --git a/img/lib/IM/Http.pm b/img/lib/IM/Http.pm index 34949b61..5e63cfa9 100644 --- a/img/lib/IM/Http.pm +++ b/img/lib/IM/Http.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Http.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Http.pm version 20030322(IM144)"; package IM::Http; require 5.003; diff --git a/img/lib/IM/Imap.pm b/img/lib/IM/Imap.pm index cdd056d6..533ab42b 100644 --- a/img/lib/IM/Imap.pm +++ b/img/lib/IM/Imap.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Imap.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Imap.pm version 20030322(IM144)"; package IM::Imap; require 5.003; @@ -534,7 +534,7 @@ sub imap_process($$$$$$$) { } } elsif ($how eq 'get') { if ($msgs > 0) { - im_info("Getting new messages from $host into $dst....\n"); + im_info("Getting new messages from $src at $host into $dst...\n"); my @alluids = &imap_all_uids($HANDLE); return -1 if ($alluids[0] < 0); my $i; diff --git a/img/lib/IM/Iso2022jp.pm b/img/lib/IM/Iso2022jp.pm index bcb37bfb..56e97ac3 100644 --- a/img/lib/IM/Iso2022jp.pm +++ b/img/lib/IM/Iso2022jp.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Iso2022jp.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Iso2022jp.pm version 20030322(IM144)"; package IM::Iso2022jp; require 5.003; diff --git a/img/lib/IM/Japanese.pm b/img/lib/IM/Japanese.pm index f0e1e1bb..165dae76 100644 --- a/img/lib/IM/Japanese.pm +++ b/img/lib/IM/Japanese.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Japanese.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Japanese.pm version 20030322(IM144)"; package IM::Japanese; require 5.003; diff --git a/img/lib/IM/LocalMbox.pm b/img/lib/IM/LocalMbox.pm index 1c27bbee..c260b43a 100644 --- a/img/lib/IM/LocalMbox.pm +++ b/img/lib/IM/LocalMbox.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::LocalMbox.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::LocalMbox.pm version 20030322(IM144)"; package IM::LocalMbox; require 5.003; @@ -119,7 +119,7 @@ sub local_get_msg($$$$$) { if (-d $mbox) { # DIRECTORY - im_info("Getting new messages from maildir into $dst....\n") + im_info("Getting new messages from maildir into $dst...\n") if ($how eq 'get'); my $msgs = 0; @@ -339,7 +339,7 @@ sub process_mbox($$$$$) { local(*MBOX); my($first_line, $FIRST_LINE); - im_info("Getting new messages from local mailbox into $dst....\n") + im_info("Getting new messages from local mailbox into $dst...\n") if ($how eq 'get'); im_warn("opening MBOX ($mbox)\n") if (&verbose); unless (im_open(\*MBOX, "<$mbox")) { diff --git a/img/lib/IM/Log.pm b/img/lib/IM/Log.pm index 256fe9da..fb2e479a 100644 --- a/img/lib/IM/Log.pm +++ b/img/lib/IM/Log.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Log.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Log.pm version 20030322(IM144)"; package IM::Log; require 5.003; diff --git a/img/lib/IM/MD5.pm b/img/lib/IM/MD5.pm index 3c995b28..1cbc4599 100644 --- a/img/lib/IM/MD5.pm +++ b/img/lib/IM/MD5.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::MD5.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::MD5.pm version 20030322(IM144)"; package IM::MD5; require 5.003; diff --git a/img/lib/IM/Message.pm b/img/lib/IM/Message.pm index 04d8e4e4..cc9dca80 100644 --- a/img/lib/IM/Message.pm +++ b/img/lib/IM/Message.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Message.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Message.pm version 20030322(IM144)"; package IM::Message; require 5.003; diff --git a/img/lib/IM/MsgStore.pm b/img/lib/IM/MsgStore.pm index 9e100293..d1789803 100644 --- a/img/lib/IM/MsgStore.pm +++ b/img/lib/IM/MsgStore.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::MsgStore.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::MsgStore.pm version 20030322(IM144)"; package IM::MsgStore; require 5.003; @@ -16,7 +16,7 @@ require Exporter; use Fcntl; use IM::Config qw(getsbr_file msg_mode msgdbfile expand_path - inbox_folder no_sync fsync_no file_attr); + inbox_folder no_sync fsync_no preferred_fsync_no file_attr); use IM::Util; use IM::Folder qw(message_number message_name create_folder touch_folder); use IM::Message qw(gen_date); @@ -294,26 +294,21 @@ sub excl_create(*$) { sub fsync($) { my $fno = shift; - if (fsync_no()) { - # try to use SYS_sync number detected when configure - return syscall(fsync_no(), $fno); + if (preferred_fsync_no()) { + return syscall(preferred_fsync_no(), $fno); } - - # otherwise, try to find from header files + # try to find from header files unless (defined($sys_fsync)) { - my $inc = 'syscall.ph'; # only for BSDs? - my $prefix; - if (-f '/usr/include/sys.s') { # for IRIX... - # create sys.ph from sys.s - require 'sys.ph'; + eval { require 'syscall.ph'; }; + unless ($@) { $sys_fsync = &SYS_fsync if (defined(&SYS_fsync)); } unless ($sys_fsync) { - foreach $prefix (@INC) { - if (-f "$prefix/$inc") { - require "$prefix/$inc"; + if (-f '/usr/include/sys.s') { # for IRIX... + # create sys.ph from sys.s + eval { require 'sys.ph'; }; + unless ($@) { $sys_fsync = &SYS_fsync if (defined(&SYS_fsync)); - last; } } } @@ -330,6 +325,10 @@ sub fsync($) { } } unless ($sys_fsync) { + # try to use SYS_fsync number detected when configure + $sys_fsync = fsync_no(); + } + unless ($sys_fsync) { im_die("Can't find a way to fsync(). Set NoSync=yes in your Config file and be careful on file system overflow if your mail folders are on NFS.\n"); } } diff --git a/img/lib/IM/Nntp.pm b/img/lib/IM/Nntp.pm index 9751d9c5..23b569ac 100644 --- a/img/lib/IM/Nntp.pm +++ b/img/lib/IM/Nntp.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Nntp.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Nntp.pm version 20030322(IM144)"; package IM::Nntp; require 5.003; @@ -97,7 +97,7 @@ sub nntp_close() { # group: news group to be posted in # part: part number to be sent in partial message mode # total: total number of partial messages -# authuser: User name for NNTP authentication +# authuser: User name for NNTP authentication # return value: # 0: success # 1: recoverable error (should be retried) @@ -558,13 +558,13 @@ sub nntp_get_msg($$$$) { if ($how eq 'from') { if ($msgs > 0) { - $msgs = &nntp_xover ($art_start, $art_end); - $msgs = &nntp_head ($art_start, $art_end) if ($msgs < 0); + $msgs = &nntp_xover($art_start, $art_end); + $msgs = &nntp_head($art_start, $art_end) if ($msgs < 0); if ($msgs < 0) { im_warn("can not get article poster information.\n"); return -1; } - im_info("$msgs article(s) in $group at $servers.\n"); + im_info("$msgs article(s) in $group at $servers.\n"); } else { im_info("no news in $group at $servers.\n"); } @@ -575,8 +575,7 @@ sub nntp_get_msg($$$$) { if ($how eq 'get') { my($last); if ($msgs > 0) { - im_info("Getting new messages from $group at $servers " - . "into $dst....\n"); + im_info("Getting new messages from $group at $servers into $dst...\n"); ($msgs, $last) = &nntp_articles($art_start, $art_end, $dst, $limit); if ($msgs < 0) { im_warn("can not get articles.\n"); diff --git a/img/lib/IM/Pop.pm b/img/lib/IM/Pop.pm index 8486edaa..9e8a5618 100644 --- a/img/lib/IM/Pop.pm +++ b/img/lib/IM/Pop.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Pop.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Pop.pm version 20030322(IM144)"; package IM::Pop; require 5.003; @@ -456,7 +456,7 @@ sub pop_inc($$$$$$$$) { } } - im_info("Getting new messages into $dst....\n"); + im_info("Getting new messages from $host into $dst...\n"); for ($i = $last; $i <= $msgs; $i++) { if ($getchk_hook ne '') { $head = &pop_head($i); diff --git a/img/lib/IM/Recipient.pm b/img/lib/IM/Recipient.pm index 7cec8467..e97c425e 100644 --- a/img/lib/IM/Recipient.pm +++ b/img/lib/IM/Recipient.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 27, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Recipient.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Recipient.pm version 20030322(IM144)"; package IM::Recipient; require 5.003; diff --git a/img/lib/IM/Scan.pm b/img/lib/IM/Scan.pm index c31c0e69..07407f84 100644 --- a/img/lib/IM/Scan.pm +++ b/img/lib/IM/Scan.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Scan.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Scan.pm version 20030322(IM144)"; package IM::Scan; require 5.003; @@ -256,17 +256,21 @@ sub parse_body(*$) { } last unless defined($_); - next if /^#/; next if /^\s*\n/; next if /^--/; next if /^- --/; + next if /^=2D/; next if /^\s+[\w*-]+=/; # eg. "boundary="; * = RFC2231 next if /^\s*[\w-]+: /; # Headers and header style citation - next if /^\s*[\w-]*[>|]/; # other citation - next if /:\n$/; - next if /^This is a multi-part message in MIME format./i; - - if (/^In message/ || /^In article/ || /^In <.*>/) { + next if /^\s*[>:|\/_}]/; # other citation + next if /^ /; + next if /^\s*\w+([\'._-]+\w+)*>/; + next if /^\s*(On|At) .*[^.!\s\n]\s*$/; + next if /(:|;|\/)\s*\n$/; + next if /(wrote|writes?|said|says?)[^.!\n]?\s*\n$/; + next if /^This is a multi-part message in MIME format/i; + + if (/^\s*In (message|article|<|\")/i) { if ($mode == 0) { $_ = <HANDLE>; } else { diff --git a/img/lib/IM/Smtp.pm b/img/lib/IM/Smtp.pm index af730a06..1826cf02 100644 --- a/img/lib/IM/Smtp.pm +++ b/img/lib/IM/Smtp.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Smtp.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Smtp.pm version 20030322(IM144)"; package IM::Smtp; require 5.003; diff --git a/img/lib/IM/Ssh.pm b/img/lib/IM/Ssh.pm index 404a8f78..cbdbb3c6 100644 --- a/img/lib/IM/Ssh.pm +++ b/img/lib/IM/Ssh.pm @@ -6,15 +6,15 @@ ### Author: Masatoshi Tsuchiya <tsuchiya@pine.kuee.kyoto-u.ac.jp> ### Internet Message Group <img@mew.org> ### Created: Oct 05, 1999 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Ssh.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Ssh.pm version 20030322(IM144)"; package IM::Ssh; require 5.003; require Exporter; -use IM::Config qw(connect_timeout command_timeout $SSH_PATH); +use IM::Config qw(connect_timeout command_timeout ssh_path); use IM::Util; use strict; use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $SSH $FH @PID); @@ -27,6 +27,7 @@ $FH = "SSH00000"; sub ssh_proxy($$$$) { my($server, $remote, $local, $host) = @_; + my $prog = ssh_path(); unless ($host) { im_err("Missing relay host.\n"); @@ -72,7 +73,7 @@ sub ssh_proxy($$$$) { close $read; open(STDOUT, ">&$write"); open(STDERR, ">&$write"); - exec($SSH_PATH, '-n', '-x', '-o', 'BatchMode yes', + exec($prog, '-n', '-x', '-o', 'BatchMode yes', "-L$local:$server:$remote", $host, sprintf('echo ssh_proxy_connect ; sleep %s', &command_timeout())); @@ -81,7 +82,7 @@ sub ssh_proxy($$$$) { sleep 5; redo FORK; } else { - im_warn("Can't fork $SSH_PATH.\n"); + im_warn("Can't fork $prog.\n"); } } 0; diff --git a/img/lib/IM/Stdio.pm b/img/lib/IM/Stdio.pm index 7d4d9808..645f1c0d 100644 --- a/img/lib/IM/Stdio.pm +++ b/img/lib/IM/Stdio.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: May 7, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Stdio.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Stdio.pm version 20030322(IM144)"; package IM::Stdio; require 5.003; diff --git a/img/lib/IM/TcpTransaction.pm b/img/lib/IM/TcpTransaction.pm index 63d6599c..b0ee4b32 100644 --- a/img/lib/IM/TcpTransaction.pm +++ b/img/lib/IM/TcpTransaction.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::TcpTransaction.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::TcpTransaction.pm version 20030322(IM144)"; package IM::TcpTransaction; require 5.003; diff --git a/img/lib/IM/Util.pm b/img/lib/IM/Util.pm index 68da1a5e..90c98b89 100644 --- a/img/lib/IM/Util.pm +++ b/img/lib/IM/Util.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Dec 7, 2002 +### Revised: Mar 22, 2003 ### -my $PM_VERSION = "IM::Util.pm version 20021207(IM142)"; +my $PM_VERSION = "IM::Util.pm version 20030322(IM144)"; package IM::Util; require 5.003; @@ -48,13 +48,18 @@ $EXIT_ERROR = 1; my $osname = $^O; -if ($osname =~ /win/i) { - if (Win32::IsWinNT()) { - $OS = 'WNT'; - } elsif (Win32::IsWin95()) { - $OS = 'WIN95'; - } else { - $OS = 'WIN95'; # xxx +if ($osname =~ /win/i && $osname !~ /darwin/i) { + eval { + if (Win32::IsWinNT()) { + $OS = 'WNT'; + } elsif (Win32::IsWin95()) { + $OS = 'WIN95'; + } else { + $OS = 'WIN95'; # xxx + } + }; + if ($@) { + $OS = 'UNIX'; } } elsif ($osname =~ /os2/i) { $OS = 'OS/2'; |