deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add checks for file size problems (fix by Roger Larsson)

Browse source
This commit is contained in:
adamdunkels 2010-11-15 21:49:05 +00:00
parent 9446d37285
commit ee6f542a06
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
examples/rime/example-rudolph2.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: example-rudolph2.c,v 1.6 2010/01/15 10:24:37 nifi Exp $ * $Id: example-rudolph2.c,v 1.7 2010/11/15 21:49:05 adamdunkels Exp $
*/ */
/** /**
@ -75,7 +75,7 @@ write_chunk(struct rudolph2_conn *c, int offset, int flag,
#endif /* CONTIKI_TARGET_NETSIM */ #endif /* CONTIKI_TARGET_NETSIM */
if(flag == RUDOLPH2_FLAG_NEWFILE) { if(flag == RUDOLPH2_FLAG_NEWFILE) {
/*printf("+++ rudolph2 new file incoming at %lu\n", clock_time());*/ printf("+++ rudolph2 new file incoming at %lu\n", clock_time());
leds_on(LEDS_RED); leds_on(LEDS_RED);
fd = cfs_open("codeprop.out", CFS_WRITE); fd = cfs_open("codeprop.out", CFS_WRITE);
} else { } else {
@ -86,6 +86,7 @@ write_chunk(struct rudolph2_conn *c, int offset, int flag,
int ret; int ret;
cfs_seek(fd, offset, CFS_SEEK_SET); cfs_seek(fd, offset, CFS_SEEK_SET);
ret = cfs_write(fd, data, datalen); ret = cfs_write(fd, data, datalen);
printf("+++ rudolph2 offset %d, length %d\n", offset, datalen);
} }
cfs_close(fd); cfs_close(fd);
@ -100,11 +101,17 @@ write_chunk(struct rudolph2_conn *c, int offset, int flag,
fd = cfs_open("hej", CFS_READ); fd = cfs_open("hej", CFS_READ);
for(i = 0; i < FILESIZE; ++i) { for(i = 0; i < FILESIZE; ++i) {
unsigned char buf; unsigned char buf;
cfs_read(fd, &buf, 1); int r = cfs_read(fd, &buf, 1);
if(buf != (unsigned char)i) { if (r != 1) {
printf("%d.%d: error: read failed at %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
i);
break;
}
else if(buf != (unsigned char)i) {
printf("%d.%d: error: diff at %d, %d != %d\n", printf("%d.%d: error: diff at %d, %d != %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
i, i, buf); i, (unsigned char)i, buf);
break; break;
} }
} }
@ -150,15 +157,24 @@ PROCESS_THREAD(example_rudolph2_process, ev, data)
PROCESS_PAUSE(); PROCESS_PAUSE();
if(rimeaddr_node_addr.u8[0] == 1 && if(rimeaddr_node_addr.u8[0] == 7 &&
rimeaddr_node_addr.u8[1] == 1) { rimeaddr_node_addr.u8[1] == 0) {
{ {
int i; int i;
printf("%d.%d: selected data source\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
fd = cfs_open("hej", CFS_WRITE); fd = cfs_open("hej", CFS_WRITE);
for(i = 0; i < FILESIZE; i++) { for(i = 0; i < FILESIZE; i++) {
unsigned char buf = i; unsigned char buf = i;
cfs_write(fd, &buf, 1); int w = cfs_write(fd, &buf, 1);
if (w != 1) {
printf("%d.%d: error: write failed at %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
i);
break;
}
} }
cfs_close(fd); cfs_close(fd);
} }