--- freem/src/mumps.c 2025/04/02 04:50:49 1.14
+++ freem/src/mumps.c 2025/04/13 04:22:43 1.20
@@ -1,5 +1,5 @@
/*
- * $Id: mumps.c,v 1.14 2025/04/02 04:50:49 snw Exp $
+ * $Id: mumps.c,v 1.20 2025/04/13 04:22:43 snw Exp $
* main module of freem
*
*
@@ -24,6 +24,24 @@
* along with FreeM. If not, see .
*
* $Log: mumps.c,v $
+ * Revision 1.20 2025/04/13 04:22:43 snw
+ * Fix snprintf calls
+ *
+ * Revision 1.19 2025/04/10 01:24:38 snw
+ * Remove C++ style comments
+ *
+ * Revision 1.18 2025/04/09 19:52:02 snw
+ * Eliminate as many warnings as possible while building with -Wall
+ *
+ * Revision 1.17 2025/04/04 21:28:16 snw
+ * Remove custom_user and custom_group vars from freem and shed privileges per environment catalog settings
+ *
+ * Revision 1.16 2025/04/04 19:43:18 snw
+ * Switch to using environment catalog to determine user and group for environment, and remove -u and -g flags from freem
+ *
+ * Revision 1.15 2025/04/03 20:48:14 snw
+ * Improve daemon error diagnostics and bump to 0.63.0-rc3
+ *
* Revision 1.14 2025/04/02 04:50:49 snw
* Allow vendor routines to be upgraded
*
@@ -62,6 +80,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
**/
+#define _GNU_SOURCE
#include
#include
#include "mpsdef.h"
@@ -134,9 +153,6 @@ int main (int argc, char **argv, char **
gid_t d_gid;
uid_t d_uid;
- short custom_user = FALSE;
- short custom_group = FALSE;
-
#if defined(HAVE_GETOPT_LONG)
struct option long_options[] = {
{"help", no_argument, 0, 'h'},
@@ -165,14 +181,13 @@ int main (int argc, char **argv, char **
char *symname = (char *) calloc(STRLEN, sizeof(char));
char *symval = (char *) calloc(STRLEN, sizeof(char));
-
- int namelen;
- int vallen;
-
+
char cli_rtn_path[PATH_MAX] = {0};
char *cli_rtn_file;
char cli_rtn_name[256];
+ char env_ena[25];
+
routine_mode = FALSE;
strcpy (m_dialect, "FREEM");
@@ -202,7 +217,7 @@ int main (int argc, char **argv, char **
while (1) {
- c = getopt_long (argc, argv, "hsfiqRr:n:e:vx:dkpS:u:g:", long_options, &option_index);
+ c = getopt_long (argc, argv, "hsfiqRr:n:e:vx:dkpS", long_options, &option_index);
if (c == -1) break;
if (c == '?') freem_usage ();
@@ -225,7 +240,7 @@ int main (int argc, char **argv, char **
break;
case 'e': /* specify FreeM environment */
- strncpy (shm_env, optarg, 255);
+ strncpy (shm_env, optarg, sizeof (shm_env) - 1);
break;
case 'R':
@@ -315,18 +330,7 @@ int main (int argc, char **argv, char **
case 'S': /* --shmsize */
shm_init_size = atol (optarg);
- break;
-
- case 'u': /* --user */
- strncpy (d_username, optarg, 40);
- custom_user = TRUE;
- break;
-
- case 'g': /* --group */
- strncpy (d_groupname, optarg, 40);
- custom_group = TRUE;
- break;
-
+ break;
}
@@ -338,7 +342,7 @@ int main (int argc, char **argv, char **
extern char *optarg;
extern int optind, optopt;
- while ((c = getopt (argc, argv, "hsfiqRr:n:e:vx:dkS:u:g:")) != -1) {
+ while ((c = getopt (argc, argv, "hsfiqRr:n:e:vx:dkS:")) != -1) {
if (c == '?') freem_usage ();
@@ -361,7 +365,7 @@ int main (int argc, char **argv, char **
break;
case 'e': /* specify FreeM environment */
- strncpy (shm_env, optarg, 255);
+ strncpy (shm_env, optarg, sizeof (shm_env) - 1);
break;
case 'R':
@@ -446,17 +450,6 @@ int main (int argc, char **argv, char **
shm_init_size = atol (optarg);
break;
- case 'u': /* --user */
- strncpy (d_username, optarg, 40);
- custom_user = TRUE;
- break;
-
- case 'g': /* --group */
- strncpy (d_groupname, optarg, 40);
- custom_group = TRUE;
- break;
-
-
}
}
}
@@ -469,35 +462,66 @@ int main (int argc, char **argv, char **
}
#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, sizeof (config_file) - 1, "%s/freem/env.conf", SYSCONFDIR);
- if (run_daemon == TRUE && geteuid() == 0) {
+ if (!file_exists (env_config_file)) {
+ fprintf (stderr, "freem: environment catalog does not exist; may need to run fmadm configure\n");
+ exit (1);
+ }
- if (custom_group) {
- d_grp = getgrnam (d_groupname);
+ if (!file_exists (config_file)) {
+ fprintf (stderr, "freem: configuration file for %s does not exist; may need to run fmadm configure\n", shm_env);
+ exit (1);
+ }
- if (d_grp == NULL) {
- fprintf (stderr, "freem: invalid group '%s'\n", d_groupname);
- exit (1);
- }
-
- d_gid = d_grp->gr_gid;
- }
+ if (read_profile_string (env_config_file, shm_env, "user", d_username) == FALSE) {
+ fprintf (stderr, "freem: could not determine owning user for environment %s\n", shm_env);
+ exit (1);
+ }
- if (custom_user) {
- d_user = getpwnam (d_username);
+ if (read_profile_string (env_config_file, shm_env, "group", d_groupname) == FALSE) {
+ fprintf (stderr, "freem: could not determine owning group for environment %s\n", shm_env);
+ exit (1);
+ }
- if (d_user == NULL) {
- fprintf (stderr, "freem: invalid user '%s'\n", d_username);
- exit (1);
- }
-
- d_uid = d_user->pw_uid;
- }
- else {
- d_uid = 0;
- }
+ if (read_profile_string (env_config_file, shm_env, "enabled", env_ena) == FALSE) {
+ fprintf (stderr, "freem: could not discover enabled state for environment %s\n", shm_env);
+ exit (1);
+ }
+
+ if (strcmp (env_ena, "true") != 0) {
+ fprintf (stderr, "freem: environment %s is administratively disabled\n", shm_env);
+ exit (1);
+ }
+
+ d_grp = getgrnam (d_groupname);
+ if (d_grp == NULL) {
+ fprintf (stderr, "freem: invalid group '%s'\n", d_groupname);
+ exit (1);
+ }
+ d_gid = d_grp->gr_gid;
+ d_user = getpwnam (d_username);
+ if (d_user == NULL) {
+ fprintf (stderr, "freem: invalid user '%s'\n", d_username);
+ exit (1);
+ }
+ d_uid = d_user->pw_uid;
+
+
+#if defined(__linux__)
+ if (run_daemon == FALSE && group_member (d_gid) == 0) {
+ fprintf (stderr, "freem: you must be a member of the %s group to use environment %s\n", d_groupname, shm_env);
+ exit (1);
+ }
+#endif
+
+ if (run_daemon == TRUE) {
+ if (geteuid () != 0 && nofork == FALSE) {
+ fprintf (stderr, "freem: forking daemon must be run as root\n");
+ exit (1);
+ }
}
if ((nofork == TRUE) && (run_daemon == FALSE)) {
@@ -555,19 +579,19 @@ int main (int argc, char **argv, char **
if (geteuid () == 0) {
/* shed privileges */
- if (custom_group) {
- fprintf (stderr, "freem: switching to group %s\n", d_groupname);
- m_log (1, "switching groups");
-
- if (setgid (d_gid) == -1) {
- fprintf (stderr, "freem: failure switching GID\n");
- m_log (1, "failure switching GIDs");
- exit (1);
- }
+
+ fprintf (stderr, "freem: switching to group %s\n", d_groupname);
+ m_log (1, "switching groups");
+
+ if (setgid (d_gid) == -1) {
+ fprintf (stderr, "freem: failure switching GID\n");
+ m_log (1, "failure switching GIDs");
+ exit (1);
}
+
- if (custom_user) {
+ if (d_uid != geteuid ()) {
fprintf (stderr, "freem: switching to username %s\n", d_username);
m_log (1, "switching users");
@@ -603,6 +627,7 @@ int main (int argc, char **argv, char **
errsav = errno;
if (pid_fd < 0) {
+ fprintf (stderr, "freem: could not open PID file %s [%s]\n", pid_file_path, strerror (errsav));
m_log (1, "freem: could not open PID file");
m_log (1, strerror (errsav));
exit (1);
@@ -610,6 +635,7 @@ int main (int argc, char **argv, char **
if (lockf (pid_fd, F_TLOCK, 0) < 0) {
errsav = errno;
+ fprintf (stderr, "freem: could not lock PID file [%s]\n", strerror (errsav));
m_log (1, "freem: could not lock PID file - perhaps already running?");
m_log (1, strerror (errsav));
exit (1);
@@ -647,7 +673,7 @@ int main (int argc, char **argv, char **
skip_init = 1;
/* initialize FreeM environment */
- strncpy (nsnbuf, nsname, 255);
+ strncpy (nsnbuf, nsname, sizeof (nsnbuf));
if (init (nsnbuf) == FALSE) {
if (fm_initialized) set_io (UNIX);
@@ -702,20 +728,20 @@ int main (int argc, char **argv, char **
}
/* 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
routine in the discovered path */
if (cli_rtn_name[0] == '%') {
- snprintf (rou0plib, 256, "%s\201", cli_rtn_path);
- snprintf (rou1plib, 256, "%s\201", cli_rtn_path);
+ snprintf (rou0plib, sizeof (rou0plib) - 1, "%s\201", cli_rtn_path);
+ snprintf (rou1plib, sizeof (rou1plib) - 1, "%s\201", cli_rtn_path);
}
else {
- snprintf (rou0path, 256, "%s\201", cli_rtn_path);
- snprintf (rou1path, 256, "%s\201", cli_rtn_path);
+ snprintf (rou0path, sizeof (rou0path) - 1, "%s\201", cli_rtn_path);
+ snprintf (rou1path, sizeof (rou1path) - 1, "%s\201", cli_rtn_path);
}
@@ -734,7 +760,7 @@ int main (int argc, char **argv, char **
if (!skip_init) {
/* initialize FreeM environment */
- strncpy (nsnbuf, nsname, 255);
+ strncpy (nsnbuf, nsname, sizeof (nsnbuf));
if (init (nsnbuf) == FALSE) {
set_io (UNIX);
fprintf (stderr, "\nError initializing FreeM.\n");
@@ -843,24 +869,16 @@ int main (int argc, char **argv, char **
#if !defined(_AIX)
- if(import_env == TRUE) {
-
+ if (import_env == TRUE) {
int i_maxlen = 255;
- for(env = envp; *env != 0; env++) {
-
- namelen = 0;
- vallen = 0;
-
- varname = strtok(*env, "=");
- varval = strtok(NULL, "=");
-
- if(varval != NULL) {
- namelen = strlen (varname);
- vallen = strlen (varval);
+ for (env = envp; *env != 0; env++) {
+ varname = strtok (*env, "=");
+ varval = strtok (NULL, "=");
+ if (varval != NULL) {
snprintf (symname, i_maxlen, "ENV.%s\201\201", varname);
- strncpy (symval, varval, i_maxlen);
+ strncpy (symval, varval, i_maxlen - 1);
stcnv_c2m (symval);
@@ -879,10 +897,10 @@ int main (int argc, char **argv, char **
stcpy (verstr, FREEM_VERSION_STR);
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);
- 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);
/*
@@ -899,7 +917,7 @@ int main (int argc, char **argv, char **
if (dx_mode) {
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);
const_define (k_buf, dx_mcode);
}
@@ -907,7 +925,7 @@ int main (int argc, char **argv, char **
if (routine_mode) {
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);
const_define (k_buf, startup_routine);
}