--- freem/src/fmadm.c	2025/04/04 19:43:18	1.31
+++ freem/src/fmadm.c	2025/04/10 15:31:25	1.34
@@ -1,5 +1,5 @@
 /*
- *   $Id: fmadm.c,v 1.31 2025/04/04 19:43:18 snw Exp $
+ *   $Id: fmadm.c,v 1.34 2025/04/10 15:31:25 snw Exp $
  *    FreeM Administration Tool
  *
  *  
@@ -24,6 +24,15 @@
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *
  *   $Log: fmadm.c,v $
+ *   Revision 1.34  2025/04/10 15:31:25  snw
+ *   Attempt to fix DosCopy calls for OS/2
+ *
+ *   Revision 1.33  2025/04/10 01:24:38  snw
+ *   Remove C++ style comments
+ *
+ *   Revision 1.32  2025/04/09 19:52:02  snw
+ *   Eliminate as many warnings as possible while building with -Wall
+ *
  *   Revision 1.31  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
  *
@@ -603,10 +612,7 @@ int fm_shell (void)
     char *cmdt = (char *) malloc (65535 * sizeof (char));
     char *result = (char *) malloc (65535 * sizeof (char));
 
-    /*
-    strcpy (fma_namespace, "SYSTEM");
-    set_namespace (fma_namespace, FALSE);
-    */
+    obj = 0;
     
     snprintf (fma_prompt, STRLEN - 1, "fmadm [%s]> ", fma_namespace);
     
@@ -711,7 +717,6 @@ int fm_shell (void)
 
         i = 0;
         while ((result = strtok (NULL, " ")) != NULL) {
-            //    printf ("%d = %s\n", i, result);
             strcpy (args[i++], result);
         }
 
@@ -1171,8 +1176,6 @@ long fm_get_pid (char *env)
 {
     char pid_file[4096];
     char tmp_pid[255];
-    long res;
-    
     FILE *fp;
 
     snprintf (pid_file, 4095, "%s/freem/run/%s.pid", LOCALSTATEDIR, env);
@@ -1433,7 +1436,7 @@ int fm_daemonctl (short action, short ob
                 case ACT_STATUS:
                     epid = fm_get_pid (cur_env);
                     if (epid > -1) {
-                        fprintf (stderr, " - %s environment daemon running as pid %d\n", cur_env, epid);
+                        fprintf (stderr, " - %s environment daemon running as pid %ld\n", cur_env, epid);
                     }
                     else {
                         fprintf (stderr, " - %s environment daemon does not appear to be running\n", cur_env);
@@ -1459,7 +1462,6 @@ void fm_checkperms(void)
 void fm_reconfigure(void)
 {
     char config_backup[4096];
-    char vers[4096];
     
     int retval;   
     
@@ -1476,7 +1478,7 @@ void fm_reconfigure(void)
 #if !defined(__OS2__)    
     retval = cp (config_backup, config_file);
 #else
-    retval = DosCopy (config_file, config_backup);
+    retval = DosCopy (config_file, config_backup, 1);
 #endif    
 
     if (retval == 0) {
@@ -1538,7 +1540,6 @@ void fm_configure (void)
     int reconfigure = FALSE;
     
     struct stat etcstat;
-    int stat_result;
 
     DIR *dir;
     struct dirent *ent;
@@ -1549,27 +1550,22 @@ void fm_configure (void)
     char *groupname = env_group;
     
 #if !defined(__OS2__)
+    struct group *d_grp;
+    struct passwd *d_user;
+
     if (geteuid () != 0) {
         fprintf (stderr, "fmadm:  not superuser\n");
         exit (1);
     }
 
-    struct group *d_grp;
-    struct passwd *d_user;
-    gid_t d_gid;
-    uid_t d_uid;
-
     if ((d_grp = getgrnam (groupname)) == NULL) {
         fprintf (stderr, "fmadm:  '%s' group must exist before configuring\n", groupname);
         exit (1);
     }
-    d_gid = d_grp->gr_gid;
-
     if ((d_user = getpwnam (username)) == NULL) {
         fprintf (stderr, "fmadm:  '%s' user must exist before configuring\n", username);
         exit (1);
     }
-    d_uid = d_user->pw_uid;
 #endif    
         
     snprintf (varbase, 4095, "%s/freem", LOCALSTATEDIR);
@@ -1778,8 +1774,6 @@ void fm_configure (void)
         fprintf (stderr, "[OK]\n");
     }
     else {
-        char modtmp[255];
-        
         fprintf (stderr, "\nUpdating %s: \n", env_config_file);
 
         update_conf (env_config_file, fma_environment, "user", env_user);