use fgets in iodiscipline instead of fread.

diff --git a/lib/graph/attribs.c b/lib/graph/attribs.c
index d735f6b0e8b6fed1fa065b2d3d7beec39ae57341..786fda9bb5dc5b6a26f2835f1ca3aa52c790aac8 100644 (file)
--- a/lib/graph/attribs.c
+++ b/lib/graph/attribs.c
@@ -340,6 +340,7 @@ void aginitlib(int gs, int ns, int es)
        AG.node_nbytes = ns;
        AG.edge_nbytes = es;
        AG.init_called = TRUE;
+       AG.fgets = fgets;   /* init to system version of fwrite() */
        AG.fwrite = fwrite;   /* init to system version of fwrite() */
 #if defined(__SUNPRO_C) || defined(__CYGWIN__)
 #undef ferror

diff --git a/lib/graph/graph.h b/lib/graph/graph.h
index 1a15a87bef4223891a4574de1634797cac2563bb..0b5ab28fe103e7f477f202f029a73f2c612ab0d1 100644 (file)
--- a/lib/graph/graph.h
+++ b/lib/graph/graph.h
@@ -164,7 +164,7 @@ extern "C" {
     extern void agsetfile(char *);
     extern Agraph_t *agmemread(char *);
     extern void agsetiodisc(
-        size_t (*myfread) (void *ptr, size_t size, size_t nmemb, FILE *stream),
+        char * (*myfgets) (char *s, int size, FILE *stream),
        size_t (*myfwrite) (const void *ptr, size_t size, size_t nmemb, FILE *stream),
        int (*myferror) (FILE *stream) );
     extern void agfprintf(FILE *fp, const char *format, ...);

diff --git a/lib/graph/graphio.c b/lib/graph/graphio.c
index 798827614d9da83caecc006e8eb8bf00129d1bc9..bc0116fa88238f7c7a48df0423ae5053542cd8e2 100644 (file)
--- a/lib/graph/graphio.c
+++ b/lib/graph/graphio.c
@@ -178,12 +178,12 @@ char *agstrcanon(char *arg, char *buf)
 }
 
 void agsetiodisc(
-    size_t (*myfread) (void *ptr, size_t size, size_t nmemb, FILE *stream),
+    char * (*myfgets) (char *s, int size, FILE *stream),
     size_t (*myfwrite) (const void *ptr, size_t size, size_t nmemb, FILE *stream),
     int (*myferror) (FILE *stream)
 )
 {
-    if (myfread) AG.fread = myfread;
+    if (myfgets) AG.fgets = myfgets;
     if (myfwrite) AG.fwrite = myfwrite;
 #if defined(__SUNPRO_C) || defined(__CYGWIN__)
 #undef ferror

diff --git a/lib/graph/libgraph.h b/lib/graph/libgraph.h
index c54225e3380af74b46e1c9159faee932723cdc66..77d810aa10065b577025122d986d89e60ba5281a 100644 (file)
--- a/lib/graph/libgraph.h
+++ b/lib/graph/libgraph.h
@@ -129,7 +129,7 @@ extern "C" {
        char *linebuf;
        short syntax_errors;
        unsigned char accepting_state, init_called;
-       size_t (*fread) (void *ptr, size_t size, size_t nmemb, FILE *stream);
+       char * (*fgets) (char *s, int size, FILE *stream);
        size_t (*fwrite) (const void *ptr, size_t size, size_t nmemb, FILE *stream);
        int (*ferror) (FILE *stream);
     } AG;