--- freem/src/init.c	2025/03/24 04:44:55	1.8
+++ freem/src/init.c	2025/04/17 14:34:27	1.13
@@ -1,5 +1,5 @@
 /*
- *   $Id: init.c,v 1.8 2025/03/24 04:44:55 snw Exp $
+ *   $Id: init.c,v 1.13 2025/04/17 14:34:27 snw Exp $
  *    FreeM initialization 
  *
  *  
@@ -24,6 +24,21 @@
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *
  *   $Log: init.c,v $
+ *   Revision 1.13  2025/04/17 14:34:27  snw
+ *   Further logging improvements
+ *
+ *   Revision 1.12  2025/04/15 14:39:06  snw
+ *   Further improvements to logging
+ *
+ *   Revision 1.11  2025/04/13 04:22:43  snw
+ *   Fix snprintf calls
+ *
+ *   Revision 1.10  2025/04/10 01:24:38  snw
+ *   Remove C++ style comments
+ *
+ *   Revision 1.9  2025/04/03 16:58:34  snw
+ *   Make error message for shm_init error during initialization more friendly
+ *
  *   Revision 1.8  2025/03/24 04:44:55  snw
  *   Don't call ttyname on OS/2
  *
@@ -83,6 +98,7 @@
 #include "jobtab.h"
 #include "datatypes.h"
 #include "objects.h"
+#include "log.h"
 
 #ifdef HAVE_LIBREADLINE
 #  if defined(HAVE_READLINE_READLINE_H)
@@ -156,7 +172,9 @@ void init_mwapi(void);
 short init (char *namespace_name) 
 {
     short retval;
+    int log_level;
     
+    init_log ();
     init_process ();
     init_devtable ();
     init_signals ();
@@ -179,8 +197,12 @@ short init (char *namespace_name)
     retval = shm_init (shm_init_size);
 
     if (retval == SHMS_GET_ERR) {
-        fprintf (stderr, "init:  error initializing shared memory [errno %d]\r\n", errno);
-        exit (1);
+        if (errno != 13) {
+            logprintf (FM_LOG_FATAL, "init:  error initializing shared memory (error code %d [%s])", errno, strerror (errno));
+        }
+        else {
+            logprintf (FM_LOG_FATAL, "init:  error attaching to environment -- does your user belong to the group that owns environment '%s'?", shm_env);
+        }
     }
 
     symtab_init ();
@@ -189,28 +211,35 @@ short init (char *namespace_name)
     set_namespace (namespace_name, FALSE);
 
     if (first_process) {
-        fprintf (stderr, "init:  we are the first process in the environment (pid %d)\r\n", pid);
+        log_level = FM_LOG_INFO;
+    }
+    else {
+        log_level = FM_LOG_DEBUG;
+    }
+    
+    if (first_process) {
+        logprintf (log_level, "init:  we are the first process in the environment (pid %d)", pid);
     }
 
-    if (first_process) fprintf (stderr, "init:  initializing job table\r\n");
+    logprintf (log_level, "init:  initializing job table");
     jobtab_init ();
 
-    if (first_process) fprintf (stderr, "init:  adding job to job table\r\n");
+    logprintf (log_level, "init:  adding job to job table");
     job_init (FALSE);
 
-    if (first_process) fprintf (stderr, "init:  initializing structured system variables\r\n");
+    logprintf (log_level, "init:  initializing structured system variables");
     init_ssvn ();
 
-    if (first_process) fprintf (stderr, "init:  initializing terminal\r\n");
+    logprintf (log_level, "init:  initializing terminal");
     init_terminal ();
 
-    if (first_process) fprintf (stderr, "init:  initializing asynchronous events\r\n");
+    logprintf (log_level, "init:  initializing asynchronous events");
     evt_init ();
 
-    if (first_process) fprintf (stderr, "init:  initializing debugger\r\n");
+    logprintf (log_level, "init:  initializing debugger");
     dbg_init ();    
 
-    if (first_process) fprintf (stderr, "init:  initializing error stack\r\n");
+    logprintf (log_level, "init:  initializing error stack");
     init_estack();
     
     etrap[0] = EOL;
@@ -230,7 +259,7 @@ void init_process (void)
 {
     pid = getpid ();            /* get $J = process ID */
     umask (0);              /* protection bits mask to full rights */
-    snprintf (fp_conversion, 9, "%%.%df\201", DBL_DIG);
+    snprintf (fp_conversion, sizeof (fp_conversion) - 1, "%%.%df\201", DBL_DIG);
 
     if (fp_mode) {
         zprecise = DBL_DIG;
@@ -439,7 +468,7 @@ void init_readline (void)
     pw_buf = (char *) calloc (strlen(pw->pw_dir) + 1, sizeof(char));
     strcpy (pw_buf, pw->pw_dir);
 
-    snprintf (history_file, 256, "%s/.freem_history", pw_buf);
+    snprintf (history_file, sizeof (history_file) - 1, "%s/.freem_history", pw_buf);
 
     free (pw_buf);
 
@@ -532,7 +561,7 @@ void init_mwapi (void)
         gtk_init (0, NULL);
     }
     */
-    //TODO: init Motif/libXt
+    /* TODO: init Motif/libXt */
 }
 #else
 void init_mwapi (void)
@@ -647,7 +676,7 @@ void cleanup (void)
     int ch;
 
     /* remove this job's entry from ^$JOB SSVN */
-    snprintf (k_buf, 255, "^$JOB\202%d\201", pid);
+    snprintf (k_buf, sizeof (k_buf) - 1, "^$JOB\202%d\201", pid);
     symtab_shm (kill_sym, k_buf, " \201");
     
     reset_terminal ();