hurd/

2008-01-23  Neal H. Walfield  <neal@gnu.org>

	* stddef.h (S_PRINTF): New macro.
	(debug): Use S_PRINTF rather than printf.
	* Makefile.am (t_addr_CPPFLAGS): Add -DS_PRINTF=printf.
	(t_addr_trans_CPPFLAGS): Likewise.
	(t_rpc_CPPFLAGS): Likewise.

libc-parts/

2008-01-24  Neal H. Walfield  <neal@gnu.org>

	* assert.h: Include <hurd/stddef.h>.
	(assertx): Use S_PRINTF rather than printf.

libhurd-btree/

2008-01-24  Neal H. Walfield  <neal@gnu.org>

	* Makefile.am (btree_test_CPPFLAGS): New variable.
	(btree_test_LDADD): Remove.
	(btree_test_SOURCES): Add btree.c.

	* btree.c (node_t): Include <stdio.h>.

libhurd-ihash/

2008-01-24  Neal H. Walfield  <neal@gnu.org>

	* Makefile.am (t_ihash_SOURCES): Add ihash.c.
	(t_ihash_CPPFLAGS): New variable.
	* t-ihash.c: Include <stdio.h>.

libhurd-mm/

2008-01-24  Neal H. Walfield  <neal@gnu.org>

	* as.c (as_alloced_dump): Use s_printf rather than printf.
	(as_walk): Likewise.

laden/

2008-01-23  Neal H. Walfield  <neal@gnu.org>

	* Makefile.am (laden_CPPFLAGS): Add -DS_PRINTF=printf.

ruth/

2008-01-24  Neal H. Walfield  <neal@gnu.org>

	* output.h (putchar): Rename from this...
	(s_putchar): ... to this.
	(puts): Rename from this...
	(s_puts): ... to this.
	(vprintf): Rename from this...
	(s_vprintf): ... to this.
	(printf): Rename from this...
	(s_printf): ... to this.
	* output.c (putchar): Rename from this...
	(s_putchar): ... to this.  Update users.
	(puts): Rename from this...
	(s_puts): ... to this.  Update users.
	(vprintf): Rename from this...
	(s_vprintf): ... to this.  Update users.
	(printf): Rename from this...
	(s_printf): ... to this.
	* Makefile.am (ruth_SOURCES): Add object.h and object.c.
	* ia32-cmain.c: Include <stddef.h>.
	(cmain): Use s_printf rather than printf.
	* panic.c (panic_): Use s_printf and s_vprintf rather than printf
	and vprintf.

6 files changed, 65 insertions, 31 deletions

diff --git a/ruth/ChangeLog b/ruth/ChangeLog
index 262faaa..97fe9e1 100644
--- a/ruth/ChangeLog
+++ b/ruth/ChangeLog
@@ -1,3 +1,27 @@
+2008-01-24  Neal H. Walfield  <neal@gnu.org>
+
+	* output.h (putchar): Rename from this...
+	(s_putchar): ... to this.
+	(puts): Rename from this...
+	(s_puts): ... to this.
+	(vprintf): Rename from this...
+	(s_vprintf): ... to this.
+	(printf): Rename from this...
+	(s_printf): ... to this.
+	* output.c (putchar): Rename from this...
+	(s_putchar): ... to this.  Update users.
+	(puts): Rename from this...
+	(s_puts): ... to this.  Update users.
+	(vprintf): Rename from this...
+	(s_vprintf): ... to this.  Update users.
+	(printf): Rename from this...
+	(s_printf): ... to this.
+	* Makefile.am (ruth_SOURCES): Add object.h and object.c.
+	* ia32-cmain.c: Include <stddef.h>.
+	(cmain): Use s_printf rather than printf.
+	* panic.c (panic_): Use s_printf and s_vprintf rather than printf
+	and vprintf.
+
 2008-01-23  Neal H. Walfield  <neal@gnu.org>
 
 	* Makefile.am (COMMON_CPPFLAGS): Add -I$(LIBC)/include.
diff --git a/ruth/Makefile.am b/ruth/Makefile.am
index 7ac8387..db39ead 100644
--- a/ruth/Makefile.am
+++ b/ruth/Makefile.am
@@ -32,6 +32,7 @@ COMMON_CPPFLAGS = -Wall -g -std=gnu99 -D_GNU_SOURCE -I$(srcdir)		\
 ruth_CPPFLAGS = $(COMMON_CPPFLAGS)
 ruth_SOURCES = $(ARCH_SOURCES)			\
 	panic.h panic.c				\
+	output.c output.h			\
 	ruth.h ruth.c
 
 ruth_LDFLAGS = -u_start -e_start -nostdlib
diff --git a/ruth/ia32-cmain.c b/ruth/ia32-cmain.c
index 05e9480..4172c35 100644
--- a/ruth/ia32-cmain.c
+++ b/ruth/ia32-cmain.c
@@ -34,6 +34,7 @@
 
 #include <hurd/startup.h>
 #include <hurd/mm.h>
+#include <hurd/stddef.h>
 
 
 /* Initialized by the machine-specific startup-code.  */
@@ -112,7 +113,7 @@ cmain (void)
   l4_init ();
   l4_init_stubs ();
 
-  printf ("In cmain\n");
+  s_printf ("In cmain\n");
 
   mm_init (__hurd_startup_data->activity);
 
