Changes to make upstart log performance stats to a file.

nih/string.c

 /* libnih
  *
  * string.c - useful string utility functions
  *
  * Copyright © 2009 Scott James Remnant <scott@netsplit.com>.
  * Copyright © 2009 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2, as
  * published by the Free Software Foundation.
@@ skipping 387 matching lines @@
 
         len = 0;
         array = nih_str_array_new (parent);
         if (! array)
                 return NULL;
 
         while (*str) {
                 const char  *ptr;
 
                 /* Skip initial delimiters */
-                while (repeat && strchr (delim, *str))
+                while (repeat && *str && strchr (delim, *str))
                         str++;
 
+                if (! *str)
+                        break;
+
                 /* Find the end of the token */
                 ptr = str;
                 while (*str && (! strchr (delim, *str)))
                         str++;
 
                 if (! nih_str_array_addn (&array, parent, &len,
                                           ptr, str - ptr)) {
                         nih_free (array);
                         return NULL;
                 }
@@ skipping 526 matching lines @@
                      size_t      indent)
 {
         size_t len;
 
         nih_assert (str != NULL);
 
         len = nih_str_screen_width () - 1;
 
         return nih_str_wrap (parent, str, len, first_indent, indent);
 }