Mercurial > hg > xemacs-beta
annotate netinstall/simpsock.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 | 3078fd1074e8 |
| 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 /* Simplified socket access functions */ | |
| 17 | |
| 18 #include "win32.h" | |
| 19 #include <winsock.h> | |
| 20 #include <stdio.h> | |
| 21 #include <stdarg.h> | |
| 22 #include <stdlib.h> | |
| 23 | |
| 24 #include "simpsock.h" | |
| 25 #include "msg.h" | |
| 26 | |
| 27 #define SSBUFSZ 1024 | |
| 28 | |
| 29 SimpleSocket::SimpleSocket (char *hostname, int port) | |
| 30 { | |
| 31 static int initted = 0; | |
| 32 if (!initted) | |
| 33 { | |
| 34 initted = 1; | |
| 35 WSADATA d; | |
| 36 WSAStartup (MAKEWORD (1,1), &d); | |
| 37 } | |
| 38 | |
| 39 s = INVALID_SOCKET; | |
| 40 buf = (char *) malloc (SSBUFSZ + 3); | |
| 41 putp = getp = 0; | |
| 42 | |
| 43 int i1, i2, i3, i4; | |
| 44 unsigned char ip[4]; | |
| 45 | |
| 46 if (sscanf (hostname, "%d.%d.%d.%d", &i1, &i2, &i3, &i4) == 4) | |
| 47 { | |
| 48 ip[0] = i1; | |
| 49 ip[1] = i2; | |
| 50 ip[2] = i3; | |
| 51 ip[3] = i4; | |
| 52 } | |
| 53 else | |
| 54 { | |
| 55 struct hostent *he; | |
| 56 he = gethostbyname (hostname); | |
| 57 if (!he) | |
| 58 { | |
| 59 msg ("Can't resolve `%s'\n", hostname); | |
| 60 return; | |
| 61 } | |
| 62 memcpy (ip, he->h_addr_list[0], 4); | |
| 63 } | |
| 64 | |
| 65 s = socket (AF_INET, SOCK_STREAM, 0); | |
| 66 if (s == INVALID_SOCKET) | |
| 67 { | |
| 68 msg ("Can't create socket, %d", WSAGetLastError ()); | |
| 69 return; | |
| 70 } | |
| 71 | |
| 72 struct sockaddr_in name; | |
| 73 | |
| 74 memset (&name, 0, sizeof (name)); | |
| 75 name.sin_family = AF_INET; | |
| 76 name.sin_port = htons (port); | |
| 77 memcpy (&name.sin_addr, ip, 4); | |
| 78 | |
| 79 if (connect (s, (sockaddr *)&name, sizeof(name))) | |
| 80 { | |
| 81 msg ("Can't connect to %s:%d", hostname, port); | |
| 82 closesocket (s); | |
| 83 s = INVALID_SOCKET; | |
| 84 return; | |
| 85 } | |
| 86 | |
| 87 return; | |
| 88 } | |
| 89 | |
| 90 SimpleSocket::~SimpleSocket () | |
| 91 { | |
| 92 if (s != INVALID_SOCKET) | |
| 93 closesocket (s); | |
| 94 s = INVALID_SOCKET; | |
| 95 if (buf) | |
| 96 free (buf); | |
| 97 buf = 0; | |
| 98 } | |
| 99 | |
| 100 int | |
| 101 SimpleSocket::ok () | |
| 102 { | |
| 103 if (s == INVALID_SOCKET) | |
| 104 return 0; | |
| 105 return 1; | |
| 106 } | |
| 107 | |
| 108 int | |
| 109 SimpleSocket::printf (char *fmt, ...) | |
| 110 { | |
| 111 char localbuf[SSBUFSZ]; | |
| 112 va_list args; | |
| 113 va_start (args, fmt); | |
| 114 vsprintf (localbuf, fmt, args); | |
| 115 return send (s, localbuf, strlen (localbuf), 0); | |
| 116 } | |
| 117 | |
| 118 int | |
| 119 SimpleSocket::write (char *localbuf, int len) | |
| 120 { | |
| 121 return send (s, localbuf, len, 0); | |
| 122 } | |
| 123 | |
| 124 int | |
| 125 SimpleSocket::fill () | |
| 126 { | |
| 127 if (putp == getp) | |
| 128 putp = getp = 0; | |
| 129 | |
| 130 int n = SSBUFSZ - putp; | |
| 131 if (n == 0) | |
| 132 return 0; | |
| 133 int r = recv (s, buf + putp, n, 0); | |
| 134 if (r > 0) | |
| 135 { | |
| 136 putp += r; | |
| 137 return r; | |
| 138 } | |
| 139 return 0; | |
| 140 } | |
| 141 | |
| 142 char * | |
| 143 SimpleSocket::gets () | |
| 144 { | |
| 145 if (getp > 0 && putp > getp) | |
| 146 { | |
| 147 memmove (buf, buf+getp, putp-getp); | |
| 148 putp -= getp; | |
| 149 getp = 0; | |
| 150 } | |
| 151 if (putp == getp) | |
| 152 fill(); | |
| 153 | |
| 154 // getp is zero, always, here, and putp is the count | |
| 155 char *nl; | |
| 156 while ((nl = (char *)memchr (buf, '\n', putp)) == NULL && putp < SSBUFSZ) | |
| 157 if (fill () <= 0) | |
| 158 break; | |
| 159 | |
| 160 if (nl) | |
| 161 { | |
| 162 getp = nl - buf + 1; | |
| 163 while ((*nl == '\n' || *nl == '\r') && nl >= buf) | |
| 164 *nl-- = 0; | |
| 165 } | |
| 166 else | |
| 167 { | |
| 168 getp = putp; | |
| 169 nl = buf + putp; | |
| 170 nl[1] = 0; | |
| 171 } | |
| 172 | |
| 173 return buf; | |
| 174 } | |
| 175 | |
| 176 #define MIN(a,b) ((a) < (b) ? (a) : (b)) | |
| 177 | |
| 178 int | |
| 179 SimpleSocket::read (char *ubuf, int ulen) | |
| 180 { | |
| 181 int n, rv=0; | |
| 182 if (putp > getp) | |
| 183 { | |
| 184 n = MIN (ulen, putp-getp); | |
| 185 memmove (ubuf, buf+getp, n); | |
| 186 getp += n; | |
| 187 ubuf += n; | |
| 188 ulen -= n; | |
| 189 rv += n; | |
| 190 } | |
| 191 while (ulen > 0) | |
| 192 { | |
| 193 n = recv (s, ubuf, ulen, 0); | |
| 194 if (n <= 0) | |
| 195 return rv; | |
| 196 ubuf += n; | |
| 197 ulen -= n; | |
| 198 rv += n; | |
| 199 } | |
| 200 return rv; | |
| 201 } |