sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3: printing: Use auto-updating of offset in printing_pread_data() to remove offset tracking in get_file_version().

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2018-05-01 11:08:40 -07:00 committed by Ralph Boehme
parent 4b580ee94e
commit 09aaed2109
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/printing/nt_printing.c
View File

@ -732,9 +732,7 @@ static int get_file_version(files_struct *fsp,
{
char *buf = NULL;
ssize_t byte_count;
off_t pos;
off_t oret;
off_t in_pos = -1;
off_t in_pos = fsp->fh->pos;
buf=(char *)SMB_MALLOC(DOS_HEADER_SIZE);
if (buf == NULL) {
@ -764,19 +762,7 @@ static int get_file_version(files_struct *fsp,
* Skip OEM header (if any) and the
* DOS stub to start of Windows header.
*/
pos = SVAL(buf,DOS_HEADER_LFANEW_OFFSET);
oret = SMB_VFS_LSEEK(fsp, pos, SEEK_SET);
if (oret == (off_t)-1) {
DBG_NOTICE("File [%s] too short, errno = %d\n",
fname,
errno);
/*
* Assume this isn't an error...
* the file just looks sort of like a PE/NE file.
*/
goto no_version_info;
}
pos = oret; /* Update new position. */
in_pos = SVAL(buf,DOS_HEADER_LFANEW_OFFSET);
/* Note: DOS_HEADER_SIZE and NE_HEADER_SIZE are incidentally same */
byte_count = printing_pread_data(fsp, buf, &in_pos, NE_HEADER_SIZE);