mirror of
https://github.com/privacore/open-source-search-engine.git
synced 2025-07-15 02:36:08 -04:00
use gbsystem() not system() so it can turn off alarms
since it forks.
This commit is contained in:
4
Dir.cpp
4
Dir.cpp
@ -68,7 +68,7 @@ bool Dir::open ( ) {
|
||||
bool Dir::cleanOut ( ) {
|
||||
char buf[1024];
|
||||
sprintf ( buf , "rm -r %s/*", m_dirname );
|
||||
system ( buf );
|
||||
gbsystem ( buf );
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -76,7 +76,7 @@ bool Dir::cleanOut ( ) {
|
||||
bool Dir::create ( ) {
|
||||
char buf[1024];
|
||||
sprintf ( buf , "mkdir %s", m_dirname );
|
||||
system ( buf );
|
||||
gbsystem ( buf );
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -2114,7 +2114,7 @@ bool Hostdb::syncHost ( long syncHostId, bool useSecondaryIps ) {
|
||||
sprintf ( cmd, "ssh %s \"cd %s; du -b | tail -n 1\" > ./synccheck.txt",
|
||||
ip1str, h->m_dir );
|
||||
log ( LOG_INFO, "init: %s", cmd );
|
||||
system(cmd);
|
||||
gbsystem(cmd);
|
||||
long fd = open ( "./synccheck.txt", O_RDONLY );
|
||||
if ( fd < 0 )
|
||||
return log(LOG_WARN, "conf: Unable to open synccheck.txt. "
|
||||
@ -2123,7 +2123,7 @@ bool Hostdb::syncHost ( long syncHostId, bool useSecondaryIps ) {
|
||||
cmd[len] = '\0';
|
||||
close(fd);
|
||||
// delete the file to make sure we don't reuse it
|
||||
system ( "rm ./synccheck.txt" );
|
||||
gbsystem ( "rm ./synccheck.txt" );
|
||||
// check the size
|
||||
long checkSize = atol(cmd);
|
||||
if ( checkSize > 4096 || checkSize <= 0 )
|
||||
@ -2239,7 +2239,7 @@ void Hostdb::syncDone ( ) {
|
||||
char cmd[1024];
|
||||
sprintf(cmd, "./gb start %li", m_syncHost->m_hostId);
|
||||
log ( LOG_INFO, "init: %s", cmd );
|
||||
system(cmd);
|
||||
gbsystem(cmd);
|
||||
m_syncHost = NULL;
|
||||
}
|
||||
|
||||
|
10
Language.cpp
10
Language.cpp
@ -2615,11 +2615,11 @@ bool Language::generateDicts ( long numWordsToDump , char *coll ) {
|
||||
}
|
||||
sprintf ( dd , "mkdir %sdict.new/" , g_hostdb.m_dir );
|
||||
log(LOG_INIT,"lang: %s",dd);
|
||||
if ( system ( dd ) == -1 ) return false;
|
||||
if ( gbsystem ( dd ) == -1 ) return false;
|
||||
|
||||
sprintf ( dd , "mkdir %stmp/" , g_hostdb.m_dir );
|
||||
log(LOG_INIT,"lang: %s",dd);
|
||||
if ( system ( dd ) == -1 ) return false;
|
||||
if ( gbsystem ( dd ) == -1 ) return false;
|
||||
|
||||
// . loop through all titleRecs
|
||||
// . put all words/phrases that begin with letter X in file
|
||||
@ -2671,7 +2671,7 @@ bool Language::generateDicts ( long numWordsToDump , char *coll ) {
|
||||
getLanguageAbbr(m_lang), i, g_hostdb.m_dir,
|
||||
getLanguageAbbr(m_lang), getLanguageAbbr(m_lang), i);
|
||||
log(LOG_INIT,"lang: %s",tmp);
|
||||
system ( tmp );
|
||||
gbsystem ( tmp );
|
||||
}
|
||||
|
||||
// . now convert each sorted file into a unique list of word/phrases
|
||||
@ -3653,7 +3653,7 @@ bool Language::makeScoreFiles ( long maxWordsPerFile ) {
|
||||
g_hostdb.m_dir, getLanguageAbbr(m_lang),
|
||||
getLanguageAbbr(m_lang), i );
|
||||
log(LOG_INIT,"lang: %s",bb);
|
||||
system ( bb );
|
||||
gbsystem ( bb );
|
||||
|
||||
// make the phonets for it too
|
||||
//sprintf(bb,"%sdict.new/dict.%li",g_hostdb.m_dir,i);
|
||||
@ -3856,7 +3856,7 @@ bool Language::makeQueryFiles ( ) {
|
||||
//"| sort -f | uniq -i -c -d | sort -g -r -k 1,1 "
|
||||
//"> %s.uniq.sorted", ff, ff );
|
||||
//log ( LOG_INIT,"lang: %s", cmd );
|
||||
//system(cmd);
|
||||
//gbsystem(cmd);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
2
Rdb.cpp
2
Rdb.cpp
@ -429,7 +429,7 @@ bool Rdb::updateToRebuildFiles ( Rdb *rdb2 , char *coll ) {
|
||||
logf(LOG_INFO,"repair: Moving *-saved.dat %s. %s", structName, cmd);
|
||||
|
||||
errno = 0;
|
||||
if ( system ( cmd ) == -1 )
|
||||
if ( gbsystem ( cmd ) == -1 )
|
||||
return log("repair: Moving saved %s had error: %s.",
|
||||
structName, mstrerror(errno));
|
||||
|
||||
|
@ -16748,7 +16748,7 @@ void XmlDoc::filterStart_r ( bool amThread ) {
|
||||
//if ( gbstrlen(cmd) > 2040 ) { char *xx=NULL;*xx=0; }
|
||||
|
||||
// exectue it
|
||||
int retVal = system ( cmd );
|
||||
int retVal = gbsystem ( cmd );
|
||||
if ( retVal == -1 )
|
||||
log("gb: system(%s) : %s",
|
||||
cmd,mstrerror(g_errno));
|
||||
@ -31349,7 +31349,7 @@ int gbcompress7 ( unsigned char *dest ,
|
||||
//if ( gbstrlen(cmd) > 2040 ) { char *xx=NULL;*xx=0; }
|
||||
|
||||
// exectue it
|
||||
int retVal = system ( cmd.getBufStart() );
|
||||
int retVal = gbsystem ( cmd.getBufStart() );
|
||||
if ( retVal == -1 )
|
||||
log("gb: system(%s) : %s",cmd.getBufStart(),
|
||||
mstrerror(g_errno));
|
||||
|
Reference in New Issue
Block a user