Mercurial > hg > xemacs-beta
view netinstall/ini.h @ 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 | ce0b3f2eff35 |
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> * */ /* When setup.ini is parsed, the information is stored according to the declarations here. ini.cc (via inilex and iniparse) initializes these structures. choose.cc sets the action and trust fields. download.cc downloads any needed files for selected packages (the chosen "install" field). install.cc installs selected packages. */ #define YYSTYPE char * /* lowest number must be most trusted, highest least trusted */ #define TRUST_PREV 0 #define TRUST_CURR 1 #define TRUST_TEST 2 #define NTRUST 3 #define TRUST_UNKNOWN 3 /* intentionally not in NTRUST */ #define TY_GENERIC 0 #define TY_CYGWIN 1 #define TY_NATIVE 2 #define ACTION_UNKNOWN 0 #define ACTION_SAME 1 #define ACTION_NEW 2 #define ACTION_UPGRADE 3 #define ACTION_UNINSTALL 4 #define ACTION_ERROR 5 #define SRCACTION_NO 0 #define SRCACTION_YES 1 typedef struct { char *name; /* package name, like "cygwin" */ char *sdesc; /* short description (replaces "name" if provided) */ char *ldesc; /* long description (multi-line) */ int action; /* ACTION_* - only NEW and UPGRADE get installed */ int srcaction;/* SRCACTION_ */ int trust; /* TRUST_* (selects among info[] below) */ int type; /* TY_GENERIC, TY_CYGWIN or TY_NATIVE. */ struct { char *version; /* version part of filename */ char *install; /* file name to install */ int install_size; /* in bytes */ char *source; /* sources for installed binaries */ int source_size; /* in bytes */ } info[NTRUST+1]; /* +1 for TRUST_UNKNOWN */ } Package; #ifdef __cplusplus extern "C" { #endif extern Package *package; extern Package *xemacs_package; extern int npackages; Package *new_package (char *name); void ini_init (char *string); #define pinfo(p) ((p).info[(p).trust]) #define pi pinfo(package[i]) #define LOOP_PACKAGES \ for (i=0; i<npackages; i++) \ if ((package[i].action == ACTION_NEW \ || package[i].action == ACTION_UPGRADE) \ && pi.install) #ifdef __cplusplus } #endif