Changeset e0ffe77

Timestamp:

Jan 16, 2008, 8:18:25 PM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

367fbf3

Parents:

b7b2a76

Message:

editwin.c: make locktext deal with UTF-8

Jabber - 
More utf-8 sanitizing.
New helper function to validate strings from C and set the utf8 flag if needed.

Files:

• editwin.c (modified) (2 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (7 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm (modified) (1 diff)

editwin.c

@@ -148 +148 @@
   /*  e->buffx=x; */
   /*  e->buffy=y; */
-  owl_editwin_adjust_for_locktext(e);
+  _owl_editwin_set_xy_by_index(e, e->lock);
   owl_editwin_redisplay(e, 0);
 }
@@ -292 +292 @@
     int len;
     int dolocklen = e->lock - (ptr1 - e->buff);
-
-    for (i = 0; i < dolocklen; i++) {
-      waddch(e->curswin, buff[i]);
-    }
+    char *locktext;
+    char tmp = e->buff[dolocklen];
+
+    e->buff[dolocklen] = '\0';
+    locktext = owl_strdup(e->buff);
+    e->buff[dolocklen] = tmp;
+
+    waddstr(e->curswin, locktext);
+    
     len = strlen(buff);
     for (i = 0; i < len-dolocklen; i++) {

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -25 +25 @@
 use Net::DNS;
 use Getopt::Long;
+
+use utf8;
 
 our $VERSION = 0.1;
@@ -294 +296 @@
     my $cmd = shift;
     my $jid = new Net::Jabber::JID;
-    $jid->SetJID(shift);
+    $jid->SetJID(check_utf8(shift));
     my $password = '';
-    $password = shift if @_;
+    $password = check_utf8(shift) if @_;
 
     my $uid           = $jid->GetUserID();
@@ -373 +375 @@
                     $vars{jlogin_havepass} = 1;
                     $conn->removeConnection($jidStr);
-                    BarnOwl::start_password( "Password for $jidStr: ", \&do_login );
+                    BarnOwl::start_password("Password for $jidStr: ", \&do_login );
                     return "";
                 }
@@ -477 +479 @@
     }
     else {
-        $to = shift @ARGV;
+      $to = check_utf8(shift @ARGV);
     }
 
@@ -521 +523 @@
     $cmd .= " -t $jwrite_thread" if $jwrite_thread;
     $cmd .= " -s $jwrite_subject" if $jwrite_subject;
-    BarnOwl::start_edit_win( $cmd, \&process_owl_jwrite );
+    queue_admin_msg("$cmd - utf8: ".Encode::is_utf8($cmd));
+
+    BarnOwl::start_edit_win( Encode::encode_utf8($cmd), \&process_owl_jwrite );
 }
 
@@ -1079 +1083 @@
 ### Helper functions
 
+sub check_utf8
+{
+  my $str = shift;
+  Encode::_utf8_on($str);
+  Encode::_utf8_off($str) unless (Encode::is_utf8($str, 1));
+  return $str;
+}
+
 sub j2hash {
     my $j   = shift;
@@ -1213 +1225 @@
 
 sub resolveConnectedJID {
-    my $givenJIDStr = shift;
+    my $givenJIDStr = check_utf8(shift);
     my $givenJID    = new Net::Jabber::JID;
     $givenJID->SetJID($givenJIDStr);

perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm

@@ -1 +1 @@
 use warnings;
 use strict;
+use utf8;
 
 =head1 NAME