pjht/os
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VFS functions now check mode

Browse Source
This commit is contained in:
pjht 2019-04-09 09:05:47 -05:00
parent ad3c8288b6
commit 680defd654
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kernel/vfs.c
View File

@ -3,6 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include "vfs.h" #include "vfs.h"
typedef struct _vfs_mapping_struct { typedef struct _vfs_mapping_struct {
char* mntpnt; char* mntpnt;
@ -126,6 +127,11 @@ FILE* fopen(const char* filename,const char* mode) {
} }
int fgetc(FILE* stream) { int fgetc(FILE* stream) {
if (!stream->rd) {
errno=EBADF;
stream->error=1;
return EOF;
}
int c; int c;
drvs[stream->type](FSOP_GETC,stream,&c,NULL); drvs[stream->type](FSOP_GETC,stream,&c,NULL);
return c; return c;
@ -136,6 +142,11 @@ int getc() {
} }
char* fgets(char* str,int count,FILE* stream) { char* fgets(char* str,int count,FILE* stream) {
if (!stream->rd) {
errno=EBADF;
stream->error=1;
return NULL;
}
int i; int i;
for (i=0;i<count-1;i++) { for (i=0;i<count-1;i++) {
char c=fgetc(stream); char c=fgetc(stream);
@ -153,6 +164,11 @@ char* fgets(char* str,int count,FILE* stream) {
} }
size_t fread(void* buffer_ptr,size_t size,size_t count,FILE* stream) { size_t fread(void* buffer_ptr,size_t size,size_t count,FILE* stream) {
if (!stream->rd) {
errno=EBADF;
stream->error=1;
return 0;
}
char* buffer=(char*)buffer_ptr; char* buffer=(char*)buffer_ptr;
size_t bytes=size*count; size_t bytes=size*count;
for (size_t i=0;i<bytes;i++) { for (size_t i=0;i<bytes;i++) {
@ -166,6 +182,11 @@ size_t fread(void* buffer_ptr,size_t size,size_t count,FILE* stream) {
} }
int fputc(int c,FILE* stream) { int fputc(int c,FILE* stream) {
if (!stream->wr) {
errno=EBADF;
stream->error=1;
return EOF;
}
char ok=drvs[stream->type](FSOP_PUTC,stream,&c,NULL); char ok=drvs[stream->type](FSOP_PUTC,stream,&c,NULL);
if (ok) { if (ok) {
return c; return c;
@ -179,6 +200,11 @@ int putc(int c) {
} }
int fputs(const char* s,FILE* stream) { int fputs(const char* s,FILE* stream) {
if (!stream->wr) {
errno=EBADF;
stream->error=1;
return EOF;
}
size_t len=strlen(s); size_t len=strlen(s);
for (size_t i=0;i<len;i++) { for (size_t i=0;i<len;i++) {
int c=fputc(s[i],stream); int c=fputc(s[i],stream);