version 1.1.1.2, 2013/10/14 07:51:14
|
version 1.1.1.3, 2016/11/01 09:54:32
|
Line 3
|
Line 3
|
* |
* |
* Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org> |
* Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org> |
* Copyright (C) 2000-2001 Martin Pool <mbp@samba.org> |
* Copyright (C) 2000-2001 Martin Pool <mbp@samba.org> |
* Copyright (C) 2003-2013 Wayne Davison | * Copyright (C) 2003-2015 Wayne Davison |
* |
* |
* This program is free software; you can redistribute it and/or modify |
* This program is free software; you can redistribute it and/or modify |
* it under the terms of the GNU General Public License as published by |
* it under the terms of the GNU General Public License as published by |
Line 656 static void log_formatted(enum logcode code, const cha
|
Line 656 static void log_formatted(enum logcode code, const cha
|
n = auth_user; |
n = auth_user; |
break; |
break; |
case 'b': |
case 'b': |
if (!(iflags & ITEM_TRANSFER)) |
|
b = 0; |
|
else if (am_sender) |
|
b = total_data_written - initial_data_written; |
|
else |
|
b = total_data_read - initial_data_read; |
|
strlcat(fmt, "s", sizeof fmt); |
|
snprintf(buf2, sizeof buf2, fmt, |
|
do_big_num(b, humanize, NULL)); |
|
n = buf2; |
|
break; |
|
case 'c': |
case 'c': |
if (!(iflags & ITEM_TRANSFER)) |
if (!(iflags & ITEM_TRANSFER)) |
b = 0; |
b = 0; |
else if (!am_sender) | else if ((!!am_sender) ^ (*p == 'c')) |
b = total_data_written - initial_data_written; |
b = total_data_written - initial_data_written; |
else |
else |
b = total_data_read - initial_data_read; |
b = total_data_read - initial_data_read; |
Line 846 void log_delete(const char *fname, int mode)
|
Line 835 void log_delete(const char *fname, int mode)
|
|
|
x.file.mode = mode; |
x.file.mode = mode; |
|
|
if (!INFO_GTE(DEL, 1) && !stdout_format) | if (am_server && protocol_version >= 29 && len < MAXPATHLEN) { |
; | |
else if (am_server && protocol_version >= 29 && len < MAXPATHLEN) { | |
if (S_ISDIR(mode)) |
if (S_ISDIR(mode)) |
len++; /* directories include trailing null */ |
len++; /* directories include trailing null */ |
send_msg(MSG_DELETED, fname, len, am_generator); |
send_msg(MSG_DELETED, fname, len, am_generator); |
} else { | } else if (!INFO_GTE(DEL, 1) && !stdout_format) |
| ; |
| else { |
fmt = stdout_format_has_o_or_i ? stdout_format : "deleting %n"; |
fmt = stdout_format_has_o_or_i ? stdout_format : "deleting %n"; |
log_formatted(FCLIENT, fmt, "del.", &x.file, fname, ITEM_DELETED, NULL); |
log_formatted(FCLIENT, fmt, "del.", &x.file, fname, ITEM_DELETED, NULL); |
} |
} |
Line 874 void log_exit(int code, const char *file, int line)
|
Line 863 void log_exit(int code, const char *file, int line)
|
{ |
{ |
if (code == 0) { |
if (code == 0) { |
rprintf(FLOG,"sent %s bytes received %s bytes total size %s\n", |
rprintf(FLOG,"sent %s bytes received %s bytes total size %s\n", |
comma_num(stats.total_written), | big_num(stats.total_written), |
comma_num(stats.total_read), | big_num(stats.total_read), |
comma_num(stats.total_size)); | big_num(stats.total_size)); |
} else if (am_server != 2) { |
} else if (am_server != 2) { |
const char *name; |
const char *name; |
|
|