Add a trailing '\0' character to the parameter filename.

git-svn-id: http://svn.cactuscode.org/flesh/trunk@2016 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 11 insertions, 7 deletions

diff --git a/src/main/ProcessCommandLine.c b/src/main/ProcessCommandLine.c
index 804a1d57..c19aaa9f 100644
--- a/src/main/ProcessCommandLine.c
+++ b/src/main/ProcessCommandLine.c
@@ -246,17 +246,24 @@ int CCTK_CommandLine(char ***outargv)
 int CCTK_ParameterFilename(int len, char *filename)
 {
   int retval;
+  const char *copy_string;
+
 
   if (CCTK_Equals(parameter_file_name,"-"))
   {
-    strncpy(filename,"STDIN",len-1);
+    copy_string = "STDIN";
   }
   else
   {
-    strncpy(filename,parameter_file_name,strlen(parameter_file_name));
+    copy_string = parameter_file_name;
+  }
+  retval = strlen (copy_string);
+  if (retval > len - 1)
+  {
+    retval = len - 1;
   }
-  retval = strlen(filename);
-  retval=retval > len ? 0 : retval;
+  strncpy (filename, copy_string, retval);
+  filename[retval] = 0;
   return retval;
 }
 
@@ -269,6 +276,3 @@ void CCTK_FCALL CCTK_FNAME(CCTK_ParameterFilename)
 /********************************************************************
  *********************     Local Routines   *************************
  ********************************************************************/
-
-
-