tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minimum checking that we have enough space before attempting decompression. Change config default compressed file from no limit to 20 MB

Browse Source
This commit is contained in:
Jean-Francois Dockes
2015-04-22 17:08:06 +02:00
parent a6d69247df
commit 906312519c
8 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/pathut.cpp
+5 -4
View File
@@ -59,7 +59,7 @@ using namespace std;
#include "wipedir.h"
#include "md5ut.h"
bool fsocc(const string &path, int *pc, long *blocks)
bool fsocc(const string &path, int *pc, long long *blocks)
{
#ifdef sun
struct statvfs buf;
@@ -88,8 +88,9 @@ bool fsocc(const string &path, int *pc, long *blocks)
int ratio = buf.f_bsize > FSOCC_MB ? buf.f_bsize / FSOCC_MB :
FSOCC_MB / buf.f_bsize;
*blocks = buf.f_bsize > FSOCC_MB ? long(buf.f_bavail) * ratio :
long(buf.f_bavail) / ratio;
*blocks = buf.f_bsize > FSOCC_MB ?
((long long)buf.f_bavail) * ratio :
((long long)buf.f_bavail) / ratio;
}
}
return true;
@@ -890,7 +891,7 @@ int main(int argc, const char **argv)
string path = *argv++;argc--;
int pc;
long blocks;
long long blocks;
if (!fsocc(path, &pc, &blocks)) {
fprintf(stderr, "fsocc failed\n");
return 1;