version 1.19, 2025/04/10 01:24:38
|
version 1.21, 2025/04/15 02:24:43
|
Line 24
|
Line 24
|
* along with FreeM. If not, see <https://www.gnu.org/licenses/>. |
* along with FreeM. If not, see <https://www.gnu.org/licenses/>. |
* |
* |
* $Log$ |
* $Log$ |
|
* Revision 1.21 2025/04/15 02:24:43 snw |
|
* Improve FreeM logging capabilities |
|
* |
|
* Revision 1.20 2025/04/13 04:22:43 snw |
|
* Fix snprintf calls |
|
* |
* Revision 1.19 2025/04/10 01:24:38 snw |
* Revision 1.19 2025/04/10 01:24:38 snw |
* Remove C++ style comments |
* Remove C++ style comments |
* |
* |
Line 106
|
Line 112
|
#include <errno.h> |
#include <errno.h> |
#include <pwd.h> |
#include <pwd.h> |
#include <grp.h> |
#include <grp.h> |
|
#include "log.h" |
|
|
#if defined(HAVE_GETOPT_H) |
#if defined(HAVE_GETOPT_H) |
# include <getopt.h> |
# include <getopt.h> |
Line 459 int main (int argc, char **argv, char **
|
Line 465 int main (int argc, char **argv, char **
|
} |
} |
#endif |
#endif |
|
|
snprintf (config_file, 4096, "%s/freem/%s/freem.conf", SYSCONFDIR, shm_env); |
snprintf (config_file, sizeof (config_file) - 1, "%s/freem/%s/freem.conf", SYSCONFDIR, shm_env); |
snprintf (env_config_file, 4096, "%s/freem/env.conf", SYSCONFDIR); |
snprintf (env_config_file, sizeof (config_file) - 1, "%s/freem/env.conf", SYSCONFDIR); |
|
|
if (!file_exists (env_config_file)) { |
if (!file_exists (env_config_file)) { |
fprintf (stderr, "freem: environment catalog does not exist; may need to run fmadm configure\n"); |
fprintf (stderr, "freem: environment catalog does not exist; may need to run fmadm configure\n"); |
Line 725 int main (int argc, char **argv, char **
|
Line 731 int main (int argc, char **argv, char **
|
} |
} |
|
|
/* make this the startup routine */ |
/* make this the startup routine */ |
snprintf (startuprou, 256, "^%s\201", cli_rtn_name); |
snprintf (startuprou, sizeof (startuprou) - 1, "^%s\201", cli_rtn_name); |
|
|
/* re-work the namespace config to search for the |
/* re-work the namespace config to search for the |
routine in the discovered path */ |
routine in the discovered path */ |
if (cli_rtn_name[0] == '%') { |
if (cli_rtn_name[0] == '%') { |
|
|
snprintf (rou0plib, 256, "%s\201", cli_rtn_path); |
snprintf (rou0plib, sizeof (rou0plib) - 1, "%s\201", cli_rtn_path); |
snprintf (rou1plib, 256, "%s\201", cli_rtn_path); |
snprintf (rou1plib, sizeof (rou1plib) - 1, "%s\201", cli_rtn_path); |
|
|
} |
} |
else { |
else { |
|
|
snprintf (rou0path, 256, "%s\201", cli_rtn_path); |
snprintf (rou0path, sizeof (rou0path) - 1, "%s\201", cli_rtn_path); |
snprintf (rou1path, 256, "%s\201", cli_rtn_path); |
snprintf (rou1path, sizeof (rou1path) - 1, "%s\201", cli_rtn_path); |
|
|
} |
} |
|
|
Line 894 int main (int argc, char **argv, char **
|
Line 900 int main (int argc, char **argv, char **
|
stcpy (verstr, FREEM_VERSION_STR); |
stcpy (verstr, FREEM_VERSION_STR); |
stcnv_m2c (verstr); |
stcnv_m2c (verstr); |
|
|
snprintf (version, 255, "\r\nCoherent Logic Development FreeM version %s [DIALECT: %s%s]\r\n\201", verstr, m_dialect, (restricted_mode == TRUE ? "/RESTRICTED" : "")); |
snprintf (version, sizeof (version) - 1, "\r\nCoherent Logic Development FreeM version %s [DIALECT: %s%s]\r\n\201", verstr, m_dialect, (restricted_mode == TRUE ? "/RESTRICTED" : "")); |
write_m (version); |
write_m (version); |
|
|
snprintf (version, 255, "Copyright (C) 2014, 2020, 2021, 2023, 2025 Coherent Logic Development LLC\r\n\r\n\201"); |
snprintf (version, sizeof (version) - 1, "Copyright (C) 2014, 2020, 2021, 2023, 2025 Coherent Logic Development LLC\r\n\r\n\201"); |
write_m (version); |
write_m (version); |
|
|
/* |
/* |
Line 914 int main (int argc, char **argv, char **
|
Line 920 int main (int argc, char **argv, char **
|
if (dx_mode) { |
if (dx_mode) { |
char k_buf[512]; |
char k_buf[512]; |
|
|
snprintf (k_buf, 512 - 1, "%%TMPINITMCODE\201\201"); |
snprintf (k_buf, sizeof (k_buf) - 1, "%%TMPINITMCODE\201\201"); |
symtab (set_sym, k_buf, dx_mcode); |
symtab (set_sym, k_buf, dx_mcode); |
const_define (k_buf, dx_mcode); |
const_define (k_buf, dx_mcode); |
} |
} |
Line 922 int main (int argc, char **argv, char **
|
Line 928 int main (int argc, char **argv, char **
|
if (routine_mode) { |
if (routine_mode) { |
char k_buf[512]; |
char k_buf[512]; |
|
|
snprintf (k_buf, 512 - 1, "%%TMPINITROUTINE\201\201"); |
snprintf (k_buf, sizeof (k_buf) - 1, "%%TMPINITROUTINE\201\201"); |
symtab (set_sym, k_buf, startup_routine); |
symtab (set_sym, k_buf, startup_routine); |
const_define (k_buf, startup_routine); |
const_define (k_buf, startup_routine); |
} |
} |