Mercurial > hg > xemacs-beta
annotate netinstall/nio-file.cc @ 4745:0c54de4c4b9d
Resolve the unregistered-CCL-programs-get-garbage-collected problem correctly
src/ChangeLog addition:
2009-11-15 Aidan Kehoe <kehoea@parhasard.net>
* mule-ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Assert that we always
have a symbol in this macro.
(setup_ccl_program): Ensure we're not allocating unreachable
memory in this function; all symbols must have been resolved in a
given CCL program before this function is called.
(find_ccl_program): New function, return a CCL program with all
its symbols resolved if it is valid (possibly allocating memory),
Qnil otherwise.
(get_ccl_program): New function, exported to other files; call
find_ccl_program, and error if it gives nil.
(Fccl_program_p): Call find_ccl_program from this function instead
of implementing the bulk of it here.
(Fccl_execute): Call get_ccl_program instead of implementing the
bulk of it here.
(Fccl_execute_on_string): Ditto.
* mule-ccl.h (Vfont_ccl_encoder_alist): Remove this declaration,
it hasn't been used in years.
(get_ccl_program): Declare this function.
* mule-coding.c (ccl_putprop): Use get_ccl_program on any
specified encode or decode CCL program property.
(fixed_width_putprop): Ditto.
* mule-charset.c (Fmake_charset): Use get_ccl_program on any
specified ccl-program.
(Fset_charset_ccl_program): Ditto.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 15 Nov 2009 16:53:14 +0000 |
| 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 /* The purpose of this file is to manage access to files stored on the | |
| 17 local disk (i.e. "downloading" setup.ini). Called from netio.cc */ | |
| 18 | |
| 19 #include <stdio.h> | |
| 20 #include <sys/types.h> | |
| 21 #include <sys/stat.h> | |
| 22 #include <errno.h> | |
| 23 #include "win32.h" | |
| 24 #include "netio.h" | |
| 25 #include "nio-file.h" | |
| 26 #include "resource.h" | |
| 27 #include "msg.h" | |
| 28 | |
| 29 NetIO_File::NetIO_File (char *Purl) | |
| 30 : NetIO (Purl) | |
| 31 { | |
| 32 struct stat s; | |
| 33 fd = fopen (path, "rb"); | |
| 34 if (fd) | |
| 35 { | |
| 36 stat (path, &s); | |
| 37 file_size = s.st_size; | |
| 38 } | |
| 39 else | |
| 40 { | |
| 41 char *err = strerror (errno); | |
| 42 if (!err) | |
| 43 err = "(unknown error)"; | |
| 44 note (IDS_ERR_OPEN_READ, path, err); | |
| 45 } | |
| 46 } | |
| 47 | |
| 48 NetIO_File::~NetIO_File () | |
| 49 { | |
| 50 if (fd) | |
| 51 fclose ((FILE *)fd); | |
| 52 } | |
| 53 | |
| 54 int | |
| 55 NetIO_File::ok () | |
| 56 { | |
| 57 return fd ? 1 : 0; | |
| 58 } | |
| 59 | |
| 60 int | |
| 61 NetIO_File::read (char *buf, int nbytes) | |
| 62 { | |
| 63 return fread (buf, 1, nbytes, (FILE *)fd); | |
| 64 } |