m_away.c derived from ratbox3 - looks much better and do not use deprecated DupString.

diff --git a/modules/m_away.c b/modules/m_away.c
index d95d0f0a7213d3c2f36e45542372b0671dd53854..0d462f9d00b2af9fd788c41507c275912a1bb218 100644 (file)
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -70,71 +70,46 @@ DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $"
 static int
 m_away(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-       char *away;
-       char *awy2;
-
-       if(MyClient(source_p) && !IsFloodDone(source_p))
-               flood_endgrace(source_p);
-
-       if(!IsClient(source_p))
-               return 0;
-
-       away = source_p->user->away;
-
-       if(parc < 2 || EmptyString(parv[1]))
-       {
-               /* Marking as not away */
-               if(away)
-               {
-                       /* we now send this only if they were away before --is */
-                       sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
-                                     ":%s AWAY", use_id(source_p));
-                       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, 
-                                     ":%s AWAY", source_p->name);
-                       rb_free(away);
-                       source_p->user->away = NULL;
-               }
-               if(MyConnect(source_p))
-                       sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
-               return 0;
-       }
-
-       /* Marking as away */
-
-       if(MyConnect(source_p))
-       {
-               if(!IsOper(source_p) &&
-                  (CurrentTime - source_p->localClient->last_away) < ConfigFileEntry.pace_wait)
-               {
-                       sendto_one(source_p, form_str(RPL_LOAD2HI), 
-                                  me.name, source_p->name, "AWAY");
-                       return 0;
-               }
-
-               source_p->localClient->last_away = CurrentTime;
-       }
-
-       awy2 = LOCAL_COPY(parv[1]);
-       if(strlen(awy2) > AWAYLEN)
-               awy2[AWAYLEN] = '\0';
-
-       /* we now send this only if they weren't away already --is */
-       if(!away)
-       {
-               sendto_server(client_p, NULL, CAP_TS6, NOCAPS, 
-                             ":%s AWAY :%s", use_id(source_p), awy2);
-               sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
-                             ":%s AWAY :%s", source_p->name, awy2);
-       }
-       else
-               rb_free(away);
-
-       DupString(away, awy2);
-
-       source_p->user->away = away;
-
-       if(MyConnect(source_p))
-               sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
-
+       if(MyClient(source_p) && !IsFloodDone(source_p))\r
+               flood_endgrace(source_p);\r
+\r
+       if(!IsClient(source_p))\r
+               return 0;\r
+\r
+       if(parc < 2 || EmptyString(parv[1]))\r
+       {\r
+               /* Marking as not away */\r
+               if(source_p->user->away != NULL)\r
+               {\r
+                       /* we now send this only if they were away before --is */\r
+                       sendto_server(client_p, NULL, CAP_TS6, NOCAPS,\r
+                                     ":%s AWAY", use_id(source_p));\r
+                       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, \r
+                                     ":%s AWAY", source_p->name);\r
+                       free_away(source_p);\r
+               }\r
+               if(MyConnect(source_p))\r
+                       sendto_one(source_p, form_str(RPL_UNAWAY),\r
+                                  me.name, source_p->name);\r
+               return 0;\r
+       }\r
+\r
+\r
+       if(source_p->user->away == NULL)\r
+       {\r
+               allocate_away(source_p);\r
+               rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);\r
+               sendto_server(client_p, NULL, CAP_TS6, NOCAPS, \r
+                             ":%s AWAY :%s", use_id(source_p), source_p->user->away);\r
+               sendto_server(client_p, NULL, NOCAPS, CAP_TS6,\r
+                             ":%s AWAY :%s", source_p->name, source_p->user->away);\r
+                       \r
+       } else {\r
+               rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);\r
+       }\r
+       \r
+       if(MyConnect(source_p))\r
+               sendto_one(source_p, form_str(RPL_NOWAWAY), me.name, source_p->name);\r
+\r
        return 0;
 }