Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 01 Oct 2014 12:34:17 +0200
From:      Peter <peter@flytrace.com>
To:        ports@freebsd.org
Subject:   xrdesktop patch
Message-ID:  <542BD8A9.1060203@flytrace.com>

next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------040002090500040506030707
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Hello,

There is a small problem in xrdesktop - the number of strings is not 
mentioned in split function call.
The problem is that it is impossible to use any arg of rdesktop with '=' 
inside (in passthru config line).
Please, add my patch in the next updated version of xrdesktop.

Best regards,
Peter

--------------040002090500040506030707
Content-Type: text/x-patch;
 name="xrdesktop.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="xrdesktop.patch"

--- /usr/local/bin/xrdesktop	2014-06-18 20:16:05.000000000 +0200
+++ xrdesktop	2014-10-01 12:28:35.323261442 +0200
@@ -855,7 +855,7 @@
   # get me some data
     $raw_data = $_;
     chomp $raw_data;
-    ( $field_type, $field_data ) = split /=/, $raw_data;
+    ( $field_type, $field_data ) = split /=/, $raw_data,2;
     chomp $field_type;
     chomp $field_data;
 
@@ -874,7 +874,7 @@
     # stuff the second line (hopefully IP) into vars 
     $raw_data = <CONFIG>;
     chomp $raw_data;
-    ( $field_type, $field_data ) = split /=/, $raw_data;
+    ( $field_type, $field_data ) = split /=/, $raw_data,2;
     chomp $field_type;
     chomp $field_data;
     if( $field_type eq "Name" ) {$machine_name = $field_data;}
@@ -891,7 +891,7 @@
     # stuff the third line (hopefully Uname) into vars
     $raw_data = <CONFIG>;
     chomp $raw_data;
-    ( $field_type, $field_data ) = split /=/, $raw_data;
+    ( $field_type, $field_data ) = split /=/, $raw_data,2;
     chomp $field_type;
     chomp $field_data;
     if( $field_type eq "Name" ) {$machine_name = $field_data;}
@@ -908,7 +908,7 @@
     # stuff the fourth line (hopefully Geometry) into vars
     $raw_data = <CONFIG>;
     chomp $raw_data;
-    ( $field_type, $field_data ) = split /=/, $raw_data;
+    ( $field_type, $field_data ) = split /=/, $raw_data,2;
     chomp $field_type;
     chomp $field_data;
     if( $field_type eq "Name" ) {$machine_name = $field_data;}
@@ -925,7 +925,7 @@
     # stuff the fifth line (hopefully Fullscreen) into vars
     $raw_data = <CONFIG>;
     chomp $raw_data;
-    ( $field_type, $field_data ) = split /=/, $raw_data;
+    ( $field_type, $field_data ) = split /=/, $raw_data,2;
     chomp $field_type;
     chomp $field_data;
     if( $field_type eq "Name" ) {$machine_name = $field_data;}
@@ -942,7 +942,7 @@
     # stuff the sixth line (hopefully Bitmap_Updates) into vars
     $raw_data = <CONFIG>;
     chomp $raw_data;
-    ( $field_type, $field_data ) = split /=/, $raw_data;
+    ( $field_type, $field_data ) = split /=/, $raw_data,2;
     chomp $field_type;
     chomp $field_data;
     if( $field_type eq "Name" ) {$machine_name = $field_data;}
@@ -959,7 +959,7 @@
     # stuff the seventh line (hopefully Keymap) into vars
     $raw_data = <CONFIG>;
     chomp $raw_data;
-    ( $field_type, $field_data ) = split /=/, $raw_data;
+    ( $field_type, $field_data ) = split /=/, $raw_data,2;
     chomp $field_type;
     chomp $field_data;
     if( $field_type eq "Name" ) {$machine_name = $field_data;}
@@ -976,7 +976,7 @@
     # stuff the eighth line (hopefully NoReqLic) into vars
     $raw_data = <CONFIG>;
     chomp $raw_data;
-    ( $field_type, $field_data ) = split /=/, $raw_data;
+    ( $field_type, $field_data ) = split /=/, $raw_data,2;
     chomp $field_type;
     chomp $field_data;
     if( $field_type eq "Name" ) {$machine_name = $field_data;}
@@ -993,7 +993,7 @@
     # stuff the ninth line (hopefully Passthru) into vars
     $raw_data = <CONFIG>;
     chomp $raw_data;
-    ( $field_type, $field_data ) = split /=/, $raw_data;
+    ( $field_type, $field_data ) = split /=/, $raw_data,2;
     chomp $field_type;
     chomp $field_data;
     if( $field_type eq "Name" ) {$machine_name = $field_data;}

--------------040002090500040506030707--




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?542BD8A9.1060203>