--- freem/src/mumps.c	2025/04/01 20:11:46	1.10
+++ freem/src/mumps.c	2025/04/03 20:48:14	1.15
@@ -1,5 +1,5 @@
 /*
- *   $Id: mumps.c,v 1.10 2025/04/01 20:11:46 snw Exp $
+ *   $Id: mumps.c,v 1.15 2025/04/03 20:48:14 snw Exp $
  *    main module of freem
  *
  *  
@@ -24,6 +24,21 @@
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *
  *   $Log: mumps.c,v $
+ *   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
+ *
+ *   Revision 1.13  2025/04/02 03:26:22  snw
+ *   Don't corrupt the terminal if FreeM runs before fmadm configure has been run
+ *
+ *   Revision 1.12  2025/04/02 02:16:27  snw
+ *   Add fmadm status environment command and move journals to a better location
+ *
+ *   Revision 1.11  2025/04/01 23:21:45  snw
+ *   fmadm commands for stopping, starting, and restarting environments now functional
+ *
  *   Revision 1.10  2025/04/01 20:11:46  snw
  *   Further work on fmadm
  *
@@ -106,6 +121,8 @@ int main (int argc, char **argv, char **
     
     int option_index = 0;
 
+    char fm_initialized = FALSE;
+    
     char dx_mcode[512];
     char startup_routine[256];
     short routine_mode;
@@ -562,11 +579,6 @@ int main (int argc, char **argv, char **
                     m_log (1, "failure switching UIDs");
                     exit (1);
                 }
-                if (chdir (d_user->pw_dir) == -1) {
-                    fprintf (stderr, "freem:  chdir failure\n");
-                    m_log (1, "failure in chdir");
-                    exit (1);
-                }            
             }
 
         }
@@ -585,15 +597,16 @@ int main (int argc, char **argv, char **
             char pidfile_buf[256];
             int errsav;
 
+            pid_file_path = (char *) malloc (PATH_MAX * sizeof (char));
+            NULLPTRCHK(pid_file_path,"main");
+            
             snprintf (pid_file_path, PATH_MAX - 1, "%s/freem/run/%s.pid", LOCALSTATEDIR, shm_env);
 
-            printf (pid_file_path);
-            m_log (1, pid_file_path);
-
             pid_fd = open (pid_file_path, O_RDWR | O_CREAT, 0640);
             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);
@@ -601,6 +614,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);
@@ -609,7 +623,6 @@ int main (int argc, char **argv, char **
             sprintf (pidfile_buf, "%ld\n", (long) getpid ());
             write (pid_fd, pidfile_buf, strlen (pidfile_buf));
 
-            close (pid_fd);
         }
        
         
@@ -642,12 +655,15 @@ int main (int argc, char **argv, char **
 	strncpy (nsnbuf, nsname, 255);    
 	if (init (nsnbuf) == FALSE) {
 	    
-	    set_io (UNIX);
+	    if (fm_initialized) set_io (UNIX);
 	    fprintf (stderr, "\nError initializing FreeM.\n");
 	    
 	    exit (1);            
 	    
-	}        
+	}
+        else {
+            fm_initialized = TRUE;
+        }
 
 	
         direct_mode = FALSE;
@@ -674,10 +690,6 @@ int main (int argc, char **argv, char **
             /* isolate the path from the routine file */
             strncpy (cli_rtn_path, argv[optind], strrchr (argv[optind], '/') - argv[optind]);      
 	    
-/*	    set_io (UNIX);
-	    printf ("cli_rtn_name = '%s' cli_rtn_path = '%s'\n", cli_rtn_name, cli_rtn_path);
-	    set_io (MUMPS);
-*/	    
         }
 
         /* do we have a file extension? */
@@ -714,10 +726,11 @@ int main (int argc, char **argv, char **
 
     }
 
-
+    
     if (!file_exists (config_file)) {
 
-        set_io (UNIX);
+        if (fm_initialized == TRUE) set_io (UNIX);
+        
         fprintf (stderr, "\nFreeM has not been configured. Please run 'fmadm configure'.\n\n\n\n");
         
         exit (2);
@@ -727,14 +740,15 @@ int main (int argc, char **argv, char **
     if (!skip_init) {
 	/* initialize FreeM environment */
 	strncpy (nsnbuf, nsname, 255);    
-	if (init (nsnbuf) == FALSE) {
-	    
+	if (init (nsnbuf) == FALSE) {	    
 	    set_io (UNIX);
 	    fprintf (stderr, "\nError initializing FreeM.\n");
 
 	    exit (1);
-
 	}
+        else {
+            fm_initialized = TRUE;
+        }
     }
 
     if (first_process == TRUE) {
@@ -816,6 +830,7 @@ int main (int argc, char **argv, char **
 
                 fprintf (stderr, "freem:  terminating\r\n");
                 cleanup ();
+                
                 exit (0);
                 
             }
@@ -942,7 +957,6 @@ void freem_usage(void)
     fprintf (stdout, "\t-x <MCODE>\n\t\texecute M code <MCODE> on startup\n\n");
     fprintf (stdout, "\t-d\n\t\trun the FreeM daemon (one and only one FreeM daemon must always be running)\n\n");
     fprintf (stdout, "\t-k\n\t\trun the FreeM daemon in foreground (requires --daemon)\n\n");
-    fprintf (stdout, "\t-p <PIDFILE>\n\t\tuse <PIDFILE> to record the PID of the FreeM daemon\n\n\n");
     fprintf (stdout, "\t-S <BYTES>\n\t\tsets the size of the shared memory segment where FreeM stores the job table, lock table, and IPC table.\n");
 #endif    
     fprintf (stdout, "\t\t  - Each concurrent job takes %d bytes (1 page) of shared memory\n", PG_SIZE);