[certi-cvs] certi/RTIG Federation.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      09/10/16 21:48:28

Modified files:
        RTIG           : Federation.cc 

Log message:
        Restore /usr/local/share/federations FED file search
        path in the Unix case in order not to break backward
        compatibility in 3.3.x series.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.112&r2=3.113

Patches:
Index: Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.112
retrieving revision 3.113
diff -u -b -r3.112 -r3.113
--- Federation.cc       12 Oct 2009 07:09:32 -0000      3.112
+++ Federation.cc       16 Oct 2009 21:48:28 -0000      3.113
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: Federation.cc,v 3.112 2009/10/12 07:09:32 erk Exp $
+// $Id: Federation.cc,v 3.113 2009/10/16 21:48:28 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -93,6 +93,8 @@
  * -# getenv(CERTI_HOME)+"/share/federations"+ FEDid_name
  * -# installation place plus FEDid_name
  *     PACKAGE_INSTALL_PREFIX + "/share/federation/" + FEDid_name
+ * -# on Unix "/usr/local/share/federation/" + FEDid_name
+ *    for backward compatibility reason.
  */
 
 #ifdef FEDERATION_USES_MULTICAST
@@ -166,6 +168,9 @@
     // 3 - Installation place plus FEDid_name
     //     PACKAGE_INSTALL_PREFIX + "/share/federation/" + FEDid_name
     //
+       // 4 - "/usr/local/share/federation/" +  FEDid_name
+       //     last resort Unix-only case [for backward compatibility]
+    //
     string filename   = FEDid;
     bool   filefound  = false;
     if (verboseLevel>0) {
@@ -225,7 +230,7 @@
 
     if (!filefound) {
       if (verboseLevel>0) {
-         cout << " --> cannot access." <<endl;
+         cout << " --> cannot access." << endl;
       }
       filename = PACKAGE_INSTALL_PREFIX 
"/share/federations/"+string(FEDid_name);
       if (verboseLevel>0) {
@@ -233,6 +238,17 @@
       }
       filefound = (0==STAT_FUNCTION(filename.c_str(),&file_stat));
     }
+
+    if (!filefound) {
+       if (verboseLevel>0) {
+               cout << " --> cannot access." << endl;
+       }
+       filename = "/usr/local/share/federations/"+string(FEDid_name);
+       if (verboseLevel>0) {
+               cout << "   Now trying..." << filename;
+       }
+       filefound = (0==STAT_FUNCTION(filename.c_str(),&file_stat));
+    }
 #endif
 
     if (!filefound) {
@@ -2590,5 +2606,5 @@
 
 }} // namespace certi/rtig
 
-// $Id: Federation.cc,v 3.112 2009/10/12 07:09:32 erk Exp $
+// $Id: Federation.cc,v 3.113 2009/10/16 21:48:28 erk Exp $