[srvx-commits] CVS: services/src hash.c,1.159.2.4,1.159.2.5 parse.c,1.129.2.1,1.129.2.2
Brought to you by:
entrope
|
From: Zoot <zo...@us...> - 2002-12-15 18:47:22
|
Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31845/src
Modified Files:
Tag: rel-1_1-branch
hash.c parse.c
Log Message:
Backport my crossing messages changes from the 1.2 branch.
Index: hash.c
===================================================================
RCS file: /cvsroot/srvx/services/src/hash.c,v
retrieving revision 1.159.2.4
retrieving revision 1.159.2.5
diff -C2 -r1.159.2.4 -r1.159.2.5
*** hash.c 12 Dec 2002 02:27:59 -0000 1.159.2.4
--- hash.c 15 Dec 2002 18:47:18 -0000 1.159.2.5
***************
*** 1187,1196 ****
safestrncpy(old_topic, channel->topic, sizeof(old_topic));
safestrncpy(channel->topic, topic, sizeof(channel->topic));
- safestrncpy(channel->topic_nick, user->nick, sizeof(channel->topic_nick));
channel->topic_time = now;
! /* Update the setter's idle time */
! if ((mn = GetUserMode(channel, user))) {
! mn->idle_since = now;
}
--- 1187,1199 ----
safestrncpy(old_topic, channel->topic, sizeof(old_topic));
safestrncpy(channel->topic, topic, sizeof(channel->topic));
channel->topic_time = now;
! if (user) {
! safestrncpy(channel->topic_nick, user->nick, sizeof(channel->topic_nick));
!
! /* Update the setter's idle time */
! if ((mn = GetUserMode(channel, user))) {
! mn->idle_since = now;
! }
}
Index: parse.c
===================================================================
RCS file: /cvsroot/srvx/services/src/Attic/parse.c,v
retrieving revision 1.129.2.1
retrieving revision 1.129.2.2
diff -C2 -r1.129.2.1 -r1.129.2.2
*** parse.c 12 Dec 2002 02:27:59 -0000 1.129.2.1
--- parse.c 15 Dec 2002 18:47:19 -0000 1.129.2.2
***************
*** 696,699 ****
--- 696,703 ----
if (argc < 3) return 0;
user = GetUser(argv[0]);
+ if (!user) {
+ /* mumble. cross. */
+ return 0;
+ }
parse_foreach(argv[2], part_helper, NULL, NULL, NULL, user);
return 1;
***************
*** 811,814 ****
--- 815,824 ----
{
struct userNode *uNode = GetUser(argv[0]);
+
+ if(!uNode)
+ {
+ /* memble! */
+ return 0;
+ }
if(argc < 3)
|