Mercurial > hg > xemacs-beta
annotate lisp/mule/china-util.el @ 5892:053ef01b71a8
Import the #'clear-string API from GNU, use it in tls.c
src/ChangeLog addition:
2015-04-18 Aidan Kehoe <kehoea@parhasard.net>
* sequence.c (Fclear_string): New, API from GNU. Zero a string's
contents, making sure the text is not kept around even when the
string's data is reallocated because of a changed character
length.
* sequence.c (syms_of_sequence): Make it available to Lisp.
* lisp.h: Make it available to C code.
* tls.c (nss_pk11_password): Use it.
* tls.c (gnutls_pk11_password): Use it.
* tls.c (openssl_password): Use it.
tests/ChangeLog addition:
2015-04-18 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test #'clear-string, just added. Unfortunately there's no way to
be certain from Lisp that the old password data has been erased
after realloc; it may be worth adding a test to tests.c, but
*we'll be reading memory we shouldn't be*, so that gives me pause.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 18 Apr 2015 23:00:14 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 771 | 1 ;;; china-util.el --- utilities for Chinese -*- coding: iso-2022-7bit; -*- |
| 2 | |
| 3 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. | |
| 4 ;; Licensed to the Free Software Foundation. | |
| 5 | |
| 6 ;; Keywords: mule, multilingual, Chinese | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
10 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
11 ;; under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
12 ;; Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
13 ;; option) any later version. |
| 771 | 14 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
15 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
16 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
17 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
18 ;; for more details. |
| 771 | 19 |
| 20 ;; You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
21 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 771 | 22 |
| 778 | 23 ;;; Synched up with: Emacs 21.1 (language/china-util.el). |
| 24 | |
| 25 ;;; Commentary: | |
| 771 | 26 |
| 27 ;;; Code: | |
| 28 | |
| 29 ;; Hz/ZW encoding stuffs | |
| 30 | |
| 31 ;; HZ is an encoding method for Chinese character set GB2312 used | |
| 32 ;; widely in Internet. It is very similar to 7-bit environment of | |
| 33 ;; ISO-2022. The difference is that HZ uses the sequence "~{" and | |
| 34 ;; "~}" for designating GB2312 and ASCII respectively, hence, it | |
| 35 ;; doesn't uses ESC (0x1B) code. | |
| 36 | |
| 37 ;; ZW is another encoding method for Chinese character set GB2312. It | |
| 38 ;; encodes Chinese characters line by line by starting each line with | |
| 39 ;; the sequence "zW". It also uses only 7-bit as HZ. | |
| 40 | |
| 41 ;; ISO-2022 escape sequence to designate GB2312. | |
| 42 (defvar iso2022-gb-designation "\e$A") | |
| 43 ;; HZ escape sequence to designate GB2312. | |
| 44 (defvar hz-gb-designnation "~{") | |
| 45 ;; ISO-2022 escape sequence to designate ASCII. | |
| 46 (defvar iso2022-ascii-designation "\e(B") | |
| 47 ;; HZ escape sequence to designate ASCII. | |
| 48 (defvar hz-ascii-designnation "~}") | |
| 49 ;; Regexp of ZW sequence to start GB2312. | |
| 50 (defvar zw-start-gb "^zW") | |
| 51 ;; Regexp for start of GB2312 in an encoding mixture of HZ and ZW. | |
| 52 (defvar hz/zw-start-gb | |
| 53 (concat hz-gb-designnation "\\|" zw-start-gb "\\|[^\0-\177]")) | |
| 54 | |
| 55 (defvar decode-hz-line-continuation nil | |
| 56 "Flag to tell if we should care line continuation convention of Hz.") | |
| 57 | |
| 58 (defconst hz-set-msb-table | |
| 59 (let ((str (make-string 127 0)) | |
| 60 (i 0)) | |
| 61 (while (< i 33) | |
| 62 (aset str i i) | |
| 63 (setq i (1+ i))) | |
| 64 (while (< i 127) | |
| 65 (aset str i (+ i 128)) | |
| 66 (setq i (1+ i))) | |
| 67 str)) | |
| 68 | |
| 69 ;;;###autoload | |
| 70 (defun decode-hz-region (beg end) | |
| 71 "Decode HZ/ZW encoded text in the current region. | |
| 72 Return the length of resulting text." | |
| 73 (interactive "r") | |
| 74 (save-excursion | |
| 75 (save-restriction | |
| 76 (let (pos ch) | |
| 77 (narrow-to-region beg end) | |
| 78 | |
| 79 ;; We, at first, convert HZ/ZW to `euc-china', | |
| 80 ;; then decode it. | |
| 81 | |
| 82 ;; "~\n" -> "\n", "~~" -> "~" | |
| 83 (goto-char (point-min)) | |
| 84 (while (search-forward "~" nil t) | |
| 85 (setq ch (following-char)) | |
| 86 (if (or (= ch ?\n) (= ch ?~)) (delete-char -1))) | |
| 87 | |
| 88 ;; "^zW...\n" -> Chinese GB2312 | |
| 89 ;; "~{...~}" -> Chinese GB2312 | |
| 90 (goto-char (point-min)) | |
| 91 (setq beg nil) | |
| 92 (while (re-search-forward hz/zw-start-gb nil t) | |
| 93 (setq pos (match-beginning 0) | |
| 94 ch (char-after pos)) | |
| 95 ;; Record the first position to start conversion. | |
| 96 (or beg (setq beg pos)) | |
| 97 (end-of-line) | |
| 98 (setq end (point)) | |
| 99 (if (>= ch 128) ; 8bit GB2312 | |
| 100 nil | |
| 101 (goto-char pos) | |
| 102 (delete-char 2) | |
| 103 (setq end (- end 2)) | |
| 104 (if (= ch ?z) ; ZW -> euc-china | |
| 105 (progn | |
| 106 (translate-region (point) end hz-set-msb-table) | |
| 107 (goto-char end)) | |
| 108 (if (search-forward hz-ascii-designnation | |
| 109 (if decode-hz-line-continuation nil end) | |
| 110 t) | |
| 111 (delete-char -2)) | |
| 112 (setq end (point)) | |
| 113 (translate-region pos (point) hz-set-msb-table)))) | |
| 114 (if beg | |
| 115 (decode-coding-region beg end 'euc-china))) | |
| 116 (- (point-max) (point-min))))) | |
| 117 | |
| 118 ;;;###autoload | |
| 119 (defun decode-hz-buffer () | |
| 120 "Decode HZ/ZW encoded text in the current buffer." | |
| 121 (interactive) | |
| 122 (decode-hz-region (point-min) (point-max))) | |
| 123 | |
| 124 ;;;###autoload | |
| 125 (defun encode-hz-region (beg end) | |
| 126 "Encode the text in the current region to HZ. | |
| 127 Return the length of resulting text." | |
| 128 (interactive "r") | |
| 129 (save-excursion | |
| 130 (save-restriction | |
| 131 (narrow-to-region beg end) | |
| 132 | |
| 133 ;; "~" -> "~~" | |
| 134 (goto-char (point-min)) | |
| 135 (while (search-forward "~" nil t) (insert ?~)) | |
| 136 | |
| 137 ;; Chinese GB2312 -> "~{...~}" | |
| 138 (goto-char (point-min)) | |
| 139 (if (re-search-forward "\\cc" nil t) | |
| 140 (let (pos) | |
| 141 (goto-char (setq pos (match-beginning 0))) | |
| 142 (encode-coding-region pos (point-max) 'iso-2022-7bit) | |
| 143 (goto-char pos) | |
| 144 (while (search-forward iso2022-gb-designation nil t) | |
| 145 (delete-char -3) | |
| 146 (insert hz-gb-designnation)) | |
| 147 (goto-char pos) | |
| 148 (while (search-forward iso2022-ascii-designation nil t) | |
| 149 (delete-char -3) | |
| 150 (insert hz-ascii-designnation)))) | |
| 151 (- (point-max) (point-min))))) | |
| 152 | |
| 153 ;;;###autoload | |
| 154 (defun encode-hz-buffer () | |
| 155 "Encode the text in the current buffer to HZ." | |
| 156 (interactive) | |
| 157 (encode-hz-region (point-min) (point-max))) | |
| 158 | |
| 159 ;; | |
| 160 (provide 'china-util) | |
| 161 | |
| 162 ;;; china-util.el ends here |