(file) Return to SystemUnix.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/SystemUnix.cpp between version 1.101 and 1.102

version 1.101, 2005/03/30 12:57:58 version 1.102, 2005/04/17 15:47:15
Line 553 
Line 553 
  
 String System::getFullyQualifiedHostName () String System::getFullyQualifiedHostName ()
 { {
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_OS_AIX) || defined(PEGASUS_OS_LINUX)  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_OS_AIX) || defined(PEGASUS_OS_LINUX) || defined(PEGASUS_OS_OS400)
     char hostName [PEGASUS_MAXHOSTNAMELEN];     char hostName [PEGASUS_MAXHOSTNAMELEN];
     struct hostent *he;     struct hostent *he;
     String fqName;     String fqName;
Line 568 
Line 568 
        strcpy (hostName, he->h_name);        strcpy (hostName, he->h_name);
     }     }
  
   #if defined(PEGASUS_OS_OS400)
       EtoA(hostName);
   #endif
   
     fqName.assign (hostName);     fqName.assign (hostName);
  
     return fqName;     return fqName;
Line 635 
Line 639 
     struct servent_data buf;     struct servent_data buf;
     memset(&buf, 0x00, sizeof(struct servent_data));     memset(&buf, 0x00, sizeof(struct servent_data));
  
     if ( (getservbyname_r((char*)serviceName, TCP, &serv_result,      char srvnameEbcdic[256];
       strcpy(srvnameEbcdic, serviceName);
       AtoE(srvnameEbcdic);
   
       char tcpEbcdic[64];
       strcpy(tcpEbcdic, TCP);
       AtoE(tcpEbcdic);
   
       if ( (getservbyname_r(srvnameEbcdic, tcpEbcdic, &serv_result,
                                 &buf)) == 0 )                                 &buf)) == 0 )
 #else // PEGASUS_OS_SOLARIS #else // PEGASUS_OS_SOLARIS
     if ( (serv = getservbyname(serviceName, TCP)) != NULL )     if ( (serv = getservbyname(serviceName, TCP)) != NULL )


Legend:
Removed from v.1.101  
changed lines
  Added in v.1.102

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2