diff options
| author | Richard Sharpe <sharpe@samba.org> | 1998-08-03 10:35:00 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@samba.org> | 1998-08-03 10:35:00 +0000 |
| commit | 4fa20ebdc051083b02c790ff8a1c0a1094bd5e53 (patch) | |
| tree | e17859b11d517b58b278e5b95e7b5afe31d92b73 | |
| parent | 8c372cf5e0ae9969b10a8b789a445787b1fd1d3b (diff) | |
| download | samba-4fa20ebdc051083b02c790ff8a1c0a1094bd5e53.tar.gz samba-4fa20ebdc051083b02c790ff8a1c0a1094bd5e53.tar.bz2 samba-4fa20ebdc051083b02c790ff8a1c0a1094bd5e53.zip | |
Fixing clitar.c so that tar to stdout works correctly.
Replaced printfs with DEBUG(0. Tested ... Works.
Hope I didn't disturb the autoconf code ... It feels
great to be able to run configure for Samba at long last!
Regards
Richard Sharpe
(This used to be commit b968aa31ba15742a9eadc010e03781583feb6455)
| -rw-r--r-- | source3/client/clitar.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c index d286477d7d..1f453da492 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -303,12 +303,12 @@ static long readtarheader(union hblock *hb, file_info2 *finfo, char *prefix) if (fchk != chk) { DEBUG(0, ("checksums don't match %d %d\n", fchk, chk)); - for (i = 0; i < sizeof(hb -> dummy); i++) { +/* for (i = 0; i < sizeof(hb -> dummy); i++) { fprintf(stdout, "%2X ", hb -> dummy[i]); } fprintf(stdout, "\n"); fprintf(stdout, "%s\n", hb -> dummy); - fprintf(stdout, "Tarbuf = %X, hb = %X\n", (int)tarbuf, (int)hb); + fprintf(stdout, "Tarbuf = %X, hb = %X\n", (int)tarbuf, (int)hb);*/ return -1; } @@ -1410,17 +1410,17 @@ static void do_atar(char *rname,char *lname,file_info *finfo1) get_total_time_ms += this_time; get_total_size += finfo.size; - /* Thanks to Carel-Jan Engel (ease@mail.wirehub.nl) for this one */ - DEBUG(3,("(%g kb/s) (average %g kb/s)\n", - finfo.size / MAX(0.001, (1.024*this_time)), - get_total_size / MAX(0.001, (1.024*get_total_time_ms)))); if (tar_noisy) { - printf("%10d (%7.1f kb/s) %s\n", + DEBUG(0, ("%10d (%7.1f kb/s) %s\n", finfo.size, finfo.size / MAX(0.001, (1.024*this_time)), - finfo.name); + finfo.name)); } + /* Thanks to Carel-Jan Engel (ease@mail.wirehub.nl) for this one */ + DEBUG(3,("(%g kb/s) (average %g kb/s)\n", + finfo.size / MAX(0.001, (1.024*this_time)), + get_total_size / MAX(0.001, (1.024*get_total_time_ms)))); } free(inbuf);free(outbuf); @@ -1490,7 +1490,7 @@ static void do_tar(file_info *finfo) writetarheader(tarhandle, cur_dir, 0, finfo->mtime, "040755 \0", '5'); if (tar_noisy) { - printf(" directory %s\n", cur_dir); + DEBUG(0, (" directory %s\n", cur_dir)); } ntarf++; /* Make sure we have a file on there */ |