2006-06-15 Corinna Vinschen <corinna@vinschen.de>

        * libc/include/stdio.h (__sgetc_r): Fix typo.
        * libc/stdio/fread.c (_fread_r): Convert crlf calls to crlf_r.
        * libc/stdio/rget.c (__srbuf): Reinstantiate.
        * libc/stdio/wbuf.c (__swbuf): Ditto.

3 files changed, 24 insertions, 3 deletions

diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
index 8df577006..d87d9f966 100644
--- a/newlib/libc/stdio/fread.c
+++ b/newlib/libc/stdio/fread.c
@@ -196,7 +196,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
               if (fp->_flags & __SCLE)
 	        {
 	          _funlockfile (fp);
-	          return crlf (fp, buf, total-resid, 1) / size;
+	          return crlf_r (ptr, fp, buf, total-resid, 1) / size;
 	        }
 #endif
 	      _funlockfile (fp);
@@ -221,7 +221,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
 	      if (fp->_flags & __SCLE)
 		{
 		  _funlockfile (fp);
-		  return crlf (fp, buf, total-resid, 1) / size;
+		  return crlf_r (ptr, fp, buf, total-resid, 1) / size;
 		}
 #endif
 	      _funlockfile (fp);
@@ -238,7 +238,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
   if (fp->_flags & __SCLE)
     {
       _funlockfile (fp);
-      return crlf(fp, buf, total, 0) / size;
+      return crlf_r(ptr, fp, buf, total, 0) / size;
     }
 #endif
   _funlockfile (fp);
diff --git a/newlib/libc/stdio/rget.c b/newlib/libc/stdio/rget.c
index 1c0bc474c..0444acee3 100644
--- a/newlib/libc/stdio/rget.c
+++ b/newlib/libc/stdio/rget.c
@@ -43,3 +43,13 @@ _DEFUN(__srget_r, (ptr, fp),
     }
   return EOF;
 }
+
+/* This function isn't any longer declared in stdio.h, but it's
+   required for backward compatibility with applications built against
+   earlier dynamically built newlib libraries. */
+int
+_DEFUN(__srget, (fp),
+       register FILE *fp)
+{
+  return __srget_r (_REENT, fp);
+}
diff --git a/newlib/libc/stdio/wbuf.c b/newlib/libc/stdio/wbuf.c
index 95d0e4d71..0d2b72ea1 100644
--- a/newlib/libc/stdio/wbuf.c
+++ b/newlib/libc/stdio/wbuf.c
@@ -85,3 +85,14 @@ _DEFUN(__swbuf_r, (ptr, c, fp),
       return EOF;
   return c;
 }
+
+/* This function isn't any longer declared in stdio.h, but it's
+   required for backward compatibility with applications built against
+   earlier dynamically built newlib libraries. */
+int
+_DEFUN(__swbuf, (c, fp),
+       register int c _AND
+       register FILE *fp)
+{
+  return __swbuf_r (_REENT, c, fp);
+}