summaryrefslogtreecommitdiff
path: root/libc/stdio/getline.c
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2004-02-11 23:48:50 +0000
committerManuel Novoa III <mjn3@codepoet.org>2004-02-11 23:48:50 +0000
commit082e680bd54e999f2bb4eb77141958938b1e9ee9 (patch)
tree203c45b85ca608e1550d8ffc459456fc9cf0b30b /libc/stdio/getline.c
parent17c21765b4a97c6f0b74ba8466073e5a3f97cdee (diff)
New stdio core. Should be more maintainable. Fixes a couple of bugs.
Codepaths streamlined. Improved performance for nonthreaded apps when linked with a thread-enabled libc. Minor iconv bug and some locale/thread related startup issues fixed. These showed up in getting a gcj-compiled java helloworld app running. Removed some old extension functions... _stdio_fdout and _stdio_fsfopen.
Diffstat (limited to 'libc/stdio/getline.c')
-rw-r--r--libc/stdio/getline.c34
1 files changed, 7 insertions, 27 deletions
diff --git a/libc/stdio/getline.c b/libc/stdio/getline.c
index 8f63bc6e0..0708aedaa 100644
--- a/libc/stdio/getline.c
+++ b/libc/stdio/getline.c
@@ -1,34 +1,14 @@
-/* vi: set sw=4 ts=4: */
-/* getline for uClibc
+/* Copyright (C) 2004 Manuel Novoa III <mjn3@codepoet.org>
*
- * Copyright (C) 2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 2000,2001 by Erik Andersen <andersen@uclibc.org>
- * Written by Erik Andersen <andersen@uclibc.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * GNU Library General Public License (LGPL) version 2 or later.
*
+ * Dedicated to Toni. See uClibc/DEDICATION.mjn3 for details.
*/
-#include <stddef.h>
-#include <sys/types.h>
-#define __USE_GNU
-#include <stdio.h>
+#include "_stdio.h"
-/* Basically getdelim() with the delimiter hard wired to '\n' */
-ssize_t getline(char **linebuf, size_t *n, FILE *file)
+ssize_t getline(char **__restrict lineptr, size_t *__restrict n,
+ FILE *__restrict stream)
{
- return (getdelim (linebuf, n, '\n', file));
+ return __getdelim(lineptr, n, '\n', stream);
}
-