From e2424ae13970c8013b2c26e264e583b308e819f1 Mon Sep 17 00:00:00 2001 From: Pavel Tsekov Date: Thu, 23 Aug 2007 13:16:39 +0000 Subject: [PATCH] * src/filegui.c (rd_widgets) [_LARGE_FILES]: Use format string capable of supporting 64 bit file sizes. * vfs/fish.c (fish_linear_start) [_LARGE_FILES]: Use format string capable of supporting 64 bit file sizes. --- src/ChangeLog | 5 +++++ src/filegui.c | 2 +- vfs/ChangeLog | 5 +++++ vfs/fish.c | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 81696ca89..1fffff9e1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-08-23 Pavel Tsekov + + * filegui.c (rd_widgets) [_LARGE_FILES]: Use format string + capable of supporting 64 bit file sizes. + 2007-08-23 Pavel Tsekov * mountlist.c (fstype_to_string): Define only when diff --git a/src/filegui.c b/src/filegui.c index 1522d4d3e..d6b7b813a 100644 --- a/src/filegui.c +++ b/src/filegui.c @@ -524,7 +524,7 @@ static struct { N_("&No"), BY - 2, 37, REPLACE_NO}, { N_("&Yes"), BY - 2, 28, REPLACE_YES}, { N_("Overwrite this target?"), BY - 2, 4, 0}, { -#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 +#if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || (defined _LARGE_FILES && _LARGE_FILES) N_("Target date: %s, size %llu"), 6, 4, 0}, { N_("Source date: %s, size %llu"), 5, 4, 0} #else diff --git a/vfs/ChangeLog b/vfs/ChangeLog index 50a946116..89fbede1e 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,3 +1,8 @@ +2007-08-23 Pavel Tsekov + + * fish.c (fish_linear_start) [_LARGE_FILES]: Use format string + capable of supporting 64 bit file sizes. + 2007-05-07 Pavel Tsekov * fish.c: Remove all references to HAVE_HACKED_SSH. diff --git a/vfs/fish.c b/vfs/fish.c index 8116a0eff..ea3fc29cd 100644 --- a/vfs/fish.c +++ b/vfs/fish.c @@ -632,7 +632,7 @@ fish_linear_start (struct vfs_class *me, struct vfs_s_fh *fh, off_t offset) if (offset != PRELIM) ERRNOR (E_REMOTE, 0); fh->linear = LS_LINEAR_OPEN; fh->u.fish.got = 0; -#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 +#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 || (defined _LARGE_FILES && _LARGE_FILES) if (sscanf( reply_str, "%llu", &fh->u.fish.total )!=1) #else if (sscanf( reply_str, "%u", &fh->u.fish.total )!=1)