[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  4a46715 s3: Fix bug 8066, wrong output in smbget
      from  bea18a5 Fix bug #7987 - ACL can get lost when files are being renamed.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 4a467155fe9ad66a2d7e7e490d7e3957b4dcb67a
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Apr 7 22:03:49 2011 +0200

    s3: Fix bug 8066, wrong output in smbget

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/smbget.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index 4dd573a..419f13b 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -74,9 +74,11 @@ static void change_columns(int sig)
 
 static void human_readable(off_t s, char *buffer, int l)
 {
-	if(s > 1024 * 1024 * 1024) snprintf(buffer, l, "%.2fGb", 1.0 * s / (1024 * 1024 * 1024));
-	else if(s > 1024 * 1024) snprintf(buffer, l, "%.2fMb", 1.0 * s / (1024 * 1024));
-	else if(s > 1024) snprintf(buffer, l, "%.2fkb", 1.0 * s / 1024);
+	if(s > 1024 * 1024 * 1024) snprintf(buffer, l, "%.2fGB",
+					    1.0 * s / (1024 * 1024 * 1024));
+	else if(s > 1024 * 1024) snprintf(buffer, l, "%.2fMB",
+					  1.0 * s / (1024 * 1024));
+	else if(s > 1024) snprintf(buffer, l, "%.2fkB", 1.0 * s / 1024);
 	else snprintf(buffer, l, OFF_T_FORMAT"b", (OFF_T_FORMAT_CAST)s);
 }
 


-- 
Samba Shared Repository