welcome: corrected some comments

diff --git a/welcome.patch b/welcome.patch
index b9ca20a59f2db6e9b3dc526e9437f57db88edaf3..dbb840db16f96a08adca39b2593e374886a86b88 100644 (file)
--- a/welcome.patch
+++ b/welcome.patch
@@ -77,7 +77,7 @@ ircd/ircd_lexer.l
 ircd/ircd_parser.y
 add PRIV_LOCAL_WELCOME PRIV_WELCOME
 
-diff -r 4676d2565f9b include/client.h
+diff -r a9b437e961ec include/client.h
 --- a/include/client.h
 +++ b/include/client.h
 @@ -142,6 +142,8 @@
@@ -89,7 +89,7 @@ diff -r 4676d2565f9b include/client.h
      PRIV_LAST_PRIV /**< number of privileges */
    };
  
-diff -r 4676d2565f9b include/handlers.h
+diff -r a9b437e961ec include/handlers.h
 --- a/include/handlers.h
 +++ b/include/handlers.h
 @@ -138,6 +138,7 @@
@@ -116,7 +116,7 @@ diff -r 4676d2565f9b include/handlers.h
  extern int ms_whois(struct Client*, struct Client*, int, char*[]);
  extern int ms_xquery(struct Client*, struct Client*, int, char*[]);
  extern int ms_xreply(struct Client*, struct Client*, int, char*[]);
-diff -r 4676d2565f9b include/ircd_features.h
+diff -r a9b437e961ec include/ircd_features.h
 --- a/include/ircd_features.h
 +++ b/include/ircd_features.h
 @@ -101,6 +101,7 @@
@@ -135,7 +135,7 @@ diff -r 4676d2565f9b include/ircd_features.h
    FEAT_HIS_STATS_w,
    FEAT_HIS_STATS_x,
    FEAT_HIS_STATS_y,
-diff -r 4676d2565f9b include/msg.h
+diff -r a9b437e961ec include/msg.h
 --- a/include/msg.h
 +++ b/include/msg.h
 @@ -196,6 +196,10 @@
@@ -149,7 +149,7 @@ diff -r 4676d2565f9b include/msg.h
  #define MSG_WALLCHOPS           "WALLCHOPS"     /* WC */
  #define TOK_WALLCHOPS           "WC"
  #define CMD_WALLCHOPS         MSG_WALLCHOPS, TOK_WALLCHOPS
-diff -r 4676d2565f9b include/numeric.h
+diff -r a9b437e961ec include/numeric.h
 --- a/include/numeric.h
 +++ b/include/numeric.h
 @@ -116,6 +116,7 @@
@@ -169,7 +169,7 @@ diff -r 4676d2565f9b include/numeric.h
  #define ERR_SILELISTFULL     511        /* Undernet extension */
  /*      ERR_NOTIFYFULL       512           aircd */
  /*    ERR_TOOMANYWATCH     512           Numeric List: Dalnet */
-diff -r 4676d2565f9b include/welcome.h
+diff -r a9b437e961ec include/welcome.h
 --- /dev/null
 +++ b/include/welcome.h
 @@ -0,0 +1,63 @@
@@ -236,7 +236,7 @@ diff -r 4676d2565f9b include/welcome.h
 +extern void welcome_stats(struct Client *sptr, const struct StatDesc *sd, char *param);
 +
 +#endif /* INCLUDED_welcome_h */
-diff -r 4676d2565f9b ircd/Makefile.in
+diff -r a9b437e961ec ircd/Makefile.in
 --- a/ircd/Makefile.in
 +++ b/ircd/Makefile.in
 @@ -186,6 +186,7 @@
@@ -281,7 +281,7 @@ diff -r 4676d2565f9b ircd/Makefile.in
  whocmds.o: whocmds.c ../config.h ../include/whocmds.h \
    ../include/channel.h ../include/ircd_defs.h ../include/res.h \
    ../config.h ../include/client.h ../include/dbuf.h ../include/msgq.h \
-diff -r 4676d2565f9b ircd/client.c
+diff -r a9b437e961ec ircd/client.c
 --- a/ircd/client.c
 +++ b/ircd/client.c
 @@ -177,6 +177,7 @@
@@ -309,7 +309,7 @@ diff -r 4676d2565f9b ircd/client.c
  #undef P
    { 0, 0 }
  };
-diff -r 4676d2565f9b ircd/ircd_features.c
+diff -r a9b437e961ec ircd/ircd_features.c
 --- a/ircd/ircd_features.c
 +++ b/ircd/ircd_features.c
 @@ -366,6 +366,7 @@
