diff options
| author | Richard Sharpe <sharpe@samba.org> | 2003-03-03 23:00:22 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@samba.org> | 2003-03-03 23:00:22 +0000 |
| commit | e3fdd289f58505f258f9617e1b8618694703bea2 (patch) | |
| tree | 71ce47bd5fda5962cb1d46e888cda573b47dda67 | |
| parent | 28074d957aa7ee5b4df60e2e553ba1212f217572 (diff) | |
| download | samba-e3fdd289f58505f258f9617e1b8618694703bea2.tar.gz samba-e3fdd289f58505f258f9617e1b8618694703bea2.tar.bz2 samba-e3fdd289f58505f258f9617e1b8618694703bea2.zip | |
More janitorial duties, fixing the BIG_UINT changes for large offsets.
(This used to be commit 1af39523cc3b2313f3e8acd4f2e5338182ec0b13)
| -rw-r--r-- | source3/client/clitar.c | 11 | ||||
| -rw-r--r-- | source3/libsmb/clifile.c | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c index e8be5e04e7..612a383ce0 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -959,9 +959,10 @@ static int skip_file(int skipsize) static int get_file(file_info2 finfo) { - int fnum = -1, pos = 0, dsize = 0, rsize = 0, bpos = 0; + int fnum = -1, pos = 0, dsize = 0, bpos = 0; + SMB_BIG_UINT rsize = 0; - DEBUG(5, ("get_file: file: %s, size %i\n", finfo.name, (int)finfo.size)); + DEBUG(5, ("get_file: file: %s, size %.0f\n", finfo.name, (double)finfo.size)); if (ensurepath(finfo.name) && (fnum=cli_open(cli, finfo.name, O_RDWR|O_CREAT|O_TRUNC, DENY_NONE)) == -1) { @@ -1052,7 +1053,7 @@ static int get_file(file_info2 finfo) ntarf++; - DEBUG(0, ("restore tar file %s of size %d bytes\n", finfo.name, (int)finfo.size)); + DEBUG(0, ("restore tar file %s of size %.0f bytes\n", finfo.name, (double)finfo.size)); return(True); } @@ -1082,7 +1083,7 @@ static int get_dir(file_info2 finfo) */ static char * get_longfilename(file_info2 finfo) { - int namesize = finfo.size + strlen(cur_dir) + 2; + int namesize = strlen(finfo.name) + strlen(cur_dir) + 2; char *longname = malloc(namesize); int offset = 0, left = finfo.size; BOOL first = True; @@ -1093,7 +1094,7 @@ static char * get_longfilename(file_info2 finfo) if (longname == NULL) { DEBUG(0, ("could not allocate buffer of size %d for longname\n", - (int)(finfo.size + strlen(cur_dir) + 2))); + namesize)); return(NULL); } diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index 07b1ff6b6f..31d7ea5911 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -805,7 +805,7 @@ BOOL cli_unlock64(struct cli_state *cli, int fnum, SMB_BIG_UINT offset, SMB_BIG_ ****************************************************************************/ BOOL cli_getattrE(struct cli_state *cli, int fd, - uint16 *attr, size_t *size, + uint16 *attr, SMB_BIG_UINT *size, time_t *c_time, time_t *a_time, time_t *m_time) { memset(cli->outbuf,'\0',smb_size); |