Changeset 42389 for trunk/Ohana/src/opihi/dvo/elixir.c

Timestamp:

Feb 8, 2023, 12:17:35 PM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. fixes for more pendantic gcc; add opihi memory stats; string vector improvements; use named macros for fixed string lengths

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/dvo/elixir.c (modified) (2 diffs)

trunk/Ohana/src/opihi/dvo/elixir.c

@@ -4 +4 @@
 int ReadMsg (char *fifo, char **message);
 
+# define MY_MAX_PATH 256
+
 int elixir (int argc, char **argv) {
   
-  char message[256], cmd[256], ElixirBase[256];
-  char fifo[256], fifodir[256], msgfile[256];
+  char message[MY_MAX_PATH], cmd[MY_MAX_PATH], ElixirBase[MY_MAX_PATH];
+  char fifo[MY_MAX_PATH], fifodir[MY_MAX_PATH], msgfile[MY_MAX_PATH];
   char *answer;
   int N;
@@ -38 +40 @@
     return (FALSE);
   }
-  sprintf (fifo, "%s.msg", ElixirBase);
+  snprintf_nowarn (fifo, MY_MAX_PATH, "%s.msg", ElixirBase);
   if (!VarConfig ("FIFOS", "%s", fifodir)) {
     gprint (GP_ERR, "FIFOS not in config, using local /tmp\n");
     strcpy (fifodir, "/tmp");
   }
-  sprintf (fifo, "%s.msg", ElixirBase);
+  snprintf_nowarn (fifo, MY_MAX_PATH, "%s.msg", ElixirBase);
 
-  sprintf (msgfile, "%s/EMsg.XXXXXX", fifodir);
+  snprintf_nowarn (msgfile, MY_MAX_PATH, "%s/EMsg.XXXXXX", fifodir);
   if (mkstemp (msgfile) == -1) {
     gprint (GP_ERR, "can't create fifo\n");
     return (FALSE);
   }
-  sprintf (message, "%s %s", cmd, msgfile);
+  snprintf_nowarn (message, MY_MAX_PATH, "%s %s", cmd, msgfile);
   unlink (msgfile);