diff --git a/chsrc.c b/chsrc.c index bd5a4ce..30650a8 100644 --- a/chsrc.c +++ b/chsrc.c @@ -180,7 +180,7 @@ lets_test_speed_ (source_info* sources, size_t size, const char* target) xy_warn ("chsrc: 跳过该站点"); speed = 0; } else { - printf (xy_strjoin(3, "chsrc: 测速 ", src.mirror->site , " ... ")); + printf ("%s",xy_strjoin(3, "chsrc: 测速 ", src.mirror->site , " ... ")); speed = test_speed_url (url); } speeds[i] = speed; @@ -1166,7 +1166,9 @@ os_gentoo_setsrc(char* option) char * yuan = xy_strjoin(3,"GENTOO_MIRRORS=\"https://", source.url, "gentoo\""); - cmd = xy_strjoin("cat ",yuan," >> /etc/portage/make.conf"); + cmd = xy_strjoin(3,"cat ", + yuan, + " >> /etc/portage/make.conf"); chsrc_logcmd(cmd); system(cmd); diff --git a/chsrc.h b/chsrc.h index 284b7d9..b32a930 100644 --- a/chsrc.h +++ b/chsrc.h @@ -375,6 +375,7 @@ os_mysys2_sources[] = { {&Sohu, "https://mirrors.sohu.com/msys2/"} }, + /** * 2023-09-05 更新 * diff --git a/xy.h b/xy.h index bd99d12..a6d5ba9 100644 --- a/xy.h +++ b/xy.h @@ -23,6 +23,7 @@ #include #include #include +#include // #define NDEBUG @@ -46,7 +47,7 @@ static bool xy_on_macos = false; static bool xy_on_bsds = false; - static char* xy_os_devnull = "/dev/null" + static char* xy_os_devnull = "/dev/null"; #define xy_useutf8() @@ -74,9 +75,9 @@ #endif -#define putf(n) printf("%f\n", n) -#define puti(n) printf("%d\n", n) -#define putb(n) if(n) puts("true"); else puts("false"); +void putf(double n) {printf("%f\n", n);} +void puti(long long n) {printf("%lld\n", n);} +void putb(bool n) {if(n) puts("true"); else puts("false");} #define xy_arylen(x) (sizeof(x) / sizeof(x[0])) @@ -131,7 +132,7 @@ xy_log_ (int level, const char* str) sprintf (buf, color_fmt_str, str); if (to_stderr) { - fprintf(stderr, buf); + fprintf(stderr, "%s",buf); } else { puts(buf); }