diff options
| author | Samba Release Account <samba-bugs@samba.org> | 1997-07-28 18:59:57 +0000 |
|---|---|---|
| committer | Samba Release Account <samba-bugs@samba.org> | 1997-07-28 18:59:57 +0000 |
| commit | 7314126d9e1d84997d818166f27e2076d55ff04e (patch) | |
| tree | afcef3a4f75a6b7441d5ce5efdf790167ee65f78 /source3/client/client.c | |
| parent | bfdaaaf36d55051bf60d30648b87b96ed87b9ba5 (diff) | |
| download | samba-7314126d9e1d84997d818166f27e2076d55ff04e.tar.gz samba-7314126d9e1d84997d818166f27e2076d55ff04e.tar.bz2 samba-7314126d9e1d84997d818166f27e2076d55ff04e.zip | |
client.c: Added amanda fixes.
clitar.c: Added amanda fixes.
nameannounce.c: Removed redundent code.
nameelect.c: Removed redundent code.
nameserv.h: Removed redundent code.
nameservresp.c: Removed redundent code.
namework.c: Removed redundent code.
password.c: Prevented crash if getpwnam fails.
Jeremy (jallison@whistle.com)
(This used to be commit 760fe30353de66e8e6571f8ff4ec1064261b5428)
Diffstat (limited to 'source3/client/client.c')
| -rw-r--r-- | source3/client/client.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index c52815c25b..84ff1b50c8 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -85,7 +85,7 @@ static BOOL call_api(int prcnt,int drcnt, int *rprcnt,int *rdrcnt, char *param,char *data, char **rparam,char **rdata); - +static BOOL do_this_one(file_info *finfo); /* clitar bits insert */ extern int blocksize; @@ -135,6 +135,8 @@ int get_total_time_ms = 0; int put_total_size = 0; int put_total_time_ms = 0; +/* totals globals */ +int dir_total = 0; extern int Client; @@ -473,12 +475,15 @@ static void cmd_cd(char *inbuf,char *outbuf) ****************************************************************************/ static void display_finfo(file_info *finfo) { - time_t t = finfo->mtime; /* the time is assumed to be passed as GMT */ - DEBUG(0,(" %-30s%7.7s%10d %s", - CNV_LANG(finfo->name), + if (do_this_one(finfo)) { + time_t t = finfo->mtime; /* the time is assumed to be passed as GMT */ + DEBUG(0,(" %-30s%7.7s%10d %s", + CNV_LANG(finfo->name), attrib_string(finfo->mode), finfo->size, asctime(LocalTime(&t)))); + dir_total += finfo->size; + } } @@ -1104,6 +1109,7 @@ static void cmd_dir(char *inbuf,char *outbuf) fstring buf; char *p=buf; + dir_total = 0; strcpy(mask,cur_dir); if(mask[strlen(mask)-1]!='\\') strcat(mask,"\\"); @@ -1122,6 +1128,8 @@ static void cmd_dir(char *inbuf,char *outbuf) do_dir(inbuf,outbuf,mask,attribute,NULL,recurse); do_dskattr(); + + DEBUG(3, ("Total bytes listed: %d\n", dir_total)); } |