ChronosXYZ/psyced
1
0
Fork 0
mirror of https://github.com/ChronosX88/psyced.git synced 2024-11-09 20:11:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'origin'

Browse Source
This commit is contained in:
psyc://psyced.org/~lynX 2009-03-25 15:05:41 +01:00
commit e4b8df5c91
6 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install.sh
View File

@ -1077,7 +1077,11 @@ then
echo "Creating $BASE_DIR..." echo "Creating $BASE_DIR..."
if mkdir -m $BASE_PERM -p $BASE_DIR 2> /dev/null if mkdir -m $BASE_PERM -p $BASE_DIR 2> /dev/null
then then
: mkdir -m $BASE_PERM -p $LOG_DIR 2> /dev/null
mkdir -m $BASE_PERM -p $LOG_DIR/place 2> /dev/null
mkdir -m $BASE_PERM -p $DATA_DIR 2> /dev/null
mkdir -m $BASE_PERM -p $DATA_DIR/person 2> /dev/null
mkdir -m $BASE_PERM -p $DATA_DIR/place 2> /dev/null
else else
if test "x$userid" = "xroot" if test "x$userid" = "xroot"
then then

1
world/local Symbolic link
View File

@ -0,0 +1 @@
../local

1
world/log Symbolic link
View File

@ -0,0 +1 @@
../log

10
world/net/jabber/user.c
View File

@ -571,17 +571,14 @@ iq(XMLNode node) {
P0(("+++ %O IQ node %O\n", ME, node)) P0(("+++ %O IQ node %O\n", ME, node))
firstchild = getfirstchild(node); firstchild = getfirstchild(node);
unless(firstchild) { unless(firstchild) switch(node["@type"]) {
switch(node["@type"]) {
case "get": case "get":
break;
case "set": case "set":
break;
case "result": case "result":
break;
case "error": case "error":
break; break;
} default:
P1(("%O got invalid iq %O\n", ME, node))
return; return;
} }
helper = firstchild; helper = firstchild;
@ -1016,6 +1013,7 @@ iq(XMLNode node) {
break; break;
#endif #endif
default: default:
P1(("%O got IQ with unknown namespace: %O\n", ME, node))
switch(node["@type"]) { switch(node["@type"]) {
case "get": case "get":
if (node["@to"]) { if (node["@to"]) {

2
world/net/user.c
View File

@ -598,6 +598,7 @@ msg(source, mc, data, mapping vars, showingLog) {
P3(("%O time %O data %O from %O\n", ME, t, data, vars)) P3(("%O time %O data %O from %O\n", ME, t, data, vars))
} }
PSYC_TRY(mc) { PSYC_TRY(mc) {
#ifndef ALPHA
case "_jabber_iq_error": // DONT reply case "_jabber_iq_error": // DONT reply
P2(("%O got %O", ME, mc)) P2(("%O got %O", ME, mc))
break; break;
@ -610,6 +611,7 @@ case "_jabber_iq_set":
sendmsg(source, "_error_unsupported_method", 0, sendmsg(source, "_error_unsupported_method", 0,
([ "_tag_reply" : vars["_tag"] ])); ([ "_tag_reply" : vars["_tag"] ]));
break; break;
#endif
case "_jabber": case "_jabber":
P1(("%O got %O", ME, mc)) P1(("%O got %O", ME, mc))
break; break;

3
world/net/usercmd.i
View File

@ -1771,6 +1771,9 @@ case "_unlink":
unlink(vars["_service"]); unlink(vars["_service"]);
return 1; return 1;
case "_exit": case "_exit":
// so this is some kind of ugly hack not to be used.. huh?
announce(AVAILABILITY_OFFLINE);
// fall thru
case "_quit": case "_quit":
// bye(vars["_reason"]); // bye(vars["_reason"]);
quit(); quit();