this gets faimtest to compile on my work box. stupid gcc 2.96

[libfaim.git] / src / ft.c

diff --git a/src/ft.c b/src/ft.c
index c7068ae86e5aae592abceaacd45ed2a258cb4940..7a27cab6b915210edc2f0689dd9fda5096b3177c 100644 (file)
--- a/src/ft.c
+++ b/src/ft.c
@@ -314,10 +314,11 @@ faim_export aim_conn_t *aim_directim_initiate(aim_session_t *sess, aim_conn_t *c
        memcpy(cookie->cookie, ck, 8);
        cookie->type = AIM_COOKIETYPE_OFTIM;
 
+       /* this one is for the cookie */
        priv = (struct aim_directim_intdata *)calloc(1, sizeof(struct aim_directim_intdata));
 
        memcpy(priv->cookie, ck, 8);
-       memcpy(priv->sn, destsn, sizeof(priv->sn));
+       strncpy(priv->sn, destsn, sizeof(priv->sn));
        cookie->data = priv;
        aim_cachecookie(sess, cookie);
 
@@ -331,7 +332,7 @@ faim_export aim_conn_t *aim_directim_initiate(aim_session_t *sess, aim_conn_t *c
        priv = (struct aim_directim_intdata *)calloc(1, sizeof(struct aim_directim_intdata));
 
        memcpy(priv->cookie, ck, 8);
-       memcpy(priv->sn, destsn, sizeof(priv->sn));
+       strncpy(priv->sn, destsn, sizeof(priv->sn));
 
        newconn->fd = listenfd;
        newconn->subtype = AIM_CONN_SUBTYPE_OFT_DIRECTIM;
@@ -421,7 +422,8 @@ faim_export aim_conn_t *aim_directim_connect(aim_session_t *sess, const char *sn
 
        memcpy(intdata->cookie, cookie, 8);
        strncpy(intdata->sn, sn, sizeof(intdata->sn));
-       strncpy(intdata->ip, addr, sizeof(intdata->ip));
+       if (addr)
+               strncpy(intdata->ip, addr, sizeof(intdata->ip));
 
        /* XXX verify that non-blocking connects actually work */
        if (!(newconn = aim_newconn(sess, AIM_CONN_TYPE_RENDEZVOUS, addr))) {
@@ -429,7 +431,7 @@ faim_export aim_conn_t *aim_directim_connect(aim_session_t *sess, const char *sn
                return NULL;
        }
 
-       if (!newconn || (newconn->fd == -1)) {
+       if (!newconn) {
                free(intdata);
                return newconn;
        }