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 31c6fb41fb9272f5b4abd5e6713b12d359fb5387..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;
@@ -135,24 +135,25 @@ ngt_TrimLastChr( char *String, const char Chr)
  * Fill a String with random chars
  */
 GLOBAL char *
-ngt_RandomStr( char *String, const size_t len)
+ngt_RandomStr(char *String, const size_t len)
 {
-       assert(String != NULL);
+       static const char chars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!\"#$&'()*+,-./:;<=>?@[\\]^_`";
+       struct timeval t;
+       size_t i;
 
-       static const char chars[] = 
-               "0123456789ABCDEFGHIJKLMNO"
-               "PQRSTUVWXYZabcdefghijklmn"
-               "opqrstuvwxyz!\"#$&'()*+,-"
-               "./:;<=>?@[\\]^_`";
+       assert(String != NULL);
 
-       struct timeval t;
        gettimeofday(&t, NULL);
-       srand(t.tv_usec * t.tv_sec);
+#ifndef HAVE_ARC4RANDOM
+       srand((unsigned)(t.tv_usec * t.tv_sec));
 
-       for (size_t i = 0; i < len; ++i) {
+       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;