* src/bar.c (marked_message): print NULL if msg is null in debug output

* src/actions.c (cmd_getenv): return an empty string for
nonexistant env vars.
(command): print NULL if rest is null in debug output

3 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 71385de..588c9bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2006-04-29  Shawn Betts  <sabetts@vcn.bc.ca>
 
+	* src/bar.c (marked_message): print NULL if msg is null in debug output
+
 	* src/actions.c (cmd_getenv): return an empty string for
 	nonexistant env vars.
+	(command): print NULL if rest is null in debug output
 
 2006-04-21  Shawn Betts  <sabetts@vcn.bc.ca>
 
diff --git a/src/actions.c b/src/actions.c
index 216432c..332f5b8 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -2324,7 +2324,7 @@ command (int interactive, char *data)
 
   rest = strtok (NULL, "\0");
 
-  PRINT_DEBUG (("cmd==%s rest==%s\n", cmd, rest));
+  PRINT_DEBUG (("cmd==%s rest==%s\n", cmd, rest?rest:"NULL"));
 
   /* Look for it in the aliases, first. */
   for (i=0; i<alias_list_last; i++)
diff --git a/src/bar.c b/src/bar.c
index c54c627..a44ef5c 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -495,7 +495,7 @@ marked_message (char *msg, int mark_start, int mark_end)
   int width;
   int height;
 
-  PRINT_DEBUG (("msg = %s\n", msg));
+  PRINT_DEBUG (("msg = %s\n", msg?msg:"NULL"));
   PRINT_DEBUG (("mark_start = %d, mark_end = %d\n", mark_start, mark_end));
 
   /* Schedule the bar to be hidden after some amount of time. */