- snprintf(buf, bufsize, "ATTACH_DIAGNOSTICS:%s,%s", argc > 1 ? argv[1] : "help", argc > 2 ? argv[2] : "");
+ size_t n = snprintf(buf, bufsize, "ATTACH_DIAGNOSTICS:%s", argc > 1 ? argv[1] : "help");
+ int i;
+ for (i = 2; i < argc && n < bufsize; i++) {
+ n += snprintf(buf + n, bufsize - n, ",%s", argv[i]);
+ }