- Dokumentation aktualisiert.

[ngircd-alex.git] / src / ngircd / irc-write.c

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c
index 5cc58006a115ad968efb4a04fbfd393ef306f785..50a555935c4bed5238680abd927de9d1a576b67f 100644 (file)
--- a/src/ngircd/irc-write.c
+++ b/src/ngircd/irc-write.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc-write.c,v 1.5 2002/05/30 16:52:21 alex Exp $
+ * $Id: irc-write.c,v 1.9 2002/10/04 11:21:46 alex Exp $
  *
  * irc-write.c: IRC-Texte und Befehle ueber Netzwerk versenden
  */
@@ -21,6 +21,7 @@
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "conn.h"
 #include "client.h"
@@ -61,7 +62,7 @@ va_dcl
        va_end( ap );
 
        /* an den Client selber */
-       ok = IRC_WriteStrClientPrefix( Client, Client_ThisServer( ), buffer );
+       ok = IRC_WriteStrClientPrefix( Client, Client_ThisServer( ), "%s", buffer );
 
        return ok;
 } /* IRC_WriteStrClient */
@@ -127,7 +128,7 @@ va_dcl
        vsnprintf( buffer, 1000, Format, ap );
        va_end( ap );
 
-       return IRC_WriteStrChannelPrefix( Client, Chan, Client_ThisServer( ), Remote, buffer );
+       return IRC_WriteStrChannelPrefix( Client, Chan, Client_ThisServer( ), Remote, "%s", buffer );
 } /* IRC_WriteStrChannel */
 
 
@@ -232,7 +233,7 @@ va_dcl
        va_end( ap );
 
        /* an den Client selber */
-       IRC_WriteStrServersPrefix( ExceptOf, Client_ThisServer( ), buffer );
+       IRC_WriteStrServersPrefix( ExceptOf, Client_ThisServer( ), "%s", buffer );
 } /* IRC_WriteStrServers */
 
 
@@ -247,6 +248,37 @@ CLIENT *Prefix;
 CHAR *Format;
 va_dcl
 #endif
+{
+       CHAR buffer[1000];
+       va_list ap;
+
+       assert( Format != NULL );
+       assert( Prefix != NULL );
+
+#ifdef PROTOTYPES
+       va_start( ap, Format );
+#else
+       va_start( ap );
+#endif
+       vsnprintf( buffer, 1000, Format, ap );
+       va_end( ap );
+
+       IRC_WriteStrServersPrefixFlag( ExceptOf, Prefix, '\0', "%s", buffer );
+} /* IRC_WriteStrServersPrefix */
+       
+
+#ifdef PROTOTYPES
+GLOBAL VOID
+IRC_WriteStrServersPrefixFlag( CLIENT *ExceptOf, CLIENT *Prefix, CHAR Flag, CHAR *Format, ... )
+#else
+GLOBAL VOID
+IRC_WriteStrServersPrefixFlag( ExceptOf, Prefix, Flag, Format, va_alist )
+CLIENT *ExceptOf;
+CLIENT *Prefix;
+CHAR Flag;
+CHAR *Format;
+va_dcl
+#endif
 {
        CHAR buffer[1000];
        CLIENT *c;
@@ -268,12 +300,12 @@ va_dcl
        {
                if(( Client_Type( c ) == CLIENT_SERVER ) && ( Client_Conn( c ) > NONE ) && ( c != Client_ThisServer( )) && ( c != ExceptOf ))
                {
-                       /* Ziel-Server gefunden */
-                       IRC_WriteStrClientPrefix( c, Prefix, buffer );
+                       /* Ziel-Server gefunden. Nun noch pruefen, ob Flags stimmen */
+                       if(( Flag == '\0' ) || ( strchr( Client_Flags( c ), Flag ) != NULL )) IRC_WriteStrClientPrefix( c, Prefix, "%s", buffer );
                }
                c = Client_Next( c );
        }
-} /* IRC_WriteStrServersPrefix */
+} /* IRC_WriteStrServersPrefixFlag */
 
 
 #ifdef PROTOTYPES