Changeset 0ca3729a in freewrt

Timestamp:

Mar 22, 2007, 4:31:51 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

1650b64

Parents:

f9d3951

Message:

I originally intended to “just fix” the _GNU_SOURCE vs declaration stuff
when I pointed this file's existence out to Han Boetes, who is currently
porting BSD grep to Crux GNU/Linux, but found out this code is crazy and
can't ever have worked correctly.

This is a re-implementation directly from the specs – getline(3) manpage
from Debian (etch) testing, fgetln(3) manpage from MirOS #10-beta

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2229 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• tools/paxmirabilis/fgetln.c (modified) (2 diffs)

tools/paxmirabilis/fgetln.c

@@ -2 +2 @@
 
 /*-
- * Copyright Holder:
+ * Copyright (c) 2007
+ *      Thorsten Glaser <tg@mirbsd.de>
  *
- *     The FreeBSD project.
+ * Provided that these terms and disclaimer and all copyright notices
+ * are retained or reproduced in an accompanying document, permission
+ * is granted to deal in this work without restriction, including un-
+ * limited rights to use, publicly perform, distribute, sell, modify,
+ * merge, give away, or sublicence.
  *
- * License:
- *
- *     Redistribution and use in source and binary forms, with or without
- *     modification, are permitted under the terms of the BSD License.
- *
- *     THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS `AS IS'' AND
- *     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *     ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- *     FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- *     DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- *     OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- *     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- *     SUCH DAMAGE.
+ * This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to
+ * the utmost extent permitted by applicable law, neither express nor
+ * implied; without malicious intent or gross negligence. In no event
+ * may a licensor, author or contributor be held liable for indirect,
+ * direct, other damage, loss, or other issues arising in any way out
+ * of dealing in the work, even if advised of the possibility of such
+ * damage or existence of a defect, except proven that it results out
+ * of said person's immediate fault when using the work as intended.
+ *-
+ * fgetln() wrapper for operating systems with getline()
  */
 
+#define _GNU_SOURCE             /* for getline() */
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <stdio.h>
 #include <string.h>
 
-#ifdef __GLIBC__
-ssize_t getline(char **, size_t *, FILE *);
+#ifdef __GLIBC__                /* FreeWRT: only build this where needed */
 char *fgetln(FILE *, size_t *);
 
@@ -36 +34 @@
 fgetln(FILE *stream, size_t *len)
 {
-        char *line=NULL;
-        size_t nread = 0;
+        char *lb = NULL;
+        size_t lbsz = 0;
 
-        while (nread == 1) {
-                nread = getline (&line, len, stream);
-                if (nread == (size_t)-1)
-                        return NULL;
-        }
-
-        (*len)--; /* get rid of the trailing \0, fgetln
-                     does not have it */
-
-        return line;
+        *len = getline(&lb, &lbsz, stream);
+        return ((*len == (size_t)-1) ? NULL : lb);
 }
 #endif