Mercurial > hg > xemacs-beta
view 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 |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* The purpose of this file is to manage access to files stored on the local disk (i.e. "downloading" setup.ini). Called from netio.cc */ #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> #include <errno.h> #include "win32.h" #include "netio.h" #include "nio-file.h" #include "resource.h" #include "msg.h" NetIO_File::NetIO_File (char *Purl) : NetIO (Purl) { struct stat s; fd = fopen (path, "rb"); if (fd) { stat (path, &s); file_size = s.st_size; } else { char *err = strerror (errno); if (!err) err = "(unknown error)"; note (IDS_ERR_OPEN_READ, path, err); } } NetIO_File::~NetIO_File () { if (fd) fclose ((FILE *)fd); } int NetIO_File::ok () { return fd ? 1 : 0; } int NetIO_File::read (char *buf, int nbytes) { return fread (buf, 1, nbytes, (FILE *)fd); }