sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-14 01:57:53 +03:00
Code

Do my janitorial duties to encourage others to do so.

Browse Source 
Fix lingering large offset problems in smbtar etc.
This commit is contained in:
Richard Sharpe -
parent 342734e3de
commit c416eec2f2
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/client/clitar.c
View File

@ -959,9 +959,10 @@ static int skip_file(int skipsize)
static int get_file(file_info2 finfo) 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) && if (ensurepath(finfo.name) &&
(fnum=cli_open(cli, finfo.name, O_RDWR|O_CREAT|O_TRUNC, DENY_NONE)) == -1) { (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++; 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); return(True);
} }
@ -1082,18 +1083,18 @@ static int get_dir(file_info2 finfo)
*/ */
static char * get_longfilename(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); char *longname = malloc(namesize);
int offset = 0, left = finfo.size; int offset = 0, left = finfo.size;
BOOL first = True; BOOL first = True;
DEBUG(5, ("Restoring a long file name: %s\n", finfo.name)); DEBUG(5, ("Restoring a long file name: %s\n", finfo.name));
DEBUG(5, ("Len = %d\n", (int)finfo.size)); DEBUG(5, ("Len = %.0f\n", (double)finfo.size));
if (longname == NULL) { if (longname == NULL) {
DEBUG(0, ("could not allocate buffer of size %d for longname\n", DEBUG(0, ("could not allocate buffer of size %d for longname\n",
(int)(finfo.size + strlen(cur_dir) + 2))); namesize));
return(NULL); return(NULL);
} }

2
source/libsmb/clifile.c
View File

@ -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, 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) time_t *c_time, time_t *a_time, time_t *m_time)
{ {
memset(cli->outbuf,'\0',smb_size); memset(cli->outbuf,'\0',smb_size);