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

Diff for /pegasus/src/Pegasus/Common/FileSystem.cpp between version 1.75 and 1.81

version 1.75, 2007/11/30 18:23:10 version 1.81, 2008/11/11 19:16:00
Line 76 
Line 76 
  
 Boolean FileSystem::existsNoCase(const String& path, String& realPath) Boolean FileSystem::existsNoCase(const String& path, String& realPath)
 { {
 #if !defined(PEGASUS_OS_VMS) && !defined(PEGASUS_OS_TYPE_WINDOWS)  #if !defined(PEGASUS_OS_VMS) && \
       !defined(PEGASUS_OS_TYPE_WINDOWS) && \
       !defined(PEGASUS_OS_DARWIN)
  
     // If a file exists that has the same case as the path parmater,     // If a file exists that has the same case as the path parmater,
     // then we can bypass the expensive directory scanning below.     // then we can bypass the expensive directory scanning below.
Line 457 
Line 459 
     //     //
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
     fileName = libraryName + String(".dll");     fileName = libraryName + String(".dll");
   #else
       fileName = String("lib") + libraryName + getDynamicLibraryExtension();
   #endif
       return fileName;
   }
   
   String FileSystem::getDynamicLibraryExtension()
   {
   #if defined(PEGASUS_OS_TYPE_WINDOWS)
       return String(".dll");
 #elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC) #elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC)
     fileName = String("lib") + libraryName + String(".sl");      return String(".sl");
 #elif defined(PEGASUS_OS_DARWIN) #elif defined(PEGASUS_OS_DARWIN)
     fileName = String("lib") + libraryName + String(".dylib");      return String(".dylib");
 #elif defined(PEGASUS_OS_VMS) #elif defined(PEGASUS_OS_VMS)
     fileName = String("lib") + libraryName + String(".exe");      return String(".exe");
   #elif defined(PEGASUS_PLATFORM_ZOS_ZSERIES64_IBM)
       return String("64.so");
 #else #else
     fileName = String("lib") + libraryName + String(".so");      return String(".so");
 #endif #endif
   
     return fileName;  
 } }
  
   Boolean GetLine(PEGASUS_STD(istream)& is, Buffer& line)
 Boolean GetLine(PEGASUS_STD(istream)& is, String& line)  
 { {
       const Uint32 buffersize = 1024;
       Uint32 gcount = 0;
   
     line.clear();     line.clear();
  
     Boolean gotChar = false;      // Read the input line in chunks.  A non-full buffer indicates the end of
 #ifdef PEGASUS_PLATFORM_ZOS_ZSERIES_IBM      // the line has been reached.
     char input[1000];      do
     is.getline(input,1000);      {
     line.assign(input);          char input[buffersize];
  
     gotChar = !(is.rdstate() & PEGASUS_STD(istream)::failbit);          // This reads up to buffersize-1 char, but stops before consuming
 #else          // a newline character ('\n').
     char c;          is.get(input, buffersize);
  
     while (is.get(c))          gcount = (Uint32)is.gcount();
     {          line.append(input, gcount);
         gotChar = true;  
  
         if (c == '\n')          if (is.rdstate() & PEGASUS_STD(istream)::failbit)
           {
               // It is okay if we encounter the newline character without reading
               // data.
               is.clear();
             break;             break;
           }
       } while (gcount == buffersize-1);
  
         line.append(c);      if (!is.eof())
       {
           // we need to consume the '\n', because get() doesn't
           char c = 0;
           is.get(c);
     }     }
 #endif  
  
     return gotChar;      return !!is;
 } }
  
 // //
Line 515 
Line 537 
     PEG_METHOD_ENTER(TRC_AUTHENTICATION, "FileSystem::changeFileOwner()");     PEG_METHOD_ENTER(TRC_AUTHENTICATION, "FileSystem::changeFileOwner()");
  
     struct passwd* userPasswd;     struct passwd* userPasswd;
 #if defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) || \  #if defined(PEGASUS_OS_SOLARIS) || \
     defined(PEGASUS_OS_HPUX) || \     defined(PEGASUS_OS_HPUX) || \
     defined(PEGASUS_OS_LINUX) || \     defined(PEGASUS_OS_LINUX) || \
     defined (PEGASUS_OS_VMS)     defined (PEGASUS_OS_VMS)
  
     const unsigned int PWD_BUFF_SIZE = 1024;     const unsigned int PWD_BUFF_SIZE = 1024;
     struct passwd pwd;     struct passwd pwd;
     struct passwd *result;  
     char pwdBuffer[PWD_BUFF_SIZE];     char pwdBuffer[PWD_BUFF_SIZE];
  
     if (getpwnam_r(userName.getCString(), &pwd, pwdBuffer, PWD_BUFF_SIZE,     if (getpwnam_r(userName.getCString(), &pwd, pwdBuffer, PWD_BUFF_SIZE,


Legend:
Removed from v.1.75  
changed lines
  Added in v.1.81

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2