d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recursively calculate includes. This solves the problem of some includes

Browse Source 
missing from the graph, but it also unfortunately forces yet another bug
in graphviz dot(1) to appear. When edge labels are enabled (using '\T')
with this many edges, dot(1) will do bad things in init_rank() and often
crash. So while we're here, let's disable edge labels for the include-
relationship graph feature.
This commit is contained in:
Devin Teske 2013-05-07 04:46:08 +00:00
parent 7de72ac1f8
commit 8f1dd43b55
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
usr.sbin/bsdconfig/dot/dot
View File

@ -276,20 +276,26 @@ if [ "$SHOW_INCLUDES" ]; then
#
# Search previously-discovered include files for further includes
#
for file in $include_file_list; do
include_file_list="$include_file_list $(
awk "$print_includes_awk" $BSDCFG_SHARE/$file
)"
done
before="$include_file_list"
while :; do
for file in $include_file_list; do
include_file_list="$include_file_list $(
awk "$print_includes_awk" $BSDCFG_SHARE/$file
)"
done
#
# Sort the list of includes and remove duplicate entries [again]
#
include_file_list=$(
for include_file in $include_file_list; do
echo "$include_file"
done | sort -u
)
#
# Sort list of includes and remove duplicate entries [again]
#
include_file_list=$(
for include_file in $include_file_list; do
echo "$include_file"
done | sort -u
)
[ "$include_file_list" = "$before" ] && break
before="$include_file_list"
done
fi
#
@ -435,7 +441,8 @@ if [ "$SHOW_INCLUDES" ]; then
shape=oval color=black fillcolor=white style=filled edge_color=grey
begin_nodelist "$shape" "$color" "$fillcolor" "$style"
print_node edge "style = dashed" "color = $edge_color"
print_node edge "label = \"\\T\"" "fontsize = 9"
#print_node edge "label = \"\\T\"" "fontsize = 9"
# NOTE: Edge labels are buggy on large graphs
file_list=$(
for file in \
$BSDCONFIG \