xnu-6153.81.5.tar.gz

[apple/xnu.git] / libsyscall / mach / fprintf_stderr.c

diff --git a/libsyscall/mach/fprintf_stderr.c b/libsyscall/mach/fprintf_stderr.c
index e89df1136f5e013d48baea18371076a4a1b395a0..53f7b4cc3f4f90e5aa2fdddb5d543e36a44dff96 100644 (file)
--- a/libsyscall/mach/fprintf_stderr.c
+++ b/libsyscall/mach/fprintf_stderr.c
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003-2010 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,40 +22,46 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_FREE_COPYRIGHT@
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_FREE_COPYRIGHT@

- * 
+ *

  */
 
 #include <mach/mach.h>
 #include <mach/mach_init.h>
  */
 
 #include <mach/mach.h>
 #include <mach/mach_init.h>

-#include <stdio.h>

 #include <stdarg.h>
 #include <stdarg.h>

+#include "string.h"

 
 int (*vprintf_stderr_func)(const char *format, va_list ap);
 
 
 int (*vprintf_stderr_func)(const char *format, va_list ap);
 

+#define __STDERR_FILENO 2
+int write(int fd, const char* cbuf, int nbyte);

 
 /* This function allows the writing of a mach error message to an
  * application-controllable output method, the default being to
  * use printf if no other method is specified by the application.
  *
 
 /* This function allows the writing of a mach error message to an
  * application-controllable output method, the default being to
  * use printf if no other method is specified by the application.
  *

- * To override, set the global (static) function pointer vprintf_stderr to
+ * To override, set the global function pointer vprintf_stderr to

  * a function which takes the same parameters as vprintf.
  */
 
  * a function which takes the same parameters as vprintf.
  */
 

-int fprintf_stderr(const char *format, ...)
+__private_extern__ int
+fprintf_stderr(const char *format, ...)

 {
 {

-        va_list args;
+       va_list args;

        int retval;
 
        va_start(args, format);
        int retval;
 
        va_start(args, format);

-       if (vprintf_stderr_func == NULL)
-               retval = vprintf(format, args);
-       else
+       if (vprintf_stderr_func == NULL) {
+               char buffer[1024];
+               retval = _mach_vsnprintf(buffer, sizeof(buffer), format, args);
+               write(__STDERR_FILENO, buffer, retval);
+       } else {

                retval = (*vprintf_stderr_func)(format, args);
                retval = (*vprintf_stderr_func)(format, args);

+       }

        va_end(args);
 
        return retval;
        va_end(args);
 
        return retval;