(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.70 and 1.71

version 1.70, 2007/02/13 18:30:58 version 1.71, 2007/06/05 09:33:02
Line 75 
Line 75 
  
 Boolean FileSystem::existsNoCase(const String& path, String& realPath) Boolean FileSystem::existsNoCase(const String& path, String& realPath)
 { {
 #ifdef PEGASUS_OS_OS400  
     // The OS/400 file system is case insensitive, so just call exists( ).  
     // This is faster, but the main reason to do this is to  
     // avoid multi-threading problems with the IFS directory APIs  
     // (even though they claim to be threadsafe).  
     realPath = path;  
     return exists(path);  
 #else  
     realPath.clear();     realPath.clear();
     CString cpath = _clonePath(path);     CString cpath = _clonePath(path);
     const char* p = cpath;     const char* p = cpath;
Line 124 
Line 116 
     }     }
  
     return false;     return false;
 #endif  
 } }
  
 Boolean FileSystem::canRead(const String& path) Boolean FileSystem::canRead(const String& path)
Line 257 
Line 248 
 #if defined(__GNUC__) && GCC_VERSION >= 30200 #if defined(__GNUC__) && GCC_VERSION >= 30200
     fs.open(_clonePath(realPath), PEGASUS_STD(ios_base::openmode)(mode));     fs.open(_clonePath(realPath), PEGASUS_STD(ios_base::openmode)(mode));
 #else #else
 #if defined(PEGASUS_OS_OS400)  
     fs.open(_clonePath(realPath), mode, PEGASUS_STD(_CCSID_T(1208)) );  
 #else  
     fs.open(_clonePath(realPath), mode);     fs.open(_clonePath(realPath), mode);
 #endif #endif
 #endif  
     return !!fs;     return !!fs;
 } }
  
Line 403 
Line 390 
 // Changes file permissions on the given file. // Changes file permissions on the given file.
 Boolean FileSystem::changeFilePermissions(const String& path, mode_t mode) Boolean FileSystem::changeFilePermissions(const String& path, mode_t mode)
 { {
 #if defined(PEGASUS_OS_OS400)  
     // ATTN: If getCString() is modified to return UTF8, then handle the  
     //       EBCDIC coversion in SystemUnix.cpp  
     CString tempPath = path.getCString();  
 #else  
     CString tempPath = path.getCString();     CString tempPath = path.getCString();
 #endif  
  
     return System::changeFilePermissions(tempPath, mode);     return System::changeFilePermissions(tempPath, mode);
 } }
Line 464 
Line 445 
     fileName = libraryName + String(".dll");     fileName = libraryName + String(".dll");
 #elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC) #elif defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC)
     fileName = String("lib") + libraryName + String(".sl");     fileName = String("lib") + libraryName + String(".sl");
 #elif defined(PEGASUS_OS_OS400)  
     fileName = libraryName;  
 #elif defined(PEGASUS_OS_DARWIN) #elif defined(PEGASUS_OS_DARWIN)
     fileName = String("lib") + libraryName + String(".dylib");     fileName = String("lib") + libraryName + String(".dylib");
 #elif defined(PEGASUS_OS_VMS) #elif defined(PEGASUS_OS_VMS)
Line 537 
Line 516 
         userPasswd = (struct passwd*)NULL;         userPasswd = (struct passwd*)NULL;
     }     }
  
 #elif defined(PEGASUS_OS_OS400)  
     CString tempName = userName.getCString();  
     const char* tmp = tempName;  
     AtoE((char *)tmp);  
     userPasswd = getpwnam(tmp);  
 #else #else
  
     userPasswd = getpwnam(userName.getCString());     userPasswd = getpwnam(userName.getCString());
Line 553 
Line 527 
         return false;         return false;
     }     }
  
 #if defined(PEGASUS_OS_OS400)  
     CString tempPath = fileName.getCString();  
     const char * tmp1 = tempPath;  
     AtoE((char *)tmp1);  
     Sint32 ret = chown(tmp1, userPasswd->pw_uid, userPasswd->pw_gid);  
 #else  
     Sint32 ret = chown(     Sint32 ret = chown(
         fileName.getCString(), userPasswd->pw_uid, userPasswd->pw_gid);         fileName.getCString(), userPasswd->pw_uid, userPasswd->pw_gid);
 #endif  
     if (ret == -1)     if (ret == -1)
     {     {
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();


Legend:
Removed from v.1.70  
changed lines
  Added in v.1.71

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2