mirror of
https://github.com/Cisco-Talos/clamav.git
synced 2025-10-19 18:33:16 +00:00
51adfb8b61
The ClamScan scan summary prints bytes scanned and bytes read in multiples of 4096 (aka `CL_COUNT_PRECISION`), as is provided by the `cl_scanfile()`, `cl_scandesc()`, `cl_scanfile_callback()`, and `cl_scandesc_callback()` functions. I believe this imprecision was the result of using an `unsigned long int` which may be 64bit or 32bit, depending on platform. I believe the intention was to be able to support scanning more than 4 GiB of data. Since the new `cl_scan*_ex()` functions use a `uint64_t`, which guarantees a 64bit integer and supports ~16,777,216 terabytes, I find no reason not to report an accurate count. For the legacy scan functions (above) I've kept the `CL_COUNT_PRECISION` behavior to maintain backwards compatibility. I have also improved the bytes scanned/read output to report GiB, MiB, KiB, or B as appropriate. Previously, it always report "MB". CLAM-1433
83 lines
2.9 KiB
C
83 lines
2.9 KiB
C
/*
|
|
* Copyright (C) 2013-2025 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
|
|
* Copyright (C) 2007-2013 Sourcefire, Inc.
|
|
*
|
|
* Authors: Nigel Horne
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
* MA 02110-1301, USA.
|
|
*/
|
|
|
|
#ifndef __BLOB_H
|
|
#define __BLOB_H
|
|
|
|
#include "clamav.h"
|
|
|
|
/*
|
|
* Resizable chunk of memory
|
|
*/
|
|
typedef struct blob {
|
|
char *name; /* filename */
|
|
unsigned char *data; /* the stuff itself */
|
|
off_t len; /* number of bytes of data so far */
|
|
off_t size; /* number of bytes allocated to data so far */
|
|
int isClosed;
|
|
#ifdef CL_DEBUG
|
|
object_type magic; /* verify that this is a blob */
|
|
#endif
|
|
} blob;
|
|
|
|
blob *blobCreate(void);
|
|
void blobDestroy(blob *b);
|
|
void blobArrayDestroy(blob *b[], int n);
|
|
void *blobToMem(blob *b);
|
|
void blobSetFilename(blob *b, const char *dir, const char *filename);
|
|
int blobAddData(blob *b, const unsigned char *data, size_t len);
|
|
unsigned char *blobGetData(const blob *b);
|
|
size_t blobGetDataSize(const blob *b);
|
|
void blobClose(blob *b);
|
|
int blobcmp(const blob *b1, const blob *b2);
|
|
int blobGrow(blob *b, size_t len);
|
|
|
|
/*
|
|
* Like a blob, but associated with a file stored in the temporary directory
|
|
*/
|
|
typedef struct fileblob {
|
|
FILE *fp;
|
|
int fd;
|
|
blob b; /*
|
|
* b.name is the name of the attachment as stored in the
|
|
* email, not the full path name of the temporary file
|
|
*/
|
|
char *fullname; /* full pathname of the file */
|
|
cli_ctx *ctx; /* When set we can scan the blob, otherwise NULL */
|
|
uint64_t bytes_scanned;
|
|
unsigned int isNotEmpty : 1;
|
|
unsigned int isInfected : 1;
|
|
} fileblob;
|
|
|
|
fileblob *fileblobCreate(void);
|
|
int fileblobScanAndDestroy(fileblob *fb);
|
|
void fileblobDestructiveDestroy(fileblob *fb);
|
|
void fileblobDestroy(fileblob *fb);
|
|
void fileblobSetFilename(fileblob *fb, const char *dir, const char *filename);
|
|
void fileblobPartialSet(fileblob *fb, const char *fullname, const char *arg);
|
|
const char *fileblobGetFilename(const fileblob *fb);
|
|
void fileblobSetCTX(fileblob *fb, cli_ctx *ctx);
|
|
int fileblobAddData(fileblob *fb, const unsigned char *data, size_t len);
|
|
cl_error_t fileblobScan(const fileblob *fb);
|
|
int fileblobInfected(const fileblob *fb);
|
|
void sanitiseName(char *name);
|
|
|
|
#endif /*_BLOB_H*/
|