@@ -328,7 +328,7 @@ diff -r 4676d2565f9b ircd/ircd_features.c
    F_B(HIS_STATS_w, 0, 1, 0),
    F_B(HIS_STATS_x, 0, 1, 0),
    F_B(HIS_STATS_y, 0, 1, 0),
-diff -r 4676d2565f9b ircd/ircd_lexer.l
+diff -r a9b437e961ec ircd/ircd_lexer.l
 --- a/ircd/ircd_lexer.l
 +++ b/ircd/ircd_lexer.l
 @@ -166,6 +166,8 @@
@@ -340,7 +340,7 @@ diff -r 4676d2565f9b ircd/ircd_lexer.l
    { NULL, 0 }
  };
  static int ntokens;
-diff -r 4676d2565f9b ircd/ircd_parser.y
+diff -r a9b437e961ec ircd/ircd_parser.y
 --- a/ircd/ircd_parser.y
 +++ b/ircd/ircd_parser.y
 @@ -189,6 +189,7 @@
@@ -360,7 +360,7 @@ diff -r 4676d2565f9b ircd/ircd_parser.y
            TPRIV_PARANOID { $$ = PRIV_PARANOID; } ;
  yesorno: YES { $$ = 1; } | NO { $$ = 0; };
  
-diff -r 4676d2565f9b ircd/m_welcome.c
+diff -r a9b437e961ec ircd/m_welcome.c
 --- /dev/null
 +++ b/ircd/m_welcome.c
 @@ -0,0 +1,296 @@
@@ -660,7 +660,7 @@ diff -r 4676d2565f9b ircd/m_welcome.c
 +  /* and do it */
 +  return welcome_do(cptr, sptr, name, timestamp, who, text, flags);
 +}
-diff -r 4676d2565f9b ircd/parse.c
+diff -r a9b437e961ec ircd/parse.c
 --- a/ircd/parse.c
 +++ b/ircd/parse.c
 @@ -661,6 +661,15 @@
@@ -679,7 +679,7 @@ diff -r 4676d2565f9b ircd/parse.c
  
    /* This command is an alias for QUIT during the unregistered part of
     * of the server.  This is because someone jumping via a broken web
-diff -r 4676d2565f9b ircd/s_err.c
+diff -r a9b437e961ec ircd/s_err.c
 --- a/ircd/s_err.c
 +++ b/ircd/s_err.c
 @@ -486,7 +486,7 @@
@@ -700,7 +700,7 @@ diff -r 4676d2565f9b ircd/s_err.c
  /* 510 */
    { 0 },
  /* 511 */
-diff -r 4676d2565f9b ircd/s_serv.c
+diff -r a9b437e961ec ircd/s_serv.c
 --- a/ircd/s_serv.c
 +++ b/ircd/s_serv.c
 @@ -57,6 +57,7 @@
