fixed last commit

[NeonServV5.git] / UserNode.c

diff --git a/UserNode.c b/UserNode.c
index 465fd2e04bf6d2c43a221cebe6ab25c9d58ffbed..5b6c9c11259c79019d5e7d7a562f656be786ab33 100644 (file)
--- a/UserNode.c
+++ b/UserNode.c
@@ -7,6 +7,20 @@ void init_UserNode() {
     userList = calloc(VALID_NICK_CHARS_FIRST_LEN+1, sizeof(*userList));
 }
 
+void free_UserNode() {
+    //kamikaze free all users
+    //chanusers will be destroyed in free_ChanNode()
+    int i;
+    struct UserNode *user, *next;
+    for(i = 0; i < VALID_NICK_CHARS_FIRST_LEN+1; i++) {
+        for(user = userList[i]; user; user = next) {
+            next = user->next;
+            free(user);
+        }
+    }
+    free(userList);
+}
+
 int is_valid_nick(const char *nick) {
     unsigned int i;
     //first char must be one of: a-zA-Z{|}~[\]^_`
@@ -181,7 +195,23 @@ struct UserNode* createTempUser(const char *mask) {
             strcpy(user->ident, &cmask[ii]);
             ii = i+1;
         } else if(cmask[i] == '\0') {
-            if(user == NULL) return NULL;
+            if(user == NULL) {
+                //nick only
+                user = malloc(sizeof(*user));
+                if (!user)
+                {
+                    perror("malloc() failed");
+                    return NULL;
+                }
+                strcpy(user->nick, cmask);
+                user->created = time(0);
+                user->ident[0] = 0;
+                user->host[0] = 0;
+                user->realname[0] = 0;
+                user->flags = 0;
+                user->channel = NULL;
+                return user;
+            }
             strcpy(user->host, &cmask[ii]);
         }
     }