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

make << work with appending arrays; PostgreSQL driver

Browse Source
This commit is contained in:
Alexander Medvednikov
2019-07-04 01:56:18 +02:00
parent fcf8909c75
commit 8f10e37370
11 changed files with 151 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
vlib/os/os.v
View File

@@ -108,12 +108,7 @@ fn parse_windows_cmd_line(cmd byteptr) []string {
//pub fn read_file(path string) ?string {
pub fn read_file(path string) ?string {
mut res := ''
mut mode := 'r'
777 // TODO
// Need 'rb' on windows to avoid the \r\n mess.
$if windows {
mode = 'rb'
}
mut mode := 'rb'
cpath := path.cstr()
fp := C.fopen(cpath, mode.cstr())
if isnil(fp) {
@@ -132,31 +127,6 @@ pub fn read_file(path string) ?string {
return res
}
pub fn read_file_opt(path string) ?string {
mut res := ''
mut mode := 'r'
777 // TODO
// Need 'rb' on windows to avoid the \r\n mess.
$if windows {
mode = 'rb'
}
cpath := path.cstr()
fp := C.fopen(cpath, mode.cstr())
if isnil(fp) {
return error('failed to open file "$path"')
}
C.fseek(fp, 0, SEEK_END)
fsize := C.ftell(fp)
// C.fseek(fp, 0, SEEK_SET) // same as C.rewind(fp) below
C.rewind(fp)
mut str := malloc(fsize + 1)
C.fread(str, fsize, 1, fp)
C.fclose(fp)
str[fsize] = 0
res = tos(str, fsize)
return res
}
// file_size returns the size of the file located in `path`.
pub fn file_size(path string) int {
s := C.stat{}
@@ -208,7 +178,7 @@ fn read_ulines(path string) []ustring {
pub fn open(path string) ?File {
cpath := path.cstr()
file := File {
cfile: C.fopen(cpath, 'r')
cfile: C.fopen(cpath, 'rb')
}
if isnil(file.cfile) {
return error('failed to open file "$path"')
@@ -220,7 +190,7 @@ pub fn open(path string) ?File {
pub fn create(path string) ?File {
cpath := path.cstr()
file := File {
cfile: C.fopen(cpath, 'w')
cfile: C.fopen(cpath, 'wb')
}
if isnil(file.cfile) {
return error('failed to create file "$path"')
@@ -231,7 +201,7 @@ pub fn create(path string) ?File {
pub fn open_append(path string) ?File {
cpath := path.cstr()
file := File {
cfile: C.fopen(cpath, 'a')
cfile: C.fopen(cpath, 'ab')
}
if isnil(file.cfile) {
return error('failed to create file "$path"')