--- freem/src/fmadm.c 2025/02/28 16:55:08 1.4
+++ freem/src/fmadm.c 2025/03/30 01:36:58 1.17
@@ -1,23 +1,11 @@
/*
- * *
- * * *
- * * *
- * ***************
- * * * * *
- * * MUMPS *
- * * * * *
- * ***************
- * * *
- * * *
- * *
- *
- * fmadm.c
+ * $Id: fmadm.c,v 1.17 2025/03/30 01:36:58 snw Exp $
* FreeM Administration Tool
*
*
- * Author: Serena Willis <jpw@coherent-logic.com>
+ * Author: Serena Willis <snw@coherent-logic.com>
* Copyright (C) 1998 MUG Deutschland
- * Copyright (C) 2020, 2023 Coherent Logic Development LLC
+ * Copyright (C) 2020, 2023, 2025 Coherent Logic Development LLC
*
*
* This file is part of FreeM.
@@ -35,6 +23,43 @@
* You should have received a copy of the GNU Affero Public License
* along with FreeM. If not, see <https://www.gnu.org/licenses/>.
*
+ * $Log: fmadm.c,v $
+ * Revision 1.17 2025/03/30 01:36:58 snw
+ * Make it easier to bring back fma_gedit, fix double-free in global handler, limit $CHAR to 7-bit ASCII
+ *
+ * Revision 1.16 2025/03/24 20:59:58 snw
+ * Try using DosCopy API instead of built-in cp function on OS/2
+ *
+ * Revision 1.15 2025/03/24 20:58:05 snw
+ * Try using DosCopy API instead of built-in cp function on OS/2
+ *
+ * Revision 1.14 2025/03/24 20:57:06 snw
+ * Try using DosCopy API instead of built-in cp function on OS/2
+ *
+ * Revision 1.13 2025/03/24 20:15:09 snw
+ * Set file permissions on freemd.exe on OS/2 in fmadm configure
+ *
+ * Revision 1.12 2025/03/24 20:13:34 snw
+ * Set file permissions on freemd.exe on OS/2 in fmadm configure
+ *
+ * Revision 1.11 2025/03/24 19:25:48 snw
+ * Make fmadm configure copy freem.exe to freemd.exe for daemon operation on OS/2 systems
+ *
+ * Revision 1.10 2025/03/24 19:22:16 snw
+ * Make fmadm configure copy freem.exe to freemd.exe for daemon operation on OS/2 systems
+ *
+ * Revision 1.9 2025/03/24 19:19:42 snw
+ * Make fmadm configure copy freem.exe to freemd.exe for daemon operation on OS/2 systems
+ *
+ * Revision 1.8 2025/03/22 18:43:54 snw
+ * Make STRLEN 255 chars and add BIGSTR macro for larger buffers
+ *
+ * Revision 1.7 2025/03/09 19:14:25 snw
+ * First phase of REUSE compliance and header reformat
+ *
+ *
+ * SPDX-FileCopyrightText: (C) 2025 Coherent Logic Development LLC
+ * SPDX-License-Identifier: AGPL-3.0-or-later
**/
#include <sys/types.h>
@@ -52,6 +77,10 @@
#include "namespace.h"
#include "fs.h"
+#if defined(__OS2__)
+# include <os2.h>
+#endif
+
#ifdef HAVE_LIBREADLINE
# if defined(HAVE_READLINE_READLINE_H)
# include <readline/readline.h>
@@ -91,13 +120,13 @@ extern int read_history ();
/* namespace configuration */
char fma_environment[STRLEN];
char fma_namespace[STRLEN];
-char fma_routine_path[STRLEN];
-char fma_global_path[STRLEN];
-char fma_journal_path[STRLEN];
-char fma_pct_global_path[STRLEN];
-char fma_pct_routine_path[STRLEN];
+char fma_routine_path[PATHLEN];
+char fma_global_path[PATHLEN];
+char fma_journal_path[PATHLEN];
+char fma_pct_global_path[PATHLEN];
+char fma_pct_routine_path[PATHLEN];
char fma_journal_cut_threshold[STRLEN];
-char fma_locktab[STRLEN];
+char fma_locktab[PATHLEN];
short fma_base_opt = 1;
short fma_min_args = 2;
short fma_explicit_namespace = FALSE;
@@ -760,7 +789,7 @@ int fm_shell (void)
printf ("Global Path: %s\n", fma_global_path);
printf ("%%-Global Path: %s\n", fma_pct_global_path);
printf ("Journal File: %s\n", fma_journal_path);
- printf ("Journal Cut Threshold: %ld bytes\n", fma_journal_cut_threshold);
+ printf ("Journal Cut Threshold: %s bytes\n", fma_journal_cut_threshold);
break;
case FMAC_EXIT:
@@ -1026,10 +1055,9 @@ int fm_edit (short object, int optc, cha
case OBJ_ROUTINE:
return fma_routines_edit (optc, options);
- /*
- case OBJ_GLOBAL:
+ /*case OBJ_GLOBAL:
return fma_globals_edit (optc, options);
- */
+ */
default:
fprintf (stderr, "fmadm: 'edit' is an invalid action for '%s'\n", obj_str);
@@ -1139,12 +1167,34 @@ void fm_configure (void)
snprintf (envbase, 4095, "%s/freem/%s", SYSCONFDIR, fma_environment);
snprintf (nsbase, 4095, "%s/freem/%s", LOCALSTATEDIR, fma_environment);
+#if defined(__OS2__)
+ {
+ char srcfile[PATHLEN];
+ char dstfile[PATHLEN];
+
+ snprintf (srcfile, PATHLEN, "%s/bin/freem.exe", PREFIX);
+ snprintf (dstfile, PATHLEN, "%s/bin/freemd.exe", PREFIX);
+
+ unlink (dstfile);
+
+ fprintf (stderr, "fmadm: running on OS/2; will copy %s to %s\n", srcfile, dstfile);
+
+ if (DosCopy (srcfile, dstfile, 1) != 0) {
+ fprintf (stderr, "fmadm: fatal error copying %s to %s\n", srcfile, dstfile);
+ exit (1);
+ }
+
+ chmod (dstfile, 0755);
+ }
+#else
+ fprintf (stderr, "fmadm: not running on OS/2\n");
+#endif
+
printf ("\nFreeM Initial Configuration\n");
printf ("---------------------------\n\n");
printf ("This utility will create the initial configuration file for ");
printf ("FreeM environment '%s' in %s.\n\n", fma_environment, config_file);
-
/* check for existence of needed directories */
if (stat (SYSCONFDIR, &etcstat) == -1) {