View | Details | Raw Unified | Return to issue 57961
Collapse All | Expand All

(-)sal/osl/unx/file_url.cxx.orig (-31 lines)
Lines 700-717 Link Here
700
                    	return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
700
                    	return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
701
                    
701
                    
702
	                ustrchrcat(*punresolved++, path_resolved_so_far); 
702
	                ustrchrcat(*punresolved++, path_resolved_so_far); 
703
                
704
    	            if ('\0' == *punresolved && !realpath_failed)
705
        	        {
706
						ferr = _osl_resolvepath(
707
							path_resolved_so_far, 
708
							presolvedsf, 
709
							sentinel, 
710
							&realpath_failed);
711
					
712
						if (osl_File_E_None != ferr)
713
			    			return ferr;
714
            	    }
715
            	}
703
            	}
716
        	}
704
        	}
717
	        else if (UNICHAR_SLASH == *punresolved)
705
	        else if (UNICHAR_SLASH == *punresolved)
Lines 723-736 Link Here
723
            
711
            
724
    	        if (!realpath_failed)
712
    	        if (!realpath_failed)
725
        	    {                
713
        	    {                
726
            	    ferr = _osl_resolvepath(
727
						path_resolved_so_far, 
728
						presolvedsf, 
729
						sentinel, 
730
						&realpath_failed);
731
		    
732
					if (osl_File_E_None != ferr)
733
						return ferr;
734
				
714
				
735
					if (!_islastchr(path_resolved_so_far, UNICHAR_SLASH))
715
					if (!_islastchr(path_resolved_so_far, UNICHAR_SLASH))
736
					{
716
					{
Lines 748-764 Link Here
748
                
728
                
749
	            ustrchrcat(*punresolved++, path_resolved_so_far); 
729
	            ustrchrcat(*punresolved++, path_resolved_so_far); 
750
            
730
            
751
    	        if ('\0' == *punresolved && !realpath_failed)
752
        	    {            
753
            	    ferr = _osl_resolvepath(
754
						path_resolved_so_far, 
755
						presolvedsf, 
756
						sentinel, 
757
						&realpath_failed);
758
		    
759
					if (osl_File_E_None != ferr)
760
						return ferr;
761
            	}
762
        	}
731
        	}
763
    	}
732
    	}
764
733

Return to issue 57961