aboutsummaryrefslogtreecommitdiff
path: root/libbb/get_line_from_file.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-12-20 02:46:48 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-12-20 02:46:48 +0000
commit9a7cef930f7e299c0e5d9d1ddeb3f95db6749eb7 (patch)
treeb8f6595e61380091ba42740cf1ad8bb684e55336 /libbb/get_line_from_file.c
parentb95636c52fbb058a39548bcbc4e86456ebbd7b7b (diff)
downloadbusybox-w32-9a7cef930f7e299c0e5d9d1ddeb3f95db6749eb7.tar.gz
busybox-w32-9a7cef930f7e299c0e5d9d1ddeb3f95db6749eb7.tar.bz2
busybox-w32-9a7cef930f7e299c0e5d9d1ddeb3f95db6749eb7.zip
less: somewhat buggy applet, but nice. Muchly reduced
xstrdup'ing and memory consumption. Made linewrap saner. regex matching code was awful - still buggy, but not as leaky as before. Made buffer size configurable. Killed several static and on-stack buffers. Hopefully eliminated staircase effect on Ctrl-C (unable to reproduce).
Diffstat (limited to 'libbb/get_line_from_file.c')
-rw-r--r--libbb/get_line_from_file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 3f2c6096e..a27693f66 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -13,7 +13,7 @@
13 13
14/* This function reads an entire line from a text file, up to a newline 14/* This function reads an entire line from a text file, up to a newline
15 * or NUL byte, inclusive. It returns a malloc'ed char * which must be 15 * or NUL byte, inclusive. It returns a malloc'ed char * which must be
16 * stored and free'ed by the caller. If end is null '\n' isn't considered 16 * stored and free'ed by the caller. If end is null '\n' isn't considered
17 * end of line. If end isn't null, length of the chunk read is stored in it. */ 17 * end of line. If end isn't null, length of the chunk read is stored in it. */
18 18
19char *bb_get_chunk_from_file(FILE * file, int *end) 19char *bb_get_chunk_from_file(FILE * file, int *end)
@@ -62,7 +62,7 @@ char *xmalloc_getline(FILE * file)
62 char *c = bb_get_chunk_from_file(file, &i); 62 char *c = bb_get_chunk_from_file(file, &i);
63 63
64 if (i && c[--i] == '\n') 64 if (i && c[--i] == '\n')
65 c[i] = 0; 65 c[i] = '\0';
66 66
67 return c; 67 return c;
68} 68}