Correctly use cloaked IRC masks on "INVITE nickname"

[ngircd-alex.git] / src / tool / tool.c

diff --git a/src/tool/tool.c b/src/tool/tool.c
index eb6c131e428462e81d3aad67075c721b429edd00..3b9cc255aed18141c38d6548804798bf396ff125 100644 (file)
--- a/src/tool/tool.c
+++ b/src/tool/tool.c
@@ -84,7 +84,7 @@ ngt_UpperStr(char *String)
 
        ptr = String;
        while(*ptr) {
-               *ptr = toupper(*ptr);
+               *ptr = toupper((int)*ptr);
                ptr++;
        }
        return String;
@@ -103,7 +103,7 @@ ngt_LowerStr(char *String)
 
        ptr = String;
        while(*ptr) {
-               *ptr = tolower(*ptr);
+               *ptr = tolower((int)*ptr);
                ptr++;
        }
        return String;
@@ -144,11 +144,16 @@ ngt_RandomStr(char *String, const size_t len)
        assert(String != NULL);
 
        gettimeofday(&t, NULL);
+#ifndef HAVE_ARC4RANDOM
        srand((unsigned)(t.tv_usec * t.tv_sec));
 
        for (i = 0; i < len; ++i) {
                String[i] = chars[rand() % (sizeof(chars) - 1)];
        }
+#else
+       for (i = 0; i < len; ++i)
+               String[i] = chars[arc4random() % (sizeof(chars) - 1)];
+#endif
        String[len] = '\0';
 
        return String;