diff --git a/ruth/output.c b/ruth/output.c
index 9830512..6b5758d 100644
--- a/ruth/output.c
+++ b/ruth/output.c
@@ -45,7 +45,7 @@ shutdown (void)
 
 /* Print the single character CHR on the output device.  */
 int
-putchar (int chr)
+s_putchar (int chr)
 {
   rm_putchar (chr);
 
@@ -54,12 +54,12 @@ putchar (int chr)
 
 
 int
-puts (const char *str)
+s_puts (const char *str)
 {
   while (*str != '\0')
-    putchar (*(str++));
+    s_putchar (*(str++));
 
-  putchar ('\n');
+  s_putchar ('\n');
 
   return 0;
 }
@@ -81,7 +81,7 @@ print_nr (unsigned long long nr, int base)
 
   i--;
   while (i >= 0)
-    putchar (str[i--]);
+    s_putchar (str[i--]);
 }
   
 
@@ -92,7 +92,7 @@ print_signed_nr (long long nr, int base)
 
   if (nr < 0)
     {
-      putchar ('-');
+      s_putchar ('-');
       unr = -nr;
     }
   else
@@ -103,7 +103,7 @@ print_signed_nr (long long nr, int base)
   
 
 int
-vprintf (const char *fmt, va_list ap)
+s_vprintf (const char *fmt, va_list ap)
 {
   const char *p = fmt;
 
@@ -111,7 +111,7 @@ vprintf (const char *fmt, va_list ap)
     {
       if (*p != '%')
 	{
-	  putchar (*(p++));
+	  s_putchar (*(p++));
 	  continue;
 	}
 
@@ -119,7 +119,7 @@ vprintf (const char *fmt, va_list ap)
       switch (*p)
 	{
 	case '%':
-	  putchar ('%');
+	  s_putchar ('%');
 	  p++;
 	  break;
 
@@ -127,9 +127,9 @@ vprintf (const char *fmt, va_list ap)
 	  p++;
 	  if (*p != 'l')
 	    {
-	      putchar ('%');
-	      putchar ('l');
-	      putchar (*(p++));
+	      s_putchar ('%');
+	      s_putchar ('l');
+	      s_putchar (*(p++));
 	      continue;
 	    }
 	  p++;
@@ -158,10 +158,10 @@ vprintf (const char *fmt, va_list ap)
 	      break;
 
 	    default:
-	      putchar ('%');
-	      putchar ('l');
-	      putchar ('l');
-	      putchar (*(p++));
+	      s_putchar ('%');
+	      s_putchar ('l');
+	      s_putchar ('l');
+	      s_putchar (*(p++));
 	      break;
 	    }
 	  break;
@@ -189,15 +189,23 @@ vprintf (const char *fmt, va_list ap)
 	  break;
 
 	case 'c':
-	  putchar (va_arg (ap, int));
+	  s_putchar (va_arg (ap, int));
 	  p++;
 	  break;
 
 	case 's':
 	  {
 	    char *str = va_arg (ap, char *);
-	    while (*str)
-	      putchar (*(str++));
+	    if (str)
+	      while (*str)
+		s_putchar (*(str++));
+	    else
+	      {
+		s_putchar ('N');
+		s_putchar ('U');
+		s_putchar ('L');
+		s_putchar ('L');
+	      }
 	  }
 	  p++;
 	  break;
@@ -208,8 +216,8 @@ vprintf (const char *fmt, va_list ap)
 	  break;
 
 	default:
-	  putchar ('%');
-	  putchar (*p);
+	  s_putchar ('%');
+	  s_putchar (*p);
 	  p++;
 	  break;
 	}
@@ -219,12 +227,12 @@ vprintf (const char *fmt, va_list ap)
 }
 
 int
-printf (const char *fmt, ...)
+s_printf (const char *fmt, ...)
 {
   va_list ap;
 
   va_start (ap, fmt);
-  int r = vprintf (fmt, ap);
+  int r = s_vprintf (fmt, ap);
   va_end (ap);
   return r;
 }
diff --git a/ruth/output.h b/ruth/output.h
index 7813bef..7610f9f 100644
--- a/ruth/output.h
+++ b/ruth/output.h
@@ -24,12 +24,12 @@
 #include <stdarg.h>
 
 /* Print the single character CHR on the output device.  */
-int putchar (int chr);
+int s_putchar (int chr);
 
-int puts (const char *str);
+int s_puts (const char *str);
 
-int vprintf (const char *fmt, va_list ap);
+int s_vprintf (const char *fmt, va_list ap);
 
-int printf (const char *fmt, ...);
+int s_printf (const char *fmt, ...);
 
 #endif	/* _OUTPUT_H */
diff --git a/ruth/panic.c b/ruth/panic.c
index 7bde1ed..24baff6 100644
--- a/ruth/panic.c
+++ b/ruth/panic.c
@@ -31,9 +31,9 @@ panic_ (const char *func, int line, const char *fmt, ...)
 
   va_start (ap, fmt);
 
-  printf ("%s:%s:%d:%x: error: ", program_name, func, line, l4_myself ());
-  vprintf (fmt, ap);
-  putchar ('\n');
+  s_printf ("%s:%s:%d:%x: error: ", program_name, func, line, l4_myself ());
+  s_vprintf (fmt, ap);
+  s_printf ("\n");
   va_end (ap);
 
   for (;;);