luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected problem in which using "ext2spice -d" (distributed 

junctions) causes magic to crash.
This commit is contained in:
Tim Edwards 2019-10-14 13:49:41 -04:00
parent 1933c5d4a5
commit 58c4c8a32e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext2spice/ext2spice.c
View File

@ -2714,7 +2714,9 @@ FILE *outf;
if ((nodeClient *)nn->efnn_node->efnode_client == (ClientData)NULL) if ((nodeClient *)nn->efnn_node->efnode_client == (ClientData)NULL)
initNodeClientHier(nn->efnn_node); initNodeClientHier(nn->efnn_node);
((nodeClient *)nn->efnn_node->efnode_client)->m_w.visitMask |= DEV_CONNECT_MASK; if (!esDistrJunct)
((nodeClient *)nn->efnn_node->efnode_client)->m_w.visitMask |=
DEV_CONNECT_MASK;
return nn->efnn_node; return nn->efnn_node;
} }
} }
@ -2919,8 +2921,11 @@ spcdevOutNode(prefix, suffix, name, outf)
nn = (EFNodeName *) HashGetValue(he); nn = (EFNodeName *) HashGetValue(he);
nname = nodeSpiceName(nn->efnn_node->efnode_name->efnn_hier); nname = nodeSpiceName(nn->efnn_node->efnode_name->efnn_hier);
fprintf(outf, " %s", nname); fprintf(outf, " %s", nname);
/* Mark node as visited */ /* Mark node as visited */
((nodeClient *)nn->efnn_node->efnode_client)->m_w.visitMask |= DEV_CONNECT_MASK; if (!esDistrJunct)
((nodeClient *)nn->efnn_node->efnode_client)->m_w.visitMask |= DEV_CONNECT_MASK;
return (1 + strlen(nname)); return (1 + strlen(nname));
} }