fix: reject unsupported rsync debug categories
CI / lint (pull_request) Successful in 11s
CI / sanitizers (address) (pull_request) Successful in 38s
CI / sanitizers (undefined) (pull_request) Successful in 38s
CI / fuzz-build (pull_request) Successful in 14s
CI / coverage (pull_request) Successful in 31s
CI / build-and-test (pull_request) Successful in 1m15s
CI / valgrind (pull_request) Successful in 33s
CI / lint (pull_request) Successful in 11s
CI / sanitizers (address) (pull_request) Successful in 38s
CI / sanitizers (undefined) (pull_request) Successful in 38s
CI / fuzz-build (pull_request) Successful in 14s
CI / coverage (pull_request) Successful in 31s
CI / build-and-test (pull_request) Successful in 1m15s
CI / valgrind (pull_request) Successful in 33s
This commit is contained in:
+1
-45
@@ -123,52 +123,8 @@ static int parse_debug_flags(const char* value, Config* config) {
|
||||
flag = LOG_DEBUG_PACK;
|
||||
} else if (strcmp(token, "util") == 0) {
|
||||
flag = LOG_DEBUG_UTIL;
|
||||
} else if (strcmp(token, "acl") == 0) {
|
||||
flag = LOG_DEBUG_ACL;
|
||||
} else if (strcmp(token, "backup") == 0) {
|
||||
flag = LOG_DEBUG_BACKUP;
|
||||
} else if (strcmp(token, "bind") == 0) {
|
||||
flag = LOG_DEBUG_BIND;
|
||||
} else if (strcmp(token, "chksum") == 0) {
|
||||
flag = LOG_DEBUG_CHKSUM;
|
||||
} else if (strcmp(token, "connect") == 0) {
|
||||
flag = LOG_DEBUG_CONNECT;
|
||||
} else if (strcmp(token, "cmd") == 0) {
|
||||
flag = LOG_DEBUG_CMD;
|
||||
} else if (strcmp(token, "del") == 0) {
|
||||
flag = LOG_DEBUG_DEL;
|
||||
} else if (strcmp(token, "digest") == 0) {
|
||||
flag = LOG_DEBUG_DIGEST;
|
||||
} else if (strcmp(token, "dflt") == 0) {
|
||||
flag = LOG_DEBUG_DFLT;
|
||||
} else if (strcmp(token, "flist") == 0) {
|
||||
flag = LOG_DEBUG_FLIST;
|
||||
} else if (strcmp(token, "fuzzer") == 0) {
|
||||
flag = LOG_DEBUG_FUZZER;
|
||||
} else if (strcmp(token, "genr") == 0) {
|
||||
flag = LOG_DEBUG_GENR;
|
||||
} else if (strcmp(token, "hash") == 0) {
|
||||
flag = LOG_DEBUG_HASH;
|
||||
} else if (strcmp(token, "hlink") == 0) {
|
||||
flag = LOG_DEBUG_HLINK;
|
||||
} else if (strcmp(token, "iconv") == 0) {
|
||||
flag = LOG_DEBUG_ICONV;
|
||||
} else if (strcmp(token, "nstr") == 0) {
|
||||
flag = LOG_DEBUG_NSTR;
|
||||
} else if (strcmp(token, "own") == 0) {
|
||||
flag = LOG_DEBUG_OWN;
|
||||
} else if (strcmp(token, "proc") == 0) {
|
||||
flag = LOG_DEBUG_PROC;
|
||||
} else if (strcmp(token, "recv") == 0) {
|
||||
flag = LOG_DEBUG_RECV;
|
||||
} else if (strcmp(token, "send") == 0) {
|
||||
flag = LOG_DEBUG_SEND;
|
||||
} else if (strcmp(token, "time") == 0) {
|
||||
flag = LOG_DEBUG_TIME;
|
||||
} else if (strcmp(token, "tls") == 0) {
|
||||
flag = LOG_DEBUG_TLS;
|
||||
} else {
|
||||
log_message(LOG_LEVEL_ERROR, "unknown --debug flag: %s", token);
|
||||
log_message(LOG_LEVEL_ERROR, "unsupported --debug flag: %s", token);
|
||||
free(flags);
|
||||
return -1;
|
||||
}
|
||||
|
||||
+2
-3
@@ -75,8 +75,7 @@ void print_usage(void) {
|
||||
}
|
||||
|
||||
void print_debug_usage(void) {
|
||||
printf("Debug flags: ACL,BACKUP,BIND,CHKSUM,CONNECT,CMD,DEL,DIGEST,DFLT,FLIST,\n");
|
||||
printf(" FUZZER,GENR,HASH,HLINK,ICONV,IO,NSTR,OWN,PACK,PROC,PROTO,\n");
|
||||
printf(" RECV,SEND,TIME,TLS,UTIL,ALL,NONE\n");
|
||||
printf("Supported debug flags: IO,PROTO,PACK,UTIL,ALL,NONE\n");
|
||||
printf("Flags may be comma-separated, for example: --debug=io,proto\n");
|
||||
printf("Other rsync debug flags are unsupported and rejected.\n");
|
||||
}
|
||||
|
||||
+1
-23
@@ -11,29 +11,7 @@ typedef enum {
|
||||
LOG_DEBUG_PROTO = 1u << 1,
|
||||
LOG_DEBUG_PACK = 1u << 2,
|
||||
LOG_DEBUG_UTIL = 1u << 3,
|
||||
LOG_DEBUG_ACL = 1u << 4,
|
||||
LOG_DEBUG_BACKUP = 1u << 5,
|
||||
LOG_DEBUG_BIND = 1u << 6,
|
||||
LOG_DEBUG_CHKSUM = 1u << 7,
|
||||
LOG_DEBUG_CONNECT = 1u << 8,
|
||||
LOG_DEBUG_CMD = 1u << 9,
|
||||
LOG_DEBUG_DEL = 1u << 10,
|
||||
LOG_DEBUG_DIGEST = 1u << 11,
|
||||
LOG_DEBUG_DFLT = 1u << 12,
|
||||
LOG_DEBUG_FLIST = 1u << 13,
|
||||
LOG_DEBUG_FUZZER = 1u << 14,
|
||||
LOG_DEBUG_GENR = 1u << 15,
|
||||
LOG_DEBUG_HASH = 1u << 16,
|
||||
LOG_DEBUG_HLINK = 1u << 17,
|
||||
LOG_DEBUG_ICONV = 1u << 18,
|
||||
LOG_DEBUG_NSTR = 1u << 19,
|
||||
LOG_DEBUG_OWN = 1u << 20,
|
||||
LOG_DEBUG_PROC = 1u << 21,
|
||||
LOG_DEBUG_RECV = 1u << 22,
|
||||
LOG_DEBUG_SEND = 1u << 23,
|
||||
LOG_DEBUG_TIME = 1u << 24,
|
||||
LOG_DEBUG_TLS = 1u << 25,
|
||||
LOG_DEBUG_ALL = (1u << 26) - 1,
|
||||
LOG_DEBUG_ALL = (1u << 4) - 1,
|
||||
} LogDebugFlag;
|
||||
|
||||
void log_message(LogLevel log_level, const char* message, ...);
|
||||
|
||||
Reference in New Issue
Block a user