Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit 4365aac6 authored by Rob Swindell's avatar Rob Swindell 💬

Don't compile the .ini parsing stuff for JSDoor

This should fix the recent JSDoor build issue introduced.
parent 23e36187
Pipeline #1426 passed with stage
in 9 minutes and 28 seconds
......@@ -1148,6 +1148,7 @@ int parseLogLevel(const char* p)
return DEFAULT_LOG_LEVEL;
}
#ifndef JSDOOR
void get_ini_values(str_list_t ini, const char* section, js_callback_t* cb)
{
log_level = iniGetLogLevel(ini, section, "LogLevel" , log_level);
......@@ -1164,6 +1165,7 @@ void get_ini_values(str_list_t ini, const char* section, js_callback_t* cb)
cb->auto_terminate = iniGetBool(ini, section, "AutoTerminate" , cb->auto_terminate);
js_opts = iniGetBitField(ini, section, strJavaScriptOptions , js_options, js_opts);
}
#endif
/*********************/
/* Entry point (duh) */
......@@ -1404,12 +1406,14 @@ int main(int argc, char **argv, char** env)
}
continue;
}
#ifndef JSDOOR
char ini_section[MAX_PATH + 1];
module=argv[argn];
SAFECOPY(ini_section, getfname(module));
if((p = getfext(ini_section)) != NULL)
*p = 0;
get_ini_values(ini, ini_section, &cb);
#endif
}
if(umask_val >= 0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment