From 81ec7ccf5c6bc5d8e835ba5a1f6a0721b8a65f44 Mon Sep 17 00:00:00 2001
From: Stepan Pologov <sisoft@users.sourceforge.net>
Date: Tue, 8 Jun 2004 11:11:44 +0000
Subject: [PATCH] fix receiving files from last position after abort, not from
 begin.

---
 ChangeLog        | 13 +++++++++++++
 Changes          |  4 +++-
 TodayFixes       | 12 +++++-------
 qico.conf.sample |  2 +-
 src/cvsdate.h    |  2 +-
 src/protfm.c     |  4 ++--
 stuff/test.pl    |  1 +
 7 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8d17355..86a99e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-06-07 22:50  sisoft
+
+	* Changes, Makefile.am, README, autogen.sh, configure.in,
+	  qico.spec, debian/Makefile.am, debian/changelog, src/Makefile.am,
+	  src/binkp.c, src/daemon.c, src/log.c, src/main.c, src/perl.c,
+	  src/qconf.x, stuff/test.pl, stuff/freebsd/Makefile:
+
+	change version to 0.55si.
+	release 0.54si (cvs tag - stbl54).
+	add 'make deb' target for make debian packages.
+	begin write perl support code.
+	add configure option --enable-perl and keyword 'perlfile'.
+
 2004-06-05 10:49  sisoft
 
 	* Changes, qico.conf.sample, src/aso.c, src/config.c, src/daemon.c,
diff --git a/Changes b/Changes
index f0a8d4a..6f296a9 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,7 @@ Version 0.55si
 Version 0.54si
 ~~~~~~~~~~~~~~
 - Стабильная версия.
+- bugfix: не работала докачка файлов.
 - тэг на CVS: stbl54.
 
 Version 0.53si
@@ -41,6 +42,7 @@ Version 0.53si
 - bugfix: qcc неверно обрабатывал изменение размера терминала.
 - bugfix: команда `h' в qcc неверно работала с числами больше 255.
 - bugfix: на binkp имена файлов не перекодировывались и не нормализовались.
+- тэг на CVS: qico53
 
 Version 0.52si
 ~~~~~~~~~~~~~~
@@ -383,4 +385,4 @@ Version 0.49.8
 ~~~~~~~~~~~~~~
 truncated.
 
-/* $Id: Changes,v 1.60 2004/06/07 18:50:51 sisoft Exp $ */
+/* $Id: Changes,v 1.61 2004/06/08 11:11:44 sisoft Exp $ */
diff --git a/TodayFixes b/TodayFixes
index a23053c..2856044 100644
--- a/TodayFixes
+++ b/TodayFixes
@@ -1,4 +1,8 @@
-/* $Id: TodayFixes,v 1.79 2004/06/07 18:50:51 sisoft Exp $ */
+/* $Id: TodayFixes,v 1.80 2004/06/08 11:11:44 sisoft Exp $ */
+---
+fix receiving files from last position after abort, not from begin.
+.
+previous:
 ---
 change version to 0.55si.
 release 0.54si (cvs tag - stbl54).
@@ -6,9 +10,3 @@ add 'make deb' target for make debian packages.
 begin write perl support code.
 add configure option --enable-perl and keyword 'perlfile'.
 .
-previous:
----
-fix sending *.req if ASO used.
-add if-expressions 'mailer' and 'exec'.
-other small changes.
-.
diff --git a/qico.conf.sample b/qico.conf.sample
index 358186b..b1a2401 100644
--- a/qico.conf.sample
+++ b/qico.conf.sample
@@ -1,7 +1,7 @@
 ###############################################################################
 ########################  qico configuration file  ############################
 ###############################################################################
-#for 0.53si $Id: qico.conf.sample,v 1.37 2004/06/05 06:49:13 sisoft Exp $
+#for 0.55si $Id: qico.conf.sample,v 1.38 2004/06/08 11:11:44 sisoft Exp $
 #
 # config structure:
 # ~~~~~~~~~~~~~~~~
diff --git a/src/cvsdate.h b/src/cvsdate.h
index 2732baf..0fb747c 100644
--- a/src/cvsdate.h
+++ b/src/cvsdate.h
@@ -1 +1 @@
-char cvsdate[]="2004-06-07 22:47";
+char cvsdate[]="2004-06-08 15:08";
diff --git a/src/protfm.c b/src/protfm.c
index 08a62b0..f7eecad 100644
--- a/src/protfm.c
+++ b/src/protfm.c
@@ -1,6 +1,6 @@
 /******************************************************************
  * common protocols' file management
- * $Id: protfm.c,v 1.23 2004/06/05 06:49:13 sisoft Exp $
+ * $Id: protfm.c,v 1.24 2004/06/08 11:11:45 sisoft Exp $
  ******************************************************************/
 #include "headers.h"
 #ifdef HAVE_UTIME_H
@@ -118,7 +118,7 @@ int rxopen(char *name, time_t rtime, size_t rsize, FILE **f)
 	snprintf(p, MAX_PATH, "%s/tmp/%s", ccs, bn);
 
 	if(!stat(p, &sb)) {
-		if(sb.st_size<rsize && sb.st_mtime==rtime) {
+		if(sb.st_size<rsize && sb.st_mtime==recvf.mtime) {
 			*f=fopen(p, "ab");
 			if(!*f) {
 				write_log("can't open file %s for writing: %s", p,strerror(errno));
diff --git a/stuff/test.pl b/stuff/test.pl
index 94b4360..629e53a 100644
--- a/stuff/test.pl
+++ b/stuff/test.pl
@@ -1,4 +1,5 @@
 # test and info perl script for qicosi.
+# $Id: test.pl,v 1.2 2004/06/08 11:11:46 sisoft Exp $
 
 # available qico functions:
 #  sub wlog(string): write string to log.