win32: change fputs to fwrite wrapper

Removes mp_puts/mp_fputs and adds mp_fwrite. In fact I wanted fwrite instead of puts, no need to make it more awkward with the implicit new lines.

Kacper Michajłow committed 2 years ago

Commit c389f9e1 parent 6177aa76 files · +25 −18Browse files

Unified · Split

6 files

     return wstream;
 }
-int mp_fputs(const char *str, FILE *stream)
+size_t mp_fwrite(const void *restrict buffer, size_t size, size_t count,
+                 FILE *restrict stream)
 {
-    HANDLE wstream = get_handle(stream);
+    if (!size || !count)
-    if (mp_check_console(wstream))
+        return 0;
-        return mp_console_fputs(wstream, bstr0(str));
-    return fputs(str, stream);
+    HANDLE wstream = get_handle(stream);
-}
+    if (mp_check_console(wstream)) {
+        unsigned char *start = (unsigned char *)buffer;
+        size_t c = 0;
+        for (; c < count; ++c) {
+            if (mp_console_write(wstream, (bstr){start, size}) <= 0)
+                break;
+            start += size;
+        }
+        return c;
+    }
-int mp_puts(const char *str)
+#undef fwrite
-{
+    return fwrite(buffer, size, count, stream);
-    return mp_fputs(str, stdout);
 }
 #if HAVE_UWP

 #include <sys/stat.h>
 #include <fcntl.h>
-int mp_puts(const char *str);
+size_t mp_fwrite(const void *restrict buffer, size_t size, size_t count,
-int mp_fputs(const char *str, FILE *stream);
+                 FILE *restrict stream);
 int mp_printf(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
 int mp_fprintf(FILE *stream, const char *format, ...) PRINTF_ATTRIBUTE(2, 3);
 int mp_open(const char *filename, int oflag, ...);
             int (*errfunc)(const char*, int), mp_glob_t *restrict pglob);
 void mp_globfree(mp_glob_t *pglob);
-#define puts(...) mp_puts(__VA_ARGS__)
+#define fwrite(...) mp_fwrite(__VA_ARGS__)
-#define fputs(...) mp_fputs(__VA_ARGS__)
 #define printf(...) mp_printf(__VA_ARGS__)
 #define fprintf(...) mp_fprintf(__VA_ARGS__)
 #define open(...) mp_open(__VA_ARGS__)

@@ -32,7 +32,7 @@ int mp_console_vfprintf(void wstream, const char format, va_list args) · 31 unmodified lines
32	return 0;	32	return 0;
33	}	33	}
34		34
35	int mp_console_fputs(void *wstream, bstr str)	35	int mp_console_write(void *wstream, bstr str)
36	{	36	{
37	return 0;	37	return 0;
38	}	38	}

@@ -239,7 +239,7 @@ int mp_console_vfprintf(HANDLE wstream, const char *format, va_list args) · 238 unmodified lines
239	buffers->write_console_buf.len = 0;	239	buffers->write_console_buf.len = 0;
240	bstr_xappend_vasprintf(buffers, &buffers->write_console_buf, format, args);	240	bstr_xappend_vasprintf(buffers, &buffers->write_console_buf, format, args);
241		241
242	int ret = mp_console_fputs(wstream, buffers->write_console_buf);	242	int ret = mp_console_write(wstream, buffers->write_console_buf);
243		243
244	if (free_buf)	244	if (free_buf)
245	talloc_free(buffers);	245	talloc_free(buffers);
@@ -247,7 +247,7 @@ int mp_console_vfprintf(HANDLE wstream, const char *format, va_list args) · 1 unmodified line
247	return ret;	247	return ret;
248	}	248	}
249		249
250	int mp_console_fputs(HANDLE wstream, bstr str)	250	int mp_console_write(HANDLE wstream, bstr str)
251	{	251	{
252	struct tmp_buffers *buffers = FlsGetValue(tmp_buffers_key);	252	struct tmp_buffers *buffers = FlsGetValue(tmp_buffers_key);
253	bool free_buf = false;	253	bool free_buf = false;

@@ -57,7 +57,7 @@ void terminal_get_size2(int rows, int cols, int px_width, int px_height); · 56 unmodified lines
57		57
58	// Windows only.	58	// Windows only.
59	int mp_console_vfprintf(void wstream, const char format, va_list args);	59	int mp_console_vfprintf(void wstream, const char format, va_list args);
60	int mp_console_fputs(void *wstream, bstr str);	60	int mp_console_write(void *wstream, bstr str);
61	bool mp_check_console(void *handle);	61	bool mp_check_console(void *handle);
62		62
63	/* Windows-only function to attach to the parent process's console */	63	/* Windows-only function to attach to the parent process's console */

@@ -114,7 +114,7 @@ int mp_msg_find_level(const char *s) {return 0;}; · 113 unmodified lines
114	int mp_msg_level(struct mp_log *log) {return 0;};	114	int mp_msg_level(struct mp_log *log) {return 0;};
115	void mp_msg_set_max_level(struct mp_log *log, int lev) {};	115	void mp_msg_set_max_level(struct mp_log *log, int lev) {};
116	int mp_console_vfprintf(void wstream, const char format, va_list args) {return 0;};	116	int mp_console_vfprintf(void wstream, const char format, va_list args) {return 0;};
117	int mp_console_fputs(void *wstream, bstr str) {return 0;};	117	int mp_console_write(void *wstream, bstr str) {return 0;};
118	bool mp_check_console(void *handle) { return false; };	118	bool mp_check_console(void *handle) { return false; };
119	void mp_set_avdict(AVDictionary dict, char kv) {};	119	void mp_set_avdict(AVDictionary dict, char kv) {};
120	struct mp_log mp_log_new(void talloc_ctx, struct mp_log *parent,	120	struct mp_log mp_log_new(void talloc_ctx, struct mp_log *parent,

Keyboard shortcuts