mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

os: realpath => real_path

Browse Source
This commit is contained in:
yuyi
2020-03-20 23:41:18 +08:00
committed by GitHub
parent 5f32663714
commit 2f27758a4b
30 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vlib/os/os.v
View File

@ -171,8 +171,8 @@ pub fn cp_r(osource_path, odest_path string, overwrite bool) ?bool {
}
pub fn cp_all(osource_path, odest_path string, overwrite bool) ?bool {
source_path := os.realpath(osource_path)
dest_path := os.realpath(odest_path)
source_path := os.real_path(osource_path)
dest_path := os.real_path(odest_path)
if !os.exists(source_path) {
return error("Source path doesn\'t exist")
}
@ -530,7 +530,7 @@ pub fn is_executable(path string) bool {
// 02 Write-only
// 04 Read-only
// 06 Read and write
p := os.realpath( path )
p := os.real_path( path )
return ( os.exists( p ) && p.ends_with('.exe') )
} $else {
return C.access(path.str, X_OK) != -1
@ -874,7 +874,7 @@ fn executable_fallback() string {
}
}
}
exepath = os.realpath(exepath)
exepath = os.real_path(exepath)
return exepath
}
@ -972,7 +972,7 @@ pub fn getwd() string {
// Also https://insanecoding.blogspot.com/2007/11/pathmax-simply-isnt.html
// and https://insanecoding.blogspot.com/2007/11/implementing-realpath-in-c.html
// NB: this particular rabbit hole is *deep* ...
pub fn realpath(fpath string) string {
pub fn real_path(fpath string) string {
mut fullpath := vcalloc(MAX_PATH)
mut ret := charptr(0)
$if windows {
@ -1184,10 +1184,10 @@ pub const (
// It gives a convenient way to access program resources like images, fonts, sounds and so on,
// *no matter* how the program was started, and what is the current working directory.
pub fn resource_abs_path(path string) string {
mut base_path := os.realpath(os.dir(os.executable()))
mut base_path := os.real_path(os.dir(os.executable()))
vresource := os.getenv('V_RESOURCE_PATH')
if vresource.len != 0 {
base_path = vresource
}
return os.realpath(os.join_path(base_path, path))
return os.real_path(os.join_path(base_path, path))
}

2
vlib/os/os_nix.v
View File

@ -171,7 +171,7 @@ pub fn mkdir(path string) ?bool {
if path == '.' {
return true
}
apath := os.realpath(path)
apath := os.real_path(path)
/*
$if linux {
$if !android {

4
vlib/os/os_test.v
View File

@ -62,7 +62,7 @@ fn test_write_and_read_bytes() {
file_name := './byte_reader_writer.tst'
payload := [`I`, `D`, `D`, `Q`, `D`]
mut file_write := os.create(os.realpath(file_name)) or {
mut file_write := os.create(os.real_path(file_name)) or {
eprintln('failed to create file $file_name')
return
}
@ -75,7 +75,7 @@ fn test_write_and_read_bytes() {
assert payload.len == os.file_size(file_name)
mut file_read := os.open(os.realpath(file_name)) or {
mut file_read := os.open(os.real_path(file_name)) or {
eprintln('failed to open file $file_name')
return
}

2
vlib/os/os_windows.v
View File

@ -173,7 +173,7 @@ pub fn (f mut File) writeln(s string) {
// mkdir creates a new directory with the specified path.
pub fn mkdir(path string) ?bool {
if path == '.' { return true }
apath := os.realpath( path )
apath := os.real_path( path )
if !C.CreateDirectory(apath.to_wide(), 0) {
return error('mkdir failed for "$apath", because CreateDirectory returned ' + get_error_msg(int(C.GetLastError())))
}