summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2003-06-25 00:26:19 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2003-06-25 00:26:19 +0000
commitc8fb78fd446be6c38a32ac9e87af48ab7f8cb300 (patch)
tree9fee263c1ea7219db3069d4c197abc1d5ecd73c9 /apps
parent29f62ebf845dab47474fd9b8b86a71b6066f4db4 (diff)
downloadrockbox-c8fb78fd446be6c38a32ac9e87af48ab7f8cb300.tar.gz
rockbox-c8fb78fd446be6c38a32ac9e87af48ab7f8cb300.zip
Made the sokoban level loader CR/LF tolerant
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3758 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/recorder/sokoban.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/recorder/sokoban.c b/apps/recorder/sokoban.c
index faf868044c..5e4148c2e1 100644
--- a/apps/recorder/sokoban.c
+++ b/apps/recorder/sokoban.c
@@ -329,7 +329,7 @@ static int get_level(char *level, int level_size)
329 /* we search for the first character that isn't a newline */ 329 /* we search for the first character that isn't a newline */
330 for (i = 0; i < nread; i++) { 330 for (i = 0; i < nread; i++) {
331 /* skip and count all newlines */ 331 /* skip and count all newlines */
332 while((buffer[i] == '\n') && (i < nread)) { 332 while((buffer[i] == '\n' || buffer[i] == '\r') && (i < nread)) {
333 prevnewl++; 333 prevnewl++;
334 i++; 334 i++;
335 } 335 }
@@ -339,7 +339,7 @@ static int get_level(char *level, int level_size)
339 break; 339 break;
340 340
341 /* start of new level? */ 341 /* start of new level? */
342 if((prevnewl>1) && (buffer[i] != '\n')) { 342 if((prevnewl>1) && (buffer[i] != '\n' && buffer[i] != '\r')) {
343 prevnewl=0; /* none now */ 343 prevnewl=0; /* none now */
344 level_ct++; 344 level_ct++;
345 345
@@ -351,7 +351,7 @@ static int get_level(char *level, int level_size)
351 } 351 }
352 352
353 /* skip all non-newlines */ 353 /* skip all non-newlines */
354 while((buffer[i] != '\n') && (i < nread)) 354 while((buffer[i] != '\n' && buffer[i] != '\r') && (i < nread))
355 i++; 355 i++;
356 } 356 }
357 if(!level_found) 357 if(!level_found)