Mercurial > hg > xemacs-beta
annotate netinstall/download.cc @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 19 Sep 2009 22:53:13 +0100 |
| parents | ce0b3f2eff35 |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 14 */ | |
| 15 | |
| 16 /* The purpose of this file is to download all the files we need to | |
| 17 do the installation. */ | |
| 18 | |
| 19 #include <stdio.h> | |
| 20 #include <sys/types.h> | |
| 21 #include <sys/stat.h> | |
| 22 | |
| 23 #include "win32.h" | |
| 24 | |
| 25 #include "resource.h" | |
| 26 #include "msg.h" | |
| 27 #include "ini.h" | |
| 28 #include "dialog.h" | |
| 29 #include "concat.h" | |
| 30 #include "geturl.h" | |
| 31 #include "state.h" | |
| 32 #include "mkdir.h" | |
| 33 #include "log.h" | |
| 34 | |
| 35 static int | |
| 36 download_one (char *name, int expected_size) | |
| 37 { | |
| 38 char *local = name; | |
| 39 | |
| 40 struct stat s; | |
| 41 if (stat (local, &s) >= 0) | |
| 42 if (s.st_size == expected_size) | |
| 43 return 0; | |
| 44 | |
| 45 mkdir_p (0, local); | |
| 46 | |
| 47 if (get_url_to_file (concat (MIRROR_SITE, "/", name, 0), | |
| 48 concat (local, ".tmp", 0), | |
| 49 expected_size)) | |
| 50 { | |
| 51 note (IDS_DOWNLOAD_FAILED, name); | |
| 52 return 1; | |
| 53 } | |
| 54 else | |
| 55 { | |
| 56 stat (concat (local, ".tmp", 0), &s); | |
| 57 if (s.st_size == expected_size) | |
| 58 { | |
| 59 log (0, "Downloaded %s", local); | |
| 60 rename (concat (local, ".tmp", 0), local); | |
| 61 } | |
| 62 else | |
| 63 { | |
| 64 log (0, "Download %s wrong size (%d actual vs %d expected)", | |
| 65 local, s.st_size, expected_size); | |
| 66 note (IDS_DOWNLOAD_SHORT, local, s.st_size, expected_size); | |
| 67 return 1; | |
| 68 } | |
| 69 } | |
| 70 | |
| 71 return 0; | |
| 72 } | |
| 73 | |
| 74 void | |
| 75 do_download (HINSTANCE h) | |
| 76 { | |
| 77 int i; | |
| 78 int errors = 0; | |
| 79 | |
| 80 for (i=0; i<npackages; i++) | |
| 81 if (package[i].action == ACTION_NEW || package[i].action == ACTION_UPGRADE) | |
| 82 { | |
| 83 int e = download_one (pi.install, pi.install_size); | |
| 84 if (package[i].srcaction == SRCACTION_YES && pi.source) | |
| 85 e += download_one (pi.source, pi.source_size); | |
| 86 errors += e; | |
| 87 if (e) | |
| 88 package[i].action = ACTION_ERROR; | |
| 89 } | |
| 90 | |
| 91 dismiss_url_status_dialog (); | |
| 92 | |
| 93 if (errors) | |
| 94 { | |
| 95 if (yesno (IDS_DOWNLOAD_INCOMPLETE) == IDYES) | |
| 96 { | |
| 97 next_dialog = IDD_SITE; | |
| 98 return; | |
| 99 } | |
| 100 } | |
| 101 | |
| 102 if (source == IDC_SOURCE_DOWNLOAD) | |
| 103 { | |
| 104 if (errors) | |
| 105 exit_msg = IDS_DOWNLOAD_INCOMPLETE; | |
| 106 else | |
| 107 exit_msg = IDS_DOWNLOAD_COMPLETE; | |
| 108 next_dialog = 0; | |
| 109 } | |
| 110 else | |
| 111 next_dialog = IDD_S_INSTALL; | |
| 112 } |