update for HEAD-2003021201

[reactos.git] / lib / crtdll / stdio / flsbuf.c

diff --git a/lib/crtdll/stdio/flsbuf.c b/lib/crtdll/stdio/flsbuf.c
index 2a0feb6..cf2395b 100644 (file)
--- a/lib/crtdll/stdio/flsbuf.c
+++ b/lib/crtdll/stdio/flsbuf.c
@@ -1,88 +1,75 @@
 /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */
 /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
 
-#include <crtdll/stdio.h>
-#include <crtdll/wchar.h>
-#include <crtdll/sys/types.h>
-#include <crtdll/stdlib.h>
-#include <crtdll/internal/file.h>
-#include <crtdll/io.h>
-#include <crtdll/errno.h>
+#include <msvcrt/stdio.h>
+#include <msvcrt/wchar.h>
+#include <msvcrt/sys/types.h>
+#include <msvcrt/stdlib.h>
+#include <msvcrt/internal/file.h>
+#include <msvcrt/io.h>
+#include <msvcrt/errno.h>
+
 
 int cntcr(char *bufp, int bufsiz);
 int convert(char *endp, int bufsiz,int n);
 int _writecnv(int fn, void *buf, size_t bufsiz);
 
-int
-_flsbuf(int c, FILE *f)
+
+int _flsbuf(int c, FILE *f)
 {
   char *base;
   int n, rn;
   char c1;
   int size;
 
-
-
   if (!OPEN4WRITING(f)) {
        __set_errno (EINVAL);
        return EOF;
   }
 
-// no file associated with buffer
-// this is a memory stream
-
-  if ( fileno(f) == -1 )
+  // no file associated with buffer, this is a memory stream
+  if (fileno(f) == -1) {
        return c;
+  }
 
   /* if the buffer is not yet allocated, allocate it */
-  if ((base = f->_base) == NULL && (f->_flag & _IONBF) == 0)
-  {
+  if ((base = f->_base) == NULL && (f->_flag & _IONBF) == 0) {
     size = 4096;
-    if ((f->_base = base = malloc (size)) == NULL)
-    {
+    if ((f->_base = base = malloc (size)) == NULL) {
       f->_flag |= _IONBF;
       f->_flag &= ~(_IOFBF|_IOLBF);
-    }
-    else
-    {
+    } else {
       f->_flag |= _IOMYBUF;
       f->_cnt = f->_bufsiz = size;
       f->_ptr = base;
       rn = 0;
-      if (f == stdout && isatty (fileno (stdout)))
-       f->_flag |= _IOLBF;
+      if (f == stdout && isatty (fileno (stdout))) {
+           f->_flag |= _IOLBF;
+      }
     }
   }
 
-  if (f->_flag & _IOLBF)
-  {
+  if (f->_flag & _IOLBF) {
     /* in line-buffering mode we get here on each character */
     *f->_ptr++ = c;
     rn = f->_ptr - base;
-    if (c == '\n' || rn >= f->_bufsiz)
-    {
+    if (c == '\n' || rn >= f->_bufsiz) {
       /* time for real flush */
       f->_ptr = base;
       f->_cnt = 0;
-    }
-    else
-    {
+    } else {
       /* we got here because _cnt is wrong, so fix it */
-      /* Negative _cnt causes all output functions
-       to call _flsbuf for each character, thus realizing line-buffering */
+      /* Negative _cnt causes all output functions to call */
+      /*  _flsbuf for each character, thus realizing line-buffering */
       f->_cnt = -rn;
       return c;
     }
-  }
-  else if (f->_flag & _IONBF)
-  {                   
+  } else if (f->_flag & _IONBF) {                   
     c1 = c;           
     rn = 1;           
     base = &c1;       
-    f->_cnt = 0;      
-  }                   
-  else /* _IOFBF */
-  {
+    f->_cnt = 0;
+  } else { /* _IOFBF */
     rn = f->_ptr - base;
     f->_ptr = base;
     if ( (f->_flag & _IOAHEAD) == _IOAHEAD )
@@ -90,25 +77,17 @@ _flsbuf(int c, FILE *f)
     f->_cnt = f->_bufsiz;
     f->_flag &= ~_IOAHEAD;
   }
-
- 
-
   f->_flag &= ~_IODIRTY;
-  while (rn > 0)
-  {
+  while (rn > 0) {
     n = _write(fileno(f), base, rn);
-    if (n <= 0)
-    {
+    if (n <= 0) {
       f->_flag |= _IOERR;
       return EOF;
     }
     rn -= n;
     base += n;
   }
-
-  
-  if ((f->_flag&(_IOLBF|_IONBF)) == 0)
-  {
+  if ((f->_flag&(_IOLBF|_IONBF)) == 0) {
     f->_cnt--;
     *f->_ptr++ = c;
   }
@@ -117,37 +96,33 @@ _flsbuf(int c, FILE *f)
 
 wint_t  _flswbuf(wchar_t c,FILE *fp)
 {
-       return (wint_t )_flsbuf((int)c,fp);
-}
+    int result;
 
+    result = _flsbuf((int)c, fp);
+    if (result == EOF)
+        return WEOF;
+       return (wint_t)result;
+}
 
 int _writecnv(int fn, void *buf, size_t siz)
 {
        char *bufp = (char *)buf;
        int bufsiz = siz;
-
-        char *tmp;
+    char *tmp;
        int cr1 = 0;
        int cr2 = 0;
-
        int n;
-               
 
        cr1 = cntcr(bufp,bufsiz);
-
        tmp = malloc(cr1);
        memcpy(tmp,bufp+bufsiz-cr1,cr1);
        cr2 = cntcr(tmp,cr1);
-               
        convert(bufp,bufsiz-cr2,cr1-cr2);
        n = _write(fn, bufp, bufsiz + cr1);
-
        convert(tmp,cr1,cr2);
        n += _write(fn, tmp, cr1 + cr2);
        free(tmp);
        return n;       
-       
-
 }
 
 int convert(char *endp, int bufsiz,int n)
@@ -165,15 +140,17 @@ int convert(char *endp, int bufsiz,int n)
        }
        return n;
 }
+
 int cntcr(char *bufp, int bufsiz)
 {
        int cr = 0; 
+
        while (bufsiz > 0) {
-               if (*bufp == '\n') 
+        if (*bufp == '\n') {
                        cr++;
+        }
                bufp++;
                bufsiz--;
        }
-
        return cr;
 }