aboutsummaryrefslogtreecommitdiff
path: root/libbb/get_line_from_file.c
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-01 21:05:12 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-01 21:05:12 +0000
commitfe8387675fa3a745aec691569d334afbdcb56199 (patch)
tree54731506b0d02a639aa2781412ca3ceab927594f /libbb/get_line_from_file.c
parenta580b634d9204d4fc4b9bea1775595e45ab434a9 (diff)
downloadbusybox-w32-fe8387675fa3a745aec691569d334afbdcb56199.tar.gz
busybox-w32-fe8387675fa3a745aec691569d334afbdcb56199.tar.bz2
busybox-w32-fe8387675fa3a745aec691569d334afbdcb56199.zip
sed: unbreak multiple -e, -f option handling (my fault)
git-svn-id: svn://busybox.net/trunk/busybox@16286 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb/get_line_from_file.c')
-rw-r--r--libbb/get_line_from_file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 68837b20d..de49eb51d 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -16,7 +16,7 @@
16/* get_line_from_file() - This function reads an entire line from a text file, 16/* get_line_from_file() - This function reads an entire line from a text file,
17 * up to a newline or NUL byte. It returns a malloc'ed char * which must be 17 * up to a newline or NUL byte. It returns a malloc'ed char * which must be
18 * stored and free'ed by the caller. If end is null '\n' isn't considered 18 * stored and free'ed by the caller. If end is null '\n' isn't considered
19 * and of line. If end isn't null, length of the chunk read is stored in it. */ 19 * end of line. If end isn't null, length of the chunk read is stored in it. */
20 20
21char *bb_get_chunk_from_file(FILE * file, int *end) 21char *bb_get_chunk_from_file(FILE * file, int *end)
22{ 22{
@@ -46,7 +46,7 @@ char *bb_get_chunk_from_file(FILE * file, int *end)
46 return linebuf; 46 return linebuf;
47} 47}
48 48
49/* Get line, including trailing /n if any */ 49/* Get line, including trailing \n if any */
50char *bb_get_line_from_file(FILE * file) 50char *bb_get_line_from_file(FILE * file)
51{ 51{
52 int i; 52 int i;
@@ -54,7 +54,7 @@ char *bb_get_line_from_file(FILE * file)
54 return bb_get_chunk_from_file(file, &i); 54 return bb_get_chunk_from_file(file, &i);
55} 55}
56 56
57/* Get line. Remove trailing /n */ 57/* Get line. Remove trailing \n */
58char *bb_get_chomped_line_from_file(FILE * file) 58char *bb_get_chomped_line_from_file(FILE * file)
59{ 59{
60 int i; 60 int i;