From 75b41a88f6bfdc478d16d0f3ad9341a6fac459d8 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Sun, 4 May 2003 02:04:31 +0000 Subject: Moved read_line() to misc.c git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3647 a1c6a512-1295-4272-9138-f99709370657 --- apps/misc.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'apps/misc.c') diff --git a/apps/misc.c b/apps/misc.c index a49739f92d..69cb7d3174 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -21,6 +21,9 @@ #include "file.h" #include "lcd.h" #include "sprintf.h" +#include "errno.h" +#include "system.h" + #define ONE_KILOBYTE 1024 #define ONE_MEGABYTE (1024*1024) @@ -49,6 +52,42 @@ char *num2max5(unsigned int bytes, char *max5) return max5; } +/* Read (up to) a line of text from fd into buffer and return number of bytes + * read (which may be larger than the number of bytes stored in buffer). If + * an error occurs, -1 is returned (and buffer contains whatever could be + * read). A line is terminated by a LF char. Neither LF nor CR chars are + * stored in buffer. + */ +int read_line(int fd, char* buffer, int buffer_size) +{ + int count = 0; + int num_read = 0; + + errno = 0; + + while (count < buffer_size) + { + unsigned char c; + + if (1 != read(fd, &c, 1)) + break; + + num_read++; + + if ( c == '\n' ) + break; + + if ( c == '\r' ) + continue; + + buffer[count++] = c; + } + + buffer[MIN(count, buffer_size - 1)] = 0; + + return errno ? -1 : num_read; +} + #ifdef TEST_MAX5 int main(int argc, char **argv) { -- cgit v1.2.3