Feature #1711

[crea.git] / appli / creaSed / creaSed.cpp

diff --git a/appli/creaSed/creaSed.cpp b/appli/creaSed/creaSed.cpp
index 51ca114fd82642ab297d8bf2015eb1f725a99c74..95ddc729704282a33316ccc52f5671af4f356ed9 100644 (file)
--- a/appli/creaSed/creaSed.cpp
+++ b/appli/creaSed/creaSed.cpp
@@ -1,5 +1,30 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ 
+*/ 
 
-#include <stdio.h>
 #include <stdio.h>
 #include <iostream>
 #include <fstream>
@@ -7,30 +32,31 @@
 #include <vector>
 
 
-
-    void replace( std::string& str,
-                       const std::string& from, 
-                        const std::string& to )
-    {
-      using std::string;
-      string::size_type pos = str.find( from );
-      while ( pos != string::npos )
-      {
-        str.replace( pos, from.size(), to );
-        pos = str.find( from, pos+from.size()-1 );
-      } 
-    }
-
-
+//==========================================================================
+void replace(std::string& str,
+                        const std::string& from, 
+             const std::string& to )
+{
+       std::string::size_type pos = str.find( from );
+       while ( pos != std::string::npos )
+       {
+               str.replace( pos, from.size(), to );
+               pos = str.find( from, pos+from.size()-1 );
+       } 
+}
+//==========================================================================
 
 
 //==========================================================================
 int main(int argc, char **argv)
 {
-  
+         
   if (argc!=4) 
     {
-      std::cerr << "usage : "<< argv[0] <<" fileIn  \"FindString\" \"ReplaceString\"" << std::endl;
+               for(int i = 1; i < argc; i++){
+                       std::cerr << "||||      "<<argv[i]<<std::endl;
+               }
+      std::cerr << "usage : "<< argv[0] <<" -fileIn  \"-FindString\" \"-ReplaceString\"" << std::endl;
       return 1;
     }
 
@@ -46,8 +72,8 @@ int main(int argc, char **argv)
   findstring   = argv[2];
   replacestring = argv[3];
 
-  ffIn =  fopen(fileIn.c_str(),"r");
-  if (ffIn){
+  errno_t errorOpen = fopen_s(&ffIn, fileIn.c_str(),"r");
+  if (!errorOpen && ffIn){
         while(!feof(ffIn)){
            fgets( strTmp , 255, ffIn );
             lineStr=strTmp;
@@ -59,7 +85,7 @@ int main(int argc, char **argv)
         }
        fclose(ffIn);   
   } else {
-      std::cerr << "ERROR. File : "<< argv[1] <<" Not exists." << std::endl;
+      std::cerr << "ERROR. File : "<< argv[1] <<" does not exists." << std::endl;
       return 1;
   }