Changes in / [a827529:9e02bb7]
- Files:
-
- 2 deleted
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile.in
rc60ade2 r2bdfed9 26 26 keypress.c keymap.c keybinding.c cmd.c context.c zcrypt.c \ 27 27 aim.c buddy.c buddylist.c timer.c style.c stylefunc.c errqueue.c \ 28 zbuddylist.c muxevents.c popexec.c obarray.c wcwidth.c glib_compat.c28 zbuddylist.c muxevents.c popexec.c obarray.c 29 29 OWL_SRC = owl.c 30 30 TESTER_SRC = tester.c -
aim.c
r34509d5 r9854278 948 948 949 949 if (modname) { 950 if (!(filename = owl_malloc(strlen(priv->aimbinarypath)+1+strlen(modname)+4+1))) {950 if (!(filename = malloc(strlen(priv->aimbinarypath)+1+strlen(modname)+4+1))) { 951 951 /* perror("memrequest: malloc"); */ 952 952 return -1; … … 954 954 sprintf(filename, "%s/%s.ocm", priv->aimbinarypath, modname); 955 955 } else { 956 if (!(filename = owl_malloc(strlen(priv->aimbinarypath)+1+strlen(defaultmod)+1))) {956 if (!(filename = malloc(strlen(priv->aimbinarypath)+1+strlen(defaultmod)+1))) { 957 957 /* perror("memrequest: malloc"); */ 958 958 return -1; … … 964 964 if (!modname) { 965 965 /* perror("memrequest: stat"); */ 966 owl_free(filename);966 free(filename); 967 967 return -1; 968 968 } … … 986 986 int i; 987 987 988 owl_free(filename); /* not needed */988 free(filename); /* not needed */ 989 989 owl_function_error("getaimdata memrequest: recieved invalid request for 0x%08lx bytes at 0x%08lx (file %s)\n", len, offset, modname); 990 990 i = 8; … … 993 993 } 994 994 995 if (!(buf = owl_malloc(i))) {995 if (!(buf = malloc(i))) { 996 996 return -1; 997 997 } … … 1017 1017 *buflenret = i; 1018 1018 } else { 1019 if (!(buf = owl_malloc(len))) {1020 owl_free(filename);1019 if (!(buf = malloc(len))) { 1020 free(filename); 1021 1021 return -1; 1022 1022 } … … 1024 1024 if (!(f = fopen(filename, "r"))) { 1025 1025 /* perror("memrequest: fopen"); */ 1026 owl_free(filename);1027 owl_free(buf);1026 free(filename); 1027 free(buf); 1028 1028 return -1; 1029 1029 } 1030 1030 1031 owl_free(filename);1031 free(filename); 1032 1032 1033 1033 if (fseek(f, offset, SEEK_SET) == -1) { 1034 1034 /* perror("memrequest: fseek"); */ 1035 1035 fclose(f); 1036 owl_free(buf);1036 free(buf); 1037 1037 return -1; 1038 1038 } … … 1041 1041 /* perror("memrequest: fread"); */ 1042 1042 fclose(f); 1043 owl_free(buf);1043 free(buf); 1044 1044 return -1; 1045 1045 } … … 1076 1076 if (priv->aimbinarypath && (getaimdata(sess, &buf, &buflen, offset, len, modname) == 0)) { 1077 1077 aim_sendmemblock(sess, fr->conn, offset, buflen, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST); 1078 owl_free(buf);1078 free(buf); 1079 1079 } else { 1080 1080 owl_function_debugmsg("faimtest_memrequest: unable to use AIM binary (\"%s/%s\"), sending defaults...\n", priv->aimbinarypath, modname); … … 1342 1342 int z; 1343 1343 1344 newbuf = owl_malloc(i+1);1344 newbuf = malloc(i+1); 1345 1345 for (z = 0; z < i; z++) 1346 1346 newbuf[z] = (z % 10)+0x30; 1347 1347 newbuf[i] = '\0'; 1348 1348 /* aim_send_im(sess, userinfo->sn, AIM_IMFLAGS_ACK | AIM_IMFLAGS_AWAY, newbuf); */ 1349 owl_free(newbuf);1349 free(newbuf); 1350 1350 } 1351 1351 } else if (strstr(tmpstr, "seticqstatus")) { -
cmd.c
r34509d5 r6922edd 74 74 owl_cmd *cmd; 75 75 76 tmpbuff= owl_strdup(cmdbuff);76 tmpbuff=strdup(cmdbuff); 77 77 argv=owl_parseline(tmpbuff, &argc); 78 78 if (argc < 0) { -
config.h.in
re23eb2b r03cf6b9 22 22 #undef HAVE_LIBCOM_ERR 23 23 24 /* Define to 1 if you have the `curses' library (-lcurses). */ 25 #undef HAVE_LIBCURSES 26 24 27 /* Define to 1 if you have the `des425' library (-ldes425). */ 25 28 #undef HAVE_LIBDES425 … … 36 39 /* Define to 1 if you have the `krb5' library (-lkrb5). */ 37 40 #undef HAVE_LIBKRB5 41 42 /* Define to 1 if you have the `ncurses' library (-lncurses). */ 43 #undef HAVE_LIBNCURSES 38 44 39 45 /* Define to 1 if you have the `ncursesw' library (-lncursesw). */ -
configure.in
re23eb2b r18e28a4 12 12 fi 13 13 14 m4_include(/usr/share/aclocal/pkg.m4)15 dnl m4_include(pkg.m4)16 14 17 15 dnl Check for Athena … … 46 44 fi 47 45 48 AC_CHECK_LIB(ncursesw, initscr,, AC_MSG_ERROR(No curses library found.)) 46 AC_CHECK_LIB(ncursesw, initscr,, 47 AC_CHECK_LIB(ncurses, initscr,, 48 AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(No curses library found.)))) 49 49 AC_CHECK_LIB(com_err, com_err) 50 50 AC_CHECK_LIB(nsl, gethostbyname) … … 109 109 LDFLAGS=${LDFLAGS}\ ${FOO} 110 110 111 dnl Add CFLAGS and LDFLAGS for glib-2.0112 PKG_CHECK_MODULES(GLIB,glib-2.0)113 114 echo Adding glib-2.0 CFLAGS ${GLIB_CFLAGS}115 CFLAGS=${CFLAGS}\ ${GLIB_CFLAGS}116 echo Adding glib-2.0 LDFLAGS ${GLIB_LIBS}117 LDFLAGS=${LDFLAGS}\ ${GLIB_LIBS}118 119 120 111 dnl Checks for typedefs, structures, and compiler characteristics. 121 112 -
editwin.c
r830c36e r9a6cc40 143 143 e->buffy=0; 144 144 owl_editwin_overwrite_string(e, text); 145 owl_editwin_overwrite_char(e, '\0');146 145 e->lock=strlen(text); 147 146 /* if (text[e->lock-1]=='\n') e->lock--; */ 148 /* e->buffx=x; */149 /* e->buffy=y; */147 e->buffx=x; 148 e->buffy=y; 150 149 owl_editwin_adjust_for_locktext(e); 151 150 owl_editwin_redisplay(e, 0); … … 252 251 253 252 /* start at topline */ 254 ptr1 =e->buff;255 for (i = 0; i <e->topline; i++) {256 ptr2 =strchr(ptr1, '\n');253 ptr1=e->buff; 254 for (i=0; i<e->topline; i++) { 255 ptr2=strchr(ptr1, '\n'); 257 256 if (!ptr2) { 258 257 /* we're already on the last line */ 259 258 break; 260 259 } 261 ptr1 = ptr2 +1;260 ptr1=ptr2+1; 262 261 } 263 262 /* ptr1 now stores the starting point */ 264 263 265 264 /* find the ending point and store it in ptr3 */ 266 ptr2 =ptr1;267 ptr3 =ptr1;268 for (i = 0; i <e->winlines; i++) {269 ptr3 =strchr(ptr2, '\n');265 ptr2=ptr1; 266 ptr3=ptr1; 267 for (i=0; i<e->winlines; i++) { 268 ptr3=strchr(ptr2, '\n'); 270 269 if (!ptr3) { 271 270 /* we've hit the last line */ 272 271 /* print everything to the end */ 273 ptr3 = e->buff + e->bufflen -1;272 ptr3=e->buff+e->bufflen-1; 274 273 ptr3--; 275 274 break; 276 275 } 277 ptr2 = ptr3 +1;278 } 279 ptr3 +=2;280 281 buff = owl_malloc(ptr3 - ptr1 +50);282 strncpy(buff, ptr1, ptr3 -ptr1);283 buff[ptr3 - ptr1] ='\0';284 if (e->echochar =='\0') {276 ptr2=ptr3+1; 277 } 278 ptr3+=2; 279 280 buff=owl_malloc(ptr3-ptr1+50); 281 strncpy(buff, ptr1, ptr3-ptr1); 282 buff[ptr3-ptr1]='\0'; 283 if (e->echochar=='\0') { 285 284 waddstr(e->curswin, buff); 286 285 } else { 287 286 /* translate to echochar, *except* for the locktext */ 288 287 int len; 289 int dolocklen = e->lock - (ptr1 -e->buff);290 291 for (i = 0; i <dolocklen; i++) {288 int dolocklen=e->lock-(ptr1-e->buff); 289 290 for (i=0; i<dolocklen; i++) { 292 291 waddch(e->curswin, buff[i]); 293 292 } 294 len =strlen(buff);295 for (i = 0; i <len-dolocklen; i++) {293 len=strlen(buff); 294 for (i=0; i<len-dolocklen; i++) { 296 295 waddch(e->curswin, e->echochar); 297 296 } 298 297 } 299 wmove(e->curswin, e->buffy-e->topline, e->buffx + _owl_editwin_cursor_adjustment(e));298 wmove(e->curswin, e->buffy-e->topline, e->buffx); 300 299 wnoutrefresh(e->curswin); 301 if (update ==1) {300 if (update==1) { 302 301 doupdate(); 303 302 } 304 303 owl_free(buff); 305 }306 307 /* Remove n bytes at cursor. */308 void _owl_editwin_remove_bytes(owl_editwin *e, int n) /*noproto*/309 {310 int i = _owl_editwin_get_index_from_xy(e) + n;311 for (; i < e->bufflen; i++) {312 e->buff[i-n] = e->buff[i];313 }314 315 e->bufflen -= n;316 e->buff[e->bufflen] = '\0';317 }318 319 /* Insert n bytes at cursor.*/320 void _owl_editwin_insert_bytes(owl_editwin *e, int n) /*noproto*/321 {322 int i, z;323 324 if ((e->bufflen + n) > (e->allocated - 5)) {325 _owl_editwin_addspace(e);326 }327 328 e->bufflen += n;329 e->buff[e->bufflen] = '\0';330 331 z = _owl_editwin_get_index_from_xy(e);332 for (i = e->bufflen - 1; i > z; i--) {333 e->buff[i] = e->buff[i - n];334 }335 304 } 336 305 … … 344 313 int i, z; 345 314 346 z =_owl_editwin_get_index_from_xy(e);315 z=_owl_editwin_get_index_from_xy(e); 347 316 /* move back and line wrap the previous word */ 348 for (i = z -1; ; i--) {317 for (i=z-1; ; i--) { 349 318 /* move back until you find a space or hit the beginning of the line */ 350 if (e->buff[i] ==' ') {319 if (e->buff[i]==' ') { 351 320 /* replace the space with a newline */ 352 e->buff[i] ='\n';321 e->buff[i]='\n'; 353 322 e->buffy++; 354 e->buffx = z - i -1;323 e->buffx=z-i-1; 355 324 /* were we on the last line */ 356 325 return(0); 357 } else if (e->buff[i] == '\n' || i <=e->lock) {358 /* we hit the beg inning of the line or the buffer, we cannot326 } else if (e->buff[i]=='\n' || i<=e->lock) { 327 /* we hit the begginning of the line or the buffer, we cannot 359 328 * wrap. 360 329 */ … … 367 336 * characters over) 368 337 */ 369 void owl_editwin_insert_char(owl_editwin *e, gunichar c) 370 { 371 int z, i, ret, len; 372 char tmp[6]; 373 memset(tmp, '\0', 6); 338 void owl_editwin_insert_char(owl_editwin *e, char c) 339 { 340 341 int z, i, ret; 374 342 375 343 /* \r is \n */ 376 if (c =='\r') {377 c ='\n';378 } 379 380 if (c == '\n' && e->style ==OWL_EDITWIN_STYLE_ONELINE) {344 if (c=='\r') { 345 c='\n'; 346 } 347 348 if (c=='\n' && e->style==OWL_EDITWIN_STYLE_ONELINE) { 381 349 /* perhaps later this will change some state that allows the string 382 350 to be read */ … … 384 352 } 385 353 386 g_unichar_to_utf8(c, tmp);387 len = strlen(tmp);388 389 354 /* make sure there is enough memory for the new text */ 390 if ((e->bufflen + len) > (e->allocated -5)) {355 if ((e->bufflen+1) > (e->allocated-5)) { 391 356 _owl_editwin_addspace(e); 392 357 } 393 358 394 359 /* get the insertion point */ 395 z =_owl_editwin_get_index_from_xy(e);360 z=_owl_editwin_get_index_from_xy(e); 396 361 397 362 /* If we're going to insert at the last column do word wrapping, unless it's a \n */ 398 if ((e->buffx + 1 == e->wrapcol) && (c !='\n')) {399 ret =_owl_editwin_linewrap_word(e);400 if (ret ==-1) {363 if ((e->buffx+1==e->wrapcol) && (c!='\n')) { 364 ret=_owl_editwin_linewrap_word(e); 365 if (ret==-1) { 401 366 /* we couldn't wrap, insert a hard newline instead */ 402 367 owl_editwin_insert_char(e, '\n'); … … 404 369 } 405 370 371 z=_owl_editwin_get_index_from_xy(e); 406 372 /* shift all the other characters right */ 407 if (z != e->bufflen) { 408 _owl_editwin_insert_bytes(e, len); 409 } 410 411 /* insert the new character */ 412 for(i = 0; i < len; i++) { 413 e->buff[z + i] = tmp[i]; 414 } 373 for (i=e->bufflen; i>z; i--) { 374 e->buff[i]=e->buff[i-1]; 375 } 376 377 /* insert the new one */ 378 e->buff[z]=c; 415 379 416 380 /* housekeeping */ 417 e->bufflen += len; 418 e->buff[e->bufflen] = '\0'; 381 e->bufflen++; 382 e->buff[e->bufflen]='\0'; 383 384 /* advance the cursor */ 385 if (c=='\n') { 386 e->buffx=0; 387 e->buffy++; 388 } else { 389 e->buffx++; 390 } 391 } 392 393 /* overwrite the character at the current point with 'c' */ 394 void owl_editwin_overwrite_char(owl_editwin *e, char c) 395 { 396 int z; 419 397 420 /* advance the cursor */421 z += len;422 _owl_editwin_set_xy_by_index(e, z);423 }424 425 /* overwrite the character at the current point with 'c' */426 void owl_editwin_overwrite_char(owl_editwin *e, gunichar c)427 {428 int z, oldlen, newlen, i;429 char tmp[6];430 memset(tmp, '\0', 6);431 432 398 /* \r is \n */ 433 if (c =='\r') {434 c ='\n';435 } 436 437 if (c == '\n' && e->style ==OWL_EDITWIN_STYLE_ONELINE) {399 if (c=='\r') { 400 c='\n'; 401 } 402 403 if (c=='\n' && e->style==OWL_EDITWIN_STYLE_ONELINE) { 438 404 /* perhaps later this will change some state that allows the string 439 405 to be read */ … … 441 407 } 442 408 443 g_unichar_to_utf8(c, tmp); 444 newlen = strlen(tmp); 445 446 z = _owl_editwin_get_index_from_xy(e); 447 { 448 char *t = g_utf8_find_next_char(e->buff + z, NULL); 449 oldlen = (t ? (t - (e->buff + z)) : 0); 450 } 451 452 /* only if we are at the end of the buffer do we create new space here */ 453 if (z == e->bufflen) { 454 if ((e->bufflen+newlen) > (e->allocated-5)) { 409 z=_owl_editwin_get_index_from_xy(e); 410 411 /* only if we are at the end of the buffer do we create new space */ 412 if (z==e->bufflen) { 413 if ((e->bufflen+1) > (e->allocated-5)) { 455 414 _owl_editwin_addspace(e); 456 415 } 457 416 } 458 /* if not at the end of the buffer, adjust based in char size difference. */459 else if (oldlen > newlen) {460 _owl_editwin_remove_bytes(e, oldlen-newlen);461 }462 else /* oldlen < newlen */ {463 _owl_editwin_insert_bytes(e, newlen-oldlen);464 }465 /* Overwrite the old char*/466 for (i = 0; i < newlen; i++) {467 e->buff[z+i] = tmp[i];468 }469 470 /* housekeeping */471 if (z == e->bufflen) {472 e->bufflen += newlen;473 e->buff[e->bufflen] = '\0';474 }475 417 418 e->buff[z]=c; 419 420 /* housekeeping if we are at the end of the buffer */ 421 if (z==e->bufflen) { 422 e->bufflen++; 423 e->buff[e->bufflen]='\0'; 424 } 425 476 426 /* advance the cursor */ 477 z += newlen; 478 _owl_editwin_set_xy_by_index(e, z); 427 if (c=='\n') { 428 e->buffx=0; 429 e->buffy++; 430 } else { 431 e->buffx++; 432 } 433 479 434 } 480 435 … … 484 439 void owl_editwin_delete_char(owl_editwin *e) 485 440 { 486 int z; 487 char *p1, *p2; 488 gunichar c; 489 490 if (e->bufflen == 0) return; 441 int z, i; 442 443 if (e->bufflen==0) return; 491 444 492 445 /* get the deletion point */ 493 z = _owl_editwin_get_index_from_xy(e); 494 495 if (z == e->bufflen) return; 496 497 p1 = e->buff + z; 498 p2 = g_utf8_next_char(p1); 499 c = g_utf8_get_char(p2); 500 while (g_unichar_ismark(c)) { 501 p2 = g_utf8_next_char(p2); 502 c = g_utf8_get_char(p2); 503 } 504 _owl_editwin_remove_bytes(e, p2-p1); 446 z=_owl_editwin_get_index_from_xy(e); 447 448 if (z==e->bufflen) return; 449 450 for (i=z; i<e->bufflen; i++) { 451 e->buff[i]=e->buff[i+1]; 452 } 453 e->bufflen--; 454 e->buff[e->bufflen]='\0'; 505 455 } 506 456 … … 513 463 { 514 464 int z; 515 char *p1, *p2, *p3, *tmp;516 517 if (e->bufflen ==0) return;465 char tmp; 466 467 if (e->bufflen==0) return; 518 468 519 469 /* get the cursor point */ 520 z =_owl_editwin_get_index_from_xy(e);521 522 if (z ==e->bufflen) {470 z=_owl_editwin_get_index_from_xy(e); 471 472 if (z==e->bufflen) { 523 473 /* point is after last character */ 524 474 z--; 525 475 } 526 476 527 if (z -1 < e->lock) {477 if (z-1 < e->lock) { 528 478 /* point is at beginning of buffer, do nothing */ 529 479 return; 530 480 } 531 481 532 /* Transpose two utf-8 unicode glyphs. */ 533 p1 = e->buff + z; 534 535 p2 = g_utf8_find_next_char(p1, NULL); 536 while (p2 != NULL && g_unichar_ismark(g_utf8_get_char(p2))) { 537 p2 = g_utf8_find_next_char(p2, NULL); 538 } 539 if (p2 == NULL) return; 540 541 p3 = g_utf8_find_prev_char(e->buff, p1); 542 while (p3 != NULL && g_unichar_ismark(g_utf8_get_char(p3))) { 543 p3 = g_utf8_find_prev_char(p3, NULL); 544 } 545 if (p3 == NULL) return; 546 547 tmp = owl_malloc(p2 - p3 + 5); 548 *tmp = '\0'; 549 strncat(tmp, p1, p2 - p1); 550 strncat(tmp, p3, p1 - p3); 551 strncpy(p3, tmp, p2 - p3); 552 owl_free(tmp); 553 _owl_editwin_set_xy_by_index(e, p3 - e->buff); 482 tmp=e->buff[z]; 483 e->buff[z]=e->buff[z-1]; 484 e->buff[z-1]=tmp; 485 owl_editwin_key_right(e); 554 486 } 555 487 … … 559 491 void owl_editwin_insert_string(owl_editwin *e, char *string) 560 492 { 561 char *p; 562 gunichar c; 563 if (!g_utf8_validate(string, -1, NULL)) { 564 owl_function_debugmsg("owl_editwin_insert_string: received non-utf-8 string."); 565 return; 566 } 567 p = string; 568 c = g_utf8_get_char(p); 569 while (c) { 570 owl_editwin_process_char(e, c); 571 p = g_utf8_next_char(p); 572 c = g_utf8_get_char(p); 493 int i, j; 494 495 j=strlen(string); 496 for (i=0; i<j; i++) { 497 owl_editwin_insert_char(e, string[i]); 573 498 } 574 499 } … … 580 505 void owl_editwin_overwrite_string(owl_editwin *e, char *string) 581 506 { 582 char *p; 583 gunichar c; 584 585 if (!g_utf8_validate(string, -1, NULL)) { 586 owl_function_debugmsg("owl_editwin_overwrite_string: received non-utf-8 string."); 587 return; 588 } 589 p = string; 590 c = g_utf8_get_char(p); 591 while (c) { 592 owl_editwin_overwrite_char(e, c); 593 p = g_utf8_next_char(p); 594 c = g_utf8_get_char(p); 507 int i, j; 508 509 j=strlen(string); 510 for (i=0; i<j; i++) { 511 owl_editwin_overwrite_char(e, string[i]); 595 512 } 596 513 } … … 603 520 int i; 604 521 char *ptr1, *ptr2; 605 gunichar c; 606 607 if (e->bufflen == 0) return(0); 522 523 if (e->bufflen==0) return(0); 608 524 609 525 /* first go to the yth line */ 610 ptr1 =e->buff;611 for (i = 0; i <e->buffy; i++) {612 ptr2= 526 ptr1=e->buff; 527 for (i=0; i<e->buffy; i++) { 528 ptr2=strchr(ptr1, '\n'); 613 529 if (!ptr2) { 614 530 /* we're already on the last line */ 615 531 break; 616 532 } 617 ptr1 = ptr2 + 1; 618 } 619 620 /* now go to the xth cell */ 621 ptr2 = ptr1; 622 i = 0; 623 while (ptr2 != NULL && i < e->buffx && (ptr2 - e->buff) < e->bufflen) { 624 c = g_utf8_get_char(ptr2); 625 i += (c == '\n' ? 1 : mk_wcwidth(c)); 626 ptr2 = g_utf8_next_char(ptr2); 627 } 628 while(ptr2 != NULL && g_unichar_ismark(g_utf8_get_char(ptr2))) { 629 ptr2 = g_utf8_next_char(ptr2); 630 } 631 if (ptr2 == NULL) return e->bufflen; 632 return(ptr2 - e->buff); 533 ptr1=ptr2+1; 534 } 535 536 /* now go to the xth character */ 537 ptr2=strchr(ptr1, '\n'); 538 if (!ptr2) { 539 ptr2=e->buff+e->bufflen; 540 } 541 542 if ((ptr2-ptr1) < e->buffx) { 543 ptr1=ptr2-1; 544 } else { 545 ptr1+=e->buffx; 546 } 547 548 /* printf("DEBUG: index is %i\r\n", ptr1-e->buff); */ 549 return(ptr1-e->buff); 633 550 } 634 551 635 552 void _owl_editwin_set_xy_by_index(owl_editwin *e, int index) 636 553 { 637 char *ptr1, *ptr2, *target; 638 gunichar c; 639 640 e->buffx = 0; 641 e->buffy = 0; 642 643 ptr1 = e->buff; 644 target = ptr1 + index; 645 /* target sanitizing */ 646 if ((target[0] & 0x80) && (~target[0] & 0x40)) { 647 /* middle of a utf-8 character, back up to previous character. */ 648 target = g_utf8_find_prev_char(e->buff, target); 649 } 650 c = g_utf8_get_char(target); 651 while (g_unichar_ismark(c) && target > e->buff) { 652 /* Adjust the target off of combining characters and the like. */ 653 target = g_utf8_find_prev_char(e->buff, target); 654 c = g_utf8_get_char(target); 655 } 656 /* If we start with a mark, something is wrong.*/ 657 if (g_unichar_ismark(c)) return; 658 659 /* Now our target should be acceptable. */ 660 ptr2 = strchr(ptr1, '\n'); 661 while (ptr2 != NULL && ptr2 < target) { 662 e->buffy++; 663 ptr1 = ptr2 + 1; 664 ptr2 = strchr(ptr1, '\n'); 665 } 666 ptr2 = ptr1; 667 while (ptr2 != NULL && ptr2 < target) { 668 c = g_utf8_get_char(ptr2); 669 e->buffx += mk_wcwidth(c); 670 ptr2 = g_utf8_next_char(ptr2); 671 } 672 } 673 674 int _owl_editwin_cursor_adjustment(owl_editwin *e) 675 { 676 char *ptr1, *ptr2; 677 gunichar c; 678 int x, i; 679 680 ptr1 = e->buff; 681 ptr2 = strchr(ptr1, '\n'); 682 for (i = 0; ptr2 != NULL && i < e->buffy; i++) { 683 ptr1 = ptr2 + 1; 684 ptr2 = strchr(ptr1, '\n'); 685 } 686 ptr2 = ptr1; 687 x = 0; 688 while (ptr2 != NULL && x < e->buffx) { 689 if (*ptr2 == '\n') return 0; 690 c = g_utf8_get_char(ptr2); 691 x += mk_wcwidth(c); 692 ptr2 = g_utf8_next_char(ptr2); 693 } 694 return x - e->buffx; 554 int z, i; 555 556 z=_owl_editwin_get_index_from_xy(e); 557 if (index>z) { 558 for (i=0; i<index-z; i++) { 559 owl_editwin_key_right(e); 560 } 561 } else if (index<z) { 562 for (i=0; i<z-index; i++) { 563 owl_editwin_key_left(e); 564 } 565 } 695 566 } 696 567 … … 699 570 /* if we happen to have the cursor over locked text 700 571 * move it to be out of the locktext region */ 701 if (_owl_editwin_get_index_from_xy(e) <e->lock) {572 if (_owl_editwin_get_index_from_xy(e)<e->lock) { 702 573 _owl_editwin_set_xy_by_index(e, e->lock); 703 574 } … … 719 590 { 720 591 if (e->buffy > 0) e->buffy--; 721 if (e->buffx >= owl_editwin_get_numc ells_on_line(e, e->buffy)) {722 e->buffx=owl_editwin_get_numc ells_on_line(e, e->buffy);592 if (e->buffx >= owl_editwin_get_numchars_on_line(e, e->buffy)) { 593 e->buffx=owl_editwin_get_numchars_on_line(e, e->buffy); 723 594 } 724 595 … … 737 608 738 609 /* if we're past the last character move back */ 739 if (e->buffx >= owl_editwin_get_numc ells_on_line(e, e->buffy)) {740 e->buffx=owl_editwin_get_numc ells_on_line(e, e->buffy);610 if (e->buffx >= owl_editwin_get_numchars_on_line(e, e->buffy)) { 611 e->buffx=owl_editwin_get_numchars_on_line(e, e->buffy); 741 612 } 742 613 … … 752 623 void owl_editwin_key_left(owl_editwin *e) 753 624 { 754 int i; 755 char * p; 756 i = _owl_editwin_get_index_from_xy(e); 757 p = e->buff + i; 758 p = g_utf8_find_prev_char(e->buff, p); 759 while (p && g_unichar_ismark(g_utf8_get_char(p))) { 760 p = g_utf8_find_prev_char(e->buff, p); 761 } 762 if (p == NULL) p = e->buff; 763 _owl_editwin_set_xy_by_index(e, p - e->buff); 764 765 if (e->buffy - e->topline < 0) { 766 e->topline -= e->winlines / 2; 625 /* move left if we can, and maybe up a line */ 626 if (e->buffx>0) { 627 e->buffx--; 628 } else if (e->buffy>0) { 629 e->buffy--; 630 e->buffx=owl_editwin_get_numchars_on_line(e, e->buffy); 631 } 632 633 /* do we need to scroll up? */ 634 if (e->buffy-e->topline < 0) { 635 e->topline-=e->winlines/2; 767 636 } 768 637 … … 774 643 { 775 644 int i; 776 char * p; 777 i = _owl_editwin_get_index_from_xy(e); 778 p = e->buff + i; 779 p = g_utf8_find_next_char(p, NULL); 780 while (p && g_unichar_ismark(g_utf8_get_char(p))) { 781 p = g_utf8_find_next_char(p, NULL); 782 } 783 if (p == NULL) { 784 _owl_editwin_set_xy_by_index(e, e->bufflen); 785 } 786 else { 787 _owl_editwin_set_xy_by_index(e, p - e->buff); 645 646 /* move right if we can, and skip down a line if needed */ 647 i=owl_editwin_get_numchars_on_line(e, e->buffy); 648 if (e->buffx < i) { 649 e->buffx++; 650 /* } else if (e->buffy+1 < owl_editwin_get_numlines(e)) { */ 651 } else if (_owl_editwin_get_index_from_xy(e) < e->bufflen) { 652 if (e->style==OWL_EDITWIN_STYLE_MULTILINE) { 653 e->buffx=0; 654 e->buffy++; 655 } 788 656 } 789 657 790 658 /* do we need to scroll down? */ 791 if (e->buffy -e->topline >= e->winlines) {792 e->topline += e->winlines /2;659 if (e->buffy-e->topline >= e->winlines) { 660 e->topline+=e->winlines/2; 793 661 } 794 662 } … … 796 664 void owl_editwin_move_to_nextword(owl_editwin *e) 797 665 { 798 /* asedeno: needs fixing for utf-8*/799 666 int i, x; 800 667 … … 836 703 void owl_editwin_move_to_previousword(owl_editwin *e) 837 704 { 838 /* asedeno: needs fixing for utf-8*/839 705 int i, x; 840 706 … … 872 738 void owl_editwin_delete_nextword(owl_editwin *e) 873 739 { 874 /* asedeno: needs fixing for utf-8*/875 740 int z; 876 741 … … 903 768 void owl_editwin_delete_previousword(owl_editwin *e) 904 769 { 905 /* asedeno: needs fixing for utf-8*/906 770 /* go backwards to the last non-space character, then delete chars */ 907 771 int i, startpos, endpos; … … 917 781 void owl_editwin_delete_to_endofline(owl_editwin *e) 918 782 { 919 /* asedeno: needs fixing for utf-8*/920 783 int i; 921 784 922 if (owl_editwin_get_numchars_on_line(e, e->buffy) >e->buffx) {785 if (owl_editwin_get_numchars_on_line(e, e->buffy)>e->buffx) { 923 786 /* normal line */ 924 787 i=_owl_editwin_get_index_from_xy(e); … … 941 804 void owl_editwin_move_to_line_end(owl_editwin *e) 942 805 { 943 e->buffx=owl_editwin_get_numc ells_on_line(e, e->buffy);806 e->buffx=owl_editwin_get_numchars_on_line(e, e->buffy); 944 807 } 945 808 … … 954 817 /* go to last char */ 955 818 e->buffy=owl_editwin_get_numlines(e)-1; 956 e->buffx=owl_editwin_get_numc ells_on_line(e, e->buffy);819 e->buffx=owl_editwin_get_numchars_on_line(e, e->buffy); 957 820 owl_editwin_key_right(e); 958 821 … … 978 841 void owl_editwin_fill_paragraph(owl_editwin *e) 979 842 { 980 /* asedeno: needs fixing for utf-8*/981 843 int i, save; 982 844 … … 995 857 /* main loop */ 996 858 while (1) { 997 i =_owl_editwin_get_index_from_xy(e);859 i=_owl_editwin_get_index_from_xy(e); 998 860 999 861 /* bail if we hit the end of the buffer */ 1000 if (i >= e->bufflen || e->buff[i] == '\0') break;862 if (i>=e->bufflen) break; 1001 863 1002 864 /* bail if we hit the end of the paragraph */ 1003 if (e->buff[i] == '\n' && e->buff[i+1] =='\n') break;865 if (e->buff[i]=='\n' && e->buff[i+1]=='\n') break; 1004 866 1005 867 /* if we've travelled too far, linewrap */ … … 1009 871 1010 872 /* did we hit the end of a line too soon? */ 1011 i =_owl_editwin_get_index_from_xy(e);1012 if (e->buff[i] == '\n' && e->buffx < e->fillcol -1) {873 i=_owl_editwin_get_index_from_xy(e); 874 if (e->buff[i]=='\n' && e->buffx<e->fillcol-1) { 1013 875 /* ********* we need to make sure we don't pull in a word that's too long ***********/ 1014 876 e->buff[i]=' '; … … 1016 878 1017 879 /* fix spacing */ 1018 i =_owl_editwin_get_index_from_xy(e);1019 if (e->buff[i] == ' ' && e->buff[i+1] ==' ') {1020 if (e->buff[i-1] == '.' || e->buff[i-1] == '!' || e->buff[i-1] =='?') {880 i=_owl_editwin_get_index_from_xy(e); 881 if (e->buff[i]==' ' && e->buff[i+1]==' ') { 882 if (e->buff[i-1]=='.' || e->buff[i-1]=='!' || e->buff[i-1]=='?') { 1021 883 owl_editwin_key_right(e); 1022 884 } else { 1023 885 owl_editwin_delete_char(e); 1024 886 /* if we did this ahead of the save point, adjust it */ 1025 if (i <save) save--;887 if (i<save) save--; 1026 888 } 1027 889 } else { … … 1049 911 int owl_editwin_check_dotsend(owl_editwin *e) 1050 912 { 1051 char *p, *p_n, *p_p; 1052 gunichar c; 913 int i; 1053 914 1054 915 if (!e->dotsend) return(0); 1055 1056 p = g_utf8_find_prev_char(e->buff, e->buff + e->bufflen); 1057 p_n = g_utf8_find_next_char(p, NULL); 1058 p_p = g_utf8_find_prev_char(e->buff, p); 1059 c = g_utf8_get_char(p); 1060 while (p != NULL) { 1061 if (*p == '.' 1062 && p_p != NULL && (*p_p == '\n' || *p_p == '\r') 1063 && p_n != NULL && (*p_n == '\n' || *p_n == '\r')) { 1064 e->bufflen = p - e->buff; 1065 e->buff[e->bufflen] = '\0'; 916 for (i=e->bufflen-1; i>0; i--) { 917 if (e->buff[i] == '.' 918 && (e->buff[i-1] == '\n' || e->buff[i-1] == '\r') 919 && (e->buff[i+1] == '\n' || e->buff[i+1] == '\r')) { 920 e->bufflen = i; 921 e->buff[i] = '\0'; 1066 922 return(1); 1067 923 } 1068 if (c != '\0' && !g_unichar_isspace(c)) return(0); 1069 p_n = p; 1070 p = p_p; 1071 c = g_utf8_get_char(p); 1072 p_p = g_utf8_find_prev_char(e->buff, p); 924 if (!isspace((int) e->buff[i])) { 925 return(0); 926 } 1073 927 } 1074 928 return(0); 1075 929 } 1076 930 1077 void owl_editwin_post_process_char(owl_editwin *e, gunicharj)931 void owl_editwin_post_process_char(owl_editwin *e, int j) 1078 932 { 1079 933 /* check if we need to scroll down */ … … 1088 942 } 1089 943 1090 void owl_editwin_process_char(owl_editwin *e, gunicharj)944 void owl_editwin_process_char(owl_editwin *e, int j) 1091 945 { 1092 946 if (j == ERR) return; 1093 if ( g_unichar_iscntrl(j) && (j != 10) && (j != 13)) {947 if (j>127 || ((j<32) && (j!=10) && (j!=13))) { 1094 948 return; 1095 } 1096 else { 949 } else { 1097 950 owl_editwin_insert_char(e, j); 1098 951 } … … 1122 975 } 1123 976 1124 /* now count characters */ 1125 i = 0; 1126 ptr2 = ptr1; 1127 while (ptr2 - e->buff < e->bufflen 1128 && *ptr2 != '\n') { 1129 ++i; 1130 ptr2 = g_utf8_next_char(ptr2); 1131 } 1132 return i; 1133 } 1134 1135 int owl_editwin_get_numcells_on_line(owl_editwin *e, int line) 1136 { 1137 int i; 1138 char *ptr1, *ptr2; 1139 gunichar c; 1140 1141 if (e->bufflen==0) return(0); 1142 1143 /* first go to the yth line */ 1144 ptr1=e->buff; 1145 for (i=0; i<line; i++) { 1146 ptr2=strchr(ptr1, '\n'); 1147 if (!ptr2) { 1148 /* we're already on the last line */ 1149 return(0); 1150 } 1151 ptr1=ptr2+1; 1152 } 1153 1154 /* now count cells */ 1155 i = 0; 1156 ptr2 = ptr1; 1157 while (ptr2 - e->buff < e->bufflen 1158 && *ptr2 != '\n') { 1159 c = g_utf8_get_char(ptr2); 1160 i += mk_wcwidth(c); 1161 ptr2 = g_utf8_next_char(ptr2); 1162 } 1163 return i; 977 /* now go to the xth character */ 978 ptr2=strchr(ptr1, '\n'); 979 if (!ptr2) { 980 return(e->buff + e->bufflen - ptr1); 981 } 982 return(ptr2-ptr1); /* don't count the newline for now */ 1164 983 } 1165 984 -
fmtext.c
r16c6cca rfa3290d 8 8 void owl_fmtext_init_null(owl_fmtext *f) 9 9 { 10 f->textlen = 0; 11 f->bufflen = 5; 12 f->textbuff = owl_malloc(5); 13 f->textbuff[0] = 0; 14 f->default_attrs = OWL_FMTEXT_ATTR_NONE; 15 f->default_fgcolor = OWL_COLOR_DEFAULT; 16 f->default_fgcolor = OWL_COLOR_DEFAULT; 10 f->textlen=0; 11 f->bufflen=5; 12 f->textbuff=owl_malloc(5); 13 f->fmbuff=owl_malloc(5); 14 f->fgcolorbuff=owl_malloc(5 * sizeof(short)); 15 f->bgcolorbuff=owl_malloc(5 * sizeof(short)); 16 f->textbuff[0]=0; 17 f->fmbuff[0]=OWL_FMTEXT_ATTR_NONE; 18 f->fgcolorbuff[0]=OWL_COLOR_DEFAULT; 19 f->bgcolorbuff[0]=OWL_COLOR_DEFAULT; 17 20 } 18 21 … … 21 24 void owl_fmtext_clear(owl_fmtext *f) 22 25 { 23 f->textlen = 0; 24 f->textbuff[0] = 0; 25 f->default_attrs = OWL_FMTEXT_ATTR_NONE; 26 f->default_fgcolor = OWL_COLOR_DEFAULT; 27 f->default_fgcolor = OWL_COLOR_DEFAULT; 26 f->textlen = 0; 27 f->textbuff[0] = 0; 28 f->fmbuff[0]=OWL_FMTEXT_ATTR_NONE; 29 f->fgcolorbuff[0]=OWL_COLOR_DEFAULT; 30 f->bgcolorbuff[0]=OWL_COLOR_DEFAULT; 31 } 32 33 /* Internal function. Set the attribute 'attr' from index 'first' to 34 * index 'last' 35 */ 36 void _owl_fmtext_set_attr(owl_fmtext *f, int attr, int first, int last) 37 { 38 int i; 39 for (i=first; i<=last; i++) { 40 f->fmbuff[i]=(unsigned char) attr; 41 } 42 } 43 44 /* Internal function. Add the attribute 'attr' to the existing 45 * attributes from index 'first' to index 'last' 46 */ 47 void _owl_fmtext_add_attr(owl_fmtext *f, int attr, int first, int last) 48 { 49 int i; 50 for (i=first; i<=last; i++) { 51 f->fmbuff[i]|=(unsigned char) attr; 52 } 53 } 54 55 /* Internal function. Set the color to be 'color' from index 'first' 56 * to index 'last 57 */ 58 void _owl_fmtext_set_fgcolor(owl_fmtext *f, int color, int first, int last) 59 { 60 int i; 61 for (i=first; i<=last; i++) { 62 f->fgcolorbuff[i]=(short)color; 63 } 64 } 65 66 void _owl_fmtext_set_bgcolor(owl_fmtext *f, int color, int first, int last) 67 { 68 int i; 69 for (i=first; i<=last; i++) { 70 f->bgcolorbuff[i]=(short)color; 71 } 28 72 } 29 73 … … 31 75 { 32 76 if(newlen + 1 > f->bufflen) { 33 f->textbuff = owl_realloc(f->textbuff, newlen + 1); 77 f->textbuff=owl_realloc(f->textbuff, newlen+1); 78 f->fmbuff=owl_realloc(f->fmbuff, newlen+1); 79 f->fgcolorbuff=owl_realloc(f->fgcolorbuff, (newlen+1) * sizeof(short)); 80 f->bgcolorbuff=owl_realloc(f->bgcolorbuff, (newlen+1) * sizeof(short)); 34 81 f->bufflen = newlen+1; 35 82 } 36 83 } 37 84 38 int _owl_fmtext_is_format_char(gunichar c) /*noproto*/39 {40 if ((c & ~OWL_FMTEXT_UC_ATTR_MASK) == OWL_FMTEXT_UC_ATTR) return 1;41 if ((c & ~(OWL_FMTEXT_UC_ALLCOLOR_MASK)) == OWL_FMTEXT_UC_COLOR_BASE) return 1;42 return 0;43 }44 85 /* append text to the end of 'f' with attribute 'attr' and color 45 86 * 'color' 46 87 */ 47 void owl_fmtext_append_attr(owl_fmtext *f, char *text, char attr, short fgcolor, short bgcolor) 48 { 49 char attrbuff[6]; 50 int newlen, a = 0, fg = 0, bg = 0; 51 52 if (attr != OWL_FMTEXT_ATTR_NONE) a=1; 53 if (fgcolor != OWL_COLOR_DEFAULT) fg=1; 54 if (bgcolor != OWL_COLOR_DEFAULT) bg=1; 55 56 /* Plane-16 characters in UTF-8 are 4 bytes long. */ 57 newlen = strlen(f->textbuff) + strlen(text) + (8 * (a + fg + bg)); 88 void owl_fmtext_append_attr(owl_fmtext *f, char *text, int attr, int fgcolor, int bgcolor) 89 { 90 int newlen; 91 newlen=strlen(f->textbuff)+strlen(text); 58 92 _owl_fmtext_realloc(f, newlen); 59 60 /* Set attributes */61 if (a) {62 memset(attrbuff,0,6);63 g_unichar_to_utf8(OWL_FMTEXT_UC_ATTR | attr, attrbuff);64 strcat(f->textbuff, attrbuff);65 }66 if (fg) {67 memset(attrbuff,0,6);68 g_unichar_to_utf8(OWL_FMTEXT_UC_FGCOLOR | fgcolor, attrbuff);69 strcat(f->textbuff, attrbuff);70 }71 if (bg) {72 memset(attrbuff,0,6);73 g_unichar_to_utf8(OWL_FMTEXT_UC_BGCOLOR | bgcolor, attrbuff);74 strcat(f->textbuff, attrbuff);75 }76 93 77 94 strcat(f->textbuff, text); 78 79 /* Reset attributes */ 80 if (bg) strcat(f->textbuff, OWL_FMTEXT_UTF8_BGDEFAULT); 81 if (fg) strcat(f->textbuff, OWL_FMTEXT_UTF8_FGDEFAULT); 82 if (a) strcat(f->textbuff, OWL_FMTEXT_UTF8_ATTR_NONE); 95 _owl_fmtext_set_attr(f, attr, f->textlen, newlen); 96 _owl_fmtext_set_fgcolor(f, fgcolor, f->textlen, newlen); 97 _owl_fmtext_set_bgcolor(f, bgcolor, f->textlen, newlen); 83 98 f->textlen=newlen; 84 99 } … … 114 129 } 115 130 116 /* Add the attribute 'attr' to the default atts for thetext in 'f' */117 void owl_fmtext_addattr(owl_fmtext *f, charattr)131 /* Add the attribute 'attr' to all text in 'f' */ 132 void owl_fmtext_addattr(owl_fmtext *f, int attr) 118 133 { 119 134 /* add the attribute to all text */ 120 f->default_attrs |= attr; 121 } 122 123 /* Set the default foreground color for this fmtext to 'color'. 124 * Only affects text that is colored default. 135 int i, j; 136 137 j=f->textlen; 138 for (i=0; i<j; i++) { 139 f->fmbuff[i] |= attr; 140 } 141 } 142 143 /* Anywhere the color is NOT ALREDY SET, set the color to 'color'. 144 * Other colors are left unchanged 125 145 */ 126 146 void owl_fmtext_colorize(owl_fmtext *f, int color) 127 147 { 128 f->default_fgcolor = color; 129 } 130 131 /* Set the default foreground color for this fmtext to 'color'. 132 * Only affects text that is colored default. 133 */ 148 /* everywhere the fgcolor is OWL_COLOR_DEFAULT, change it to be 'color' */ 149 int i, j; 150 151 j=f->textlen; 152 for(i=0; i<j; i++) { 153 if (f->fgcolorbuff[i]==OWL_COLOR_DEFAULT) f->fgcolorbuff[i] = (short)color; 154 } 155 } 156 134 157 void owl_fmtext_colorizebg(owl_fmtext *f, int color) 135 158 { 136 f->default_bgcolor = color; 137 } 138 139 /* Internal function. Parse attrbute character. */ 140 void _owl_fmtext_update_attributes(gunichar c, char *attr, short *fgcolor, short *bgcolor) /*noproto*/ 141 { 142 if ((c & OWL_FMTEXT_UC_ATTR) == OWL_FMTEXT_UC_ATTR) { 143 *attr = c & OWL_FMTEXT_UC_ATTR_MASK; 144 } 145 else if ((c & OWL_FMTEXT_UC_FGCOLOR) == OWL_FMTEXT_UC_FGCOLOR) { 146 *fgcolor = (c == OWL_FMTEXT_UC_FGDEFAULT 147 ? OWL_COLOR_DEFAULT 148 : c & OWL_FMTEXT_UC_COLOR_MASK); 149 } 150 else if ((c & OWL_FMTEXT_UC_BGCOLOR) == OWL_FMTEXT_UC_BGCOLOR) { 151 *bgcolor = (c == OWL_FMTEXT_UC_BGDEFAULT 152 ? OWL_COLOR_DEFAULT 153 : c & OWL_FMTEXT_UC_COLOR_MASK); 154 } 155 } 156 157 /* Internal function. Scan for attribute characters. */ 158 void _owl_fmtext_scan_attributes(owl_fmtext *f, int start, char *attr, short *fgcolor, short *bgcolor) /*noproto*/ 159 { 160 char *p; 161 p = strchr(f->textbuff, OWL_FMTEXT_UC_STARTBYTE_UTF8); 162 while (p && p < f->textbuff + start) { 163 _owl_fmtext_update_attributes(g_utf8_get_char(p), attr, fgcolor, bgcolor); 164 p = strchr(p+1, OWL_FMTEXT_UC_STARTBYTE_UTF8); 165 } 166 } 159 /* everywhere the bgcolor is OWL_COLOR_DEFAULT, change it to be 'color' */ 160 int i, j; 161 162 j=f->textlen; 163 for(i=0; i<j; i++) { 164 if (f->bgcolorbuff[i]==OWL_COLOR_DEFAULT) f->bgcolorbuff[i] = (short)color; 165 } 166 } 167 167 168 168 /* Internal function. Append text from 'in' between index 'start' and 169 169 * 'stop' to the end of 'f' 170 170 */ 171 void _owl_fmtext_append_fmtext(owl_fmtext *f, owl_fmtext *in, int start, int stop) /*noproto*/ 172 { 173 char attrbuff[6]; 174 int newlen, a = 0, fg = 0, bg = 0; 175 char attr = 0; 176 short fgcolor = OWL_COLOR_DEFAULT; 177 short bgcolor = OWL_COLOR_DEFAULT; 178 179 _owl_fmtext_scan_attributes(in, start, &attr, &fgcolor, &bgcolor); 180 if (attr != OWL_FMTEXT_ATTR_NONE) a=1; 181 if (fgcolor != OWL_COLOR_DEFAULT) fg=1; 182 if (bgcolor != OWL_COLOR_DEFAULT) bg=1; 183 184 /* We will reset to defaults after appending the text. We may need 185 to set initial attributes. */ 186 newlen=strlen(f->textbuff)+(stop-start+1) + (4 * (a + fg + bg)) + 12; 171 void _owl_fmtext_append_fmtext(owl_fmtext *f, owl_fmtext *in, int start, int stop) 172 { 173 int newlen, i; 174 175 newlen=strlen(f->textbuff)+(stop-start+1); 187 176 _owl_fmtext_realloc(f, newlen); 188 177 189 if (a) {190 memset(attrbuff,0,6);191 g_unichar_to_utf8(OWL_FMTEXT_UC_ATTR | attr, attrbuff);192 strcat(f->textbuff, attrbuff);193 }194 if (fg) {195 memset(attrbuff,0,6);196 g_unichar_to_utf8(OWL_FMTEXT_UC_FGCOLOR | fgcolor, attrbuff);197 strcat(f->textbuff, attrbuff);198 }199 if (bg) {200 memset(attrbuff,0,6);201 g_unichar_to_utf8(OWL_FMTEXT_UC_BGCOLOR | bgcolor, attrbuff);202 strcat(f->textbuff, attrbuff);203 }204 205 178 strncat(f->textbuff, in->textbuff+start, stop-start+1); 206 207 /* Reset attributes */208 strcat(f->textbuff, OWL_FMTEXT_UTF8_BGDEFAULT);209 strcat(f->textbuff, OWL_FMTEXT_UTF8_FGDEFAULT);210 strcat(f->textbuff, OWL_FMTEXT_UTF8_ATTR_NONE);211 212 179 f->textbuff[newlen]='\0'; 180 for (i=start; i<=stop; i++) { 181 f->fmbuff[f->textlen+(i-start)]=in->fmbuff[i]; 182 f->fgcolorbuff[f->textlen+(i-start)]=in->fgcolorbuff[i]; 183 f->bgcolorbuff[f->textlen+(i-start)]=in->bgcolorbuff[i]; 184 } 213 185 f->textlen=newlen; 214 186 } … … 235 207 char *owl_fmtext_print_plain(owl_fmtext *f) 236 208 { 237 return owl_strip_format_chars(f->textbuff); 238 } 239 240 void _owl_fmtext_wattrset(WINDOW *w, int attrs) /*noproto*/ 241 { 242 wattrset(w, A_NORMAL); 243 if (attrs & OWL_FMTEXT_ATTR_BOLD) wattron(w, A_BOLD); 244 if (attrs & OWL_FMTEXT_ATTR_REVERSE) wattron(w, A_REVERSE); 245 if (attrs & OWL_FMTEXT_ATTR_UNDERLINE) wattron(w, A_UNDERLINE); 246 } 247 248 void _owl_fmtext_update_colorpair(short fg, short bg, short *pair) /*noproto*/ 249 { 250 if (owl_global_get_hascolors(&g)) { 251 *pair = owl_fmtext_get_colorpair(fg, bg); 252 } 253 } 254 255 void _owl_fmtext_wcolor_set(WINDOW *w, short pair) /*noproto*/ 256 { 257 if (owl_global_get_hascolors(&g)) { 258 wcolor_set(w,pair,NULL); 259 } 209 return(owl_strdup(f->textbuff)); 260 210 } 261 211 … … 263 213 * must already be initiatlized with curses 264 214 */ 265 void _owl_fmtext_curs_waddstr(owl_fmtext *f, WINDOW *w, int do_search) /*noproto*/ 266 { 267 /* char *tmpbuff; */ 268 /* int position, trans1, trans2, trans3, len, lastsame; */ 269 char *s, *p; 270 char attr; 271 short fg, bg, pair; 272 int search_results, search_len; 273 215 void owl_fmtext_curs_waddstr(owl_fmtext *f, WINDOW *w) 216 { 217 char *tmpbuff; 218 int position, trans1, trans2, trans3, len, lastsame; 219 274 220 if (w==NULL) { 275 221 owl_function_debugmsg("Hit a null window in owl_fmtext_curs_waddstr."); … … 277 223 } 278 224 279 search_results = (do_search 280 ? owl_fmtext_search(f, owl_global_get_search_string(&g)) 281 : 0); 282 search_len = (search_results 283 ? strlen(owl_global_get_search_string(&g)) 284 : 0); 285 s = f->textbuff; 286 /* Set default attributes. */ 287 attr = f->default_attrs; 288 fg = f->default_fgcolor; 289 bg = f->default_bgcolor; 290 _owl_fmtext_wattrset(w, attr); 291 _owl_fmtext_update_colorpair(fg, bg, &pair); 292 _owl_fmtext_wcolor_set(w, pair); 293 294 /* Find next possible format character. */ 295 p = strchr(s, OWL_FMTEXT_UC_STARTBYTE_UTF8); 296 while(p) { 297 if (_owl_fmtext_is_format_char(g_utf8_get_char(p))) { 298 /* Deal with all text from last insert to here. */ 299 char tmp; 300 301 tmp = p[0]; 302 p[0] = '\0'; 303 if (search_results) { 304 /* Search is active, so highlight search results. */ 305 char tmp2, *ss; 306 ss = stristr(s, owl_global_get_search_string(&g)); 307 while (ss) { 308 /* Found search string, highlight it. */ 309 310 tmp2 = ss[0]; 311 ss[0] = '\0'; 312 waddstr(w, s); 313 ss[0] = tmp2; 314 315 _owl_fmtext_wattrset(w, attr ^ OWL_FMTEXT_ATTR_REVERSE); 316 _owl_fmtext_wcolor_set(w, pair); 317 318 tmp2 = ss[search_len]; 319 ss[search_len] = '\0'; 320 waddstr(w, ss); 321 ss[search_len] = tmp2; 322 323 _owl_fmtext_wattrset(w, attr); 324 _owl_fmtext_wcolor_set(w, pair); 325 326 s = ss + search_len; 327 ss = stristr(s, owl_global_get_search_string(&g)); 328 } 329 } 330 /* Deal with remaining part of string. */ 331 waddstr(w, s); 332 p[0] = tmp; 333 334 /* Deal with new attributes. Initialize to defaults, then 335 process all consecutive formatting characters. */ 336 attr = f->default_attrs; 337 fg = f->default_fgcolor; 338 bg = f->default_bgcolor; 339 while (p && _owl_fmtext_is_format_char(g_utf8_get_char(p))) { 340 _owl_fmtext_update_attributes(g_utf8_get_char(p), &attr, &fg, &bg); 341 p = g_utf8_next_char(p); 342 } 343 _owl_fmtext_wattrset(w, attr | f->default_attrs); 344 if (fg == OWL_COLOR_DEFAULT) fg = f->default_fgcolor; 345 if (bg == OWL_COLOR_DEFAULT) bg = f->default_bgcolor; 346 _owl_fmtext_update_colorpair(fg, bg, &pair); 347 _owl_fmtext_wcolor_set(w, pair); 348 349 /* Advance to next non-formatting character. */ 350 s = p; 351 p = strchr(s, OWL_FMTEXT_UC_STARTBYTE_UTF8); 352 } 353 else { 354 p = strchr(p+1, OWL_FMTEXT_UC_STARTBYTE_UTF8); 355 } 356 } 357 if (s) { 358 waddstr(w, s); 359 } 360 } 361 362 void owl_fmtext_curs_waddstr(owl_fmtext *f, WINDOW *w) 363 { 364 _owl_fmtext_curs_waddstr(f, w, owl_global_is_search_active(&g)); 365 } 366 367 void owl_fmtext_curs_waddstr_without_search(owl_fmtext *f, WINDOW *w) 368 { 369 _owl_fmtext_curs_waddstr(f, w, 0); 370 } 225 tmpbuff=owl_malloc(f->textlen+10); 226 227 position=0; 228 len=f->textlen; 229 while (position<=len) { 230 /* find the last char with the current format and color */ 231 trans1=owl_util_find_trans(f->fmbuff+position, len-position); 232 trans2=owl_util_find_trans_short(f->fgcolorbuff+position, len-position); 233 trans3=owl_util_find_trans_short(f->bgcolorbuff+position, len-position); 234 235 lastsame = (trans1 < trans2) ? trans1 : trans2; 236 lastsame = (lastsame < trans3) ? lastsame : trans3; 237 lastsame += position; 238 239 /* set the format */ 240 wattrset(w, A_NORMAL); 241 if (f->fmbuff[position] & OWL_FMTEXT_ATTR_BOLD) { 242 wattron(w, A_BOLD); 243 } 244 if (f->fmbuff[position] & OWL_FMTEXT_ATTR_REVERSE) { 245 wattron(w, A_REVERSE); 246 } 247 if (f->fmbuff[position] & OWL_FMTEXT_ATTR_UNDERLINE) { 248 wattron(w, A_UNDERLINE); 249 } 250 251 /* set the color */ 252 /* warning, this is sort of a hack */ 253 if (owl_global_get_hascolors(&g)) { 254 short fg, bg, pair; 255 fg = f->fgcolorbuff[position]; 256 bg = f->bgcolorbuff[position]; 257 258 pair = owl_fmtext_get_colorpair(fg, bg); 259 if (pair != -1) { 260 wcolor_set(w,pair,NULL); 261 } 262 } 263 264 /* add the text */ 265 strncpy(tmpbuff, f->textbuff + position, lastsame-position+1); 266 tmpbuff[lastsame-position+1]='\0'; 267 waddstr(w, tmpbuff); 268 269 position=lastsame+1; 270 } 271 owl_free(tmpbuff); 272 } 273 371 274 372 275 /* start with line 'aline' (where the first line is 0) and print … … 379 282 380 283 /* find the starting line */ 381 ptr1 = in->textbuff; 382 for (i = 0; i < aline; i++) { 383 ptr1 = strchr(ptr1, '\n'); 384 if (!ptr1) return(-1); 385 ptr1++; 386 } 387 284 ptr1=in->textbuff; 285 if (aline!=0) { 286 for (i=0; i<aline; i++) { 287 ptr1=strchr(ptr1, '\n'); 288 if (!ptr1) return(-1); 289 ptr1++; 290 } 291 } 388 292 /* ptr1 now holds the starting point */ 389 293 390 294 /* copy in the next 'lines' lines */ 391 if (lines <1) return(-1);392 393 for (i = 0; i <lines; i++) {394 offset = ptr1 -in->textbuff;395 ptr2 =strchr(ptr1, '\n');295 if (lines<1) return(-1); 296 297 for (i=0; i<lines; i++) { 298 offset=ptr1-in->textbuff; 299 ptr2=strchr(ptr1, '\n'); 396 300 if (!ptr2) { 397 _owl_fmtext_append_fmtext(out, in, offset, (in->textlen) -1);301 _owl_fmtext_append_fmtext(out, in, offset, (in->textlen)-1); 398 302 return(-1); 399 303 } 400 _owl_fmtext_append_fmtext(out, in, offset, (ptr2 - ptr1) +offset);401 ptr1 = ptr2 +1;304 _owl_fmtext_append_fmtext(out, in, offset, (ptr2-ptr1)+offset); 305 ptr1=ptr2+1; 402 306 } 403 307 return(0); … … 407 311 * ends at 'bcol' or sooner. The first column is number 0. The new 408 312 * message is placed in 'out'. The message is * expected to end in a 409 * new line for now. NOTE: This needs to be modified to deal with 410 * backing up if we find a SPACING COMBINING MARK at the end of a 411 * line. If that happens, we should back up to the last non-mark 412 * character and stop there. 313 * new line for now 413 314 */ 414 315 void owl_fmtext_truncate_cols(owl_fmtext *in, int acol, int bcol, owl_fmtext *out) 415 316 { 416 char *ptr _s, *ptr_e, *ptr_c, *last;417 int col, st, padding, chwidth;317 char *ptr1, *ptr2, *last; 318 int len, offset; 418 319 419 320 last=in->textbuff+in->textlen-1; 420 ptr _s=in->textbuff;421 while (ptr _s <=last) {422 ptr _e=strchr(ptr_s, '\n');423 if (!ptr _e) {321 ptr1=in->textbuff; 322 while (ptr1<=last) { 323 ptr2=strchr(ptr1, '\n'); 324 if (!ptr2) { 424 325 /* but this shouldn't happen if we end in a \n */ 425 326 break; 426 327 } 427 328 428 if (ptr _e == ptr_s) {329 if (ptr2==ptr1) { 429 330 owl_fmtext_append_normal(out, "\n"); 430 ++ptr_s;331 ptr1++; 431 332 continue; 432 333 } 433 334 434 col = 0; 435 st = 0; 436 padding = 0; 437 chwidth = 0; 438 ptr_c = ptr_s; 439 while(ptr_c < ptr_e) { 440 gunichar c = g_utf8_get_char(ptr_c); 441 if (!_owl_fmtext_is_format_char(c)) { 442 chwidth = mk_wcwidth(c); 443 if (col + chwidth > bcol) break; 444 445 if (col >= acol) { 446 if (st == 0) { 447 ptr_s = ptr_c; 448 padding = col - acol; 449 ++st; 450 } 451 } 452 col += chwidth; 453 chwidth = 0; 454 } 455 ptr_c = g_utf8_next_char(ptr_c); 456 } 457 if (st) { 458 /* lead padding */ 459 owl_fmtext_append_spaces(out, padding); 460 if (ptr_c == ptr_e) { 461 /* We made it to the newline. */ 462 _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff); 463 } 464 else { 465 if (chwidth > 1) { 466 /* Last char is wide, truncate. */ 467 _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff - 1); 468 owl_fmtext_append_normal(out, "\n"); 469 } 470 else { 471 /* Last char fits perfectly, leave alone.*/ 472 _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff); 473 } 474 } 475 } 476 else { 335 /* we need to check that we won't run over here */ 336 len=bcol-acol; 337 if (len > (ptr2-(ptr1+acol))) { 338 /* the whole line fits with room to spare, don't take a full 'len' */ 339 len=ptr2-(ptr1+acol); 340 } 341 if (len>last-ptr1) { 342 /* the whole rest of the text fits with room to spare, adjust for it */ 343 len-=(last-ptr1); 344 } 345 if (len<=0) { 346 /* saftey check */ 477 347 owl_fmtext_append_normal(out, "\n"); 478 } 479 ptr_s = g_utf8_next_char(ptr_e); 348 ptr1=ptr2+1; 349 continue; 350 } 351 352 offset=ptr1-in->textbuff; 353 _owl_fmtext_append_fmtext(out, in, offset+acol, offset+acol+len); 354 355 ptr1=ptr2+1; 480 356 } 481 357 } … … 505 381 506 382 /* set the charater at 'index' to be 'char'. If index is out of 507 * bounds don't do anything. If c or char at index is not ASCII, don't 508 * do anything because it's not UTF-8 safe. */ 509 void owl_fmtext_set_char(owl_fmtext *f, int index, char ch) 383 * bounds don't do anything */ 384 void owl_fmtext_set_char(owl_fmtext *f, int index, int ch) 510 385 { 511 386 if ((index < 0) || (index > f->textlen-1)) return; 512 /* NOT ASCII*/513 if (f->textbuff[index] & 0x80 || ch & 0x80) return;514 387 f->textbuff[index]=ch; 515 388 } … … 527 400 dst->textlen=src->textlen; 528 401 dst->textbuff=owl_malloc(mallocsize); 402 dst->fmbuff=owl_malloc(mallocsize); 403 dst->fgcolorbuff=owl_malloc(mallocsize * sizeof(short)); 404 dst->bgcolorbuff=owl_malloc(mallocsize * sizeof(short)); 529 405 memcpy(dst->textbuff, src->textbuff, src->textlen+1); 530 dst->default_attrs = src->default_attrs; 531 dst->default_fgcolor = src->default_fgcolor; 532 dst->default_bgcolor = src->default_bgcolor; 406 memcpy(dst->fmbuff, src->fmbuff, src->textlen); 407 memcpy(dst->fgcolorbuff, src->fgcolorbuff, src->textlen * sizeof(short)); 408 memcpy(dst->bgcolorbuff, src->bgcolorbuff, src->textlen * sizeof(short)); 409 } 410 411 /* highlight all instances of "string". Return the number of 412 * instances found. This is a case insensitive search. 413 */ 414 int owl_fmtext_search_and_highlight(owl_fmtext *f, char *string) 415 { 416 417 int found, len; 418 char *ptr1, *ptr2; 419 420 len=strlen(string); 421 found=0; 422 ptr1=f->textbuff; 423 while (ptr1-f->textbuff <= f->textlen) { 424 ptr2=stristr(ptr1, string); 425 if (!ptr2) return(found); 426 427 found++; 428 _owl_fmtext_add_attr(f, OWL_FMTEXT_ATTR_REVERSE, 429 ptr2 - f->textbuff, 430 ptr2 - f->textbuff + len - 1); 431 432 ptr1=ptr2+len; 433 } 434 return(found); 533 435 } 534 436 … … 538 440 int owl_fmtext_search(owl_fmtext *f, char *string) 539 441 { 442 540 443 if (stristr(f->textbuff, string)) return(1); 541 444 return(0); … … 778 681 { 779 682 if (f->textbuff) owl_free(f->textbuff); 683 if (f->fmbuff) owl_free(f->fmbuff); 684 if (f->fgcolorbuff) owl_free(f->fgcolorbuff); 685 if (f->bgcolorbuff) owl_free(f->bgcolorbuff); 780 686 } 781 687 -
functions.c
rf9eea4c r3617286 1606 1606 sprintf(buff, " Field %i : ", i+1); 1607 1607 1608 ptr=owl_zephyr_get_field _as_utf8(n, i+1);1608 ptr=owl_zephyr_get_field(n, i+1); 1609 1609 len=strlen(ptr); 1610 1610 if (len<30) { … … 2187 2187 void owl_function_start_command(char *line) 2188 2188 { 2189 int i, j; 2189 2190 owl_editwin *tw; 2190 2191 … … 2197 2198 owl_global_set_needrefresh(&g); 2198 2199 2199 owl_editwin_insert_string(tw, line); 2200 j=strlen(line); 2201 for (i=0; i<j; i++) { 2202 owl_editwin_process_char(tw, line[i]); 2203 } 2200 2204 owl_editwin_redisplay(tw, 0); 2201 2205 … … 2595 2599 } 2596 2600 /* downcase it */ 2597 { 2598 char *temp = g_utf8_strdown(filtname, -1); 2599 if (temp) { 2600 owl_free(filtname); 2601 filtname = temp; 2602 } 2603 } 2601 downstr(filtname); 2604 2602 /* turn spaces, single quotes, and double quotes into dots */ 2605 2603 owl_text_tr(filtname, ' ', '.'); … … 3026 3024 char *quoted; 3027 3025 3028 buff= owl_malloc(strlen(class)+strlen(inst)+strlen(recip)+100);3026 buff=malloc(strlen(class)+strlen(inst)+strlen(recip)+100); 3029 3027 strcpy(buff, "class"); 3030 3028 if (!strcmp(class, "*")) { … … 3330 3328 if (ret==0) { 3331 3329 for (x=0; x<numlocs; x++) { 3332 line= owl_malloc(strlen(location[x].host)+strlen(location[x].time)+strlen(location[x].tty)+100);3330 line=malloc(strlen(location[x].host)+strlen(location[x].time)+strlen(location[x].tty)+100); 3333 3331 tmp=short_zuser(user); 3334 3332 sprintf(line, " %-10.10s %-24.24s %-12.12s %20.20s\n", … … 3373 3371 owl_view *v; 3374 3372 FILE *file; 3375 char *plaintext;3376 3373 3377 3374 v=owl_global_get_current_view(&g); … … 3396 3393 for (i=0; i<j; i++) { 3397 3394 m=owl_view_get_element(v, i); 3398 plaintext = owl_strip_format_chars(owl_message_get_text(m)); 3399 if (plaintext) { 3400 fputs(plaintext, file); 3401 owl_free(plaintext); 3402 } 3395 fputs(owl_message_get_text(m), file); 3403 3396 } 3404 3397 fclose(file); … … 3441 3434 _exit(127); 3442 3435 } 3443 parsed= owl_realloc(parsed, sizeof(*parsed) * (myargc+1));3436 parsed=realloc(parsed, sizeof(*parsed) * (myargc+1)); 3444 3437 parsed[myargc] = NULL; 3445 3438 -
global.c
rc0f9e30 rc0f9e30 549 549 len+=strlen(argv[i])+5; 550 550 } 551 g->startupargs= owl_malloc(len+5);551 g->startupargs=malloc(len+5); 552 552 553 553 strcpy(g->startupargs, ""); -
keymap.c
r428834d rcf83b7a 5 5 6 6 /* returns 0 on success */ 7 int owl_keymap_init(owl_keymap *km, char *name, char *desc, void (*default_fn)( owl_input), void (*prealways_fn)(owl_input), void (*postalways_fn)(owl_input))7 int owl_keymap_init(owl_keymap *km, char *name, char *desc, void (*default_fn)(int), void (*prealways_fn)(int), void (*postalways_fn)(int)) 8 8 { 9 9 if (!name || !desc) return(-1); … … 151 151 } 152 152 153 owl_keymap *owl_keyhandler_create_and_add_keymap(owl_keyhandler *kh, char *name, char *desc, void (*default_fn)( owl_input), void (*prealways_fn)(owl_input), void (*postalways_fn)(owl_input))153 owl_keymap *owl_keyhandler_create_and_add_keymap(owl_keyhandler *kh, char *name, char *desc, void (*default_fn)(int), void (*prealways_fn)(int), void (*postalways_fn)(int)) 154 154 { 155 155 owl_keymap *km; … … 202 202 /* processes a keypress. returns 0 if the keypress was handled, 203 203 * 1 if not handled, -1 on error, and -2 if j==ERR. */ 204 int owl_keyhandler_process(owl_keyhandler *kh, owl_input j)204 int owl_keyhandler_process(owl_keyhandler *kh, int j) 205 205 { 206 206 owl_keymap *km; … … 214 214 215 215 /* temporarily disallow C-`/C-SPACE until we fix associated bugs */ 216 if (j .ch == ERR || j.ch ==0) {216 if (j==ERR || j==0) { 217 217 return(-1); 218 218 } … … 224 224 225 225 /* deal with ESC prefixing */ 226 if (!kh->in_esc && j .ch ==27) {226 if (!kh->in_esc && j==27) { 227 227 kh->in_esc = 1; 228 228 return(0); 229 229 } 230 230 if (kh->in_esc) { 231 j .ch = OWL_META(j.ch);231 j = OWL_META(j); 232 232 kh->in_esc = 0; 233 233 } 234 234 235 kh->kpstack[++(kh->kpstackpos)] = j .ch;235 kh->kpstack[++(kh->kpstackpos)] = j; 236 236 if (kh->kpstackpos >= OWL_KEYMAP_MAXSTACK) { 237 237 owl_keyhandler_reset(kh); … … 260 260 } else if (match == 2) { /* exact match */ 261 261 /* owl_function_debugmsg("processkey: found exact match in %s", km->name); */ 262 owl_keybinding_execute(kb, j .ch);262 owl_keybinding_execute(kb, j); 263 263 owl_keyhandler_reset(kh); 264 264 if (km->postalways_fn) { -
keypress.c
r428834d r948b942 148 148 } 149 149 if (!*kb) { 150 if (j &OWL_META(0)) {150 if (j&OWL_META(0)) { 151 151 strcat(kb, "M-"); 152 152 j &= ~OWL_META(0); … … 163 163 strcat(kb, kb2); 164 164 } 165 166 165 } 167 166 if (!*kb) { -
keys.c
r428834d r8938188 294 294 /****************************************************************/ 295 295 296 void owl_keys_recwin_prealways( owl_input j) {296 void owl_keys_recwin_prealways(int j) { 297 297 /* Clear the message line on subsequent key presses */ 298 298 owl_function_makemsg(""); 299 299 } 300 300 301 void owl_keys_editwin_default( owl_input j) {301 void owl_keys_editwin_default(int j) { 302 302 owl_editwin *e; 303 if (NULL != (e=owl_global_get_typwin(&g)) 304 && j.ch < 0x100) { 305 owl_editwin_process_char(e, j.uch); 303 if (NULL != (e=owl_global_get_typwin(&g))) { 304 owl_editwin_process_char(e, j); 306 305 } 307 306 } 308 307 309 void owl_keys_editwin_postalways( owl_input j) {308 void owl_keys_editwin_postalways(int j) { 310 309 owl_editwin *e; 311 if (NULL != (e=owl_global_get_typwin(&g)) 312 && j.ch < 0x100) { 313 owl_editwin_post_process_char(e, j.uch); 310 if (NULL != (e=owl_global_get_typwin(&g))) { 311 owl_editwin_post_process_char(e, j); 314 312 } 315 313 owl_global_set_needrefresh(&g); 316 314 } 317 315 318 void owl_keys_popless_postalways( owl_input j) {316 void owl_keys_popless_postalways(int j) { 319 317 owl_viewwin *v = owl_global_get_viewwin(&g); 320 318 owl_popwin *pw = owl_global_get_popwin(&g); … … 325 323 } 326 324 327 void owl_keys_default_invalid( owl_input j) {328 if (j .ch==ERR) return;329 if (j .ch==410) return;325 void owl_keys_default_invalid(int j) { 326 if (j==ERR) return; 327 if (j==410) return; 330 328 owl_keyhandler_invalidkey(owl_global_get_keyhandler(&g)); 331 329 } -
logging.c
r28ee32b rd0961fe 155 155 to = owl_sprintf("jabber:%s", owl_message_get_recipient(m)); 156 156 } else if (owl_message_is_type_aim(m)) { 157 char *temp2;158 157 temp = owl_aim_normalize_screenname(owl_message_get_recipient(m)); 159 temp2 = g_utf8_strdown(temp,-1); 160 to = owl_sprintf("aim:%s", temp2); 161 owl_free(temp2); 158 downstr(temp); 159 to = owl_sprintf("aim:%s", temp); 162 160 owl_free(temp); 163 161 } else { … … 269 267 } else if (owl_message_is_type_aim(m)) { 270 268 /* we do not yet handle chat rooms */ 271 char *normalto , *temp;272 temp =owl_aim_normalize_screenname(owl_message_get_sender(m));273 normalto = g_utf8_strdown(temp, -1);269 char *normalto; 270 normalto=owl_aim_normalize_screenname(owl_message_get_sender(m)); 271 downstr(normalto); 274 272 from=frombuff=owl_sprintf("aim:%s", normalto); 275 273 owl_free(normalto); 276 owl_free(temp);277 274 } else if (owl_message_is_type_loopback(m)) { 278 275 from=frombuff=owl_strdup("loopback"); … … 293 290 294 291 ch=frombuff[0]; 295 if (! g_ascii_isalnum(ch)) from="weird";292 if (!isalnum(ch)) from="weird"; 296 293 297 294 for (i=0; i<len; i++) { … … 302 299 303 300 if (!personal) { 304 if (strcmp(from, "weird")) { 305 char* temp = g_utf8_strdown(frombuff, -1); 306 if (temp) { 307 owl_free(frombuff); 308 from = frombuff = temp; 309 } 310 } 301 if (strcmp(from, "weird")) downstr(from); 311 302 } 312 303 -
message.c
r635881c r635881c 79 79 owl_list_append_element(&(m->attributes), pair); 80 80 } 81 owl_pair_set_value(pair, owl_ validate_or_convert(attrvalue));81 owl_pair_set_value(pair, owl_strdup(attrvalue)); 82 82 } 83 83 … … 493 493 { 494 494 if(m->zwriteline) owl_free(m->zwriteline); 495 m->zwriteline= owl_strdup(line);495 m->zwriteline=strdup(line); 496 496 } 497 497 … … 535 535 owl_fmtext_init_null(&b); 536 536 537 owl_fmtext_truncate_lines(&(m->fmtext->fmtext), aline, bline-aline , &a);537 owl_fmtext_truncate_lines(&(m->fmtext->fmtext), aline, bline-aline+1, &a); 538 538 owl_fmtext_truncate_cols(&a, acol, bcol, &b); 539 owl_fmtext_colorize(&b, fgcolor); 540 owl_fmtext_colorizebg(&b, bgcolor); 541 539 if (fgcolor!=OWL_COLOR_DEFAULT) { 540 owl_fmtext_colorize(&b, fgcolor); 541 } 542 if (bgcolor!=OWL_COLOR_DEFAULT) { 543 owl_fmtext_colorizebg(&b, bgcolor); 544 } 545 546 if (owl_global_is_search_active(&g)) { 547 owl_fmtext_search_and_highlight(&b, owl_global_get_search_string(&g)); 548 } 549 542 550 owl_fmtext_curs_waddstr(&b, win); 543 551 … … 882 890 } 883 891 884 m->zwriteline= owl_strdup("");892 m->zwriteline=strdup(""); 885 893 886 894 /* save the hostname */ … … 964 972 } 965 973 966 m->zwriteline= owl_strdup("");974 m->zwriteline=strdup(""); 967 975 968 976 owl_message_set_body(m, "<uninitialized>"); -
owl.c
r428834d r89f5338 48 48 #include <termios.h> 49 49 #include <sys/stat.h> 50 #include <locale.h>51 50 #include "owl.h" 52 51 … … 70 69 owl_editwin *tw; 71 70 owl_popwin *pw; 72 int ret, initialsubs, debug, argcsave, followlast; 73 owl_input j; 71 int j, ret, initialsubs, debug, argcsave, followlast; 74 72 int newmsgs, nexttimediff; 75 73 struct sigaction sigact; … … 86 84 int newstderr; 87 85 #endif 88 89 if (!GLIB_CHECK_VERSION (2, 12, 0))90 g_error ("GLib version 2.12.0 or above is needed.");91 86 92 87 argcsave=argc; … … 97 92 debug=0; 98 93 initialsubs=1; 99 100 setlocale(LC_ALL, "");101 102 94 if (argc>0) { 103 95 argv++; … … 546 538 * little bit, but otherwise do not. This lets input be grabbed 547 539 * as quickly as possbile */ 548 j .ch =wgetch(typwin);549 if (j .ch ==ERR) {540 j=wgetch(typwin); 541 if (j==ERR) { 550 542 usleep(10000); 551 543 } else { 552 j.uch = '\0';553 if (j.ch >= KEY_MIN && j.ch <= KEY_MAX) {554 /* This is a curses control character. */555 }556 else if (j.ch > 0x7f && j.ch < 0xfe) {557 /* Pull in a full utf-8 character. */558 int bytes, i;559 char *utf8buf[7];560 memset(utf8buf, '\0', 7);561 562 utf8buf[0] = j.ch;563 564 if ((j.ch & 0xc0) && (~j.ch & 0x20)) bytes = 2;565 else if ((j.ch & 0xe0) && (~j.ch & 0x10)) bytes = 3;566 else if ((j.ch & 0xf0) && (~j.ch & 0x08)) bytes = 4;567 else if ((j.ch & 0xf8) && (~j.ch & 0x04)) bytes = 5;568 else if ((j.ch & 0xfc) && (~j.ch & 0x02)) bytes = 6;569 else bytes = 1;570 571 for (i = 1; i < bytes; i++) {572 utf8buf[i] = wgetch(typwin);573 }574 if (g_utf8_validate(utf8buf, -1, NULL)) {575 j.uch = g_utf8_get_char(utf8buf);576 }577 else {578 j.ch = ERR;579 }580 }581 else if (j.ch <= 0x7f) {582 j.uch = j.ch;583 }584 585 544 owl_global_update_lastinputtime(&g); 586 545 /* find and activate the current keymap. -
owl.h
r428834d r18e28a4 52 52 #include <termios.h> 53 53 #include <libfaim/aim.h> 54 #include <wchar.h>55 54 #include "config.h" 56 #include "glib.h"57 55 #ifdef HAVE_LIBZEPHYR 58 56 #include <zephyr/zephyr.h> … … 100 98 #define OWL_FMTEXT_ATTR_REVERSE 2 101 99 #define OWL_FMTEXT_ATTR_UNDERLINE 4 102 103 #define OWL_FMTEXT_UC_BASE 0x100000 /* Unicode Plane 16 - Supplementary Private Use Area-B*/104 #define OWL_FMTEXT_UC_ATTR ( OWL_FMTEXT_UC_BASE | 0x800 )105 #define OWL_FMTEXT_UC_ATTR_MASK 0x7106 #define OWL_FMTEXT_UC_COLOR_BASE ( OWL_FMTEXT_UC_BASE | 0x400 )107 #define OWL_FMTEXT_UC_FGCOLOR OWL_FMTEXT_UC_COLOR_BASE108 #define OWL_FMTEXT_UC_BGCOLOR ( OWL_FMTEXT_UC_COLOR_BASE | 0x200 )109 #define OWL_FMTEXT_UC_DEFAULT_COLOR 0x100110 #define OWL_FMTEXT_UC_FGDEFAULT ( OWL_FMTEXT_UC_FGCOLOR | OWL_FMTEXT_UC_DEFAULT_COLOR )111 #define OWL_FMTEXT_UC_BGDEFAULT ( OWL_FMTEXT_UC_BGCOLOR | OWL_FMTEXT_UC_DEFAULT_COLOR )112 #define OWL_FMTEXT_UC_COLOR_MASK 0xFF113 #define OWL_FMTEXT_UC_ALLCOLOR_MASK ( OWL_FMTEXT_UC_COLOR_MASK | OWL_FMTEXT_UC_DEFAULT_COLOR | 0x200)114 #define OWL_FMTEXT_UC_STARTBYTE_UTF8 '\xf4'115 116 #define OWL_FMTEXT_UTF8_ATTR_NONE "\xf4\x80\xa0\x80"117 #define OWL_FMTEXT_UTF8_FGDEFAULT "\xf4\x80\x94\x80"118 #define OWL_FMTEXT_UTF8_BGDEFAULT "\xf4\x80\x96\x80"119 120 121 122 100 123 101 #define OWL_COLOR_BLACK 0 … … 272 250 } owl_variable; 273 251 274 typedef struct _owl_input {275 int ch;276 char utf8buf[8];277 gunichar uch;278 } owl_input;279 280 252 typedef struct _owl_fmtext { 281 253 int textlen; 282 254 int bufflen; 283 255 char *textbuff; 284 char default_attrs;285 short default_fgcolor;286 short default_bgcolor;256 char *fmbuff; 257 short *fgcolorbuff; 258 short *bgcolorbuff; 287 259 } owl_fmtext; 288 260 … … 517 489 owl_list bindings; /* key bindings */ 518 490 struct _owl_keymap *submap; /* submap */ 519 void (*default_fn)( owl_input j); /* default action (takes a keypress) */520 void (*prealways_fn)( owl_inputj); /* always called before a keypress is received */521 void (*postalways_fn)( owl_inputj); /* always called after keypress is processed */491 void (*default_fn)(int j); /* default action (takes a keypress) */ 492 void (*prealways_fn)(int j); /* always called before a keypress is received */ 493 void (*postalways_fn)(int j); /* always called after keypress is processed */ 522 494 } owl_keymap; 523 495 -
perlconfig.c
r5376a95 rad15610 55 55 j=owl_zephyr_get_num_fields(owl_message_get_notice(m)); 56 56 for (i=0; i<j; i++) { 57 ptr=owl_zephyr_get_field _as_utf8(owl_message_get_notice(m), i+1);57 ptr=owl_zephyr_get_field(owl_message_get_notice(m), i+1); 58 58 av_push(av_zfields, newSVpvn(ptr, strlen(ptr))); 59 59 owl_free(ptr); -
text.c
r47519e1b r72db971 50 50 void owl_text_truncate_cols(char *out, char *in, int acol, int bcol) 51 51 { 52 char *ptr _s, *ptr_e, *ptr_c, *tmpbuff, *last;53 int col, cnt, padding;54 52 char *ptr1, *ptr2, *tmpbuff, *last; 53 int len; 54 55 55 tmpbuff=owl_malloc(strlen(in)+20); 56 56 57 57 strcpy(tmpbuff, ""); 58 58 last=in+strlen(in)-1; 59 ptr _s=in;60 while (ptr _s<last) {61 ptr _e=strchr(ptr_s, '\n');62 if (!ptr _e) {59 ptr1=in; 60 while (ptr1<last) { 61 ptr2=strchr(ptr1, '\n'); 62 if (!ptr2) { 63 63 /* but this shouldn't happen if we end in a \n */ 64 64 break; 65 65 } 66 66 67 if (ptr _e==ptr_s) {67 if (ptr2==ptr1) { 68 68 strcat(tmpbuff, "\n"); 69 ptr_s++; 70 continue; 71 } 72 73 col = 0; 74 cnt = 0; 75 padding = 0; 76 ptr_c = ptr_s; 77 while(col < bcol && ptr_c < ptr_e) { 78 gunichar c = g_utf8_get_char(ptr_c); 79 if (col + mk_wcwidth(c) > bcol) break; 80 col += mk_wcwidth(c); 81 ptr_c = g_utf8_next_char(ptr_c); 82 if (col >= acol) { 83 if (cnt == 0) { 84 ptr_s = ptr_c; 85 padding = col - acol; 86 } 87 ++cnt; 88 } 89 } 90 if (cnt) { 91 while(padding-- > 0) { 92 strcat(tmpbuff, " "); 93 } 94 strncat(tmpbuff, ptr_s, ptr_c - ptr_s - 1); 95 } 96 strcat(tmpbuff, "\n"); 97 ptr_s = ptr_e + 1; 98 #if 0 69 ptr1++; 70 continue; 71 } 72 99 73 /* we need to check that we won't run over here */ 100 if ( (ptr _e-ptr_s) < (bcol-acol) ) {101 len=ptr _e-(ptr_s+acol);74 if ( (ptr2-ptr1) < (bcol-acol) ) { 75 len=ptr2-(ptr1+acol); 102 76 } else { 103 77 len=bcol-acol; 104 78 } 105 if ((ptr _s+len)>=last) {106 len-=last-(ptr _s+len);107 } 108 109 strncat(tmpbuff, ptr _s+acol, len);79 if ((ptr1+len)>=last) { 80 len-=last-(ptr1+len); 81 } 82 83 strncat(tmpbuff, ptr1+acol, len); 110 84 strcat(tmpbuff, "\n"); 111 85 112 ptr_s=ptr_e+1; 113 #endif 86 ptr1=ptr2+1; 114 87 } 115 88 strcpy(out, tmpbuff); … … 302 275 char *stristr(char *a, char *b) 303 276 { 304 char *x, *y; 305 char *ret = NULL; 306 if ((x = g_utf8_casefold(a, -1)) != NULL) { 307 if ((y = g_utf8_casefold(b, -1)) != NULL) { 308 ret = strstr(x, y); 309 if (ret != NULL) { 310 ret = ret - x + a; 311 } 312 g_free(y); 313 } 314 g_free(x); 315 } 277 char *x, *y, *ret; 278 279 if ((x=owl_strdup(a))==NULL) return(NULL); 280 if ((y=owl_strdup(b))==NULL) return(NULL); 281 downstr(x); 282 downstr(y); 283 ret=strstr(x, y); 284 if (ret==NULL) { 285 owl_free(x); 286 owl_free(y); 287 return(NULL); 288 } 289 ret=ret-x+a; 290 owl_free(x); 291 owl_free(y); 316 292 return(ret); 317 293 } … … 320 296 int only_whitespace(char *s) 321 297 { 322 if (g_utf8_validate(s,-1,NULL)) { 323 char *p; 324 for(p = s; p[0]; p=g_utf8_next_char(p)) { 325 if (!g_unichar_isspace(g_utf8_get_char(p))) return 0; 326 } 327 } 328 else { 329 int i; 330 for (i=0; s[i]; i++) { 331 if (!isspace((int) s[i])) return(0); 332 } 298 int i; 299 for (i=0; s[i]; i++) { 300 if (!isspace((int) s[i])) return(0); 333 301 } 334 302 return(1); … … 359 327 tolen = strlen(to); 360 328 fromlen = strlen(from); 361 out = owl_malloc(outlen);329 out = malloc(outlen); 362 330 363 331 while (in[inpos]) { -
util.c
r7b1d048 r89f5338 399 399 } 400 400 401 /* downcase the string 'foo' */ 402 void downstr(char *foo) 403 { 404 int i; 405 for (i=0; foo[i]!='\0'; i++) { 406 foo[i]=tolower(foo[i]); 407 } 408 } 409 401 410 /* Caller must free response. 402 411 * Takes in strings which are space-separated lists of tokens … … 437 446 void *owl_malloc(size_t size) 438 447 { 439 return( g_malloc(size));448 return(malloc(size)); 440 449 } 441 450 442 451 void owl_free(void *ptr) 443 452 { 444 g_free(ptr);453 free(ptr); 445 454 } 446 455 447 456 char *owl_strdup(const char *s1) 448 457 { 449 return( g_strdup(s1));458 return(strdup(s1)); 450 459 } 451 460 452 461 void *owl_realloc(void *ptr, size_t size) 453 462 { 454 return( g_realloc(ptr, size));463 return(realloc(ptr, size)); 455 464 } 456 465 457 466 /* allocates memory and returns the string or null. 458 467 * caller must free the string. 468 * from Linux sprintf man page. 459 469 */ 460 470 char *owl_sprintf(const char *fmt, ...) 461 471 { 472 int n, size = 100; 473 char *p; 462 474 va_list ap; 463 char *ret = NULL; 464 va_start(ap, fmt); 465 ret = g_strdup_vprintf(fmt, ap); 466 va_end(ap); 467 return ret; 468 } 469 475 if ((p = owl_malloc (size)) == NULL) return (NULL); 476 while (1) { 477 /* Try to print in the allocated space. */ 478 va_start(ap, fmt); 479 n = vsnprintf (p, size, fmt, ap); 480 va_end(ap); 481 /* If that worked, return the string. */ 482 if (n > -1 && n < size) 483 return p; 484 /* Else try again with more space. */ 485 if (n > -1) /* glibc 2.1 */ 486 size = n+1; /* precisely what is needed */ 487 else /* glibc 2.0 */ 488 size *= 2; /* twice the old size */ 489 if ((p = owl_realloc (p, size)) == NULL) 490 return NULL; 491 } 492 } 470 493 471 494 /* Return the owl color associated with the named color. Return -1 … … 753 776 } 754 777 755 char * owl_get_datadir() 756 { 757 char * datadir = getenv("BARNOWL_DATA_DIR"); 758 if(datadir != NULL) 759 return strchr(datadir, '=') + 1; 760 return DATADIR; 761 } 762 763 /* Strips format characters from a valid utf-8 string. Returns the 764 empty string if 'in' does not validate. */ 765 char * owl_strip_format_chars(char *in) 766 { 767 char *r; 768 if (g_utf8_validate(in, -1, NULL)) { 769 char *s, *p; 770 r = owl_malloc(strlen(in)+1); 771 r[0] = '\0'; 772 s = in; 773 p = strchr(s, OWL_FMTEXT_UC_STARTBYTE_UTF8); 774 while(p) { 775 /* If it's a format character, copy up to it, and skip all 776 immediately following format characters. */ 777 if (_owl_fmtext_is_format_char(g_utf8_get_char(p))) { 778 strncat(r, s, p-s); 779 p = g_utf8_next_char(p); 780 while (p && _owl_fmtext_is_format_char(g_utf8_get_char(p))) { 781 p = g_utf8_next_char(p); 782 } 783 s = p; 784 p = strchr(s, OWL_FMTEXT_UC_STARTBYTE_UTF8); 785 } 786 else { 787 p = strchr(p+1, OWL_FMTEXT_UC_STARTBYTE_UTF8); 788 } 789 } 790 if (s) strcat(r,s); 791 } 792 else { 793 r = owl_strdup(""); 794 } 795 return r; 796 } 797 798 /* If in is not UTF-8, convert from ISO-8859-1. We may want to allow 799 * the caller to specify an alternative in the future. We also strip 800 * out characters in Unicode Plane 16, as we use that plane internally 801 * for formatting. 802 */ 803 char * owl_validate_or_convert(char *in) 804 { 805 if (g_utf8_validate(in, -1, NULL)) { 806 return owl_strip_format_chars(in); 807 } 808 else { 809 return g_convert(in, -1, 810 "UTF-8", "ISO-8859-1", 811 NULL, NULL, NULL); 812 } 813 } 814 /* Attempts to convert 'in' to ISO-8859-1. Returns that if possible, 815 else returns UTF-8. 816 */ 817 char * owl_get_iso_8859_1_if_possible(char *in) 818 { 819 char *out; 820 if (g_utf8_validate(in, -1, NULL)) { 821 out = g_convert(in, -1, 822 "ISO-8859-1", "UTF-8", 823 NULL, NULL, NULL); 824 if (!out) { 825 out = owl_strdup(in); 826 } 827 } 828 else { 829 out = owl_strdup(""); 830 } 831 return out; 778 char * owl_get_datadir() { 779 char * datadir = getenv("BARNOWL_DATA_DIR"); 780 if(datadir != NULL) 781 return strchr(datadir, '=') + 1; 782 return DATADIR; 832 783 } 833 784 -
viewwin.c
r47519e1b r8721756 73 73 owl_fmtext_truncate_cols(&fm1, v->rightshift, v->wincols-1+v->rightshift, &fm2); 74 74 75 owl_fmtext_curs_waddstr _without_search(&fm2, v->curswin);75 owl_fmtext_curs_waddstr(&fm2, v->curswin); 76 76 77 77 /* print the message at the bottom */ -
zcrypt.c
r34509d5 r9ceee9d 385 385 386 386 /* Build a space-separated string from argv from elements between start * 387 * and end - 1. owl_malloc()'s the returned string. */387 * and end - 1. malloc()'s the returned string. */ 388 388 char *BuildArgString(char **argv, int start, int end) { 389 389 int len = 1; … … 397 397 398 398 /* Allocate memory */ 399 result = (char *) owl_malloc(len);399 result = (char *)malloc(len); 400 400 if (result) { 401 401 /* Build the string */ … … 482 482 /* Prepare result to be returned */ 483 483 char *temp = keyfile; 484 keyfile = (char *) owl_malloc(strlen(temp) + 1);484 keyfile = (char *)malloc(strlen(temp) + 1); 485 485 if (keyfile) { 486 486 strcpy(keyfile, temp); … … 611 611 } 612 612 use_buffer = TRUE; 613 if ((inptr = inbuff = (char *) owl_malloc(MAX_RESULT)) == NULL) {613 if ((inptr = inbuff = (char *)malloc(MAX_RESULT)) == NULL) { 614 614 printf("Memory allocation error\n"); 615 615 return FALSE; … … 639 639 printf("Could not run zwrite\n"); 640 640 if (freein && inbuff) { 641 owl_free(inbuff);641 free(inbuff); 642 642 } 643 643 return(FALSE); … … 685 685 686 686 /* Free the input buffer, if necessary */ 687 if (freein && inbuff) owl_free(inbuff);687 if (freein && inbuff) free(inbuff); 688 688 689 689 return(!error); -
zephyr.c
r1151f0b r1151f0b 354 354 return(owl_strdup("")); 355 355 } 356 357 char *owl_zephyr_get_field_as_utf8(ZNotice_t *n, int j) 358 { 359 int i, count, save; 360 361 /* If there's no message here, just run along now */ 362 if (n->z_message_len == 0) 363 return(owl_strdup("")); 364 365 count=save=0; 366 for (i = 0; i < n->z_message_len; i++) { 367 if (n->z_message[i]=='\0') { 368 count++; 369 if (count == j) { 370 /* just found the end of the field we're looking for */ 371 return(owl_validate_or_convert(n->z_message + save)); 372 } else { 373 save = i + 1; 374 } 375 } 376 } 377 /* catch the last field, which might not be null terminated */ 378 if (count == j - 1) { 379 char *tmp, *out; 380 tmp = owl_malloc(n->z_message_len-save+5); 381 memcpy(tmp, n->z_message+save, n->z_message_len-save); 382 tmp[n->z_message_len-save]='\0'; 383 out = owl_validate_or_convert(tmp); 384 owl_free(tmp); 385 return out; 386 } 387 356 #else 357 char *owl_zephyr_get_field(void *n, int j) 358 { 388 359 return(owl_strdup("")); 389 }390 #else391 char *owl_zephyr_get_field(void *n, int j)392 {393 return(owl_strdup(""));394 }395 char *owl_zephyr_get_field_as_utf8(ZNotice_t *n, int j)396 {397 return owl_zephyr_get_field(n, j);398 360 } 399 361 #endif -
zwrite.c
r7b1d048 r1fe100c 44 44 break; 45 45 } 46 z->class=owl_ get_iso_8859_1_if_possible(myargv[1]);46 z->class=owl_strdup(myargv[1]); 47 47 myargv+=2; 48 48 myargc-=2; … … 52 52 break; 53 53 } 54 z->inst=owl_ get_iso_8859_1_if_possible(myargv[1]);54 z->inst=owl_strdup(myargv[1]); 55 55 myargv+=2; 56 56 myargc-=2; … … 60 60 break; 61 61 } 62 z->realm=owl_ get_iso_8859_1_if_possible(myargv[1]);62 z->realm=owl_strdup(myargv[1]); 63 63 myargv+=2; 64 64 myargc-=2; … … 68 68 break; 69 69 } 70 z->zsig=owl_ get_iso_8859_1_if_possible(myargv[1]);70 z->zsig=owl_strdup(myargv[1]); 71 71 myargv+=2; 72 72 myargc-=2; … … 76 76 break; 77 77 } 78 z->opcode=owl_ get_iso_8859_1_if_possible(myargv[1]);78 z->opcode=owl_strdup(myargv[1]); 79 79 myargv+=2; 80 80 myargc-=2; … … 93 93 myargv++; 94 94 myargc--; 95 z->message=owl_ get_iso_8859_1_if_possible("");95 z->message=owl_strdup(""); 96 96 while (myargc) { 97 z->message= owl_realloc(z->message, strlen(z->message)+strlen(myargv[0])+5);97 z->message=realloc(z->message, strlen(z->message)+strlen(myargv[0])+5); 98 98 strcat(z->message, myargv[0]); 99 99 strcat(z->message, " "); … … 113 113 } else { 114 114 /* anything unattached is a recipient */ 115 owl_list_append_element(&(z->recips), owl_get_iso_8859_1_if_possible(myargv[0]));115 owl_list_append_element(&(z->recips), strdup(myargv[0])); 116 116 myargv++; 117 117 myargc--; … … 146 146 147 147 if (zsigowlvar && *zsigowlvar) { 148 z->zsig=owl_ get_iso_8859_1_if_possible(zsigowlvar);148 z->zsig=owl_strdup(zsigowlvar); 149 149 } else if (zsigproc && *zsigproc) { 150 150 FILE *file; … … 161 161 if (!file) { 162 162 if (zsigzvar && *zsigzvar) { 163 z->zsig=owl_ get_iso_8859_1_if_possible(zsigzvar);163 z->zsig=owl_strdup(zsigzvar); 164 164 } 165 165 } else { … … 175 175 } 176 176 } else if (zsigzvar) { 177 z->zsig=owl_ get_iso_8859_1_if_possible(zsigzvar);177 z->zsig=owl_strdup(zsigzvar); 178 178 } else if (((pw=getpwuid(getuid()))!=NULL) && (pw->pw_gecos)) { 179 z->zsig= owl_get_iso_8859_1_if_possible(pw->pw_gecos);179 z->zsig=strdup(pw->pw_gecos); 180 180 ptr=strchr(z->zsig, ','); 181 181 if (ptr) { … … 218 218 int i, j; 219 219 char toline[LINE]; 220 char *tmp = NULL;221 220 222 221 if (z->message) owl_free(z->message); … … 232 231 } 233 232 } 234 tmp = owl_get_iso_8859_1_if_possible(msg); 235 z->message=owl_sprintf("%s\n%s", toline, tmp); 233 z->message=owl_sprintf("%s\n%s", toline, msg); 236 234 } else { 237 z->message=owl_get_iso_8859_1_if_possible(msg); 238 } 239 if (tmp) owl_free(tmp); 235 z->message=owl_strdup(msg); 236 } 240 237 } 241 238 … … 308 305 { 309 306 if (z->opcode) owl_free(z->opcode); 310 z->opcode=owl_ get_iso_8859_1_if_possible(opcode);307 z->opcode=owl_strdup(opcode); 311 308 } 312 309
Note: See TracChangeset
for help on using the changeset viewer.