Re: mc-4.6.1-pre2

[Jindrich Novy <jnovy redhat com>]

Hello Nerius,

On Wed, 2004-12-01 at 17:48 +0200, Nerijus Baliunas wrote:
> On Wed, 1 Dec 2004 18:09:16 +0500 "Pavel Shirshov (pchel)" <me pavelsh pp ru> wrote:
> 
> >   I sent mail to Pavel Roskin about release mc-4.6.1-pre2. I think to
> >   release mc-4.6.1 without any subshell fixes.
> 
> Could you please apply the fix for large files (a patch was posted here, but
> I cannot find it in list archives)? IIRC basically it changed %d to %llu
> in filegui.c.

... and the off_t instead of int.

Ok, I'm sending the patch again.

-- 
Jindrich Novy <jnovy redhat com>, http://people.redhat.com/jnovy/

--- mc-4.6.1-20041124/src/filegui.c.badsize	2004-11-08 21:10:33.000000000 +0100
+++ mc-4.6.1-20041124/src/filegui.c	2004-11-24 09:51:14.330852896 +0100
@@ -525,8 +525,13 @@
     N_("&No"), BY - 2, 37, REPLACE_NO}, {
     N_("&Yes"), BY - 2, 28, REPLACE_YES}, {
     N_("Overwrite this target?"), BY - 2, 4, 0}, {
-    N_("Target date: %s, size %d"), 6, 4, 0}, {
-    N_("Source date: %s, size %d"), 5, 4, 0}
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+    N_("Target date: %s, size %llu"), 6, 4, 0}, {
+    N_("Source date: %s, size %llu"), 5, 4, 0}
+#else
+    N_("Target date: %s, size %u"), 6, 4, 0}, {
+    N_("Source date: %s, size %u"), 5, 4, 0}
+#endif
 };
 
 #define ADD_RD_BUTTON(i)\
@@ -635,9 +640,9 @@
     ADD_RD_LABEL (ui, 11, 0, 0);
 
     ADD_RD_LABEL (ui, 12, file_date (ui->d_stat->st_mtime),
-		  (int) ui->d_stat->st_size);
+		  (off_t) ui->d_stat->st_size);
     ADD_RD_LABEL (ui, 13, file_date (ui->s_stat->st_mtime),
-		  (int) ui->s_stat->st_size);
+		  (off_t) ui->s_stat->st_size);
 }
 
 void