From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Rose Subject: Re: [bug] org-link-escape and (wrong-type-argument stringp nil) Date: Mon, 27 Sep 2010 00:47:03 +0200 Message-ID: <877hi8i0m0.fsf@gmx.de> References: <87tylkwpq0.fsf@mundaneum.com> <87mxrc1bwj.wl%dmaus@ictsoc.de> <87sk14rz3t.fsf@gmx.de> <87sk128cuk.wl%dmaus@ictsoc.de> <87fwx1yhw5.fsf@gmx.de> <87aan8xpzy.wl%dmaus@ictsoc.de> <87d3s48c8c.fsf@gmx.de> <87bp7kicuh.wl%dmaus@ictsoc.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from [140.186.70.92] (port=40936 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P0001-00056o-Ei for emacs-orgmode@gnu.org; Sun, 26 Sep 2010 18:47:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1P0000-0001CL-3C for emacs-orgmode@gnu.org; Sun, 26 Sep 2010 18:47:13 -0400 Received: from mailout-de.gmx.net ([213.165.64.23]:59503 helo=mail.gmx.net) by eggs.gnu.org with smtp (Exim 4.69) (envelope-from ) id 1Ozzzz-0001CG-M0 for emacs-orgmode@gnu.org; Sun, 26 Sep 2010 18:47:12 -0400 In-Reply-To: <87bp7kicuh.wl%dmaus@ictsoc.de> (David Maus's message of "Sun, 26 Sep 2010 20:22:46 +0200") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: David Maus Cc: =?utf-8?Q?S=C3=A9bastien?= Vauban , emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain AAAAhhhhrrrggrgrggrgr premature and wrong patch, sorry. Again against master: --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=org-protocol-unhex-compound-single-byte.patch Content-Transfer-Encoding: quoted-printable diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index 21f28e7..d69d584 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -305,7 +305,7 @@ part." =20 (defun org-protocol-unhex-string(str) "Unhex hexified unicode strings as returned from the JavaScript function -encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `=C3=BC'." +encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `=C3=B6'." (setq str (or str "")) (let ((tmp "") (case-fold-search t)) @@ -321,7 +321,11 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut= `=C3=BC'." =20 =20 (defun org-protocol-unhex-compound (hex) - "Unhexify unicode hex-chars. E.g. `%C3%B6' is the German Umlaut `=C3=BC'= ." + "Unhexify unicode hex-chars. E.g. `%C3%B6' is the German Umlaut `=C3=B6'. +Note: this function also decodes single byte encodings like +`%E1' (\"=C3=A1\") if not followed by another `%[A-F0-9]{2}' group. +Singlebyte decoding is not secure though, since we could have +two single byte characters above 128 in a row." (let* ((bytes (remove "" (split-string hex "%"))) (ret "") (eat 0) @@ -353,12 +357,30 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlau= t `=C3=BC'." (setq val (logxor val xor)) (setq sum (+ (lsh sum shift) val)) (if (> eat 0) (setq eat (- eat 1))) - (when (=3D 0 eat) + (cond + ((=3D 0 eat) ;multi byte (setq ret (concat ret (org-protocol-char-to-string sum))) (setq sum 0)) + ((not bytes) ; single byte(s) + (setq ret (org-protocol-unhex-single-byte-sequence hex)))) )) ;; end (while bytes ret )) =20 +(defun org-protocol-unhex-single-byte-sequence(hex) + "Unhexify hex-ecncoded single byte character sequences." + (let ((bytes (remove "" (split-string hex "%"))) + (ret "")) + (while bytes + (let* ((b (pop bytes)) + (a (elt b 0)) + (b (elt b 1)) + (c1 (if (> a ?9) (+ 10 (- a ?A)) (- a ?0))) + (c2 (if (> b ?9) (+ 10 (- b ?A)) (- b ?0)))) + (setq ret + (concat ret (char-to-string + (+ (lsh c1 4) c2)))))) + ret)) + (defun org-protocol-flatten-greedy (param-list &optional strip-path replac= ement) "Greedy handlers might receive a list like this from emacsclient: '( (\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\") --=-=-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode --=-=-=--