some test changes

This commit is contained in:
Marian Ohligs 2011-04-12 12:48:52 +02:00
parent 41bee4b453
commit cc06ff20e0
2 changed files with 21 additions and 14 deletions

View file

@ -56,24 +56,24 @@ int syscall_handler(uint32_t sys_nr, ...)
const char* buf = va_arg(vl, const char*);
size_t len = va_arg(vl, size_t);
read_fs(per_core(current_task)->fildes_table[fd].node, (uint8_t*)buf, len, per_core(current_task)->fildes_table[fd].offset);
kprintf("Dateiinhalt:%i\n", len);
sys_write(fd, buf, len);
kprintf("\n");
ret = 8;
kprintf("fd:%i, Dateilaenge:%i, Dateiinhalt: %s \n", fd, len, buf);
ret = len;
break;
}
case __NR_write: {
int fd = va_arg(vl, int);
const char* buf = va_arg(vl, const char*);
size_t len = va_arg(vl, size_t);
ret = write_fs(per_core(current_task)->fildes_table[fd].node, (uint8_t*)buf, len, per_core(current_task)->fildes_table[fd].offset);
write_fs(per_core(current_task)->fildes_table[fd].node, (uint8_t*)buf, len, per_core(current_task)->fildes_table[fd].offset);
kprintf("ins Dateis. geschr. -- fd:%i, Dateilaenge:%i, Dateiinhalt: %s \n", fd, len, buf);
ret = len;
break;
}
case __NR_open: {
const char* file = va_arg(vl, const char*);
int flags = va_arg(vl, int);
int mode = va_arg(vl, int);
int fd = 0;
int fd;
for (fd = 0; fd < MAX_FILDES; fd++) {
if (per_core(current_task)->fildes_table[fd].node == NULL) {
per_core(current_task)->fildes_table[fd].node = findnode_fs((char*) file);

View file

@ -27,17 +27,24 @@ extern int errno;
int main(int argc, char** argv)
{
int i;
char* str;
//int i;
char* str = (char *)malloc(40 * sizeof(char));
FILE* testfile;
testfile = fopen("/bin/test", "rw\n");
setbuf(testfile, 2);
//printf("Dateiinhalt\n");
fgets(str, 10, testfile);
FILE* testfileX;
testfileX = fopen("/bin/tests", "w+r");
testfile = fopen("/bin/test", "w+r");
setbuf(testfile, NULL);
setbuf(testfileX, NULL);
fwrite("wtest1\n", 1, 10, testfileX);
//fflush(testfile);
fread(str, 1, 10, testfile);
printf("Schreiben: %s", str);
setbuf(testfile, NULL);
fread(str, 1, 20, testfileX);
//fgets(str, 2, testfile);
//setbuf(testfile, 0);
//printf("%s", str);
//printf("Stage 2: %s", str);
//printf("Hello from printf2!!!\n");
return errno;