From 806b8a2f36ea20560f136f246d21824e62073b84 Mon Sep 17 00:00:00 2001 From: John Ellson Date: Sun, 4 Dec 2016 14:29:23 -0500 Subject: [PATCH] improve fix for #1175 --- cmd/dot/dot.c | 3 +-- lib/gvc/gvevent.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c index 5a738466c..0bb88103e 100644 --- a/cmd/dot/dot.c +++ b/cmd/dot/dot.c @@ -188,13 +188,12 @@ int main(int argc, char **argv) } gvLayoutJobs(Gvc, G); /* take layout engine from command line */ gvRenderJobs(Gvc, G); + gvFinalize(Gvc); r = agreseterrors(); rc = MAX(rc,r); prev = G; } } - gvFinalize(Gvc); - r = gvFreeContext(Gvc); return (MAX(rc,r)); } diff --git a/lib/gvc/gvevent.c b/lib/gvc/gvevent.c index b116fcfa0..d4a000f1f 100644 --- a/lib/gvc/gvevent.c +++ b/lib/gvc/gvevent.c @@ -576,8 +576,7 @@ static void gvevent_read (GVJ_t * job, const char *filename, const char *layout) gvc = job->gvc; if (!filename) { - g = agopen("G", Agdirected, NIL(Agdisc_t *)); - job->output_filename = "new.gv"; + g = agread(stdin,NIL(Agdisc_t *)); // continue processing stdin } else { f = fopen(filename, "r"); @@ -586,6 +585,7 @@ static void gvevent_read (GVJ_t * job, const char *filename, const char *layout) g = agread(f,NIL(Agdisc_t *)); fclose(f); } + if (!g) return; /* FIXME - need some error handling */ -- 2.40.0