* Port [2546] to 1.2.16 from trunk

 * egg_snprintf()->simple_snprintf() 


svn: 3812

src/dccutil.c

@@ -306,7 +306,7 @@ dprintf(int idx, const char *format, ...)
 //      size_t size = strlen(dcc[idx].simulbot) + strlen(buf) + 20;
 //      char *ircbuf = (char *) my_calloc(1, size);
 
-//      egg_snprintf(ircbuf, size, "PRIVMSG %s :%s", dcc[idx].simulbot, buf);
+//      simple_snprintf(ircbuf, size, "PRIVMSG %s :%s", dcc[idx].simulbot, buf);
 //      tputs(dcc[idx].sock, ircbuf, strlen(ircbuf));
       dprintf(DP_HELP, "PRIVMSG %s :%s\n", dcc[idx].simulbot, buf);
 //      free(ircbuf);
@@ -745,7 +745,7 @@ detect_dcc_flood(time_t * timer, struct chat_info *chat, int idx)
       if ((dcc[idx].type->flags & DCT_CHAT) && chat && (chat->channel >= 0)) {
         char x[1024];
 
-        egg_snprintf(x, sizeof x, DCC_FLOODBOOT, dcc[idx].nick);
+        simple_snprintf(x, sizeof x, DCC_FLOODBOOT, dcc[idx].nick);
         chanout_but(idx, chat->channel, "*** %s", x);
         if (chat->channel < GLOBAL_CHANS)
           botnet_send_part_idx(idx, x);
@@ -777,7 +777,7 @@ do_boot(int idx, char *by, char *reason)
   if ((dcc[idx].type->flags & DCT_CHAT) && (dcc[idx].u.chat->channel >= 0)) {
     char x[1024] = "";
 
-    egg_snprintf(x, sizeof x, DCC_BOOTED3, by, dcc[idx].nick, reason[0] ? ": " : "", reason);
+    simple_snprintf(x, sizeof x, DCC_BOOTED3, by, dcc[idx].nick, reason[0] ? ": " : "", reason);
     chanout_but(idx, dcc[idx].u.chat->channel, "*** %s.\n", x);
     if (dcc[idx].u.chat->channel < GLOBAL_CHANS)
       botnet_send_part_idx(idx, x);

src/mod/channels.mod/channels.c

@@ -232,7 +232,7 @@ static void got_cjoin(char *botnick, char *code, char *par)
       size_t size = strlen(par) + 12 + 1;
 
       options = (char *) my_calloc(1, size);
-      egg_snprintf(options, size, "%s +inactive", par);
+      simple_snprintf(options, size, "%s +inactive", par);
     } else if (match && chan && !shouldjoin(chan)) {
       if (!inactive)
         do_chanset(NULL, chan, "-inactive", DO_LOCAL);

src/mod/compress.mod/compress.c

@@ -221,7 +221,7 @@ static int compress_to_file(char *f_src, char *f_target, int mode_num)
   size_t len;
 
   adjust_mode_num(&mode_num);
-  egg_snprintf(mode, sizeof mode, "wb%d", mode_num);
+  simple_snprintf(mode, sizeof mode, "wb%d", mode_num);
 
   if (!is_file(f_src)) {
     putlog(LOG_MISC, "*", "Failed to compress file `%s': not a file.",

src/mod/console.mod/console.c

@@ -115,7 +115,7 @@ console_set(struct userrec *u, struct user_entry *e, void *buf)
   if (!noshare && !u->bot) {
     char string[501] = "";
 
-    egg_snprintf(string, sizeof string, "%s %s %s %d %d %d %d %d %d %d %d", ci->channel,
+    simple_snprintf(string, sizeof string, "%s %s %s %d %d %d %d %d %d %d %d", ci->channel,
                  masktype(ci->conflags), stripmasktype(ci->stripflags), ci->echoflags, ci->page, ci->conchan,
                  ci->color, ci->banner, ci->channels, ci->bots, ci->whom);
     /* shareout("c %s %s %s\n", e->type->name, u->handle, string); */

src/mod/transfer.mod/transfer.c

@@ -154,11 +154,11 @@ static void eof_dcc_send(int idx)
       }
     }
     if (y >= 0) {
-      putlog(LOG_BOTS, "*",TRANSFER_USERFILE_LOST, dcc[y].nick);
+      putlog(LOG_BOTS, "*", TRANSFER_USERFILE_LOST, dcc[y].nick);
       unlink(dcc[idx].u.xfer->filename);
       /* Drop that bot */
       dprintf(y, "bye\n");
-      egg_snprintf(s, sizeof s,TRANSFER_USERFILE_DISCON, dcc[y].nick);
+      simple_snprintf(s, sizeof s, TRANSFER_USERFILE_DISCON, dcc[y].nick);
       botnet_send_unlinked(y, dcc[y].nick, s);
       chatout("*** %s %s\n", dcc[y].nick, s);
 
@@ -189,7 +189,7 @@ static void eof_dcc_send(int idx)
       unlink(dcc[idx].u.xfer->filename);
 /* Drop that bot 
       dprintf(y, "bye\n");
-      egg_snprintf(s, sizeof s,"Disconnected %s (aborted binary transfer)", dcc[y].nick);
+      simple_snprintf(s, sizeof s,"Disconnected %s (aborted binary transfer)", dcc[y].nick);
       botnet_send_unlinked(y, dcc[y].nick, s);
       chatout("*** %s\n", dcc[y].nick, s);
       if (y != idx) {
@@ -392,7 +392,7 @@ void eof_dcc_get(int idx)
     /* Note: no need to unlink the xfer file, as it's already unlinked. */
     /* Drop that bot */
     dprintf(-dcc[y].sock, "bye\n");
-    egg_snprintf(s, sizeof s, TRANSFER_USERFILE_DISCON,
+    simple_snprintf(s, sizeof s, TRANSFER_USERFILE_DISCON,
 		 dcc[y].nick);
     botnet_send_unlinked(y, dcc[y].nick, s);
     chatout("*** %s\n", s);
@@ -419,7 +419,7 @@ void eof_dcc_get(int idx)
     bupdating = 0;
 /*
     dprintf(-dcc[y].sock, "bye\n");
-    egg_snprintf(s, sizeof s, "Disconnected %s (aborted binary transfer)",
+    simple_snprintf(s, sizeof s, "Disconnected %s (aborted binary transfer)",
 		 dcc[y].nick);
     botnet_send_unlinked(y, dcc[y].nick, s);
     chatout("*** %s\n", s);
@@ -491,7 +491,7 @@ static void transfer_get_timeout(int i)
     unlink(dcc[i].u.xfer->filename);
     putlog(LOG_BOTS, "*",TRANSFER_USERFILE_TIMEOUT);
     dprintf(y, "bye\n");
-    egg_snprintf(xx, sizeof xx,TRANSFER_DICONNECT_TIMEOUT,
+    simple_snprintf(xx, sizeof xx,TRANSFER_DICONNECT_TIMEOUT,
 		 dcc[y].nick);
     botnet_send_unlinked(y, dcc[y].nick, xx);
     chatout("*** %s\n", xx);
@@ -517,7 +517,7 @@ static void transfer_get_timeout(int i)
     }
     putlog(LOG_BOTS, "*","Timeout on binary transfer.");
     dprintf(y, "bye\n");
-    egg_snprintf(xx, sizeof xx,"Disconnected %s (timed-out binary transfer)",
+    simple_snprintf(xx, sizeof xx,"Disconnected %s (timed-out binary transfer)",
 		 dcc[y].nick);
     botnet_send_unlinked(y, dcc[y].nick, xx);
     chatout("*** %s\n", xx);
@@ -591,7 +591,7 @@ void display_dcc_send(int idx, char *buf)
 
 void display_dcc_fork_send(int idx, char *buf)
 {
-  sprintf(buf, TRANSFER_CONN_SEND);
+  simple_sprintf(buf, TRANSFER_CONN_SEND);
 }
 
 void kill_dcc_xfer(int idx, void *x)
@@ -660,7 +660,7 @@ void dcc_fork_send(int idx, char *x, int y)
   dcc[idx].type = &DCC_SEND;
   dcc[idx].status = 0;
   dcc[idx].u.xfer->start_time = now;
-  egg_snprintf(s1, sizeof s1, "%s!%s", dcc[idx].nick, dcc[idx].host);
+  simple_snprintf(s1, sizeof s1, "%s!%s", dcc[idx].nick, dcc[idx].host);
   if (strcmp(dcc[idx].nick, "*users") && strcmp(dcc[idx].nick, "*binary"))
     putlog(LOG_MISC, "*", TRANSFER_DCC_CONN, dcc[idx].u.xfer->origname, s1);
 }