fix for interface changes

This commit is contained in:
Juan José Gutiérrez de Quevedo Pérez 2021-03-27 22:02:36 +01:00
parent 2371a976e3
commit 5d8efec3f6

View file

@ -1957,13 +1957,8 @@ static int isFileReadable(char *path)
ret = PTR_ERR(fp); ret = PTR_ERR(fp);
} }
else { else {
oldfs = get_fs(); set_fs(KERNEL_DS); ret = kernel_read(fp, &buf, 1, NULL);
closeFile(fp);
if(1!=readFile(fp, &buf, 1))
ret = PTR_ERR(fp);
set_fs(oldfs);
filp_close(fp,NULL);
} }
return ret; return ret;
} }
@ -1984,10 +1979,7 @@ static int retriveFromFile(char *path, u8* buf, u32 sz)
if(path && buf) { if(path && buf) {
if( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){ if( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp); DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
ret = kernel_read(fp, buf, sz, NULL);
oldfs = get_fs(); set_fs(KERNEL_DS);
ret=readFile(fp, buf, sz);
set_fs(oldfs);
closeFile(fp); closeFile(fp);
DBG_871X("%s readFile, ret:%d\n",__FUNCTION__, ret); DBG_871X("%s readFile, ret:%d\n",__FUNCTION__, ret);
@ -2018,10 +2010,7 @@ static int storeToFile(char *path, u8* buf, u32 sz)
if(path && buf) { if(path && buf) {
if( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) { if( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) {
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp); DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
ret = kernel_write(fp, buf, sz, NULL);
oldfs = get_fs(); set_fs(KERNEL_DS);
ret=writeFile(fp, buf, sz);
set_fs(oldfs);
closeFile(fp); closeFile(fp);
DBG_871X("%s writeFile, ret:%d\n",__FUNCTION__, ret); DBG_871X("%s writeFile, ret:%d\n",__FUNCTION__, ret);