xnu-1228.12.14.tar.gz

[apple/xnu.git] / osfmk / kern / printf.c

diff --git a/osfmk/kern/printf.c b/osfmk/kern/printf.c
index a90469d95207a634764f00433cf3dffacee8d2fd..f8376b4197ff4302da10ee7041a7470a0624af4a 100644 (file)
--- a/osfmk/kern/printf.c
+++ b/osfmk/kern/printf.c
@@ -172,6 +172,7 @@
 #ifdef  MACH_BSD
 #include <sys/msgbuf.h>
 #endif
 #ifdef  MACH_BSD
 #include <sys/msgbuf.h>
 #endif

+#include <console/serial_protos.h>

 
 #ifdef __ppc__
 #include <ppc/Firmware.h>
 
 #ifdef __ppc__
 #include <ppc/Firmware.h>


@@ -183,15 +184,20 @@
 #define MAXBUF (sizeof(long long int) * 8)     /* enough for binary */
 static char digs[] = "0123456789abcdef";
 
 #define MAXBUF (sizeof(long long int) * 8)     /* enough for binary */
 static char digs[] = "0123456789abcdef";
 

+
+#if CONFIG_NO_PRINTF_STRINGS
+#undef printf(x, ...)
+#endif
+

 static int
 printnum(
 static int
 printnum(

-       register unsigned long long int u,      /* number to print */
-       register int            base,
+       unsigned long long int  u,      /* number to print */
+       int             base,

        void                    (*putc)(int, void *),
        void                    *arg)
 {
        char    buf[MAXBUF];    /* build number here */
        void                    (*putc)(int, void *),
        void                    *arg)
 {
        char    buf[MAXBUF];    /* build number here */

-       register char * p = &buf[MAXBUF-1];
+       char *  p = &buf[MAXBUF-1];

        int nprinted = 0;
 
        do {
        int nprinted = 0;
 
        do {


@@ -211,7 +217,7 @@ boolean_t   _doprnt_truncates = FALSE;
 
 int
 __doprnt(
 
 int
 __doprnt(

-       register const char     *fmt,
+       const char      *fmt,

        va_list                 *argp,
                                                /* character output routine */
        void                    (*putc)(int, void *arg),
        va_list                 *argp,
                                                /* character output routine */
        void                    (*putc)(int, void *arg),


@@ -228,7 +234,7 @@ __doprnt(
        int             sign_char;
        boolean_t       altfmt, truncate;
        int             base;
        int             sign_char;
        boolean_t       altfmt, truncate;
        int             base;

-       register char   c;
+       char    c;

        int             capitals;
        int             long_long;
        int             nprinted = 0;
        int             capitals;
        int             long_long;
        int             nprinted = 0;


@@ -400,15 +406,15 @@ __doprnt(
 
                case 's':
                {
 
                case 's':
                {

-                   register char *p;
-                   register char *p2;
+                   register const char *p;
+                   register const char *p2;

 
                    if (prec == -1)
                        prec = 0x7fffffff;      /* MAXINT */
 
                    p = va_arg(*argp, char *);
 
 
                    if (prec == -1)
                        prec = 0x7fffffff;      /* MAXINT */
 
                    p = va_arg(*argp, char *);
 

-                   if (p == (char *)0)
+                   if (p == NULL)

                        p = "";
 
                    if (length > 0 && !ladjust) {
                        p = "";
 
                    if (length > 0 && !ladjust) {


@@ -429,12 +435,13 @@ __doprnt(
 
                    n = 0;
 
 
                    n = 0;
 

-                   while (*p != '\0') {
-                       if (++n > prec || (length > 0 && n > length))
-                           break;
-
-                       (*putc)(*p++, arg);
-                       nprinted++;
+                   while ((n < prec) && (!(length > 0 && n >= length))) {
+                           if (*p == '\0') {
+                                   break;
+                           }
+                           (*putc)(*p++, arg);
+                           nprinted++;
+                           n++;

                    }
 
                    if (n < length && ladjust) {
                    }
 
                    if (n < length && ladjust) {


@@ -551,7 +558,7 @@ __doprnt(
                    char        buf[MAXBUF];    /* build number here */
                    register char *     p = &buf[MAXBUF-1];
                    static char digits[] = "0123456789abcdef0123456789ABCDEF";
                    char        buf[MAXBUF];    /* build number here */
                    register char *     p = &buf[MAXBUF-1];
                    static char digits[] = "0123456789abcdef0123456789ABCDEF";

-                   char *prefix = 0;
+                   const char *prefix = NULL;

 
                    if (truncate) u = (long long)((int)(u));
 
 
                    if (truncate) u = (long long)((int)(u));
 


@@ -572,7 +579,7 @@ __doprnt(
                    if (sign_char)
                        length--;
                    if (prefix)
                    if (sign_char)
                        length--;
                    if (prefix)

-                       length -= strlen((const char *) prefix);
+                       length -= strlen(prefix);

 
                    if (padc == ' ' && !ladjust) {
                        /* blank padding goes before prefix */
 
                    if (padc == ' ' && !ladjust) {
                        /* blank padding goes before prefix */


@@ -652,7 +659,6 @@ boolean_t   new_printf_cpu_number = FALSE;
 
 decl_simple_lock_data(,printf_lock)
 decl_simple_lock_data(,bsd_log_spinlock)
 
 decl_simple_lock_data(,printf_lock)
 decl_simple_lock_data(,bsd_log_spinlock)

-decl_mutex_data(,sprintf_lock)

 extern void bsd_log_init(void);
 void bsd_log_lock(void);
 void bsd_log_unlock(void);
 extern void bsd_log_init(void);
 void bsd_log_lock(void);
 void bsd_log_unlock(void);


@@ -666,17 +672,16 @@ printf_init(void)
        simple_lock_init(&printf_lock, 0);
        simple_lock_init(&bsd_log_spinlock, 0);
        bsd_log_init();
        simple_lock_init(&printf_lock, 0);
        simple_lock_init(&bsd_log_spinlock, 0);
        bsd_log_init();

-       mutex_init(&sprintf_lock, 0);

 }
 
 void
 }
 
 void

-bsd_log_lock()
+bsd_log_lock(void)

 {
        simple_lock(&bsd_log_spinlock);
 }
 
 void
 {
        simple_lock(&bsd_log_spinlock);
 }
 
 void

-bsd_log_unlock()
+bsd_log_unlock(void)

 {
        simple_unlock(&bsd_log_spinlock);
 }
 {
        simple_unlock(&bsd_log_spinlock);
 }


@@ -730,27 +735,30 @@ safe_gets(
        }
 }
 
        }
 }
 

+extern int disableConsoleOutput;
+

 void
 conslog_putc(
        char c)
 {
 void
 conslog_putc(
        char c)
 {

-       extern unsigned int debug_mode, disableDebugOuput, disableConsoleOutput;
-
-       if ((debug_mode && !disableDebugOuput) || !disableConsoleOutput)
+       if ((debug_mode && !disable_debug_output) || !disableConsoleOutput)

                cnputc(c);
 
 #ifdef MACH_BSD
                cnputc(c);
 
 #ifdef MACH_BSD

-       log_putc(c);
+       if (debug_mode == 0)
+               log_putc(c);

 #endif
 }
 
 #endif
 }
 

+#if    MACH_KDB
+extern void db_putchar(char c);
+#endif
+

 void
 void

-dbugprintf(const char *fmt, ...)
+dbugprintf(__unused const char *fmt, ...)

 {
 
 #if    MACH_KDB
 {
 
 #if    MACH_KDB

-
-       extern void db_putchar(char c);

        va_list listp;
 
        va_start(listp, fmt);
        va_list listp;
 
        va_start(listp, fmt);


@@ -760,37 +768,42 @@ dbugprintf(const char *fmt, ...)
        return;
 }
 
        return;
 }
 

-void
+int

 printf(const char *fmt, ...)
 {
        va_list listp;
 
 printf(const char *fmt, ...)
 {
        va_list listp;
 

-       disable_preemption();
-       va_start(listp, fmt);
-       _doprnt(fmt, &listp, conslog_putc, 16);
-       va_end(listp);
-       enable_preemption();
+       if (fmt) {
+               disable_preemption();
+               va_start(listp, fmt);
+               _doprnt(fmt, &listp, conslog_putc, 16);
+               va_end(listp);
+               enable_preemption();
+       }
+       return 0;

 }
 
 }
 

-extern unsigned int disableSerialOuput;
-

 void
 void

-consdebug_putc(
-       char c)
+consdebug_putc(char c)

 {
 {

-       extern unsigned int debug_mode, disableDebugOuput, disableConsoleOutput;
-
-       if ((debug_mode && !disableDebugOuput) || !disableConsoleOutput)
+       if ((debug_mode && !disable_debug_output) || !disableConsoleOutput)

                cnputc(c);
 
        debug_putc(c);
 
        if (!console_is_serial())
                cnputc(c);
 
        debug_putc(c);
 
        if (!console_is_serial())

-               if (!disableSerialOuput)
+               if (!disable_serial_output)

                        PE_kputc(c);
 }
 
                        PE_kputc(c);
 }
 

+

 void
 void

+consdebug_log(char c)
+{
+       debug_putc(c);
+}
+
+int

 kdb_printf(const char *fmt, ...)
 {
        va_list listp;
 kdb_printf(const char *fmt, ...)
 {
        va_list listp;


@@ -798,28 +811,48 @@ kdb_printf(const char *fmt, ...)
        va_start(listp, fmt);
        _doprnt(fmt, &listp, consdebug_putc, 16);
        va_end(listp);
        va_start(listp, fmt);
        _doprnt(fmt, &listp, consdebug_putc, 16);
        va_end(listp);

+       return 0;

 }
 
 }
 

-static char *copybyte_str;
+int
+kdb_log(const char *fmt, ...)
+{
+       va_list listp;
+
+       va_start(listp, fmt);
+       _doprnt(fmt, &listp, consdebug_log, 16);
+       va_end(listp);
+       return 0;
+}

 
 static void
 
 static void

-copybyte(
-        char byte)
+copybyte(int c, void *arg)

 {
 {

-  *copybyte_str++ = byte;
-  *copybyte_str = '\0';
+       /*
+        * arg is a pointer (outside pointer) to the pointer
+        * (inside pointer) which points to the character.
+        * We pass a double pointer, so that we can increment
+        * the inside pointer.
+        */
+       char** p = arg; /* cast outside pointer */
+       **p = c;        /* store character */
+       (*p)++;         /* increment inside pointer */

 }
 
 }
 

+/*
+ * Deprecation Warning:
+ *     sprintf() is being deprecated. Please use snprintf() instead.
+ */

 int
 sprintf(char *buf, const char *fmt, ...)
 {
         va_list listp;
 int
 sprintf(char *buf, const char *fmt, ...)
 {
         va_list listp;

+       char *copybyte_str;

 
         va_start(listp, fmt);
 
         va_start(listp, fmt);

-       mutex_lock(&sprintf_lock);

         copybyte_str = buf;
         copybyte_str = buf;

-        _doprnt(fmt, &listp, copybyte, 16);
-       mutex_unlock(&sprintf_lock);
+        __doprnt(fmt, &listp, copybyte, &copybyte_str, 16);

         va_end(listp);
         va_end(listp);

+       *copybyte_str = '\0';

         return strlen(buf);
 }
         return strlen(buf);
 }