Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(160) |
Mar
(119) |
Apr
(111) |
May
(118) |
Jun
(101) |
Jul
(304) |
Aug
(113) |
Sep
(140) |
Oct
(137) |
Nov
(87) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(78) |
Feb
(125) |
Mar
(131) |
Apr
(59) |
May
(121) |
Jun
(166) |
Jul
(150) |
Aug
(137) |
Sep
(73) |
Oct
(58) |
Nov
(27) |
Dec
(60) |
| 2005 |
Jan
(131) |
Feb
(84) |
Mar
(36) |
Apr
(8) |
May
(28) |
Jun
(20) |
Jul
(10) |
Aug
(72) |
Sep
(76) |
Oct
(34) |
Nov
(3) |
Dec
(29) |
| 2006 |
Jan
(13) |
Feb
(92) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(17) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(12) |
| 2007 |
Jan
(28) |
Feb
(15) |
Mar
|
Apr
|
May
(8) |
Jun
(4) |
Jul
(5) |
Aug
(8) |
Sep
(20) |
Oct
(38) |
Nov
(65) |
Dec
(92) |
| 2008 |
Jan
(21) |
Feb
(56) |
Mar
(27) |
Apr
(174) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <xue...@us...> - 2003-07-21 14:20:28
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv21295
Modified Files:
CBP.nsh
Log Message:
New NSIS compiler removes the need for the UNC workaround.
Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CBP.nsh 14 Jul 2003 09:45:43 -0000 1.17
--- CBP.nsh 21 Jul 2003 14:20:25 -0000 1.18
***************
*** 12,19 ****
# WARNING:
#
! # This script requires a version of NSIS 2.0b4 (CVS) which meets the following requirement:
#
! # '{NSIS}\makensis.exe' dated 8 July 2003 @ 18:44 (NSIS CVS version 1.203) or later
! # This is required to ensure 'language' strings can be combined with other strings.
#----------------------------------------------------------------------------------------------
--- 12,22 ----
# WARNING:
#
! # This script requires a version of NSIS 2.0b4 (CVS) which meets the following requirements:
#
! # (1) '{NSIS}\makensis.exe' dated 8 July 2003 @ 18:44 (NSIS CVS version 1.203) or later
! # This is required to ensure 'language' strings can be combined with other strings.
! #
! # (2) '{NSIS}\makensis.exe' dated 21 July 2003 @ 06:44 (NSIS CVS version 1.214) or later
! # This is required to avoid spurious error messages when creating buckets with UNC paths.
#----------------------------------------------------------------------------------------------
***************
*** 422,426 ****
!define CBP_L_NAME $R3 ; used when checking the corpus directory
!define CBP_L_PTR $R2 ; used to access the names in the bucket list
- !define CBP_L_UNC $R1 ; used to detect UNC-format 'corpus' paths
Exch ${CBP_L_COUNT} ; get number of buckets to be created
--- 425,428 ----
***************
*** 434,438 ****
Push ${CBP_L_NAME}
Push ${CBP_L_PTR}
- Push ${CBP_L_UNC}
; Retrieve the corpus path (as determined by CBP_CheckCorpusStatus)
--- 436,439 ----
***************
*** 441,446 ****
"CBP Data" "CorpusPath"
- StrCpy ${CBP_L_UNC} ${CBP_L_CORPUS} 2 ; will be "\\" for UNC-format paths
-
; Now we create the buckets selected by the user. At present this code is only executed
; for a "fresh" install, one where there are no corpus files, so we can simply create a
--- 442,445 ----
***************
*** 473,480 ****
FileWrite ${CBP_L_FILE_HANDLE} "__CORPUS__ __VERSION__ 1$\r$\n"
FileClose ${CBP_L_FILE_HANDLE}
- StrCmp ${CBP_L_UNC} "\\" ignore_errors
IfErrors incrm_ptr
-
- ignore_errors:
IntOp ${CBP_L_COUNT} ${CBP_L_COUNT} - 1
--- 472,476 ----
***************
*** 484,488 ****
finished_now:
- Pop ${CBP_L_UNC}
Pop ${CBP_L_PTR}
Pop ${CBP_L_NAME}
--- 480,483 ----
***************
*** 503,507 ****
!undef CBP_L_NAME
!undef CBP_L_PTR
- !undef CBP_L_UNC
FunctionEnd
--- 498,501 ----
|
|
From: <ssc...@us...> - 2003-07-21 08:41:12
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv2995
Modified Files:
Tag: b0/19/0
POP3.pm
Log Message:
fix calling of "flush_extra" to fix:
[ 773093 ] 19.1 toptoo bug
Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.55.2.1
retrieving revision 1.55.2.2
diff -C2 -d -r1.55.2.1 -r1.55.2.2
*** POP3.pm 15 Jul 2003 17:50:36 -0000 1.55.2.1
--- POP3.pm 21 Jul 2003 08:41:08 -0000 1.55.2.2
***************
*** 142,146 ****
# and mail accounts
my $user_command = 'USER (.+)(:(\d+))?' . $self->config_( 'separator' ) . '(.+)';
! if ( $command =~ /$user_command/i ) {
if ( $1 ne '' ) {
if ( $mail = $self->verify_connected_( $mail, $client, $1, $3 || 110 ) ) {
--- 142,146 ----
# and mail accounts
my $user_command = 'USER (.+)(:(\d+))?' . $self->config_( 'separator' ) . '(.+)';
! if ( $command =~ /$user_command/i ) {
if ( $1 ne '' ) {
if ( $mail = $self->verify_connected_( $mail, $client, $1, $3 || 110 ) ) {
***************
*** 274,278 ****
my $class = $self->{classifier__}->classify_and_modify( $mail, undef, $download_count, 0, 1, '', 0 );
! $self->flush_extra( $mail, $client, 0 );
if ( $self->echo_response_($mail, $client, $command ) ) {
--- 274,278 ----
my $class = $self->{classifier__}->classify_and_modify( $mail, undef, $download_count, 0, 1, '', 0 );
! $self->flush_extra_( $mail, $client, 0 );
if ( $self->echo_response_($mail, $client, $command ) ) {
|
|
From: <ssc...@us...> - 2003-07-21 08:38:47
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv2608
Modified Files:
Tag: b0/19/0
Bayes.pm
Log Message:
whitespace cleanup
cross-port of:
fix case where it was possible for messages to terminate without CRLF.CRLF (my fault)
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.149.2.1
retrieving revision 1.149.2.2
diff -C2 -d -r1.149.2.1 -r1.149.2.2
*** Bayes.pm 15 Jul 2003 17:50:35 -0000 1.149.2.1
--- Bayes.pm 21 Jul 2003 08:38:44 -0000 1.149.2.2
***************
*** 264,271 ****
if ( $word ne '' ) {
$word =~ /^(.)/;
! my $i = ord($1);
$self->{matrix__}{$bucket}[$i] = '' if ( !defined($self->{matrix__}{$bucket}[$i]) );
! $self->{matrix__}{$bucket}[$i] .= "|$word $value|" if ( ( $self->{matrix__}{$bucket}[$i] =~ s/\|\Q$word\E [\-\.\d]+\|/\|$word $value\|/ ) == 0 );
}
}
--- 264,271 ----
if ( $word ne '' ) {
$word =~ /^(.)/;
! my $i = ord($1);
$self->{matrix__}{$bucket}[$i] = '' if ( !defined($self->{matrix__}{$bucket}[$i]) );
! $self->{matrix__}{$bucket}[$i] .= "|$word $value|" if ( ( $self->{matrix__}{$bucket}[$i] =~ s/\|\Q$word\E [\-\.\d]+\|/\|$word $value\|/ ) == 0 );
}
}
***************
*** 679,685 ****
$self->{scores__} .= "<input type=\"hidden\" name=\"count\" value=\"" . ($mlen + 1) . "\" />";
$self->{scores__} .= "<hr><b>$language{QuickMagnets}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Magnet}</th>\n<th>$language{Magnet_Always}</th>\n";
!
my %types = get_magnet_types();
!
foreach my $type ( keys %types ) {
--- 679,685 ----
$self->{scores__} .= "<input type=\"hidden\" name=\"count\" value=\"" . ($mlen + 1) . "\" />";
$self->{scores__} .= "<hr><b>$language{QuickMagnets}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Magnet}</th>\n<th>$language{Magnet_Always}</th>\n";
!
my %types = get_magnet_types();
!
foreach my $type ( keys %types ) {
***************
*** 687,713 ****
{
$i += 1;
!
!
$self->{scores__} .= "<tr><td scope=\"col\">$type: ";
$self->{scores__} .= "<select name=\"text$i\" id=\"\">\n";
!
foreach my $magnet ( 0 .. $#{$qm{$type}} ) {
$self->{scores__} .= "<option>" . Classifier::MailParse::splitline(@{$qm{$type}}[$magnet], 0) . "</option>\n";
}
! $self->{scores__} .= "</select>\n";
$self->{scores__} .= "</td><td>";
! $self->{scores__} .= "<input type=\"hidden\" name=\"type$i\" id=\"magnetsAddType\" value=\"$type\"/>";
$self->{scores__} .= "<select name=\"bucket$i\" id=\"magnetsAddBucket\">\n<option value=\"\"></option>\n";
!
foreach my $bucket (@buckets) {
$self->{scores__} .= "<option value=\"$bucket\">$bucket</option>\n";
}
!
$self->{scores__} .= "</select></td></tr>";
! }
! }
$self->{scores__} .= "<tr><td></td><td><input type=\"submit\" class=\"submit\" name=\"create\" value=\"$language{Create}\" /></td></tr></table></form>";
! }
$self->{scores__} .= "<hr><b>$language{Scores}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Bucket}</th>\n<th> </th>\n";
--- 687,713 ----
{
$i += 1;
!
!
$self->{scores__} .= "<tr><td scope=\"col\">$type: ";
$self->{scores__} .= "<select name=\"text$i\" id=\"\">\n";
!
foreach my $magnet ( 0 .. $#{$qm{$type}} ) {
$self->{scores__} .= "<option>" . Classifier::MailParse::splitline(@{$qm{$type}}[$magnet], 0) . "</option>\n";
}
! $self->{scores__} .= "</select>\n";
$self->{scores__} .= "</td><td>";
! $self->{scores__} .= "<input type=\"hidden\" name=\"type$i\" id=\"magnetsAddType\" value=\"$type\"/>";
$self->{scores__} .= "<select name=\"bucket$i\" id=\"magnetsAddBucket\">\n<option value=\"\"></option>\n";
!
foreach my $bucket (@buckets) {
$self->{scores__} .= "<option value=\"$bucket\">$bucket</option>\n";
}
!
$self->{scores__} .= "</select></td></tr>";
! }
! }
$self->{scores__} .= "<tr><td></td><td><input type=\"submit\" class=\"submit\" name=\"create\" value=\"$language{Create}\" /></td></tr></table></form>";
! }
$self->{scores__} .= "<hr><b>$language{Scores}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Bucket}</th>\n<th> </th>\n";
***************
*** 899,903 ****
if ( $line =~ /(^[ \t])|([:])/ ) {
if ( $msg_subject eq '' ) {
! $msg_head_before .= $msg_head_q . $line;
} else {
$msg_head_after .= $msg_head_q . $line;
--- 899,903 ----
if ( $line =~ /(^[ \t])|([:])/ ) {
if ( $msg_subject eq '' ) {
! $msg_head_before .= $msg_head_q . $line;
} else {
$msg_head_after .= $msg_head_q . $line;
***************
*** 906,914 ****
} else {
# Gather up any lines that are questionable
!
! $msg_head_q .= $line;
}
!
!
}
} else {
--- 906,914 ----
} else {
# Gather up any lines that are questionable
!
! $msg_head_q .= $line;
}
!
!
}
} else {
***************
*** 1033,1041 ****
if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
print $client "$eol--$temp_file--$eol";
! }
}
if ( $got_full_body == 1 ) {
! print $client ".$eol" if ( $echo );
}
--- 1033,1041 ----
if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
print $client "$eol--$temp_file--$eol";
! }
}
if ( $got_full_body == 1 ) {
! print $client "$eol.$eol" if ( $echo );
}
***************
*** 1138,1142 ****
my $value = $self->get_value_( $bucket, $word );
!
return int( exp( $value ) * $self->get_bucket_word_count( $bucket ) + 0.5 );
}
--- 1138,1142 ----
my $value = $self->get_value_( $bucket, $word );
!
return int( exp( $value ) * $self->get_bucket_word_count( $bucket ) + 0.5 );
}
***************
*** 1468,1472 ****
# Check for an abort
last if ( $self->{alive_} == 0 );
!
print $client $_ if ( defined( $client ) );
--- 1468,1472 ----
# Check for an abort
last if ( $self->{alive_} == 0 );
!
print $client $_ if ( defined( $client ) );
|
|
From: <xue...@us...> - 2003-07-20 14:11:20
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv1122
Modified Files:
pfi-library.nsh
Log Message:
Simplified un.GetCorpusPath no longer reliable (latest NSIS?), revert to old method.
Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pfi-library.nsh 20 Jul 2003 12:36:33 -0000 1.4
--- pfi-library.nsh 20 Jul 2003 14:11:17 -0000 1.5
***************
*** 279,300 ****
Call un.StrBackSlash ; ensure corpus path uses backslashes
Pop ${L_CORPUS}
!
! GetFullPathName ${L_TEMP} ".\"
!
! ; Ensure relative paths are handled properly (${L_SOURCE} holds path to 'popfile.cfg' file)
!
! SetOutPath "${L_SOURCE}"
! GetFullPathName ${L_RESULT} "${L_CORPUS}"
!
! SetOutPath "${L_TEMP}"
!
! ; If 'corpus' path parameter was not valid, GetFullPathName returns ""
!
! StrCmp ${L_RESULT} "" use_default_locn got_path
use_default_locn:
! StrCpy ${L_RESULT} "${L_SOURCE}\corpus"
got_path:
Pop ${L_TEMP}
Pop ${L_FILE_HANDLE}
--- 279,330 ----
Call un.StrBackSlash ; ensure corpus path uses backslashes
Pop ${L_CORPUS}
!
! StrCpy ${L_TEMP} ${L_CORPUS} 2
! StrCmp ${L_TEMP} ".\" sub_folder
! StrCmp ${L_TEMP} "\\" got_path
!
! StrCpy ${L_TEMP} ${L_CORPUS} 3
! StrCmp ${L_TEMP} "..\" relative_folder
!
! StrCpy ${L_TEMP} ${L_CORPUS} 1
! StrCmp ${L_TEMP} "\" instdir_drive
!
! StrCpy ${L_TEMP} ${L_CORPUS} 1 1
! StrCmp ${L_TEMP} ":" got_path
!
! ; Assume path can be safely added to $INSTDIR
!
! StrCpy ${L_CORPUS} $INSTDIR\${L_CORPUS}
! Goto got_path
!
! sub_folder:
! StrCpy ${L_CORPUS} ${L_CORPUS} "" 2
! StrCpy ${L_CORPUS} $INSTDIR\${L_CORPUS}
! Goto got_path
!
! relative_folder:
! StrCpy ${L_RESULT} $INSTDIR
!
! relative_again:
! StrCpy ${L_CORPUS} ${L_CORPUS} "" 3
! Push ${L_RESULT}
! Call un.GetParent
! Pop ${L_RESULT}
! StrCpy ${L_TEMP} ${L_CORPUS} 3
! StrCmp ${L_TEMP} "..\" relative_again
! StrCpy ${L_CORPUS} ${L_RESULT}\${L_CORPUS}
! Goto got_path
!
! instdir_drive:
! StrCpy ${L_TEMP} $INSTDIR 2
! StrCpy ${L_CORPUS} ${L_TEMP}${L_CORPUS}
! Goto got_path
use_default_locn:
! StrCpy ${L_CORPUS} ${L_SOURCE}\corpus
got_path:
+ StrCpy ${L_RESULT} ${L_CORPUS}
+
Pop ${L_TEMP}
Pop ${L_FILE_HANDLE}
***************
*** 355,358 ****
--- 385,432 ----
nothing_to_do:
+ Pop $R2
+ Pop $R1
+ Exch $R0
+ FunctionEnd
+
+ #--------------------------------------------------------------------------
+ # Function: un.GetParent
+ #
+ # This function is used by the uninstaller when it looks for the corpus files for the version
+ # of POPFile which is being upgraded. It extracts the parent directory from a given path.
+ #
+ # NB: Path is assumed to use backslashes (\)
+ #
+ # Inputs:
+ # (top of stack) - string containing a path (e.g. C:\A\B\C)
+ #
+ # Outputs:
+ # (top of stack) - the parent part of the input string (e.g. C:\A\B)
+ #
+ # Usage Example:
+ # Push "C:\Program Files\Directory\Whatever"
+ # Call un.GetParent
+ # Pop $R0
+ #
+ # ($R0 at this point is ""C:\Program Files\Directory")
+ #
+ #--------------------------------------------------------------------------
+
+ Function un.GetParent
+ Exch $R0
+ Push $R1
+ Push $R2
+
+ StrCpy $R1 -1
+
+ loop:
+ StrCpy $R2 $R0 1 $R1
+ StrCmp $R2 "" exit
+ StrCmp $R2 "\" exit
+ IntOp $R1 $R1 - 1
+ Goto loop
+
+ exit:
+ StrCpy $R0 $R0 $R1
Pop $R2
Pop $R1
|
|
From: <xue...@us...> - 2003-07-20 12:36:36
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv17584
Modified Files:
pfi-library.nsh
Log Message:
Fix the simplified version of un.GetCorpusPath.
Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pfi-library.nsh 19 Jul 2003 13:52:31 -0000 1.3
--- pfi-library.nsh 20 Jul 2003 12:36:33 -0000 1.4
***************
*** 280,291 ****
Pop ${L_CORPUS}
! StrCpy ${L_TEMP} "$OUTDIR" ; Save current working directory
; Ensure relative paths are handled properly (${L_SOURCE} holds path to 'popfile.cfg' file)
! StrCpy "$OUTDIR" "${L_SOURCE}"
GetFullPathName ${L_RESULT} "${L_CORPUS}"
! StrCpy "$OUTDIR" ${L_TEMP} ; Restore current working directory
; If 'corpus' path parameter was not valid, GetFullPathName returns ""
--- 280,291 ----
Pop ${L_CORPUS}
! GetFullPathName ${L_TEMP} ".\"
; Ensure relative paths are handled properly (${L_SOURCE} holds path to 'popfile.cfg' file)
! SetOutPath "${L_SOURCE}"
GetFullPathName ${L_RESULT} "${L_CORPUS}"
! SetOutPath "${L_TEMP}"
; If 'corpus' path parameter was not valid, GetFullPathName returns ""
|
|
From: <xue...@us...> - 2003-07-19 13:52:35
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv1042
Modified Files:
pfi-library.nsh
Log Message:
Using GetFullPathName makes un.GetCorpusPath simpler and makes un.GetParent redundant. Start adopting the "MUI" coding standard.
Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pfi-library.nsh 12 Jul 2003 22:00:46 -0000 1.2
--- pfi-library.nsh 19 Jul 2003 13:52:31 -0000 1.3
***************
*** 2,7 ****
#
# pfi-library.nsi --- This is a collection of library functions and macro
! # definitions used by the NSIS script used to create the
! # Windows installer for POPFile.
#
# Copyright (c) 2001-2003 John Graham-Cumming
--- 2,7 ----
#
# pfi-library.nsi --- This is a collection of library functions and macro
! # definitions used by 'installer.nsi', the NSIS script
! # used to create the Windows installer for POPFile.
#
# Copyright (c) 2001-2003 John Graham-Cumming
***************
*** 91,95 ****
StrCmp ${L_SUBFOLDER} "no" +6
Push ${L_CORPUS}
! Push ${PATH}
Call un.StrStr
POP ${L_TEMP}
--- 91,95 ----
StrCmp ${L_SUBFOLDER} "no" +6
Push ${L_CORPUS}
! Push "${PATH}"
Call un.StrStr
POP ${L_TEMP}
***************
*** 98,102 ****
StrCmp ${L_TEMP} "" 0 +2
! RMDir /r ${PATH}
!macroend
--- 98,102 ----
StrCmp ${L_TEMP} "" 0 +2
! RMDir /r "${PATH}"
!macroend
***************
*** 143,147 ****
ClearErrors
! FileOpen ${L_CFG} $INSTDIR\popfile.cfg r
loop:
--- 143,147 ----
ClearErrors
! FileOpen ${L_CFG} "$INSTDIR\popfile.cfg" r
loop:
***************
*** 235,242 ****
StrCpy ${L_CORPUS} ""
! IfFileExists ${L_SOURCE}\popfile.cfg 0 use_default_locn
ClearErrors
! FileOpen ${L_FILE_HANDLE} ${L_SOURCE}\popfile.cfg r
loop:
--- 235,242 ----
StrCpy ${L_CORPUS} ""
! IfFileExists "${L_SOURCE}\popfile.cfg" 0 use_default_locn
ClearErrors
! FileOpen ${L_FILE_HANDLE} "${L_SOURCE}\popfile.cfg" r
loop:
***************
*** 279,330 ****
Call un.StrBackSlash ; ensure corpus path uses backslashes
Pop ${L_CORPUS}
!
! StrCpy ${L_TEMP} ${L_CORPUS} 2
! StrCmp ${L_TEMP} ".\" sub_folder
! StrCmp ${L_TEMP} "\\" got_path
!
! StrCpy ${L_TEMP} ${L_CORPUS} 3
! StrCmp ${L_TEMP} "..\" relative_folder
!
! StrCpy ${L_TEMP} ${L_CORPUS} 1
! StrCmp ${L_TEMP} "\" instdir_drive
!
! StrCpy ${L_TEMP} ${L_CORPUS} 1 1
! StrCmp ${L_TEMP} ":" got_path
!
! ; Assume path can be safely added to $INSTDIR
!
! StrCpy ${L_CORPUS} $INSTDIR\${L_CORPUS}
! Goto got_path
!
! sub_folder:
! StrCpy ${L_CORPUS} ${L_CORPUS} "" 2
! StrCpy ${L_CORPUS} $INSTDIR\${L_CORPUS}
! Goto got_path
!
! relative_folder:
! StrCpy ${L_RESULT} $INSTDIR
!
! relative_again:
! StrCpy ${L_CORPUS} ${L_CORPUS} "" 3
! Push ${L_RESULT}
! Call un.GetParent
! Pop ${L_RESULT}
! StrCpy ${L_TEMP} ${L_CORPUS} 3
! StrCmp ${L_TEMP} "..\" relative_again
! StrCpy ${L_CORPUS} ${L_RESULT}\${L_CORPUS}
! Goto got_path
!
! instdir_drive:
! StrCpy ${L_TEMP} $INSTDIR 2
! StrCpy ${L_CORPUS} ${L_TEMP}${L_CORPUS}
! Goto got_path
use_default_locn:
! StrCpy ${L_CORPUS} ${L_SOURCE}\corpus
got_path:
- StrCpy ${L_RESULT} ${L_CORPUS}
-
Pop ${L_TEMP}
Pop ${L_FILE_HANDLE}
--- 279,300 ----
Call un.StrBackSlash ; ensure corpus path uses backslashes
Pop ${L_CORPUS}
!
! StrCpy ${L_TEMP} "$OUTDIR" ; Save current working directory
!
! ; Ensure relative paths are handled properly (${L_SOURCE} holds path to 'popfile.cfg' file)
!
! StrCpy "$OUTDIR" "${L_SOURCE}"
! GetFullPathName ${L_RESULT} "${L_CORPUS}"
!
! StrCpy "$OUTDIR" ${L_TEMP} ; Restore current working directory
!
! ; If 'corpus' path parameter was not valid, GetFullPathName returns ""
!
! StrCmp ${L_RESULT} "" use_default_locn got_path
use_default_locn:
! StrCpy ${L_RESULT} "${L_SOURCE}\corpus"
got_path:
Pop ${L_TEMP}
Pop ${L_FILE_HANDLE}
***************
*** 385,432 ****
nothing_to_do:
- Pop $R2
- Pop $R1
- Exch $R0
- FunctionEnd
-
- #--------------------------------------------------------------------------
- # Function: un.GetParent
- #
- # This function is used by the uninstaller when it looks for the corpus files for the version
- # of POPFile which is being upgraded. It extracts the parent directory from a given path.
- #
- # NB: Path is assumed to use backslashes (\)
- #
- # Inputs:
- # (top of stack) - string containing a path (e.g. C:\A\B\C)
- #
- # Outputs:
- # (top of stack) - the parent part of the input string (e.g. C:\A\B)
- #
- # Usage Example:
- # Push "C:\Program Files\Directory\Whatever"
- # Call un.GetParent
- # Pop $R0
- #
- # ($R0 at this point is ""C:\Program Files\Directory")
- #
- #--------------------------------------------------------------------------
-
- Function un.GetParent
- Exch $R0
- Push $R1
- Push $R2
-
- StrCpy $R1 -1
-
- loop:
- StrCpy $R2 $R0 1 $R1
- StrCmp $R2 "" exit
- StrCmp $R2 "\" exit
- IntOp $R1 $R1 - 1
- Goto loop
-
- exit:
- StrCpy $R0 $R0 $R1
Pop $R2
Pop $R1
--- 355,358 ----
|
|
From: <jgr...@us...> - 2003-07-18 13:07:23
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv8374
Modified Files:
Bayes.pm
Log Message:
Fix MIME boundary problem in quarantined messages.
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** Bayes.pm 17 Jul 2003 04:48:42 -0000 1.169
--- Bayes.pm 18 Jul 2003 13:00:07 -0000 1.170
***************
*** 1201,1205 ****
if ( $classification ne 'unclassified' ) {
if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
! $before_dot = "$eol--$temp_file--$eol";
}
}
--- 1201,1205 ----
if ( $classification ne 'unclassified' ) {
if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
! $before_dot = "$eol--$nopath_temp_file--$eol";
}
}
|
|
From: <ssc...@us...> - 2003-07-18 05:25:27
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv4776
Modified Files:
Tag: b0/19/0
MailParse.pm
Log Message:
fix greedy regexp in decode_string
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.132.2.1
retrieving revision 1.132.2.2
diff -C2 -d -r1.132.2.1 -r1.132.2.2
*** MailParse.pm 15 Jul 2003 17:50:35 -0000 1.132.2.1
--- MailParse.pm 18 Jul 2003 05:25:24 -0000 1.132.2.2
***************
*** 44,48 ****
'ugrave' => 248, 'Ugrave' => 216, 'uml' => 168, 'Uuml' => 220,
'uuml' => 252, 'Yacute' => 220, 'yacute' => 252, 'yen' => 165,
! 'yuml' => 254);
#----------------------------------------------------------------------------
--- 44,48 ----
'ugrave' => 248, 'Ugrave' => 216, 'uml' => 168, 'Uuml' => 220,
'uuml' => 252, 'Yacute' => 220, 'yacute' => 252, 'yen' => 165,
! 'yuml' => 254);
#----------------------------------------------------------------------------
***************
*** 391,395 ****
# If we hit a table tag then any font information is lost
!
if ( $tag =~ /^(table|td|tr|th)$/i ) {
$self->{htmlfontcolor__} = map_color( $self, 'black' );
--- 391,395 ----
# If we hit a table tag then any font information is lost
!
if ( $tag =~ /^(table|td|tr|th)$/i ) {
$self->{htmlfontcolor__} = map_color( $self, 'black' );
***************
*** 1153,1165 ****
my $decode_it = '';
! while ( $mystring =~ /=\?[\w-]+\?(B|Q)\?(.*)\?=/ig ) {
if ($1 eq "B") {
$decode_it = decode_base64( $2 );
! $mystring =~ s/=\?[\w-]+\?B\?(.*)\?=/$decode_it/i;
} elsif ($1 eq "Q") {
$decode_it = $2;
$decode_it =~ s/\_/=20/g;
$decode_it = decode_qp( $decode_it );
! $mystring =~ s/=\?[\w-]+\?Q\?(.*)\?=/$decode_it/i;
}
}
--- 1153,1165 ----
my $decode_it = '';
! while ( $mystring =~ /=\?[\w-]+\?(B|Q)\?(.*?)\?=/ig ) {
if ($1 eq "B") {
$decode_it = decode_base64( $2 );
! $mystring =~ s/=\?[\w-]+\?B\?(.*?)\?=/$decode_it/i;
} elsif ($1 eq "Q") {
$decode_it = $2;
$decode_it =~ s/\_/=20/g;
$decode_it = decode_qp( $decode_it );
! $mystring =~ s/=\?[\w-]+\?Q\?(.*?)\?=/$decode_it/i;
}
}
|
|
From: <ssc...@us...> - 2003-07-18 05:24:56
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv4682
Modified Files:
Tag: v0/18/1
MailParse.pm
Log Message:
fix greedy regexp in decode_string
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.91.2.7
retrieving revision 1.91.2.8
diff -C2 -d -r1.91.2.7 -r1.91.2.8
*** MailParse.pm 23 Jun 2003 20:35:35 -0000 1.91.2.7
--- MailParse.pm 18 Jul 2003 05:24:54 -0000 1.91.2.8
***************
*** 43,47 ****
'ugrave' => 248, 'Ugrave' => 216, 'uml' => 168, 'Uuml' => 220,
'uuml' => 252, 'Yacute' => 220, 'yacute' => 252, 'yen' => 165,
! 'yuml' => 254);
#----------------------------------------------------------------------------
--- 43,47 ----
'ugrave' => 248, 'Ugrave' => 216, 'uml' => 168, 'Uuml' => 220,
'uuml' => 252, 'Yacute' => 220, 'yacute' => 252, 'yen' => 165,
! 'yuml' => 254);
[...1347 lines suppressed...]
my ($line, $encoding) = @_;
$line =~ s/([^\r\n]{100,120} )/$1\r\n/g;
! $line =~ s/([^ \r\n]{120})/$1\r\n/g;
$line =~ s/</</g;
***************
*** 1235,1240 ****
$line =~ s/\t/ /g;
!
! return $line;
}
--- 1235,1240 ----
$line =~ s/\t/ /g;
!
! return $line;
}
|
|
From: <ssc...@us...> - 2003-07-18 05:09:44
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv2413
Modified Files:
TestMailParse.tst
Log Message:
decode_string tests
Index: TestMailParse.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse.tst,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TestMailParse.tst 13 Jul 2003 02:40:35 -0000 1.11
--- TestMailParse.tst 18 Jul 2003 05:09:42 -0000 1.12
***************
*** 44,57 ****
# map_color()
! test_assert_equal( $cl->map_color( 'red' ), 'ff0000' );
! test_assert_equal( $cl->map_color( 'ff0000' ), 'ff0000' );
! test_assert_equal( $cl->map_color( 'FF0000' ), 'ff0000' );
! test_assert_equal( $cl->map_color( '#fF0000' ), 'ff0000' );
! test_assert_equal( $cl->map_color( '#Ff0000' ), 'ff0000' );
! test_assert_equal( $cl->map_color( 'white' ), 'ffffff' );
! test_assert_equal( $cl->map_color( 'fFfFFf' ), 'ffffff' );
! test_assert_equal( $cl->map_color( 'FFFFFF' ), 'ffffff' );
! test_assert_equal( $cl->map_color( '#ffffff' ), 'ffffff' );
! test_assert_equal( $cl->map_color( '#FFfFFF' ), 'ffffff' );
# Check line splitting into words
--- 44,57 ----
# map_color()
! test_assert_equal( $cl->map_color( 'red' ), 'ff0000' );
! test_assert_equal( $cl->map_color( 'ff0000' ), 'ff0000' );
! test_assert_equal( $cl->map_color( 'FF0000' ), 'ff0000' );
! test_assert_equal( $cl->map_color( '#fF0000' ), 'ff0000' );
! test_assert_equal( $cl->map_color( '#Ff0000' ), 'ff0000' );
! test_assert_equal( $cl->map_color( 'white' ), 'ffffff' );
! test_assert_equal( $cl->map_color( 'fFfFFf' ), 'ffffff' );
! test_assert_equal( $cl->map_color( 'FFFFFF' ), 'ffffff' );
! test_assert_equal( $cl->map_color( '#ffffff' ), 'ffffff' );
! test_assert_equal( $cl->map_color( '#FFfFFF' ), 'ffffff' );
# Check line splitting into words
***************
*** 137,141 ****
test_assert_equal( defined( $cl->{words__}{invisible} ), '' );
! # glob the tests directory for files called TestMailParse\d+.msg which consist of messages
# to be parsed with the resulting values for the words hash in TestMailParse\d+.wrd
--- 137,141 ----
test_assert_equal( defined( $cl->{words__}{invisible} ), '' );
! # glob the tests directory for files called TestMailParse\d+.msg which consist of messages
# to be parsed with the resulting values for the words hash in TestMailParse\d+.wrd
***************
*** 145,149 ****
my $words = $parse_test;
$words =~ s/msg/wrd/;
!
# Parse the document and then check the words hash against the words in the
# wrd file
--- 145,149 ----
my $words = $parse_test;
$words =~ s/msg/wrd/;
!
# Parse the document and then check the words hash against the words in the
# wrd file
***************
*** 186,190 ****
my $colored = $color_test;
$colored =~ s/msg/clr/;
!
$cl->{color__} = 1;
$cl->{bayes__} = $b;
--- 186,190 ----
my $colored = $color_test;
$colored =~ s/msg/clr/;
!
$cl->{color__} = 1;
$cl->{bayes__} = $b;
***************
*** 197,198 ****
--- 197,207 ----
test_assert_equal( $check, $html );
}
+
+
+ # test decode_string
+
+ test_assert_equal($cl->decode_string("=?ISO-8859-1?Q?foo?="), "foo");
+ test_assert_equal($cl->decode_string("=?ISO-8859-1?Q?foo_bar?="), "foo bar");
+ test_assert_equal($cl->decode_string("=?ISO-8859-1?Q?foo=20bar?="), "foo bar");
+ test_assert_equal($cl->decode_string("=?ISO-8859-1?Q?foo_bar?= =?ISO-8859-1?Q?foo_bar?="), "foo bar foo bar");
+ test_assert_equal($cl->decode_string("=?ISO-8859-1?B?QWxhZGRpbjpvcGVuIHNlc2FtZQ==?= =?ISO-8859-1?B?QWxhZGRpbjpvcGVuIHNlc2FtZQ==?="), "Aladdin:open sesame Aladdin:open sesame");
|
|
From: <ssc...@us...> - 2003-07-18 05:08:59
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv2279
Modified Files:
MailParse.pm
Log Message:
fix decode_string to allow multiple encoded chunks without crashing
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** MailParse.pm 12 Jul 2003 06:17:03 -0000 1.145
--- MailParse.pm 18 Jul 2003 05:08:56 -0000 1.146
***************
*** 477,481 ****
# If we hit a table tag then any font information is lost
!
if ( $tag =~ /^(table|td|tr|th)$/i ) {
$self->{htmlfontcolor__} = map_color( $self, 'black' );
--- 477,481 ----
# If we hit a table tag then any font information is lost
!
if ( $tag =~ /^(table|td|tr|th)$/i ) {
$self->{htmlfontcolor__} = map_color( $self, 'black' );
***************
*** 1296,1308 ****
my $decode_it = '';
! while ( $mystring =~ /=\?[\w-]+\?(B|Q)\?(.*)\?=/ig ) {
if ($1 eq "B") {
$decode_it = decode_base64( $2 );
! $mystring =~ s/=\?[\w-]+\?B\?(.*)\?=/$decode_it/i;
} elsif ($1 eq "Q") {
$decode_it = $2;
$decode_it =~ s/\_/=20/g;
$decode_it = decode_qp( $decode_it );
! $mystring =~ s/=\?[\w-]+\?Q\?(.*)\?=/$decode_it/i;
}
}
--- 1296,1309 ----
my $decode_it = '';
! while ( $mystring =~ /=\?[\w-]+\?(B|Q)\?(.*?)\?=/ig ) {
if ($1 eq "B") {
+ print $2;
$decode_it = decode_base64( $2 );
! $mystring =~ s/=\?[\w-]+\?B\?(.*?)\?=/$decode_it/i;
} elsif ($1 eq "Q") {
$decode_it = $2;
$decode_it =~ s/\_/=20/g;
$decode_it = decode_qp( $decode_it );
! $mystring =~ s/=\?[\w-]+\?Q\?(.*?)\?=/$decode_it/i;
}
}
|
|
From: <jgr...@us...> - 2003-07-17 20:28:55
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1:/tmp/cvs-serv16442a Modified Files: popfile.pl Log Message: Tidy up code Index: popfile.pl =================================================================== RCS file: /cvsroot/popfile/engine/popfile.pl,v retrieving revision 1.212 retrieving revision 1.213 diff -C2 -d -r1.212 -r1.213 *** popfile.pl 12 Jul 2003 12:44:28 -0000 1.212 --- popfile.pl 17 Jul 2003 20:12:16 -0000 1.213 *************** *** 4,10 **** # popfile.pl --- Message analyzer and sorter # ! # Acts as a server and client designed to sit between a real mail/news client and a real mail # news server using POP3. Inserts an extra header X-Text-Classification: into the header to ! # tell the client which category the message belongs in. # # Copyright (c) 2001-2003 John Graham-Cumming --- 4,10 ---- # popfile.pl --- Message analyzer and sorter # ! # Acts as a server and client designed to sit between a real mail/news client and a real mail/ # news server using POP3. Inserts an extra header X-Text-Classification: into the header to ! # tell the client which category the message belongs in and much more... # # Copyright (c) 2001-2003 John Graham-Cumming *************** *** 14,34 **** use strict; use locale; use POPFile::Loader; ! # ! # ! # MAIN ! # ! # my $POPFile = POPFile::Loader->new(); ! $POPFile->debug(1); $POPFile->CORE_loader_init(); ! ! my ( $major_version, $minor_version, $build_version ) = ( 0, 20, 0 ); ! ! $POPFile->CORE_version($major_version, $minor_version, $build_version); # Redefine POPFile's signals --- 14,31 ---- use strict; use locale; + use POPFile::Loader; ! # POPFile is actually loaded by the POPFile::Loader object which does all ! # the work my $POPFile = POPFile::Loader->new(); ! # Indicate that we should create output on STDOUT (the POPFile ! # load sequence) and initialize with the version + $POPFile->debug(1); $POPFile->CORE_loader_init(); ! $POPFile->CORE_version(0, 20, 0); # Redefine POPFile's signals *************** *** 38,67 **** # Create the main objects that form the core of POPFile. Consists of the configuration # modules, the classifier, the UI (currently HTML based), platform specific code, ! # and the POP3 proxy. $POPFile->CORE_load(); - - # Make sure each component knows about all the components it needs to know about - $POPFile->CORE_link_components(); - - # Initialize everything - $POPFile->CORE_initialize(); - - # Handle configuration options - $POPFile->CORE_config(); - - # Start each module - $POPFile->CORE_start(); ! # MAIN $POPFile->CORE_service(); ! # cleanup $POPFile->CORE_stop(); ! # --------------------------------------------------------------------------------------------- --- 35,55 ---- # Create the main objects that form the core of POPFile. Consists of the configuration # modules, the classifier, the UI (currently HTML based), platform specific code, ! # and the POP3 proxy. The link the components together, intialize them all, load ! # the configuration from disk, start the modules running $POPFile->CORE_load(); $POPFile->CORE_link_components(); $POPFile->CORE_initialize(); $POPFile->CORE_config(); $POPFile->CORE_start(); ! # This is the main POPFile loop that services requests, it will exit only when we ! # need to exit $POPFile->CORE_service(); ! # Shutdown every POPFile module $POPFile->CORE_stop(); ! ! # END |
|
From: <jgr...@us...> - 2003-07-17 20:14:20
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv16819/tests
Modified Files:
TestProxy.tst
Log Message:
More tests for Proxy
Index: TestProxy.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestProxy.tst,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestProxy.tst 13 Jul 2003 05:21:21 -0000 1.4
--- TestProxy.tst 17 Jul 2003 20:14:17 -0000 1.5
***************
*** 81,85 ****
# Start a generic proxy on port 9999
! $p->config_( 'port', 9999 );
test_assert_equal( $p->start(), 1 );
$p->stop();
--- 81,86 ----
# Start a generic proxy on port 9999
! my $port = 9000 + int(rand(1000));
! $p->config_( 'port', $port );
test_assert_equal( $p->start(), 1 );
$p->stop();
***************
*** 101,105 ****
$sp->initialize();
! $sp->config_( 'port', 9999 );
test_assert_equal( $sp->start(), 1 );
test_assert( $sp->start_server() );
--- 102,106 ----
$sp->initialize();
! $sp->config_( 'port', $port );
test_assert_equal( $sp->start(), 1 );
test_assert( $sp->start_server() );
***************
*** 110,114 ****
Proto => "tcp",
PeerAddr => 'localhost',
! PeerPort => 9999 );
$sp->service();
--- 111,115 ----
Proto => "tcp",
PeerAddr => 'localhost',
! PeerPort => $port );
$sp->service();
***************
*** 135,138 ****
--- 136,198 ----
test_assert_regexp( $sp->received(), 'toserver' );
+ # Test the tee function, that send a line to the server
+ # or client and to the logger
+
+ $sp->tee_( $client, "teed\n" );
+ select( undef, undef, undef, 0.25 );
+ $sp->service_server();
+ test_assert_regexp( $sp->received(), 'teed' );
+ my @lastten = $l->last_ten();
+ test_assert_regexp( $lastten[$#lastten], 'teed' );
+
+ # Test the echo_to_regexp_ function
+
+ $sp->send( 'before1' );
+ $sp->send( 'before2' );
+ $sp->send( 'matchTHis' );
+ $sp->send( 'after' );
+ $sp->service_server();
+ open TEMP, ">temp.tmp";
+ $sp->echo_to_regexp_( $sp->{remote_client__}, \*TEMP, qr/TH/ );
+ close TEMP;
+ open TEMP, "<temp.tmp";
+ my $line = <TEMP>;
+ test_assert_regexp( $line, 'before1' );
+ $line = <TEMP>;
+ test_assert_regexp( $line, 'before2' );
+ $line = <TEMP>;
+ test_assert_regexp( $line, 'matchTHis' );
+ $line = <TEMP>;
+ test_assert( !defined( $line ) );
+ close TEMP;
+
+ my $handle = $sp->{remote_client__};
+ $line = <$handle>;
+ test_assert_regexp( $line, 'after' );
+
+ # Test echo_to_dot_
+
+ $sp->send( 'before1' );
+ $sp->send( 'before2' );
+ $sp->send( '.' );
+ $sp->send( 'after' );
+ $sp->service_server();
+ open TEMP, ">temp.tmp";
+ $sp->echo_to_dot_( $sp->{remote_client__}, \*TEMP );
+ close TEMP;
+ open TEMP, "<temp.tmp";
+ my $line = <TEMP>;
+ test_assert_regexp( $line, 'before1' );
+ $line = <TEMP>;
+ test_assert_regexp( $line, 'before2' );
+ $line = <TEMP>;
+ test_assert_regexp( $line, '\.' );
+ $line = <TEMP>;
+ test_assert( !defined( $line ) );
+ close TEMP;
+
+ $line = <$handle>;
+ test_assert_regexp( $line, 'after' );
+
# Close down the child process
***************
*** 140,141 ****
--- 200,205 ----
$sp->stop_server();
select( undef, undef, undef, 0.25 );
+
+ # Reap the children
+
+ $sp->reaper();
|
|
From: <jgr...@us...> - 2003-07-17 20:13:46
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1:/tmp/cvs-serv16677 Modified Files: Makefile Log Message: Add target for macosx Index: Makefile =================================================================== RCS file: /cvsroot/popfile/engine/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile 15 Jul 2003 17:53:30 -0000 1.15 --- Makefile 17 Jul 2003 20:13:43 -0000 1.16 *************** *** 18,22 **** @echo @echo "windows - Build Windows installer" ! @echo "macosx - Build Mac OS X package installer" @echo "package - Build Windows installer, and create" @echo " ZIP files for Windows and cross-platform" --- 18,22 ---- @echo @echo "windows - Build Windows installer" ! @echo "macosx - Build Mac OS X package installer" @echo "package - Build Windows installer, and create" @echo " ZIP files for Windows and cross-platform" |
|
From: <jgr...@us...> - 2003-07-17 20:12:35
|
Update of /cvsroot/popfile/engine/Test
In directory sc8-pr-cvs1:/tmp/cvs-serv16506/Test
Modified Files:
SimpleProxy.pm
Log Message:
SimpleProxy chooses a random port
Index: SimpleProxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Test/SimpleProxy.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimpleProxy.pm 13 Jul 2003 04:01:35 -0000 1.2
--- SimpleProxy.pm 17 Jul 2003 20:12:33 -0000 1.3
***************
*** 21,25 ****
# A handy variable containing the value of an EOL for networks
! my $eol = "\015\012";
#----------------------------------------------------------------------------
--- 21,25 ----
# A handy variable containing the value of an EOL for networks
! my $eol = "\n";
#----------------------------------------------------------------------------
***************
*** 43,46 ****
--- 43,48 ----
$self->{received__} = '';
+ $self->{server_port__} = 10000 + int(rand(2000));
+
return $self;
}
***************
*** 55,59 ****
my ( $self ) = @_;
! close $self->{remote_server__};
}
--- 57,61 ----
my ( $self ) = @_;
! close $self->{remote_server__} if ( defined( $self->{remote_server__} ) );
}
***************
*** 74,78 ****
$self->{remote_server__} = IO::Socket::INET->new( Proto => 'tcp',
LocalAddr => 'localhost',
! LocalPort => 10000,
Listen => SOMAXCONN,
Reuse => 1 );
--- 76,80 ----
$self->{remote_server__} = IO::Socket::INET->new( Proto => 'tcp',
LocalAddr => 'localhost',
! LocalPort => $self->{server_port__},
Listen => SOMAXCONN,
Reuse => 1 );
***************
*** 102,107 ****
# If there's data in the send pipe then write it out line by line
! while ( $self->{send__} =~ s/(.+)[\r\n]+// ) {
$self->tee_( $handle, "$1$eol" );
}
--- 104,110 ----
# If there's data in the send pipe then write it out line by line
! while ( $self->{send__} =~ s/^([^\r\n]+)[\r\n]+// ) {
$self->tee_( $handle, "$1$eol" );
+ select( undef, undef, undef, 0.1 );
}
***************
*** 146,150 ****
# Connect to the simple server that
! my $remote = $self->verify_connected_( 0, $client, 'localhost', 10000 );
if ( defined( $remote ) && $remote->connected ) {
--- 149,153 ----
# Connect to the simple server that
! my $remote = $self->verify_connected_( 0, $client, 'localhost', $self->{server_port__} );
if ( defined( $remote ) && $remote->connected ) {
***************
*** 189,192 ****
--- 192,197 ----
my $received = $self->{received__};
+
+ $self->log_( "Received $received" );
$self->{received__} = '';
|
|
From: <jgr...@us...> - 2003-07-17 20:12:19
|
Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv16442a/POPFile
Modified Files:
Loader.pm
Log Message:
Tidy up code
Index: Loader.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Loader.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Loader.pm 12 Jul 2003 20:22:00 -0000 1.2
--- Loader.pm 17 Jul 2003 20:12:16 -0000 1.3
***************
*** 1,3 ****
--- 1,4 ----
package POPFile::Loader;
+
# ---------------------------------------------------------------------------------------------
#
***************
*** 5,11 ****
# tasks
#
! # subroutine names beginning with CORE indicate a subroutine designed for exclusive use of
! # POPFile's core application. subroutines not so marked are suitable for use by POPFile-based
! # utilities to assist in loading and executing modules
#
# Copyright (c) 2001-2003 John Graham-Cumming
--- 6,14 ----
# tasks
#
! # Subroutine names beginning with CORE indicate a subroutine designed for exclusive use of
! # POPFile's core application (popfile.pl).
! #
! # Subroutines not so marked are suitable for use by POPFile-based utilities to assist in loading
! # and executing modules
#
# Copyright (c) 2001-2003 John Graham-Cumming
***************
*** 13,18 ****
# ---------------------------------------------------------------------------------------------
!
! #----------------------------------------------------------------------------
# new
#
--- 16,20 ----
# ---------------------------------------------------------------------------------------------
! #----------------------------------------------------------------------------------------------
# new
#
***************
*** 50,53 ****
--- 52,57 ----
}
+ # See CORE_loader_init below for an explanation of these
+
$self->{aborting__} = '';
$self->{pipeready__} = '';
***************
*** 55,62 ****
$self->{reaper__} = '';
$self->{major_version__} = '';
! $self->{minor_version__} = '';
$self->{build_version__} = '';
-
$self->{version_string__} = '';
--- 59,68 ----
$self->{reaper__} = '';
+ # POPFile's version number as individual numbers and as
+ # string
+
$self->{major_version__} = '';
! $self->{minor_version__} = '';
$self->{build_version__} = '';
$self->{version_string__} = '';
***************
*** 67,70 ****
--- 73,77 ----
#---------------------------------------------------------------------------------------------
+ #
# CORE_loader_init
#
***************
*** 72,79 ****
#
#---------------------------------------------------------------------------------------------
-
sub CORE_loader_init
{
! my ($self) = @_;
# These anonymous subroutine references allow us to call these important
--- 79,85 ----
#
#---------------------------------------------------------------------------------------------
sub CORE_loader_init
{
! my ( $self ) = @_;
# These anonymous subroutine references allow us to call these important
***************
*** 100,104 ****
sub CORE_aborting
{
! my ($self) = @_;
$self->{alive__} = 0;
--- 106,110 ----
sub CORE_aborting
{
! my ( $self ) = @_;
$self->{alive__} = 0;
***************
*** 158,162 ****
sub CORE_reaper
{
! my ($self) = @_;
foreach my $type (keys %{$self->{components__}}) {
--- 164,168 ----
sub CORE_reaper
{
! my ( $self ) = @_;
foreach my $type (keys %{$self->{components__}}) {
***************
*** 184,188 ****
sub CORE_forker
{
! my ($self) = @_;
# Tell all the modules that a fork is about to happen
--- 190,194 ----
sub CORE_forker
{
! my ( $self ) = @_;
# Tell all the modules that a fork is about to happen
***************
*** 239,243 ****
}
-
#---------------------------------------------------------------------------------------------
#
--- 245,248 ----
***************
*** 279,283 ****
#
# Called to load a single POPFile Loadable Module (implemented as .pm files with special
! # comment on first line and add it to the components hash.
# Returns a handle to the module
#
--- 284,289 ----
#
# Called to load a single POPFile Loadable Module (implemented as .pm files with special
! # comment on first line) and add it to the components hash.
! #
# Returns a handle to the module
#
***************
*** 334,337 ****
--- 340,344 ----
#---------------------------------------------------------------------------------------------
+ #
# CORE_signals
#
***************
*** 343,347 ****
sub CORE_signals
{
! my ($self) = @_;
# Redefine POPFile's signals
--- 350,354 ----
sub CORE_signals
{
! my ( $self ) = @_;
# Redefine POPFile's signals
***************
*** 368,371 ****
--- 375,379 ----
#---------------------------------------------------------------------------------------------
+ #
# CORE_platform_
#
***************
*** 375,379 ****
sub CORE_platform_
{
! my ($self) = @_;
# Look for a module called Platform::<platform> where <platform> is the value of $^O
--- 383,387 ----
sub CORE_platform_
{
! my ( $self ) = @_;
# Look for a module called Platform::<platform> where <platform> is the value of $^O
***************
*** 394,398 ****
#---------------------------------------------------------------------------------------------
! # load
#
# Loads POPFile's modules
--- 402,407 ----
#---------------------------------------------------------------------------------------------
! #
! # CORE_load
#
# Loads POPFile's modules
***************
*** 401,405 ****
sub CORE_load
{
! my ($self) = @_;
# Create the main objects that form the core of POPFile. Consists of the configuration
--- 410,414 ----
sub CORE_load
{
! my ( $self ) = @_;
# Create the main objects that form the core of POPFile. Consists of the configuration
***************
*** 419,423 ****
#---------------------------------------------------------------------------------------------
! # clink
#
# Links POPFile's modules together to allow them to make use of each-other as objects
--- 428,433 ----
#---------------------------------------------------------------------------------------------
! #
! # CORE_link_components
#
# Links POPFile's modules together to allow them to make use of each-other as objects
***************
*** 426,430 ****
sub CORE_link_components
{
! my ($self) = @_;
print "\n\nPOPFile Engine $self->{version_string__} starting" if $self->{debug__};
--- 436,440 ----
sub CORE_link_components
{
! my ( $self ) = @_;
print "\n\nPOPFile Engine $self->{version_string__} starting" if $self->{debug__};
***************
*** 454,458 ****
#---------------------------------------------------------------------------------------------
! # initialize
#
# Loops across POPFile's modules and initializes them
--- 464,469 ----
#---------------------------------------------------------------------------------------------
! #
! # CORE_initialize
#
# Loops across POPFile's modules and initializes them
***************
*** 461,465 ****
sub CORE_initialize
{
! my ($self) = @_;
print "\n\n Initializing... " if $self->{debug__};
--- 472,476 ----
sub CORE_initialize
{
! my ( $self ) = @_;
print "\n\n Initializing... " if $self->{debug__};
***************
*** 486,489 ****
--- 497,501 ----
#---------------------------------------------------------------------------------------------
+ #
# CORE_config
#
***************
*** 493,497 ****
sub CORE_config
{
! my ($self) = @_;
# Load the configuration from disk and then apply any command line
--- 505,509 ----
sub CORE_config
{
! my ( $self ) = @_;
# Load the configuration from disk and then apply any command line
***************
*** 503,506 ****
--- 515,519 ----
#---------------------------------------------------------------------------------------------
+ #
# CORE_start
#
***************
*** 510,514 ****
sub CORE_start
{
! my ($self) = @_;
print "\n\n Starting... " if $self->{debug__};
--- 523,527 ----
sub CORE_start
{
! my ( $self ) = @_;
print "\n\n Starting... " if $self->{debug__};
***************
*** 530,533 ****
--- 543,547 ----
#---------------------------------------------------------------------------------------------
+ #
# CORE_service
#
***************
*** 539,543 ****
sub CORE_service
{
! my ($self) = @_;
print "\n\nPOPFile Engine $self->{version_string__} running\n" if $self->{debug__};
--- 553,557 ----
sub CORE_service
{
! my ( $self ) = @_;
print "\n\nPOPFile Engine $self->{version_string__} running\n" if $self->{debug__};
***************
*** 575,578 ****
--- 589,593 ----
#---------------------------------------------------------------------------------------------
+ #
# CORE_stop
#
***************
*** 582,586 ****
sub CORE_stop
{
! my ($self) = @_;
print "\n\nPOPFile Engine $self->{version_string__} stopping\n" if $self->{debug__};
--- 597,601 ----
sub CORE_stop
{
! my ( $self ) = @_;
print "\n\nPOPFile Engine $self->{version_string__} stopping\n" if $self->{debug__};
***************
*** 605,611 ****
}
- # GETTERS/SETTERS
-
#---------------------------------------------------------------------------------------------
# CORE_version
#
--- 620,625 ----
}
#---------------------------------------------------------------------------------------------
+ #
# CORE_version
#
***************
*** 618,622 ****
#
#---------------------------------------------------------------------------------------------
-
sub CORE_version
{
--- 632,635 ----
***************
*** 636,639 ****
--- 649,653 ----
#---------------------------------------------------------------------------------------------
+ #
# get_module
#
***************
*** 650,657 ****
#
#---------------------------------------------------------------------------------------------
-
sub get_module
{
! my ($self, $name, $type) = @_;
if (!defined($type) && $name =~ /^(.*)::(.*)$/ ) {
--- 664,670 ----
#
#---------------------------------------------------------------------------------------------
sub get_module
{
! my ( $self, $name, $type ) = @_;
if (!defined($type) && $name =~ /^(.*)::(.*)$/ ) {
***************
*** 662,671 ****
}
-
return $self->{components__}{$type}{$name};
}
-
#---------------------------------------------------------------------------------------------
# set_module
#
--- 675,683 ----
}
return $self->{components__}{$type}{$name};
}
#---------------------------------------------------------------------------------------------
+ #
# set_module
#
***************
*** 685,688 ****
--- 697,701 ----
#---------------------------------------------------------------------------------------------
+ #
# remove_module
#
***************
*** 703,717 ****
}
!
! #---------------------------------------------------------------------------------------------
! # debug
! #
! # POPFile::Loader debugging getter/setter
! #
! #---------------------------------------------------------------------------------------------
sub debug
{
! my ($self, $debug) = @_;
$self->{debug__} = $debug;
--- 716,724 ----
}
! # SETTER
sub debug
{
! my ( $self, $debug ) = @_;
$self->{debug__} = $debug;
***************
*** 719,721 ****
1;
! ##
\ No newline at end of file
--- 726,728 ----
1;
!
|
|
From: <xue...@us...> - 2003-07-17 11:15:02
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv16266
Modified Files:
installer.nsi
Log Message:
Ensure "Shutdown" warning appears if installation folder changes after an 'upgrade' uninstall.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** installer.nsi 15 Jul 2003 16:04:26 -0000 1.90
--- installer.nsi 17 Jul 2003 11:14:58 -0000 1.91
***************
*** 90,94 ****
!endif
! !define C_README "v0.19.0.change"
!define C_RELEASE_NOTES "..\engine\${C_README}"
--- 90,94 ----
!endif
! !define C_README "v0.19.1.change"
!define C_RELEASE_NOTES "..\engine\${C_README}"
***************
*** 1139,1142 ****
--- 1139,1146 ----
Push ${L_RESULT}
+ ; Ensure custom page shows the "Shutdown" warning message box.
+
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "NumFields" "7"
+
IfFileExists "$INSTDIR\popfile.pl" 0 continue
|
|
From: <ssc...@us...> - 2003-07-17 04:48:45
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv23976
Modified Files:
Bayes.pm
Log Message:
prevent double CRLF.CRLF on long messages
prevent CRLF.CRLF from being echoed to files
added comments to echo_to_dot clarifying that CRLF.CRLF is consumed
cleanup some tabs
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -d -r1.168 -r1.169
*** Bayes.pm 15 Jul 2003 02:43:44 -0000 1.168
--- Bayes.pm 17 Jul 2003 04:48:42 -0000 1.169
***************
*** 744,751 ****
$self->{scores__} .= "</select></td></tr>";
}
! }
$self->{scores__} .= "<tr><td></td><td><input type=\"submit\" class=\"submit\" name=\"create\" value=\"$language{Create}\" /></td></tr></table></form>";
! }
$self->{scores__} .= "<hr><b>$language{Scores}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Bucket}</th>\n<th> </th>\n";
--- 744,751 ----
$self->{scores__} .= "</select></td></tr>";
}
! }
$self->{scores__} .= "<tr><td></td><td><input type=\"submit\" class=\"submit\" name=\"create\" value=\"$language{Create}\" /></td></tr></table></form>";
! }
$self->{scores__} .= "<hr><b>$language{Scores}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Bucket}</th>\n<th> </th>\n";
***************
*** 1211,1215 ****
}
! if ( $echo ) {
print $client "$eol.$eol";
}
--- 1211,1215 ----
}
! if ( $echo && $got_full_body ) {
print $client "$eol.$eol";
}
***************
*** 1662,1665 ****
--- 1662,1666 ----
#
# echo all information from the $mail server until a single line with a . is seen
+ # Also echoes the line with . to $client but not to $file
#
# ---------------------------------------------------------------------------------------------
***************
*** 1683,1696 ****
if ( /^\.(\r\n|\r|\n)$/ ) {
! if ( $before ne '' ) {
print $client $before;
print FILE $before;
! }
print $client $_;
- print FILE $_;
last;
! }
print $client $_;
--- 1684,1696 ----
if ( /^\.(\r\n|\r|\n)$/ ) {
! if ( $before ne '' ) {
print $client $before;
print FILE $before;
! }
print $client $_;
last;
! }
print $client $_;
***************
*** 1711,1722 ****
if ( /^\.(\r\n|\r|\n)$/ ) {
! if ( $before ne '' ) {
print $client $before;
! }
print $client $_;
last;
! }
print $client $_;
--- 1711,1722 ----
if ( /^\.(\r\n|\r|\n)$/ ) {
! if ( $before ne '' ) {
print $client $before;
! }
print $client $_;
last;
! }
print $client $_;
***************
*** 1735,1746 ****
if ( /^\.(\r\n|\r|\n)$/ ) {
! if ( $before ne '' ) {
! print FILE $before;
! }
!
! print FILE $_;
!
last;
! }
print FILE $_;
--- 1735,1743 ----
if ( /^\.(\r\n|\r|\n)$/ ) {
! if ( $before ne '' ) {
! print FILE $before;
! }
last;
! }
print FILE $_;
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1:/tmp/cvs-serv14146 Modified Files: Bulgarian-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh Finnish-pfi.nsh French-pfi.nsh German-pfi.nsh Hungarian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh Portuguese-pfi.nsh PortugueseBR-pfi.nsh Russian-pfi.nsh SimpChinese-pfi.nsh Slovak-pfi.nsh Spanish-pfi.nsh Swedish-pfi.nsh TradChinese-pfi.nsh Ukrainian-pfi.nsh Log Message: Make the banner message less confusing in case where 'upgrade uninstall' is cancelled by the user. Index: Bulgarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Bulgarian-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- Bulgarian-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Danish-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- Danish-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: Dutch-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Dutch-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- Dutch-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** English-pfi.nsh 14 Jul 2003 19:30:19 -0000 1.7 --- English-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.8 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Finnish-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- Finnish-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** French-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- French-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** German-pfi.nsh 14 Jul 2003 19:29:45 -0000 1.7 --- German-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.8 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "Dies kann einige Sekunden dauern..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "Dies kann einige Sekunden dauern..." Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Hungarian-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- Hungarian-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Japanese-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.7 --- Japanese-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.8 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Korean-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.7 --- Korean-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.8 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Portuguese-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- Portuguese-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PortugueseBR-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- PortugueseBR-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Russian-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- Russian-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SimpChinese-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- SimpChinese-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Slovak-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- Slovak-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Spanish-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- Spanish-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Swedish-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- Swedish-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TradChinese-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.7 --- TradChinese-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.8 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Ukrainian-pfi.nsh 13 Jul 2003 17:39:19 -0000 1.6 --- Ukrainian-pfi.nsh 16 Jul 2003 11:53:58 -0000 1.7 *************** *** 90,94 **** ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." --- 90,94 ---- ; Banner message displayed whilst uninstalling old version ! !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Please be patient." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." |
|
From: <jgr...@us...> - 2003-07-15 17:53:33
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1:/tmp/cvs-serv6474 Modified Files: Makefile Log Message: Add macosx target to Makefile to enable building of the Mac OS X package installer Index: Makefile =================================================================== RCS file: /cvsroot/popfile/engine/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 13 Jul 2003 04:01:35 -0000 1.14 --- Makefile 15 Jul 2003 17:53:30 -0000 1.15 *************** *** 8,12 **** include vars.mak ! .PHONY: test package windows core manual skins coverage error: --- 8,12 ---- include vars.mak ! .PHONY: test package windows core manual skins coverage macosx error: *************** *** 18,21 **** --- 18,22 ---- @echo @echo "windows - Build Windows installer" + @echo "macosx - Build Mac OS X package installer" @echo "package - Build Windows installer, and create" @echo " ZIP files for Windows and cross-platform" *************** *** 37,40 **** --- 38,45 ---- endif @$(MAKE) --no-print-directory -C tests runtest TESTARGS=$(TESTARGS) DEBUGARGS= + + # Mac OS X is built in the Mac OS X directory + + macosx: ; @$(MAKE) -C ../macosx # windows builds the Windows installer |
|
From: <jgr...@us...> - 2003-07-15 17:51:42
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1:/tmp/cvs-serv6258 Modified Files: English-UK.msg English.msg Log Message: Change already reclassified message to make it clearer and shorter Index: English-UK.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English-UK.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** English-UK.msg 9 Jun 2003 18:29:22 -0000 1.1 --- English-UK.msg 15 Jul 2003 17:51:34 -0000 1.2 *************** *** 140,144 **** History_MagnetBecause <b>Magnet Used</b><p>Classified to <font color="%s">%s</font> because of magnet %s </p> History_ChangedTo Changed to <font color="%s">%s ! History_Already Already reclassified as <font color="%s">%s</font> History_RemoveAll Remove All History_RemovePage Remove Page --- 140,144 ---- History_MagnetBecause <b>Magnet Used</b><p>Classified to <font color="%s">%s</font> because of magnet %s </p> History_ChangedTo Changed to <font color="%s">%s ! History_Already Reclassified as <font color="%s">%s</font> History_RemoveAll Remove All History_RemovePage Remove Page Index: English.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English.msg,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** English.msg 29 Jun 2003 21:02:26 -0000 1.37 --- English.msg 15 Jul 2003 17:51:35 -0000 1.38 *************** *** 144,148 **** History_MagnetBecause <b>Magnet Used</b><p>Classified to <font color="%s">%s</font> because of magnet %s </p> History_ChangedTo Changed to <font color="%s">%s ! History_Already Already reclassified as <font color="%s">%s</font> History_RemoveAll Remove All History_RemovePage Remove Page --- 144,148 ---- History_MagnetBecause <b>Magnet Used</b><p>Classified to <font color="%s">%s</font> because of magnet %s </p> History_ChangedTo Changed to <font color="%s">%s ! History_Already Reclassified as <font color="%s">%s</font> History_RemoveAll Remove All History_RemovePage Remove Page |
|
From: <jgr...@us...> - 2003-07-15 17:50:40
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv6005/Classifier
Modified Files:
Tag: b0/19/0
Bayes.pm MailParse.pm
Log Message:
Port v0.18.3 fixes to v0.19.1 branch
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.149
retrieving revision 1.149.2.1
diff -C2 -d -r1.149 -r1.149.2.1
*** Bayes.pm 9 Jun 2003 18:33:10 -0000 1.149
--- Bayes.pm 15 Jul 2003 17:50:35 -0000 1.149.2.1
***************
*** 1028,1038 ****
$self->echo_to_dot_( $mail, undef );
}
! } else {
! if ( $classification ne 'unclassified' ) {
! if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
! print $client "$eol--$temp_file$eol";
! }
! }
print $client ".$eol" if ( $echo );
}
--- 1028,1040 ----
$self->echo_to_dot_( $mail, undef );
}
! }
+ if ( $classification ne 'unclassified' ) {
+ if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
+ print $client "$eol--$temp_file--$eol";
+ }
+ }
+
+ if ( $got_full_body == 1 ) {
print $client ".$eol" if ( $echo );
}
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.132
retrieving revision 1.132.2.1
diff -C2 -d -r1.132 -r1.132.2.1
*** MailParse.pm 9 Jun 2003 18:33:36 -0000 1.132
--- MailParse.pm 15 Jul 2003 17:50:35 -0000 1.132.2.1
***************
*** 20,26 ****
# character code
! my %entityhash;
!
! @entityhash{'amp', 'nbsp','iexcl','cent','pound','curren','yen','brvbar','sect','uml','copy','ordf','laquo','not','shy','reg','macr','deg','plusmn','sup2','sup3','acute','micro','para','middot','cedil','sup1','ordm','raquo','frac14','frac12','frac34','iquest','Agrave','Aacute','Acirc','Atilde','Auml','Aring','AElig','Ccedil','Egrave','Eacute','Ecirc','Euml','Igrave','Iacute','Icirc','Iuml','ETH','Ntilde','Ograve','Oacute','Ocirc','Otilde','Ouml','times','Oslash','Ugrave','Uacute','Ucirc','Uuml','Yacute','THORN','szlig','agrave','aacute','acirc','atilde','auml','aring','aelig','ccedil','egrave','eacute','ecirc','euml','igrave','iacute','icirc','iuml','eth','ntilde','ograve','oacute','ocirc','otilde','ouml','divide','oslash','ugrave','uacute','ucirc','uuml','yacute','thorn','yuml'} = ( 38, 160,161,162,163,164,165,166,167,168,169,170,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 );
#----------------------------------------------------------------------------
--- 20,48 ----
# character code
! my %entityhash = ('aacute' => 224, 'Aacute' => 202, 'Acirc' => 203, 'acirc' => 225,
! 'acute' => 189, 'AElig' => 207, 'aelig' => 229, 'Agrave' => 201,
! 'agrave' => 223, 'amp' => 38, 'Aring' => 206, 'aring' => 228,
! 'atilde' => 226, 'Atilde' => 204, 'Auml' => 196, 'auml' => 228,
! 'brvbar' => 166, 'ccedil' => 230, 'Ccedil' => 208, 'cedil' => 193,
! 'cent' => 162, 'copy' => 169, 'curren' => 164, 'deg' => 185,
! 'divide' => 246, 'Eacute' => 210, 'eacute' => 232, 'ecirc' => 233,
! 'Ecirc' => 211, 'Egrave' => 209, 'egrave' => 231, 'ETH' => 217,
! 'eth' => 239, 'Euml' => 212, 'euml' => 234, 'frac12' => 198,
! 'frac14' => 197, 'frac34' => 199, 'iacute' => 236, 'Iacute' => 214,
! 'icirc' => 237, 'Icirc' => 215, 'iexcl' => 161, 'igrave' => 235,
! 'Igrave' => 213, 'iquest' => 200, 'iuml' => 238, 'Iuml' => 216,
! 'laquo' => 180, 'macr' => 184, 'micro' => 190, 'middot' => 192,
! 'nbsp' => 160, 'not' => 181, 'ntilde' => 240, 'Ntilde' => 218,
! 'oacute' => 242, 'Oacute' => 210, 'Ocirc' => 211, 'ocirc' => 243,
! 'Ograve' => 219, 'ograve' => 241, 'ordf' => 170, 'ordm' => 195,
! 'oslash' => 247, 'Oslash' => 215, 'Otilde' => 212, 'otilde' => 244,
! 'Ouml' => 214, 'ouml' => 246, 'para' => 191, 'plusmn' => 186,
! 'pound' => 163, 'raquo' => 196, 'reg' => 183, 'sect' => 167,
! 'shy' => 182, 'sup1' => 194, 'sup2' => 187, 'sup3' => 188,
! 'szlig' => 223, 'thorn' => 253, 'THORN' => 221, 'times' => 214,
! 'Uacute' => 217, 'uacute' => 249, 'ucirc' => 250, 'Ucirc' => 218,
! 'ugrave' => 248, 'Ugrave' => 216, 'uml' => 168, 'Uuml' => 220,
! 'uuml' => 252, 'Yacute' => 220, 'yacute' => 252, 'yen' => 165,
! 'yuml' => 254);
#----------------------------------------------------------------------------
|
|
From: <jgr...@us...> - 2003-07-15 17:50:40
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv6005/UI
Modified Files:
Tag: b0/19/0
HTTP.pm
Log Message:
Port v0.18.3 fixes to v0.19.1 branch
Index: HTTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTTP.pm,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** HTTP.pm 9 Jun 2003 18:34:36 -0000 1.6
--- HTTP.pm 15 Jul 2003 17:50:36 -0000 1.6.2.1
***************
*** 130,134 ****
while ( <$client> ) {
$content_length = $1 if ( /Content-Length: (\d+)/i );
! last if ( !/[A-Z]/i );
}
--- 130,134 ----
while ( <$client> ) {
$content_length = $1 if ( /Content-Length: (\d+)/i );
! last if ( !/:/i );
}
|
|
From: <jgr...@us...> - 2003-07-15 17:50:40
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv6005/Proxy
Modified Files:
Tag: b0/19/0
POP3.pm
Log Message:
Port v0.18.3 fixes to v0.19.1 branch
Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.55
retrieving revision 1.55.2.1
diff -C2 -d -r1.55 -r1.55.2.1
*** POP3.pm 14 May 2003 09:12:12 -0000 1.55
--- POP3.pm 15 Jul 2003 17:50:36 -0000 1.55.2.1
***************
*** 274,277 ****
--- 274,278 ----
my $class = $self->{classifier__}->classify_and_modify( $mail, undef, $download_count, 0, 1, '', 0 );
+ $self->flush_extra( $mail, $client, 0 );
if ( $self->echo_response_($mail, $client, $command ) ) {
|
|
From: <xue...@us...> - 2003-07-15 16:04:29
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv18218
Modified Files:
installer.nsi
Log Message:
Uninstaller needs to check for the old-style UI param in case 'upgrade uninstall' is being used to remove an old version of POPFile.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** installer.nsi 13 Jul 2003 17:32:29 -0000 1.89
--- installer.nsi 15 Jul 2003 16:04:26 -0000 1.90
***************
*** 1780,1783 ****
--- 1780,1784 ----
!define L_CORPUS $R2 ; holds full path to the POPFile corpus data
!define L_SUBFOLDER $R1 ; "yes" if corpus is in a subfolder of $INSTDIR, otherwise "no"
+ !define L_OLDUI $R0 ; holds old-style UI port (if previous POPFile is an old version)
; When a normal uninstall is performed, the uninstaller is copied to a uniquely named
***************
*** 1818,1824 ****
check_if_running:
- ; If the POPFile we are about to uninstall is still running,
- ; then one of the EXE files will be 'locked'
-
SetDetailsPrint textonly
DetailPrint "$(un.PFI_LANG_PROGRESS_1)"
--- 1819,1822 ----
***************
*** 1829,1832 ****
--- 1827,1832 ----
IfFileExists "$INSTDIR\popfile.pid" attempt_shutdown
+ ; If the POPFile we are to uninstall is still running, one of the EXE files will be 'locked'
+
IfFileExists "$INSTDIR\wperl.exe" 0 other_perl
SetFileAttributes "$INSTDIR\wperl.exe" NORMAL
***************
*** 1837,1848 ****
other_perl:
! IfFileExists "$INSTDIR\perl.exe" 0 skip_shutdown
SetFileAttributes "$INSTDIR\perl.exe" NORMAL
ClearErrors
FileOpen ${L_CFG} "$INSTDIR\perl.exe" a
FileClose ${L_CFG}
! IfErrors 0 skip_shutdown
attempt_shutdown:
ClearErrors
FileOpen ${L_CFG} $INSTDIR\popfile.cfg r
--- 1837,1851 ----
other_perl:
! IfFileExists "$INSTDIR\perl.exe" 0 remove_shortcuts
SetFileAttributes "$INSTDIR\perl.exe" NORMAL
ClearErrors
FileOpen ${L_CFG} "$INSTDIR\perl.exe" a
FileClose ${L_CFG}
! IfErrors 0 remove_shortcuts
attempt_shutdown:
+ StrCpy ${G_GUI} ""
+ StrCpy ${L_OLDUI} ""
+
ClearErrors
FileOpen ${L_CFG} $INSTDIR\popfile.cfg r
***************
*** 1850,1857 ****
loop:
FileRead ${L_CFG} ${L_LNE}
! IfErrors done
StrCpy ${L_TEMP} ${L_LNE} 10
StrCmp ${L_TEMP} "html_port " got_html_port
Goto loop
--- 1853,1863 ----
loop:
FileRead ${L_CFG} ${L_LNE}
! IfErrors ui_port_done
StrCpy ${L_TEMP} ${L_LNE} 10
StrCmp ${L_TEMP} "html_port " got_html_port
+
+ StrCpy ${L_TEMP} ${L_LNE} 8
+ StrCmp ${L_TEMP} "ui_port " got_ui_port
Goto loop
***************
*** 1860,1877 ****
Goto loop
! done:
FileClose ${L_CFG}
!
Push ${G_GUI}
Call un.TrimNewlines
Call un.StrCheckDecimal
Pop ${G_GUI}
! StrCmp ${G_GUI} "" skip_shutdown
DetailPrint "$(un.PFI_LANG_LOG_1) ${G_GUI}"
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
Sleep 250 ; milliseconds
! skip_shutdown:
SetDetailsPrint textonly
--- 1866,1900 ----
Goto loop
! got_ui_port:
! StrCpy ${L_OLDUI} ${L_LNE} 5 8
! Goto loop
!
! ui_port_done:
FileClose ${L_CFG}
!
! StrCmp ${G_GUI} "" use_other_port
Push ${G_GUI}
Call un.TrimNewlines
Call un.StrCheckDecimal
Pop ${G_GUI}
! StrCmp ${G_GUI} "" use_other_port
DetailPrint "$(un.PFI_LANG_LOG_1) ${G_GUI}"
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
Sleep 250 ; milliseconds
+ Goto remove_shortcuts
+
+ use_other_port:
+ Push ${L_OLDUI}
+ Call un.TrimNewlines
+ Call un.StrCheckDecimal
+ Pop ${L_OLDUI}
+ StrCmp ${L_OLDUI} "" remove_shortcuts
+ DetailPrint "$(un.PFI_LANG_LOG_1) ${L_OLDUI}"
+ NSISdl::download_quiet http://127.0.0.1:${L_OLDUI}/shutdown "$PLUGINSDIR\shutdown.htm"
+ Pop ${L_TEMP}
+ Sleep 250 ; milliseconds
! remove_shortcuts:
SetDetailsPrint textonly
***************
*** 2043,2046 ****
--- 2066,2070 ----
!undef L_CORPUS
!undef L_SUBFOLDER
+ !undef L_OLDUI
SectionEnd
|
11 messages has been excluded from this view by a project administrator.
