[Ttssh2-commit] [4216] SCP 送信で 2GB を超えるファイルを正しく扱えないのを修正。

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2010年 12月 14日 (火) 01:10:52 JST


Revision: 4216
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4216
Author:   doda
Date:     2010-12-14 01:10:51 +0900 (Tue, 14 Dec 2010)

Log Message:
-----------
SCP 送信で 2GB を超えるファイルを正しく扱えないのを修正。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/ttssh2/ttxssh/ssh.c


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-12 12:47:05 UTC (rev 4215)
+++ trunk/doc/en/html/about/history.html	2010-12-13 16:10:51 UTC (rev 4216)
@@ -31,6 +31,28 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
+<h3><a name="teraterm_4.69">2011.xx.xx (Ver 4.69)</a></h3>
+<ul class="history">
+  <!-- li>Changes
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <!-- li>Bug fixes
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <li>Misc
+    <ul>
+      <li>upgraded TTSSH version supporting SSH2 to <a href="#ttssh_2.56">2.56</a></li>
+    </ul>
+  </li>
+
+</ul>
+
 <h3><a name="teraterm_4.68">2010.12.7 (Ver 4.68)</a></h3>
 <ul class="history">
   <li>Changes
@@ -1585,6 +1607,27 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
+<h3><a name="ttssh_2.56">2011.xx.xx (Ver 2.56)</a></h3>
+<ul class="history">
+  <!-- li>Changes
+    <ul>
+     <li></li>
+    </ul>
+  </li -->
+
+  <!-- li>Bug fixes
+    <ul>
+      <li>SCP ƒtƒ@ƒCƒ‹‘—M‚ŁA2GB‚æ‚è‘å‚«‚¢ƒtƒ@ƒCƒ‹‚ª³‚µ‚­ˆµ‚¦‚È‚¢–â‘è‚ðC³‚µ‚½B</li>
+    </ul>
+  </li -->
+
+  <li>Misc
+    <ul>
+      <li>upgraded OpenSSL to 1.0.0c</li>
+    </ul>
+  </li>
+</ul>
+
 <h3><a name="ttssh_2.55">2010.12.7 (Ver 2.55)</a></h3>
 <ul class="history">
   <li>Changes

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-12 12:47:05 UTC (rev 4215)
+++ trunk/doc/ja/html/about/history.html	2010-12-13 16:10:51 UTC (rev 4216)
@@ -31,6 +31,28 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
+<h3><a name="teraterm_4.69">2011.xx.xx (Ver 4.69)</a></h3>
+<ul class="history">
+  <!-- li>•ÏX
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <!-- li>ƒoƒOC³
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <li>‚»‚Ì‘¼
+    <ul>
+      <li><a href="#ttssh_2.56">SSH2‘ΉžTTSSH(2.56)</a>‚֍·‚µ‘Ö‚¦‚½B</li>
+    </ul>
+  </li>
+
+</ul>
+
 <h3><a name="teraterm_4.68">2010.12.7 (Ver 4.68)</a></h3>
 <ul class="history">
   <li>•ÏX
@@ -1587,6 +1609,27 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
+<h3><a name="ttssh_2.56">2011.xx.xx (Ver 2.56)</a></h3>
+<ul class="history">
+  <!-- li>•ÏX
+    <ul>
+     <li></li>
+    </ul>
+  </li -->
+
+  <li>ƒoƒOC³
+    <ul>
+      <li>SCP ƒtƒ@ƒCƒ‹‘—M‚ŁA2GB‚æ‚è‘å‚«‚¢ƒtƒ@ƒCƒ‹‚ª³‚µ‚­ˆµ‚¦‚È‚¢–â‘è‚ðC³‚µ‚½B</li>
+    </ul>
+  </li>
+
+  <li>‚»‚Ì‘¼
+    <ul>
+      <li>OpenSSL 1.0.0c‚֍·‚µ‘Ö‚¦‚½</li>
+    </ul>
+  </li>
+</ul>
+
 <h3><a name="ttssh_2.55">2010.12.7 (Ver 2.55)</a></h3>
 <ul class="history">
   <li>•ÏX

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2010-12-12 12:47:05 UTC (rev 4215)
+++ trunk/ttssh2/ttxssh/ssh.c	2010-12-13 16:10:51 UTC (rev 4216)
@@ -91,7 +91,7 @@
 	char localfilefull[MAX_PATH];  // local filename fullpath
 	char remotefile[MAX_PATH];     // remote filename
 	FILE *localfp;                 // file pointer for local file
-	struct _stat filestat;         // file status information
+	struct __stat64 filestat;      // file status information
 	HWND progress_window;
 	HANDLE thread;
 	unsigned int thread_id;
@@ -3740,7 +3740,7 @@
 	int len;
 	Channel_t *c = NULL;
 	FILE *fp = NULL;
-	struct _stat st;
+	struct __stat64 st;
 
 	// ƒ\ƒPƒbƒg‚ªƒNƒ[ƒY‚³‚ê‚Ä‚¢‚éê‡‚͉½‚à‚µ‚È‚¢B
 	if (pvar->socket == INVALID_SOCKET)
@@ -3776,7 +3776,7 @@
 		}
 		c->scp.localfp = fp;     // file pointer
 
-		if (_stat(c->scp.localfilefull, &st) == 0) {
+		if (_stat64(c->scp.localfilefull, &st) == 0) {
 			c->scp.filestat = st;
 		} else {
 			goto error;
@@ -3880,7 +3880,7 @@
 	int len;
 	Channel_t *c = NULL;
 //	FILE *fp = NULL;
-//	struct _stat st;
+//	struct __stat64 st;
 
 	// ƒ\ƒPƒbƒg‚ªƒNƒ[ƒY‚³‚ê‚Ä‚¢‚éê‡‚͉½‚à‚µ‚È‚¢B
 	if (pvar->socket == INVALID_SOCKET)
@@ -8363,7 +8363,7 @@
 
 		total_size += ret;
 
-		_snprintf_s(s, sizeof(s), _TRUNCATE, "%lld / %lld (%d%%)", total_size, (long long)c->scp.filestat.st_size, 
+		_snprintf_s(s, sizeof(s), _TRUNCATE, "%lld / %lld (%d%%)", total_size, c->scp.filestat.st_size, 
 			(100 * total_size / c->scp.filestat.st_size)%100 );
 		SendMessage(GetDlgItem(hWnd, IDC_PROGRESS), WM_SETTEXT, 0, (LPARAM)s);
 
@@ -8407,7 +8407,7 @@
 		char buf[128];
 
 		_snprintf_s(buf, sizeof(buf), _TRUNCATE, "C0644 %lld %s\n", 
-			(long long)c->scp.filestat.st_size, c->scp.localfile);
+			c->scp.filestat.st_size, c->scp.localfile);
 
 		c->scp.state = SCP_FILEINFO;
 		SSH2_send_channel_data(pvar, c, buf, strlen(buf));



Ttssh2-commit メーリングリストの案内
Back to archive index