Changes in / [69c3878:7cfb1df]


Ignore:
Files:
2 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r1703f72 r42ad917  
    44*~
    55.#*
    6 .*.swp
    76.deps
    87META.yml
  • Makefile.am

    rb373d44 r42ad917  
    2020perl_tester_SOURCES = $(BASE_SRCS) \
    2121     owl.h owl_perl.h config.h \
     22     libzcrypt.a \
    2223     $(GEN_C) $(GEN_H) \
    2324     perl_tester.c
    2425
    25 perl_tester_LDADD = libfaim/libfaim.a
     26perl_tester_LDADD = libfaim/libfaim.a libzcrypt.a
    2627
    2728TESTS=runtests.sh
     
    4243GEN_H = owl_prototypes.h
    4344
    44 TYPEMAP = typemap
    45 
    4645BUILT_SOURCES = $(GEN_C) $(GEN_H)
    4746
     
    5554proto: owl_prototypes.h
    5655
    57 perlglue.c: perlglue.xs $(TYPEMAP)
    58         $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes perlglue.xs -typemap $(TYPEMAP) > perlglue.c
     56perlglue.c: perlglue.xs
     57        $(AM_V_GEN)perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes perlglue.xs > perlglue.c
    5958
    6059varstubs.c: stubgen.pl variable.c
  • aim.c

    r1fdca1b rc79a047  
    249249}
    250250
    251 /*
    252  * I got these constants by skimming libfaim/im.c
    253  *
    254  * "UNICODE" actually means "UCS-2BE".
    255  */
    256 #define AIM_CHARSET_ISO_8859_1         0x0003
    257 #define AIM_CHARSET_UNICODE            0x0002
    258 
    259 int owl_aim_do_send(const char *to, const char *msg, int flags) /* noproto */
     251int owl_aim_send_im(const char *to, const char *msg)
    260252{
    261253  int ret;
    262   char *encoded;
    263   struct aim_sendimext_args args;
    264     gsize len;
    265 
    266   encoded = g_convert(msg, -1, "ISO-8859-1", "UTF-8", NULL, &len, NULL);
    267   if (encoded) {
    268     owl_function_debugmsg("Encoded outgoing AIM as ISO-8859-1");
    269     args.charset = AIM_CHARSET_ISO_8859_1;
    270     args.charsubset = 0;
    271     args.flags = AIM_IMFLAGS_ISO_8859_1;
    272   } else {
    273     owl_function_debugmsg("Encoding outgoing IM as UCS-2BE");
    274     encoded = g_convert(msg, -1, "UCS-2BE", "UTF-8", NULL, &len, NULL);
    275     if (!encoded) {
    276       /*
    277        * TODO: Strip or HTML-encode characters, or figure out how to
    278        * send in a differen charset.
    279        */
    280       owl_function_error("Unable to encode outgoing AIM message in UCS-2");
    281       return 1;
    282     }
    283 
    284     args.charset = AIM_CHARSET_UNICODE;
    285     args.charsubset = 0;
    286     args.flags = AIM_IMFLAGS_UNICODE;
    287   }
    288 
    289   args.destsn = to;
    290   args.msg = encoded;
    291   args.msglen = len;
    292   args.flags |= flags;
    293 
    294   ret=aim_im_sendch1_ext(owl_global_get_aimsess(&g), &args);
    295 
    296   owl_free(encoded);
    297 
     254
     255  ret=aim_im_sendch1(owl_global_get_aimsess(&g), to, 0, msg);
     256   
     257  /* I don't know how to check for an error yet */
    298258  return(ret);
    299259}
    300260
    301 int owl_aim_send_im(const char *to, const char *msg)
    302 {
    303   return owl_aim_do_send(to, msg, 0);
    304 }
    305 
    306261int owl_aim_send_awaymsg(const char *to, const char *msg)
    307262{
    308   return owl_aim_do_send(to, msg, AIM_IMFLAGS_AWAY);
     263  int ret;
     264
     265  ret=aim_im_sendch1(owl_global_get_aimsess(&g), to, AIM_IMFLAGS_AWAY, msg);
     266
     267  /* I don't know how to check for an error yet */
     268  return(ret);
    309269}
    310270
     
    11891149  owl_message *m;
    11901150  char *stripmsg, *nz_screenname, *wrapmsg;
    1191   char *realmsg = NULL;
    1192 
    1193   if (!args->msg) {
    1194     realmsg = owl_strdup("");
    1195   } else if (args->icbmflags & AIM_IMFLAGS_UNICODE) {
    1196     realmsg = g_convert(args->msg, args->msglen, "UTF-8", "UCS-2BE",
    1197                         NULL, NULL, NULL);
    1198   } else if(args->icbmflags & AIM_IMFLAGS_ISO_8859_1) {
    1199     realmsg = g_convert(args->msg, args->msglen, "UTF-8", "ISO-8859-1",
    1200                         NULL, NULL, NULL);
     1151  char realmsg[8192+1] = "";
     1152  /* int clienttype = AIM_CLIENTTYPE_UNKNOWN; */
     1153
     1154  /* clienttype = aim_fingerprintclient(args->features, args->featureslen); */
     1155
     1156  /*
     1157  printf("icbm: sn = \"%s\"\n", userinfo->sn);
     1158  printf("icbm: probable client type: %d\n", clienttype);
     1159  printf("icbm: warnlevel = %f\n", aim_userinfo_warnlevel(userinfo));
     1160  printf("icbm: flags = 0x%04x = ", userinfo->flags);
     1161  printuserflags(userinfo->flags);
     1162  printf("\n");
     1163  */
     1164
     1165  /*
     1166  printf("icbm: membersince = %lu\n", userinfo->membersince);
     1167  printf("icbm: onlinesince = %lu\n", userinfo->onlinesince);
     1168  printf("icbm: idletime = 0x%04x\n", userinfo->idletime);
     1169  printf("icbm: capabilities = %s = 0x%08lx\n", (userinfo->present & AIM_USERINFO_PRESENT_CAPABILITIES) ? "present" : "not present", userinfo->capabilities);
     1170  */
     1171
     1172  /*
     1173  printf("icbm: icbmflags = ");
     1174  if (args->icbmflags & AIM_IMFLAGS_AWAY) printf("away ");
     1175  if (args->icbmflags & AIM_IMFLAGS_ACK) printf("ackrequest ");
     1176  if (args->icbmflags & AIM_IMFLAGS_OFFLINE) printf("offline ");
     1177  if (args->icbmflags & AIM_IMFLAGS_BUDDYREQ) printf("buddyreq ");
     1178  if (args->icbmflags & AIM_IMFLAGS_HASICON) printf("hasicon ");
     1179  printf("\n");
     1180  */
     1181
     1182  /*
     1183  if (args->icbmflags & AIM_IMFLAGS_CUSTOMCHARSET) {
     1184  printf("icbm: encoding flags = {%04x, %04x}\n", args->charset, args->charsubset);
     1185  }
     1186  */
     1187 
     1188  /*
     1189   * Quickly convert it to eight bit format, replacing non-ASCII UNICODE
     1190   * characters with their equivelent HTML entity.
     1191   */
     1192  if (args->icbmflags & AIM_IMFLAGS_UNICODE) {
     1193    int i;
     1194   
     1195    for (i=0; i<args->msglen; i+=2) {
     1196      fu16_t uni;
     1197
     1198      uni = ((args->msg[i] & 0xff) << 8) | (args->msg[i+1] & 0xff);
     1199      if ((uni < 128) || ((uni >= 160) && (uni <= 255))) { /* ISO 8859-1 */
     1200        snprintf(realmsg+strlen(realmsg), sizeof(realmsg)-strlen(realmsg), "%c", uni);
     1201      } else { /* something else, do UNICODE entity */
     1202        snprintf(realmsg+strlen(realmsg), sizeof(realmsg)-strlen(realmsg), "&#%04x;", uni);
     1203      }
     1204    }
    12011205  } else {
    1202     realmsg = owl_strdup(args->msg);
    1203   }
    1204 
    1205   if (!realmsg) {
    1206     realmsg = owl_strdup("[Error decoding incoming IM]");
     1206    /*
     1207     * For non-UNICODE encodings (ASCII and ISO 8859-1), there is
     1208     * no need to do anything special here.  Most
     1209     * terminals/whatever will be able to display such characters
     1210     * unmodified.
     1211     *
     1212     * Beware that PC-ASCII 128 through 159 are _not_ actually
     1213     * defined in ASCII or ISO 8859-1, and you should send them as
     1214     * UNICODE.  WinAIM will send these characters in a UNICODE
     1215     * message, so you need to do so as well.
     1216     *
     1217     * You may not think it necessary to handle UNICODE messages. 
     1218     * You're probably wrong.  For one thing, Microsoft "Smart
     1219     * Quotes" will be sent by WinAIM as UNICODE (not HTML UNICODE,
     1220     * but real UNICODE). If you don't parse UNICODE at all, your
     1221     * users will get a blank message instead of the message
     1222     * containing Smart Quotes.
     1223     *
     1224     */
     1225    if (args->msg && args->msglen)
     1226      strncpy(realmsg, args->msg, sizeof(realmsg));
    12071227  }
    12081228
     
    12491269  }
    12501270
    1251   owl_free(realmsg);
    1252 
     1271  /*
     1272  if (realmsg) {
     1273    int i = 0;
     1274    while (realmsg[i] == '<') {
     1275      if (realmsg[i] == '<') {
     1276        while (realmsg[i] != '>')
     1277          i++;
     1278        i++;
     1279      }
     1280    }
     1281    tmpstr = realmsg+i;
     1282    faimtest_handlecmd(sess, conn, userinfo, tmpstr);
     1283  }
     1284  */
     1285 
    12531286  return(1);
    12541287}
  • commands.c

    r5ade618 r61de085  
    861861  OWLCMD_VOID_CTX("edit:history-next", owl_command_edit_history_next,
    862862                  OWL_CTX_EDIT,
    863                   "replaces the text with the next history",
     863                  "replaces the text with the previous history",
    864864                  "", ""),
    865865
  • editwin.c

    r6c171f1 r2184001  
    326326static void oe_release_excursion(owl_editwin *e, oe_excursion *x)
    327327{
    328   oe_excursion **px;
     328  oe_excursion *p;
    329329
    330330  x->valid = 0;
    331   for (px = &e->excursions; *px != NULL; px = &(*px)->next)
    332     if (*px == x) {
    333       *px = x->next;
    334       return;
    335     }
    336   abort();
     331  if (e->excursions == NULL)
     332    /* XXX huh. */ ;
     333  else if (e->excursions == x)
     334    e->excursions = x->next;
     335  else {
     336    for (p = e->excursions; p->next != NULL; p = p->next)
     337      if (p->next == x) {
     338        p->next = p->next->next;
     339        break;
     340      }
     341    /* and if we ran off the end? XXX */
     342  }
    337343}
    338344
     
    12521258
    12531259  if (!g_unichar_iscntrl(c) || c == '\n' || c== '\t' ) {
     1260    memset(tmp, 0, 7);
     1261
    12541262    if (c == '\n' && e->style == OWL_EDITWIN_STYLE_ONELINE) {
    12551263      return;
     
    12941302      return; /* our work here is done */
    12951303
    1296     tmp[g_unichar_to_utf8(c, tmp)] = '\0';
     1304    g_unichar_to_utf8(c, tmp);
    12971305    owl_editwin_replace(e, 0, tmp);
    12981306  }
  • fmtext.c

    r6c171f1 rf119757  
    5757
    5858  /* Set attributes */
    59   if (a)
    60     strncat(f->textbuff, attrbuff,
    61             g_unichar_to_utf8(OWL_FMTEXT_UC_ATTR | attr, attrbuff));
    62   if (fg)
    63     strncat(f->textbuff, attrbuff,
    64             g_unichar_to_utf8(OWL_FMTEXT_UC_FGCOLOR | fgcolor, attrbuff));
    65   if (bg)
    66     strncat(f->textbuff, attrbuff,
    67             g_unichar_to_utf8(OWL_FMTEXT_UC_BGCOLOR | bgcolor, attrbuff));
     59  if (a) {
     60    memset(attrbuff,0,6);
     61    g_unichar_to_utf8(OWL_FMTEXT_UC_ATTR | attr, attrbuff);
     62    strcat(f->textbuff, attrbuff);     
     63  }
     64  if (fg) {
     65    memset(attrbuff,0,6);
     66    g_unichar_to_utf8(OWL_FMTEXT_UC_FGCOLOR | fgcolor, attrbuff);
     67    strcat(f->textbuff, attrbuff);     
     68  }
     69  if (bg) {
     70    memset(attrbuff,0,6);
     71    g_unichar_to_utf8(OWL_FMTEXT_UC_BGCOLOR | bgcolor, attrbuff);
     72    strcat(f->textbuff, attrbuff);     
     73  }
    6874 
    6975  strcat(f->textbuff, text);
     
    196202  _owl_fmtext_realloc(f, newlen);
    197203
    198   if (a)
    199     strncat(f->textbuff, attrbuff,
    200             g_unichar_to_utf8(OWL_FMTEXT_UC_ATTR | attr, attrbuff));
    201   if (fg)
    202     strncat(f->textbuff, attrbuff,
    203             g_unichar_to_utf8(OWL_FMTEXT_UC_FGCOLOR | fgcolor, attrbuff));
    204   if (bg)
    205     strncat(f->textbuff, attrbuff,
    206             g_unichar_to_utf8(OWL_FMTEXT_UC_BGCOLOR | bgcolor, attrbuff));
     204  if (a) {
     205    memset(attrbuff,0,6);
     206    g_unichar_to_utf8(OWL_FMTEXT_UC_ATTR | attr, attrbuff);
     207    strcat(f->textbuff, attrbuff);     
     208  }
     209  if (fg) {
     210    memset(attrbuff,0,6);
     211    g_unichar_to_utf8(OWL_FMTEXT_UC_FGCOLOR | fgcolor, attrbuff);
     212    strcat(f->textbuff, attrbuff);     
     213  }
     214  if (bg) {
     215    memset(attrbuff,0,6);
     216    g_unichar_to_utf8(OWL_FMTEXT_UC_BGCOLOR | bgcolor, attrbuff);
     217    strcat(f->textbuff, attrbuff);     
     218  }
    207219
    208220  strncat(f->textbuff, in->textbuff+start, stop-start+1);
     
    303315        int start, end;
    304316        while (owl_regex_compare(owl_global_get_search_re(&g), s, &start, &end) == 0) {
    305           /* Prevent an infinite loop matching the empty string. */
    306           if (end == 0)
    307             break;
    308 
    309317          /* Found search string, highlight it. */
    310318
  • functions.c

    rdca3b27 r340c3e7  
    19411941{
    19421942  owl_fmtext fm;
    1943   char *ptr;
    1944   char *result;
     1943  char *ptr, buff[LINE];
    19451944  int i;
    19461945
     
    19481947
    19491948  for (i=0; i<argc; i++) {
    1950     ptr = long_zuser(argv[i]);
    1951     result = owl_zephyr_zlocate(ptr, auth);
    1952     owl_fmtext_append_normal(&fm, result);
    1953     owl_free(result);
     1949    ptr=long_zuser(argv[i]);
     1950    owl_zephyr_zlocate(ptr, buff, auth);
     1951    owl_fmtext_append_normal(&fm, buff);
    19541952    owl_free(ptr);
    19551953  }
  • perl/lib/BarnOwl.pm

    r77c87b2 rde3f641  
    435435sub default_zephyr_signature
    436436{
    437   my $zsig = getvar('zsig');
    438   if (!$zsig && (my $zsigproc = getvar('zsigproc'))) {
    439     $zsig = `$zsigproc`;
    440   } elsif (!defined($zsig = get_zephyr_variable('zwrite-signature'))) {
    441     $zsig = ((getpwuid($<))[6]);
    442     $zsig =~ s/,.*//;
     437  if (my $zsig = getvar('zsig')) {
     438    return $zsig;
    443439  }
    444   chomp($zsig);
    445   return $zsig;
     440  if (my $zsigproc = getvar('zsigproc')) {
     441    return `$zsigproc`;
     442  }
     443  my $zwrite_signature = get_zephyr_variable('zwrite-signature');
     444  if (defined($zwrite_signature)) {
     445    return $zwrite_signature;
     446  }
     447  my $name = ((getpwuid($<))[6]);
     448  $name =~ s/,.*//;
     449  return $name;
    446450}
    447451
  • perl/modules/IRC/lib/BarnOwl/Module/IRC.pm

    r0c4a190 recee82f  
    399399    $body =~ tr/\n\r/  /;
    400400    if ($body =~ /^\/me (.*)/) {
    401         $conn->conn->me($to, Encode::encode('utf-8', $1));
     401        $conn->conn->me($to, $1);
    402402        $body = '* '.$conn->nick.' '.$1;
    403403    } else {
    404         $conn->conn->privmsg($to, Encode::encode('utf-8', $body));
     404        $conn->conn->privmsg($to, $body);
    405405    }
    406406    my $msg = BarnOwl::Message->new(
  • perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

    r26cde20 r5118b32  
    321321              . "add <jid>     Adds <jid> to your roster.\n\n"
    322322              . "unsub <jid>   Unsubscribe from <jid>'s presence.\n\n"
    323               . "remove <jid>  Removes <jid> from your roster. (implicit unsub)\n\n"
     323              . "remove <jid>  Removes <jid> to your roster. (implicit unsub)\n\n"
    324324              . "auth <jid>    Authorizes <jid> to subscribe to your presence.\n\n"
    325325              . "deauth <jid>  De-authorizes <jid>'s subscription to your presence.\n\n"
  • perl_tester.c

    r737b8f1 r42ad917  
    3232  perl_free(my_perl);
    3333  PERL_SYS_TERM();
    34   return 0;
    3534}
    3635
  • perlglue.xs

    r5791bf7 r9e5b5fd  
    99
    1010#define SV_IS_CODEREF(sv) (SvROK((sv)) && SvTYPE(SvRV((sv))) == SVt_PVCV)
    11 
    12 typedef char utf8;
    1311
    1412        /*************************************************************
     
    3129MODULE = BarnOwl                PACKAGE = BarnOwl
    3230
    33 const utf8 *
     31const char *
    3432command(cmd, ...)
    3533        const char *cmd
     
    7977                RETVAL
    8078
    81 const utf8 *
     79const char *
    8280zephyr_getrealm()
    8381        CODE:
     
    8684                RETVAL
    8785
    88 const utf8 *
     86const char *
    8987zephyr_getsender()
    9088        CODE:
     
    102100                i = owl_zwrite_create_and_send_from_line(cmd, msg);
    103101
    104 const utf8 *
     102const char *
    105103ztext_stylestrip(ztext)
    106104        const char *ztext
     
    115113                if (rv) owl_free(rv);
    116114
    117 const utf8 *
     115const char *
    118116zephyr_smartstrip_user(in)
    119117        const char *in
     
    130128                owl_free(rv);
    131129
    132 const utf8 *
     130const char *
    133131zephyr_getsubs()
    134132        PREINIT:
     
    142140                if (rv) owl_free(rv);
    143141
    144 void
    145 queue_message(msg)
     142void queue_message(msg)
    146143        SV *msg
    147144        PREINIT:
     
    158155        }
    159156
    160 void
    161 admin_message(header, body)
     157void admin_message(header, body)
    162158        const char *header
    163159        const char *body
     
    167163        }
    168164
    169 void
    170 start_question(line, callback)
     165void start_question(line, callback)
    171166        const char *line
    172167        SV *callback
     
    183178        }
    184179
    185 void
    186 start_password(line, callback)
     180void start_password(line, callback)
    187181        const char *line
    188182        SV *callback
     
    199193        }
    200194
    201 void
    202 start_edit_win(line, callback)
     195void start_edit_win(line, callback)
    203196        const char *line
    204197        SV *callback
     
    316309        }
    317310
    318 const utf8 *
     311const char *
    319312wordwrap(in, cols)
    320313        const char *in
     
    328321                RETVAL
    329322        CLEANUP:
    330                 if (rv)
    331                         owl_free(rv);
     323                if (rv) owl_free(rv);
    332324
    333325void
     
    432424                RETVAL
    433425
    434 const utf8 *
     426const char *
    435427skiptokens(str, n)
    436428        const char *str;
     
    572564                RETVAL
    573565
    574 const utf8 *
     566const char *
    575567get_region()
    576568        PREINIT:
  • zephyr.c

    rdca3b27 rc79a047  
    911911#endif
    912912
    913 char *owl_zephyr_zlocate(const char *user, int auth)
     913void owl_zephyr_zlocate(const char *user, char *out, int auth)
    914914{
    915915#ifdef HAVE_LIBZEPHYR
     
    918918  ZLocations_t locations;
    919919  char *myuser;
    920   char *p, *result;
    921 
     920 
     921  strcpy(out, "");
    922922  ZResetAuthentication();
    923   ret = ZLocateUser(zstr(user), &numlocs, auth ? ZAUTH : ZNOAUTH);
    924   if (ret != ZERR_NONE)
    925     return owl_sprintf("Error locating user %s: %s\n",
    926                        user, error_message(ret));
    927 
    928   myuser = short_zuser(user);
    929   if (numlocs == 0) {
    930     result = owl_sprintf("%s: Hidden or not logged in\n", myuser);
    931   } else {
    932     result = owl_strdup("");
    933     for (; numlocs; numlocs--) {
    934       ZGetLocations(&locations, &one);
    935       p = owl_sprintf("%s%s: %s\t%s\t%s\n",
    936                           result, myuser,
    937                           locations.host ? locations.host : "?",
    938                           locations.tty ? locations.tty : "?",
    939                           locations.time ? locations.time : "?");
    940       owl_free(result);
    941       result = p;
    942     }
    943   }
    944 
    945   return result;
    946 #else
    947   return owl_strdup("");
     923  ret=ZLocateUser(zstr(user),&numlocs,auth?ZAUTH:ZNOAUTH);
     924  if (ret != ZERR_NONE) {
     925    sprintf(out, "Error locating user %s\n", user);
     926    return;
     927  }
     928
     929  if (numlocs==0) {
     930    myuser=short_zuser(user);
     931    sprintf(out, "%s: Hidden or not logged in\n", myuser);
     932    owl_free(myuser);
     933    return;
     934  }
     935   
     936  for (;numlocs;numlocs--) {
     937    ZGetLocations(&locations,&one);
     938    myuser=short_zuser(user);
     939    sprintf(out + strlen(out), "%s: %s\t%s\t%s\n", myuser,
     940            locations.host ? locations.host : "?",
     941            locations.tty ? locations.tty : "?",
     942            locations.time ? locations.time : "?");
     943    owl_free(myuser);
     944  }
    948945#endif
    949946}
Note: See TracChangeset for help on using the changeset viewer.