[BACK]Return to stdio.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / parse

Diff for /OpenXM_contrib2/asir2000/parse/stdio.c between version 1.2 and 1.6

version 1.2, 2000/08/21 08:31:47 version 1.6, 2001/10/09 01:36:25
Line 23 
Line 23 
  * shall be made on your publication or presentation in any form of the   * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.   * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by   * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
  * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification   * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the   * for such modification or the source code of the modified part of the
  * SOFTWARE.   * SOFTWARE.
  *   *
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/parse/stdio.c,v 1.1.1.1 1999/12/03 07:39:12 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/parse/stdio.c,v 1.5 2001/10/05 10:23:07 noro Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
Line 64  static int noflush;
Line 64  static int noflush;
   
 #define INBUF_EMPTY (W_BUF.inpos >= W_BUF.inlen)  #define INBUF_EMPTY (W_BUF.inpos >= W_BUF.inlen)
   
   void w_purge_stdin(void)
   {
     W_BUF.inpos = 0;
     W_BUF.inlen = 0;
   }
   
 int w_filbuf(void)  int w_filbuf(void)
 {  {
   int status = get_line(W_BUF.inbuf);    int status = get_line(W_BUF.inbuf);
Line 135  int unget_char(int c)
Line 141  int unget_char(int c)
   return c;    return c;
 }  }
   
 int put_char(int c,FILE *file)  int win_put_string(char *s,FILE *file);
   
   int win_put_char(int c,FILE *file)
 {  {
   static char s[2];    static char s[2];
   
   s[0] = (char)c;    s[0] = (char)c;
   put_string(s,file);    win_put_string(s,file);
   return c;    return c;
 }  }
   
 int put_string(char *s,FILE *file)  int win_put_string(char *s,FILE *file)
 {  {
   char c;    char c;
   
Line 186  int w_ungetc(int c, FILE *file)
Line 194  int w_ungetc(int c, FILE *file)
 int w_fputc(int c, FILE *file)  int w_fputc(int c, FILE *file)
 {  {
   if ( file == stdout || file == stderr )    if ( file == stdout || file == stderr )
     return put_char(c,file);      return win_put_char(c,file);
   else    else
     return fputc(c,file);      return fputc(c,file);
 }  }
   
 int w_fputs(char *s, FILE *file)  int w_fputs(char *s, FILE *file)
 {  {
   int status;  
   
   if ( file == stdout || file == stderr )    if ( file == stdout || file == stderr )
     return put_string(s,file);      return win_put_string(s,file);
   else    else
     return fputs(s,file);      return fputs(s,file);
 }  }
Line 209  int w_printf(char *format, ...)
Line 215  int w_printf(char *format, ...)
   
   va_start(ap,format);    va_start(ap,format);
   status = vsprintf(buf,format,ap);    status = vsprintf(buf,format,ap);
   put_string(buf,stdout);    win_put_string(buf,stdout);
   return status;    return status;
 }  }
   
Line 222  int w_fprintf(FILE *file, char *format, ...)
Line 228  int w_fprintf(FILE *file, char *format, ...)
   va_start(ap,format);    va_start(ap,format);
   if ( file == stdout || file == stderr ) {    if ( file == stdout || file == stderr ) {
     status = vsprintf(buf,format,ap);      status = vsprintf(buf,format,ap);
     put_string(buf,file);      win_put_string(buf,file);
   } else {    } else {
     status = vfprintf(file,format,ap);      status = vfprintf(file,format,ap);
   }    }
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.6
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>