CVS gsasl/lib/gl

[gsasl-commit]

Update of /home/cvs/gsasl/lib/gl
In directory dopio:/tmp/cvs-serv21043/gl

Modified Files:
        lgetdelim.c lgetdelim.h lgetline.c lgetline.h 
Log Message:
Update.

--- /home/cvs/gsasl/lib/gl/lgetdelim.c  2005/01/01 16:04:52     1.1
+++ /home/cvs/gsasl/lib/gl/lgetdelim.c  2005/01/01 16:59:28     1.2
@@ -1,24 +1,32 @@
-/* Copyright (C) 2004 Simon Josefsson
-   Copyright (C) 1994,1996,1997,1998,2001,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2004, 2005 Free
+ * Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1, 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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.  */
+
+/* Ported from libc by Simon Josefsson. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
-   This file is free software; you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of
-   the License, or (at your option) any later version.
-
-   This file 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this file; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-   USA. */
+/* Get specification.  */
+#include "lgetdelim.h"
 
+/* Get malloc. */
 #include <stdlib.h>
-#include <string.h>
-#include <errno.h>
 
 /* Read up to (and including) a TERMINATOR from FP into *LINEPTR
    (and null-terminate it).  *LINEPTR is a pointer returned from malloc (or
--- /home/cvs/gsasl/lib/gl/lgetdelim.h  2005/01/01 16:04:52     1.1
+++ /home/cvs/gsasl/lib/gl/lgetdelim.h  2005/01/01 16:59:28     1.2
@@ -1,34 +1,36 @@
-/* Copyright (C) 2004 Simon Josefsson
+/* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1, 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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.  */
 
-   The file is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   This file 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this file; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-   USA.  */
+/* Written by Simon Josefsson. */
 
-#ifndef GETDELIM_H_
-# define GETDELIM_H_
+#ifndef GNULIB_GETDELIM_H
+# define GNULIB_GETDELIM_H
 
-/* Get getdelim, if available.  */
+/* Get getline, if available.  */
 #include <stdio.h>
 
-#if defined HAVE_DECL_GETDELIM && !HAVE_DECL_GETDELIM
-/* Read up to (and including) a TERMINATOR from FP into *LINEPTR
-   (and null-terminate it).  *LINEPTR is a pointer returned from malloc (or
-   NULL), pointing to *N characters of space.  It is realloc'ed as
-   necessary.  Returns the number of characters read (not including the
-   null terminator), or -1 on error or EOF.  */
-ssize_t
-getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp);
+#if defined HAVE_DECL_GETLINE && !HAVE_DECL_GETLINE
+/* Get size_t. */
+# include <stddef.h>
+
+/* Get ssize_t.  */
+# include <sys/types.h>
+
+extern ssize_t getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp);
 #endif
 
-#endif /* GETDELIM_H_ */
+#endif /* GNULIB_GETDELIM_H */
--- /home/cvs/gsasl/lib/gl/lgetline.c   2005/01/01 16:04:52     1.1
+++ /home/cvs/gsasl/lib/gl/lgetline.c   2005/01/01 16:59:28     1.2
@@ -1,24 +1,31 @@
-/* Copyright (C) 2004 Simon Josefsson
-   Copyright (C) 1991, 1992, 1995, 1996, 1997, 2004
-   Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1, 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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.  */
 
-   This file is free software; you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of
-   the License, or (at your option) any later version.
+/* Written by Simon Josefsson. */
 
-   This file 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
-   Lesser General Public License for more details.
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this file; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-   USA.  */
+/* Get specification. */
+#include "lgetline.h"
 
-#include <stddef.h>
-#include <stdio.h>
+/* Get getdelim. */
+#include "lgetdelim.h"
 
 /* Like getdelim, but always looks for a newline.  */
 ssize_t
--- /home/cvs/gsasl/lib/gl/lgetline.h   2005/01/01 16:04:52     1.1
+++ /home/cvs/gsasl/lib/gl/lgetline.h   2005/01/01 16:59:28     1.2
@@ -1,29 +1,36 @@
-/* Copyright (C) 2004 Simon Josefsson
+/* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1, 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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.  */
 
-   The file is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   This file 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this file; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-   USA.  */
+/* Written by Simon Josefsson. */
 
-#ifndef GETLINE_H_
-# define GETLINE_H_
+#ifndef GNULIB_GETLINE_H
+# define GNULIB_GETLINE_H
 
 /* Get getline, if available.  */
 #include <stdio.h>
 
 #if defined HAVE_DECL_GETLINE && !HAVE_DECL_GETLINE
-/* Like getdelim, but always looks for a newline.  */
-ssize_t getline (char **lineptr, size_t *n, FILE *stream);
+/* Get size_t. */
+# include <stddef.h>
+
+/* Get ssize_t.  */
+# include <sys/types.h>
+
+extern ssize_t getline (char **lineptr, size_t *n, FILE *stream);
 #endif
 
-#endif /* GETLINE_H_ */
+#endif /* GNULIB_GETLINE_H */