@@ -719,7 +719,7 @@ diff -r 4676d2565f9b ircd/s_serv.c
  
    /*
     * Pass on my client information to the new server
-diff -r 4676d2565f9b ircd/s_stats.c
+diff -r a9b437e961ec ircd/s_stats.c
 --- a/ircd/s_stats.c
 +++ b/ircd/s_stats.c
 @@ -54,6 +54,7 @@
@@ -744,7 +744,7 @@ diff -r 4676d2565f9b ircd/s_stats.c
    { 'x', "memusage", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_x,
      stats_meminfo, 0,
      "List usage information." },
-diff -r 4676d2565f9b ircd/s_user.c
+diff -r a9b437e961ec ircd/s_user.c
 --- a/ircd/s_user.c
 +++ b/ircd/s_user.c
 @@ -63,6 +63,7 @@
@@ -765,10 +765,10 @@ diff -r 4676d2565f9b ircd/s_user.c
    }
    else {
      struct Client *acptr = user->server;
-diff -r 4676d2565f9b ircd/welcome.c
+diff -r a9b437e961ec ircd/welcome.c
 --- /dev/null
 +++ b/ircd/welcome.c
-@@ -0,0 +1,584 @@
+@@ -0,0 +1,585 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/welcome.c
 + * Copyright (C) 1990 Jarkko Oikarinen and
@@ -858,6 +858,7 @@ diff -r 4676d2565f9b ircd/welcome.c
 +welcome_propagate(struct Client *cptr, struct Client *sptr, int nameint,
 +  time_t timestamp, char *who, char *text, unsigned int flags)
 +{
++  /* must be global */
 +  assert(!(flags & WELCOME_LOCAL));
 +
 +  sendcmdto_serv_butone(sptr, CMD_WELCOME, cptr, "* %s%s%d %Tu %s :%s",
@@ -916,7 +917,7 @@ diff -r 4676d2565f9b ircd/welcome.c
 +welcome_set(struct Client *cptr, struct Client *sptr, int nameint,
 +  int namearray, time_t timestamp, char *who, char *text, unsigned int flags)
 +{
-+  char msg[BUFSIZE];                    /* msg for snomask, logging, etc. */
++  char msg[BUFSIZE];                    /* msg for logging */
 +  int new = 0;
 +
 +  /* debug */
@@ -930,7 +931,7 @@ diff -r 4676d2565f9b ircd/welcome.c
 +  /* update */
 +  welcome_make(namearray, text, who, timestamp);
 +
-+  /* create msg for snomask, logging, etc. */
++  /* create msg for log */
 +  ircd_snprintf(0, msg, 0, "%s%s%s WELCOME %d \"%s\" [%Tu]",
 +    new ? "setting" : "changing",
 +    (flags & WELCOME_ANNOUNCE) ? " and announcing " : " ",
@@ -966,7 +967,7 @@ diff -r 4676d2565f9b ircd/welcome.c
 +welcome_unset(struct Client *cptr, struct Client *sptr, int nameint,
 +  int namearray, time_t timestamp, char *who, unsigned int flags)
 +{
-+  char msg[BUFSIZE];                    /* msg for snomask, logging, etc. */
++  char msg[BUFSIZE];                    /* msg for logging */
 +  char text[WELCOMELEN + 1];            /* save old text */
 +  int i;                                /* loop variable */
 +  int empty = namearray;                /* first empty spot in array after arrayname */
@@ -982,7 +983,7 @@ diff -r 4676d2565f9b ircd/welcome.c
 +  /* update */
 +  welcome_make(namearray, "", who, timestamp);
 +
-+  /* create msg for snomask, logging, etc. */
++  /* create msg for log */
 +  ircd_snprintf(0, msg, 0, "unsetting %s WELCOME %d \"%s\" [%Tu]",
 +    (flags & WELCOME_LOCAL) ? "local" : "global", nameint, text, timestamp);
 +
@@ -997,11 +998,11 @@ diff -r 4676d2565f9b ircd/welcome.c
 +  if (flags & WELCOME_LOCAL)
 +    end += WELCOME_MAX_ENTRIES;
 +
-+  /* found first empty spot */
++  /* move entries up, update timestamp */
 +  for (i = namearray; i < end; i++)
 +    welcome_make(i, WelcomeArray[i+1].text, WelcomeArray[i+1].who, timestamp);
 +
-+  /* clear last entry */
++  /* clear last entry, update timestamp */
 +  welcome_make(end, "", who, timestamp);
 +
 +  return 0;
@@ -1023,7 +1024,7 @@ diff -r 4676d2565f9b ircd/welcome.c
 +welcome_insert(struct Client *cptr, struct Client *sptr, int nameint,
 +  int namearray, time_t timestamp, char *who, char *text, unsigned int flags)
 +{
-+  char msg[BUFSIZE];                    /* msg for snomask, logging, etc. */
++  char msg[BUFSIZE];                    /* msg for logging */
 +  int i;                                /* loop variable */
 +  int empty = -1;                       /* first empty spot in array after arrayname */
 +  int end = WELCOME_MAX_ENTRIES -1;     /* last element to check in array */
@@ -1037,7 +1038,7 @@ diff -r 4676d2565f9b ircd/welcome.c
 +  if (flags & WELCOME_LOCAL)
 +    end += WELCOME_MAX_ENTRIES;
 +
-+  /* found first empty spot */
++  /* find first empty spot */
 +  for (i = namearray; i <= end; i++) {
 +    if (*WelcomeArray[i].text == 0) {
 +      empty = i;
@@ -1059,7 +1060,7 @@ diff -r 4676d2565f9b ircd/welcome.c
 +  if (flags & WELCOME_LOCAL)
 +    empty -= WELCOME_MAX_ENTRIES;
 +
-+  /* create msg for snomask, logging, etc. */
++  /* create msg for log */
 +  if (nameint == empty)
 +    ircd_snprintf(0, msg, 0, "moving %s WELCOME message %d one place down",
 +      (flags & WELCOME_LOCAL) ? "local" : "global", nameint);