gEDA-cvs: pcb.git: branch: master updated (07d0e2691bc9dbbf5eb743468cce5ab82f28f32a)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  07d0e2691bc9dbbf5eb743468cce5ab82f28f32a (commit)
      from  31df66e87a810aac852139da9119b15c47fa8c71 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/file.c |    3 ++-
 src/main.c |   11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)


=================
 Commit Messages
=================

commit 07d0e2691bc9dbbf5eb743468cce5ab82f28f32a
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Don't adjust the Library command settings if they are NULL, or
    an empty string.
    
    (The empty string part is a fixup for
    commit 31df66e87a810aac852139da9119b15c47fa8c71
     - this will teach me for bikeshedding)
    
    The NULL part should fix bug lp-852598
    
    Closes-bug: lp-852598

:100644 100644 8888432... c22f5c5... M	src/file.c
:100644 100644 ddd5675... d5a8487... M	src/main.c

=========
 Changes
=========

commit 07d0e2691bc9dbbf5eb743468cce5ab82f28f32a
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Don't adjust the Library command settings if they are NULL, or
    an empty string.
    
    (The empty string part is a fixup for
    commit 31df66e87a810aac852139da9119b15c47fa8c71
     - this will teach me for bikeshedding)
    
    The NULL part should fix bug lp-852598
    
    Closes-bug: lp-852598

diff --git a/src/file.c b/src/file.c
index 8888432..c22f5c5 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1417,7 +1417,8 @@ ReadLibraryContents (void)
    * skip this. This is used by default on Windows builds (set in main.c),
    * as we can't normally run shell scripts or expect to have m4 present.
    */
-  if (*Settings.LibraryContentsCommand != '\0')
+  if (Settings.LibraryContentsCommand != NULL &&
+      Settings.LibraryContentsCommand[0] != '\0')
     {
       /*  First load the M4 stuff.  The variable Settings.LibraryPath
        *  points to it.
diff --git a/src/main.c b/src/main.c
index ddd5675..d5a8487 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1442,7 +1442,10 @@ REGISTER_ATTRIBUTES (main_attribute_list)
 {
   char *tmps;
 
-  if (Settings.LibraryCommand[0] != PCB_DIR_SEPARATOR_C && Settings.LibraryCommand[0] != '.')
+  if (Settings.LibraryCommand != NULL &&
+      Settings.LibraryCommand[0] != '\0' &&
+      Settings.LibraryCommand[0] != PCB_DIR_SEPARATOR_C &&
+      Settings.LibraryCommand[0] != '.')
     {
       Settings.LibraryCommand
 	=
@@ -1450,8 +1453,10 @@ REGISTER_ATTRIBUTES (main_attribute_list)
 		Settings.LibraryCommand,
 		NULL);
     }
-  if (Settings.LibraryContentsCommand[0] != PCB_DIR_SEPARATOR_C
-      && Settings.LibraryContentsCommand[0] != '.')
+  if (Settings.LibraryContentsCommand != NULL &&
+      Settings.LibraryContentsCommand[0] != '\0' &&
+      Settings.LibraryContentsCommand[0] != PCB_DIR_SEPARATOR_C &&
+      Settings.LibraryContentsCommand[0] != '.')
     {
       Settings.LibraryContentsCommand
 	=




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs