The branch, master has been updated
via 53f50c2 s3: Fix bug 8066, wrong output in smbget
from 9c2aa5b s3-krb5 Move #ifdef HAVE_KRB5 above #include of
libcli/auth/krb5_wrap.h
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 53f50c2268122e648a09e4b0643cd29fcc7a4bfd
Author: Volker Lendecke <[email protected]>
Date: Thu Apr 7 22:03:49 2011 +0200
s3: Fix bug 8066, wrong output in smbget
Autobuild-User: Volker Lendecke <[email protected]>
Autobuild-Date: Fri Apr 15 09:32:55 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
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
