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

[Volker Lendecke]

The branch, v3-6-test has been updated
       via  bb47e2b s3: Fix bug 8066, wrong output in smbget
      from  72c9b37 Ensure change_dir_owner_to_parent() can't be raced.

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


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

    s3: Fix bug 8066, wrong output in smbget
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Fri Apr 15 09:32:55 CEST 2011 on sn-devel-104
    (cherry picked from commit 53f50c2268122e648a09e4b0643cd29fcc7a4bfd)

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

Summary of changes:
 source3/utils/smbget.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index 672e438..fc65b3b 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -76,10 +76,15 @@ 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);
-	else snprintf(buffer, l, OFF_T_FORMAT"b", (OFF_T_FORMAT_CAST)s);
+	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);
+	}
 }
 
 static void get_auth_data(const char *srv, const char *shr, char *wg, int wglen, char *un, int unlen, char *pw, int pwlen)


-- 
Samba Shared Repository