Rewrite with GNU C

Author: Moe-hacker

Makefile

@@ -3,9 +3,9 @@ $(error config.mk is missing. Please run gen-config step before building.)
 endif
 include config.mk
 all :
-	$(CC) $(CFLAGS) -std=c11 cprintf.c main.c -o cprintf
+	$(CC) $(CFLAGS) -std=gnu11 cprintf.c main.c -o cprintf
 	$(STRIP) cprintf
 format :
 	clang-format -i include/cprintf.h cprintf.c test.c main.c
 test :
-	$(CC) -O0 -Wall -Wextra -Wgnu -std=c11 -pedantic -ggdb -fsanitize=address cprintf.c test.c
+	$(CC) -O0 -Wall -Wno-format-extra-args -Wextra -Wno-format-security -std=gnu11 -Wno-gnu-zero-variadic-macro-arguments -Wno-gnu-statement-expression-from-macro-expansion -pedantic -ggdb -fsanitize=address cprintf.c test.c

README.md

@@ -17,6 +17,8 @@ cprintf("{}{}{}{}","xxxxx"); // Also boom!!!!!!
 printf("%s","xxxxx"); // Good!
 cprintf("{}","xxxxxx"); // Also good :)
 ```
+# About GNU C:
+cprintf uses GNU C11, port/cprintf.c is in pure C std.     
 # Let's make a colorful world!
 # What's this?
 We often use ASCII color like `\033[0m` when developing. But it's hard to remember them.          

cprintf.c

@@ -28,19 +28,28 @@
  *
  */
 #include "include/cprintf.h"
-#define cprintf_strlen(f) (f == NULL ? 0 : strlen(f))
-#define cprintf_avoid_null(f) (f == NULL ? "" : f)
-#define cprintf_buf_len(f, d) (f != NULL ? (size_t)snprintf(NULL, 0, f, d) : 0)
+
+//
+// Generic support.
+//
+
+// For marking the buffer, so that it can be free() later.
 static thread_local char **cprintf_buffer = NULL;
 static thread_local size_t cprintf_buf_count = 0;
-static void cprintf_mark_buf(char *b)
+void cprintf_mark_buf(char *b)
 {
+	/*
+	 * Mark the buffer, so that it can be free() later.
+	 */
 	cprintf_buffer = realloc(cprintf_buffer, (cprintf_buf_count + 1) * sizeof(char *));
 	cprintf_buffer[cprintf_buf_count] = b;
 	cprintf_buf_count++;
 }
 void cprintf_free_buf(void)
 {
+	/*
+	 * Free all the buffers that have been marked.
+	 */
 	for (size_t i = 0; i < cprintf_buf_count; i++) {
 		free(cprintf_buffer[i]);
 	}
@@ -50,6 +59,11 @@ void cprintf_free_buf(void)
 }
 char *cprintf_regen_format(const char *f)
 {
+	/*
+	 * This function will regenerate the format string
+	 * to replace all '{}' with '%s'.
+	 * If the input is NULL, it will return an empty string.
+	 */
 	char *ret = strdup(cprintf_avoid_null(f));
 	int j = 0;
 	size_t len = cprintf_strlen(f);
@@ -76,246 +90,11 @@ char *cprintf_regen_format(const char *f)
 	cprintf_mark_buf(ret);
 	return ret;
 }
-char *cprintf_get_fmt_unknown(const char *f)
-{
-	(void)f; // Unused parameter
-	return NULL;
-}
-char *cprintf_get_fmt_bool(const char *f)
-{
-	(void)f; // Unused parameter
-	return NULL;
-}
-char *cprintf_get_fmt_char(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%sc", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_schar(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%sd", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_uchar(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%sd", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_short(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%shd", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_ushort(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%shu", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_int(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%sd", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_uint(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%su", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_long(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%sld", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_ulong(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%slu", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_llong(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%slld", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_ullong(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%sllu", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_float(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%sf", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_double(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%sf", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_ldouble(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%sLf", cprintf_avoid_null(f));
-	return b;
-}
-char *cprintf_get_fmt_ptr(const char *f)
-{
-	char *b = malloc(cprintf_strlen(f) + 16);
-	sprintf(b, "%%%sp", cprintf_avoid_null(f));
-	return b;
-}
-
-char *cprintf_get_string_bool(char *f, bool d)
-{
-	char *buf = malloc(32);
-	sprintf(buf, "%s", d ? "true" : "false");
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_char(char *f, char d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_schar(char *f, signed char d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_uchar(char *f, unsigned char d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_short(char *f, short d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_ushort(char *f, unsigned short d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_int(char *f, int d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_uint(char *f, unsigned int d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_long(char *f, long d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_ulong(char *f, unsigned long d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_llong(char *f, long long d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_ullong(char *f, unsigned long long d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_float(char *f, float d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_double(char *f, double d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_ldouble(char *f, long double d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_ptr(char *f, void *d)
-{
-	char *buf = malloc(cprintf_buf_len(f, d) + 32);
-	sprintf(buf, f, d);
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
-char *cprintf_get_string_unknown(char *f, ...)
-{
-	char *buf = malloc(32);
-	sprintf(buf, "%s", "{unknown type}");
-	free(f);
-	cprintf_mark_buf(buf);
-	return buf;
-}
+//
+// Color support.
+//
 char *cprintf_base_color = "254;228;208";
 bool cprintf_print_color_only_tty = true;
-#ifdef _GNU_SOURCE
 #define fprintf_only_tty(stream, ...)                                                               \
 	{                                                                                           \
 		if (!cprintf_print_color_only_tty) {                                                \
@@ -327,9 +106,6 @@ bool cprintf_print_color_only_tty = true;
 			}                                                                           \
 		}                                                                                   \
 	}
-#else
-#define fprintf_if_not_fifo(stream, ...) fprintf(stream, __VA_ARGS__)
-#endif
 static void fprint_rgb_fg_color(FILE *_Nonnull stream, const char *_Nonnull color)
 {
 	/*
@@ -491,7 +267,7 @@ static const char *cfprintf_print_bg_color(FILE *_Nonnull stream, const char *_N
 	}
 	return ret;
 }
-void cprintf__(const char *_Nonnull buf)
+int cprintf__(const char *_Nonnull buf)
 {
 	const char *p = NULL;
 	p = buf;
@@ -514,8 +290,9 @@ void cprintf__(const char *_Nonnull buf)
 	// We will always reset the color in the end.
 	fprintf_only_tty(stdout, "\033[0m");
 	fflush(stdout);
+	return 114514;
 }
-void cfprintf__(FILE *_Nonnull stream, const char *_Nonnull buf)
+int cfprintf__(FILE *_Nonnull stream, const char *_Nonnull buf)
 {
 	const char *p = NULL;
 	p = buf;
@@ -538,4 +315,5 @@ void cfprintf__(FILE *_Nonnull stream, const char *_Nonnull buf)
 	// We will always reset the color in the end.
 	fprintf_only_tty(stream, "\033[0m");
 	fflush(stream);
+	return 114514;
 }