(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.87.10.4 and 1.87.10.5

version 1.87.10.4, 2013/09/05 02:45:13 version 1.87.10.5, 2013/09/18 06:29:20
Line 447 
Line 447 
     return root;     return root;
 } }
  
 #ifdef PEGASUS_ENABLE_PROTOCOL_WEB  
  
 String FileSystem::getAbsoluteFileName(  //#ifdef PEGASUS_ENABLE_PROTOCOL_WEB
     const String& filename)  //
 {  //String FileSystem::getAbsoluteFileName(
 #ifdef PEGASUS_OS_LINUX  //    const String& filename)
     char resolvedName[PATH_MAX+1];  //{
 #endif  //#ifdef PEGASUS_OS_LINUX
 #ifdef PEGASUS_OS_ZOS  //    char resolvedName[PATH_MAX+1];
     char resolvedName[_POSIX_PATH_MAX+1];  //#endif
 #endif  //#ifdef PEGASUS_OS_ZOS
 //for other platform,please add here.  //    char resolvedName[_POSIX_PATH_MAX+1];
   //#endif
     /*  ////for other platform,please add here.
      * ReturnValue:  //
      *    1) Upon successful completion, realpath() shall return a pointer to  //    /*
      *        the buffer containing the resolved name. Otherwise, realpath()  //     * ReturnValue:
      *        shall return a null pointer and set errno to indicate the error.  //     *    1) Upon successful completion, realpath() shall return a pointer to
      *    2) If the resolved_name argument is a null pointer, the pointer  //     *        the buffer containing the resolved name. Otherwise, realpath()
      *        returned by realpath() can be passed to free().  //     *        shall return a null pointer and set errno to indicate the error.
      *    3) If the resolved_name argument is not a null pointer and the  //     *    2) If the resolved_name argument is a null pointer, the pointer
      *        realpath() function fails, the contents of the buffer pointed to  //     *        returned by realpath() can be passed to free().
      *        by resolved_name are undefined.  //     *    3) If the resolved_name argument is not a null pointer and the
      */  //     *        realpath() function fails, the contents of the buffer pointed to
     char* result = realpath(filename.getCString(), resolvedName);  //     *        by resolved_name are undefined.
     if (!result)  //     */
     {// failed, resolvedName is undefined  //    char* result = realpath(filename.getCString(), resolvedName);
         return String("");  //    if (!result)
     }  //    {// failed, resolvedName is undefined
     return String(result);  //        return String("");
 }  //    }
   //    return String(result);
   //}
   //
   //#endif
   
  
 #endif  
  
 String FileSystem::buildLibraryFileName(const String &libraryName) String FileSystem::buildLibraryFileName(const String &libraryName)
 { {


Legend:
Removed from v.1.87.10.4  
changed lines
  Added in v.1.87.10.5

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2