Merge from V7_2_BR 09/08/2013

[modules/kernel.git] / src / Utils / OpUtil.cxx

diff --git a/src/Utils/OpUtil.cxx b/src/Utils/OpUtil.cxx
index 00ed5a66da050e9e762631262bc50db09706acbf..323f0e87cd16b7dc6aaadfe1f8ed7e2b622c8f81 100644 (file)
--- a/src/Utils/OpUtil.cxx
+++ b/src/Utils/OpUtil.cxx
@@ -1,51 +1,55 @@
-//  SALOME Utils : general SALOME's definitions and tools
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
+//  SALOME Utils : general SALOME's definitions and tools
 //  File   : OpUtil.cxx
 //  Module : SALOME
-
+//
 #include "utilities.h" 
 #include "OpUtil.hxx"
-#include <unistd.h>
 #include <errno.h>
 #include <string.h>
-using namespace std;
 
-int gethostname(char *name, size_t len);
+#ifndef WNT
+#include <unistd.h>
+#else
+#include <winsock2.h>
+#endif
+
+//int gethostname(char *name, size_t len);
 
-string GetHostname()
+std::string GetHostname()
 {
-  int ls = 100, r = 0;
+  int ls = 100, r = 1;
   char *s;
 
-  while (ls < 10000) {
+  while (ls < 10000 && r) {
     ls *= 2;
     s = new char[ls];
     r = gethostname(s, ls-1);
     switch (r) 
       {
       case 0:
-         break;
+          break;
       default:
 #ifdef EINVAL
       case EINVAL:
@@ -54,7 +58,7 @@ string GetHostname()
       case ENAMETOOLONG:
 #endif
         delete [] s;
-       continue;
+        continue;
       }
   }
 
@@ -67,7 +71,7 @@ string GetHostname()
   char *aDot = (strchr(s,'.'));
   if (aDot) aDot[0] = '\0';
 
-  string p = s;
+  std::string p = s;
   delete [] s;
   return p;
 }