--- cvsroot/microscheme/scheme.c	2015/12/01 01:56:22	1.52
+++ cvsroot/microscheme/scheme.c	2015/12/01 02:21:49	1.53
@@ -105,7 +105,7 @@
   char *p = s;
 
   do {
-    *p++ = '0' + n % base;
+    *p++ = "0123456789abcdef"[n % base];
     n /= base;
   } while (n);
 
@@ -125,18 +125,12 @@
 }
 
 static void
-xwrstr (const char *s)
-{
-  write (1, s, strlen (s));
-}
-
-static void
-xwrnum (long n)
+putnum (SCHEME_P_ long n)
 {
   char buf[64];
 
   xnum (buf, n);
-  xwrstr (buf);
+  putstr (SCHEME_A_ buf);
 }
 
 static char
@@ -1060,10 +1054,10 @@
 {
   /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
   if (typeflag (p) & !expect_alloced)
-    xwrstr ("Cell is already allocated!\n");
+    putstr (SCHEME_A_ "Cell is already allocated!\n");
 
   if (!(typeflag (p)) & expect_alloced)
-    xwrstr ("Cell is not allocated!\n");
+    putstr (SCHEME_A_ "Cell is not allocated!\n");
 }
 
 static void
@@ -1676,7 +1670,7 @@
   SCHEME_V->free_cell = NIL;
 
   if (SCHEME_V->gc_verbose)
-    xwrstr ("freeing...");
+    putstr (SCHEME_A_ "freeing...");
 
   uint32_t total = 0;
 
@@ -1712,7 +1706,7 @@
 
   if (SCHEME_V->gc_verbose)
     {
-      xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
+      putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
     }
 }
 
@@ -2095,7 +2089,7 @@
         *pt->rep.string.curr++ = *s;
 
 #else
-  xwrstr (s);
+  write (pt->rep.stdio.file, s, strlen (s));
 #endif
 }
 
@@ -3345,7 +3339,7 @@
       case OP_LOAD:            /* load */
         if (file_interactive (SCHEME_A))
           {
-            xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
+            putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
             //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
           }
 
@@ -5548,7 +5542,7 @@
 
       if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
         {
-          xwrstr ("No memory!\n");
+          putstr (SCHEME_A_ "No memory!\n");
           return;
         }
     }
@@ -6042,19 +6036,19 @@
 
   if (argc == 2 && strcmp (argv[1], "-?") == 0)
     {
-      xwrstr ("Usage: tinyscheme -?\n");
-      xwrstr ("or:    tinyscheme [<file1> <file2> ...]\n");
-      xwrstr ("followed by\n");
-      xwrstr ("          -1 <file> [<arg1> <arg2> ...]\n");
-      xwrstr ("          -c <Scheme commands> [<arg1> <arg2> ...]\n");
-      xwrstr ("assuming that the executable is named tinyscheme.\n");
-      xwrstr ("Use - as filename for stdin.\n");
+      putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
+      putstr (SCHEME_A_ "or:    tinyscheme [<file1> <file2> ...]\n");
+      putstr (SCHEME_A_ "followed by\n");
+      putstr (SCHEME_A_ "          -1 <file> [<arg1> <arg2> ...]\n");
+      putstr (SCHEME_A_ "          -c <Scheme commands> [<arg1> <arg2> ...]\n");
+      putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
+      putstr (SCHEME_A_ "Use - as filename for stdin.\n");
       return 1;
     }
 
   if (!scheme_init (SCHEME_A))
     {
-      xwrstr ("Could not initialize!\n");
+      putstr (SCHEME_A_ "Could not initialize!\n");
       return 2;
     }
 
@@ -6109,7 +6103,7 @@
 
       if (isfile && fin < 0)
         {
-          xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n");
+          putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
         }
       else
         {
@@ -6123,7 +6117,7 @@
             {
               if (SCHEME_V->retcode != 0)
                 {
-                  xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n");
+                  putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
                 }
 
               if (isfile)