From 082e680bd54e999f2bb4eb77141958938b1e9ee9 Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Wed, 11 Feb 2004 23:48:50 +0000 Subject: 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. --- libc/stdio/getline.c | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) (limited to 'libc/stdio/getline.c') 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 * - * Copyright (C) 2000 by Lineo, inc. and Erik Andersen - * Copyright (C) 2000,2001 by Erik Andersen - * Written by Erik Andersen - * - * 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 -#include -#define __USE_GNU -#include +#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); } - -- cgit v1.2.3