X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=conout.c;h=0595f33f6fe23931417bc2d11839e78f82419f13;hb=18fad16a7d5bc7e981e2824c7a5ade68ce9a2064;hp=81cf48135433264abeffa2e659ab1d7915dc6f00;hpb=9edae7fa0a06516a94b411f5d6220bd25157cee7;p=xonotic%2Fgmqcc.git diff --git a/conout.c b/conout.c index 81cf481..0595f33 100644 --- a/conout.c +++ b/conout.c @@ -168,7 +168,7 @@ static int win_fputs(FILE *h, const char *str) { state = -1; } } else { - file_putc(h, *str); + fs_file_putc(h, *str); length ++; } str++; @@ -219,7 +219,7 @@ static int con_write(FILE *handle, const char *fmt, va_list va) { char data[4096]; memset(data, 0, sizeof(data)); vsnprintf(data, sizeof(data), fmt, va); - ln = (GMQCC_IS_DEFINE(handle)) ? win_fputs(handle, data) : file_puts(handle, data); + ln = (GMQCC_IS_DEFINE(handle)) ? win_fputs(handle, data) : fs_file_puts(handle, data); } #endif return ln; @@ -231,9 +231,9 @@ static int con_write(FILE *handle, const char *fmt, va_list va) { void con_close() { if (!GMQCC_IS_DEFINE(console.handle_err)) - file_close(console.handle_err); + fs_file_close(console.handle_err); if (!GMQCC_IS_DEFINE(console.handle_out)) - file_close(console.handle_out); + fs_file_close(console.handle_out); } void con_color(int state) { @@ -275,16 +275,12 @@ int con_change(const char *out, const char *err) { if (GMQCC_IS_DEFINE(out)) { console.handle_out = GMQCC_IS_STDOUT(out) ? stdout : stderr; con_enablecolor(); - } else if (!(console.handle_out = file_open(out, "w"))) return 0; + } else if (!(console.handle_out = fs_file_open(out, "w"))) return 0; if (GMQCC_IS_DEFINE(err)) { console.handle_err = GMQCC_IS_STDOUT(err) ? stdout : stderr; con_enablecolor(); - } else if (!(console.handle_err = file_open(err, "w"))) return 0; - - /* no buffering */ - setvbuf(console.handle_out, NULL, _IONBF, 0); - setvbuf(console.handle_err, NULL, _IONBF, 0); + } else if (!(console.handle_err = fs_file_open(err, "w"))) return 0; return 1; }