[brlcad-commits] SF.net SVN: brlcad:[43918] brlcad/branches/cmake/src

[<sta...@us...>]

Revision: 43918
          http://brlcad.svn.sourceforge.net/brlcad/?rev=43918&view=rev
Author:   starseeker
Date:     2011-03-22 17:52:35 +0000 (Tue, 22 Mar 2011)

Log Message:
-----------
MFC r43917

Modified Paths:
--------------
    brlcad/branches/cmake/src/libbu/booleanize.c
    brlcad/branches/cmake/src/libged/red.c

Modified: brlcad/branches/cmake/src/libbu/booleanize.c
===================================================================
--- brlcad/branches/cmake/src/libbu/booleanize.c	2011-03-22 17:50:30 UTC (rev 43917)
+++ brlcad/branches/cmake/src/libbu/booleanize.c	2011-03-22 17:52:35 UTC (rev 43918)
@@ -72,6 +72,12 @@
 	return 0;
     }
 
+    /* exactly "(null)" */
+    if (BU_STR_EQUAL(newstr, "(null)")) {
+	bu_vls_free(&vls);
+	return 0;
+    }
+
     /* true value from here on out */
 
     /* starts with 'y', [yY]* looks like 'yes' */

Modified: brlcad/branches/cmake/src/libged/red.c
===================================================================
--- brlcad/branches/cmake/src/libged/red.c	2011-03-22 17:50:30 UTC (rev 43917)
+++ brlcad/branches/cmake/src/libged/red.c	2011-03-22 17:52:35 UTC (rev 43918)
@@ -238,7 +238,7 @@
 
     /* Set up the regular expressions */
     regcomp(&whitespace_regex, "([^[:space:]])", REG_EXTENDED);
-    regcomp(&attr_regex, "(.+[[:space:]]+=[[:space:]]+.*)", REG_EXTENDED|REG_NEWLINE);
+    regcomp(&attr_regex, "(.+[[:space:]]+=[[:blank:]]+.*)", REG_EXTENDED|REG_NEWLINE);
     bu_vls_sprintf(&current_substring, "(%s)", combtree_header);
     regcomp(&combtree_regex, bu_vls_addr(&current_substring), REG_EXTENDED);
     regcomp(&combtree_op_regex, "([[:space:]]+[[.-.][.+.]u][[:space:]]+)", REG_EXTENDED);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.