Libc-1272.250.1.tar.gz

[apple/libc.git] / stdio / FreeBSD / puts.c

diff --git a/stdio/FreeBSD/puts.c b/stdio/FreeBSD/puts.c
index 22697d8fe6576acc82cc2abf6698c295e6016851..511cab4b5b6a2ce0073ec6f014f182f2868c7b6e 100644 (file)
--- a/stdio/FreeBSD/puts.c
+++ b/stdio/FreeBSD/puts.c
@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.

  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.


@@ -38,7 +34,7 @@
 static char sccsid[] = "@(#)puts.c     8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 static char sccsid[] = "@(#)puts.c     8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/stdio/puts.c,v 1.9 2002/03/22 21:53:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/puts.c,v 1.11 2007/01/09 00:28:07 imp Exp $");

 
 #include "namespace.h"
 #include <stdio.h>
 
 #include "namespace.h"
 #include <stdio.h>


@@ -46,6 +42,10 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/puts.c,v 1.9 2002/03/22 21:53:04 obrien E
 #include "un-namespace.h"
 #include "fvwrite.h"
 #include "libc_private.h"
 #include "un-namespace.h"
 #include "fvwrite.h"
 #include "libc_private.h"

+#include "local.h"
+
+// 3340719: __puts_null__ is used if string is NULL.  Shared by fputs.c
+__private_extern__ char const __puts_null__[] = "(null)";

 
 /*
  * Write the given string to stdout, appending a newline.
 
 /*
  * Write the given string to stdout, appending a newline.


@@ -55,18 +55,22 @@ puts(s)
        char const *s;
 {
        int retval;
        char const *s;
 {
        int retval;

-       size_t c = strlen(s);
+       size_t c;

        struct __suio uio;
        struct __siov iov[2];
 
        struct __suio uio;
        struct __siov iov[2];
 

+       // 3340719: __puts_null__ is used if s is NULL
+       if(s == NULL)
+               s = __puts_null__;

        iov[0].iov_base = (void *)s;
        iov[0].iov_base = (void *)s;

-       iov[0].iov_len = c;
+       iov[0].iov_len = c = strlen(s);

        iov[1].iov_base = "\n";
        iov[1].iov_len = 1;
        uio.uio_resid = c + 1;
        uio.uio_iov = &iov[0];
        uio.uio_iovcnt = 2;
        FLOCKFILE(stdout);
        iov[1].iov_base = "\n";
        iov[1].iov_len = 1;
        uio.uio_resid = c + 1;
        uio.uio_iov = &iov[0];
        uio.uio_iovcnt = 2;
        FLOCKFILE(stdout);

+       ORIENT(stdout, -1);

        retval = __sfvwrite(stdout, &uio) ? EOF : '\n';
        FUNLOCKFILE(stdout);
        return (retval);
        retval = __sfvwrite(stdout, &uio) ? EOF : '\n';
        FUNLOCKFILE(stdout);
        return (retval);