Changeset 537d9b9 for irc_send.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master up to commit '9f03c47' into parson

File:

• irc_send.c (modified) (5 diffs)

irc_send.c

@@ -41 +41 @@
 {
         irc_send_num(irc,   1, ":Welcome to the %s gateway, %s", PACKAGE, irc->user->nick);
-        irc_send_num(irc,   2, ":Host %s is running %s %s %s/%s.", irc->root->host,
-                     PACKAGE, BITLBEE_VERSION, ARCH, CPU);
+        irc_send_num(irc,   2, ":Host %s is running %s %s.", irc->root->host,
+                     PACKAGE, BITLBEE_VERSION);
         irc_send_num(irc,   3, ":%s", IRCD_INFO);
         irc_send_num(irc,   4, "%s %s %s %s", irc->root->host, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES);
@@ -54 +54 @@
 void irc_send_motd(irc_t *irc)
 {
-        char motd[2048];
-        ssize_t len;
-        int fd;
-
-        fd = open(global.conf->motdfile, O_RDONLY);
-        if (fd == -1 || (len = read(fd, motd, sizeof(motd) - 1)) <= 0) {
+        char *motd;
+        size_t len;
+
+        g_file_get_contents(global.conf->motdfile, &motd, &len, NULL);
+
+        if (!motd || !len) {
                 irc_send_num(irc, 422, ":We don't need MOTDs.");
         } else {
@@ -66 +66 @@
 
                 in = motd;
-                motd[len] = '\0';
                 linebuf[79] = len = 0;
                 max = sizeof(linebuf) - 1;
@@ -101 +100 @@
         }
 
-        if (fd != -1) {
-                close(fd);
-        }
+        g_free(motd);
+
 }
 
@@ -348 +346 @@
                 }
 
-                /* rfc1459 doesn't mention this: G means gone, H means here */
-                status_prefix[0] = iu->flags & IRC_USER_AWAY ? 'G' : 'H';
+                /* If this is the account nick, check configuration to see if away */
+                if (iu == irc->user) {
+                        /* rfc1459 doesn't mention this: G means gone, H means here */
+                        status_prefix[0] = set_getstr(&irc->b->set, "away") ? 'G' : 'H';
+                } else {
+                        status_prefix[0] = iu->flags & IRC_USER_AWAY ? 'G' : 'H';
+                }
 
                 irc_send_num(irc, 352, "%s %s %s %s %s %s :0 %s",