Mule-izing, various fixes related to char * arguments -------------------- ChangeLog entries follow: -------------------- modules/ChangeLog addition: 2010-01-26 Ben Wing <ben@xemacs.org> * postgresql/postgresql.c: * postgresql/postgresql.c (CHECK_LIVE_CONNECTION): * postgresql/postgresql.c (print_pgresult): * postgresql/postgresql.c (Fpq_conn_defaults): * postgresql/postgresql.c (Fpq_connectdb): * postgresql/postgresql.c (Fpq_connect_start): * postgresql/postgresql.c (Fpq_result_status): * postgresql/postgresql.c (Fpq_res_status): Mule-ize large parts of it. 2010-01-26 Ben Wing <ben@xemacs.org> * ldap/eldap.c (print_ldap): * ldap/eldap.c (allocate_ldap): Use write_ascstring(). src/ChangeLog addition: 2010-01-26 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (build_ascstring): * alloc.c (build_msg_cistring): * alloc.c (staticpro_1): * alloc.c (staticpro_name): * alloc.c (staticpro_nodump_1): * alloc.c (staticpro_nodump_name): * alloc.c (unstaticpro_nodump_1): * alloc.c (mcpro_1): * alloc.c (mcpro_name): * alloc.c (object_memory_usage_stats): * alloc.c (common_init_alloc_early): * alloc.c (init_alloc_once_early): * buffer.c (print_buffer): * buffer.c (vars_of_buffer): * buffer.c (common_init_complex_vars_of_buffer): * buffer.c (init_initial_directory): * bytecode.c (invalid_byte_code): * bytecode.c (print_compiled_function): * bytecode.c (mark_compiled_function): * chartab.c (print_table_entry): * chartab.c (print_char_table): * config.h.in: * console-gtk.c: * console-gtk.c (gtk_device_to_console_connection): * console-gtk.c (gtk_semi_canonicalize_console_connection): * console-gtk.c (gtk_canonicalize_console_connection): * console-gtk.c (gtk_semi_canonicalize_device_connection): * console-gtk.c (gtk_canonicalize_device_connection): * console-stream.c (stream_init_frame_1): * console-stream.c (vars_of_console_stream): * console-stream.c (init_console_stream): * console-x.c (x_semi_canonicalize_console_connection): * console-x.c (x_semi_canonicalize_device_connection): * console-x.c (x_canonicalize_device_connection): * console-x.h: * data.c (eq_with_ebola_notice): * data.c (Fsubr_interactive): * data.c (Fnumber_to_string): * data.c (digit_to_number): * device-gtk.c (gtk_init_device): * device-msw.c (print_devmode): * device-x.c (x_event_name): * dialog-msw.c (handle_directory_dialog_box): * dialog-msw.c (handle_file_dialog_box): * dialog-msw.c (vars_of_dialog_mswindows): * doc.c (weird_doc): * doc.c (Fsnarf_documentation): * doc.c (vars_of_doc): * dumper.c (pdump): * dynarr.c: * dynarr.c (Dynarr_realloc): * editfns.c (Fuser_real_login_name): * editfns.c (get_home_directory): * elhash.c (print_hash_table_data): * elhash.c (print_hash_table): * emacs.c (main_1): * emacs.c (vars_of_emacs): * emodules.c: * emodules.c (_emodules_list): * emodules.c (Fload_module): * emodules.c (Funload_module): * emodules.c (Flist_modules): * emodules.c (find_make_module): * emodules.c (attempt_module_delete): * emodules.c (emodules_load): * emodules.c (emodules_doc_subr): * emodules.c (emodules_doc_sym): * emodules.c (syms_of_module): * emodules.c (vars_of_module): * emodules.h: * eval.c (print_subr): * eval.c (signal_call_debugger): * eval.c (build_error_data): * eval.c (signal_error): * eval.c (maybe_signal_error): * eval.c (signal_continuable_error): * eval.c (maybe_signal_continuable_error): * eval.c (signal_error_2): * eval.c (maybe_signal_error_2): * eval.c (signal_continuable_error_2): * eval.c (maybe_signal_continuable_error_2): * eval.c (signal_ferror): * eval.c (maybe_signal_ferror): * eval.c (signal_continuable_ferror): * eval.c (maybe_signal_continuable_ferror): * eval.c (signal_ferror_with_frob): * eval.c (maybe_signal_ferror_with_frob): * eval.c (signal_continuable_ferror_with_frob): * eval.c (maybe_signal_continuable_ferror_with_frob): * eval.c (syntax_error): * eval.c (syntax_error_2): * eval.c (maybe_syntax_error): * eval.c (sferror): * eval.c (sferror_2): * eval.c (maybe_sferror): * eval.c (invalid_argument): * eval.c (invalid_argument_2): * eval.c (maybe_invalid_argument): * eval.c (invalid_constant): * eval.c (invalid_constant_2): * eval.c (maybe_invalid_constant): * eval.c (invalid_operation): * eval.c (invalid_operation_2): * eval.c (maybe_invalid_operation): * eval.c (invalid_change): * eval.c (invalid_change_2): * eval.c (maybe_invalid_change): * eval.c (invalid_state): * eval.c (invalid_state_2): * eval.c (maybe_invalid_state): * eval.c (wtaerror): * eval.c (stack_overflow): * eval.c (out_of_memory): * eval.c (print_multiple_value): * eval.c (issue_call_trapping_problems_warning): * eval.c (backtrace_specials): * eval.c (backtrace_unevalled_args): * eval.c (Fbacktrace): * eval.c (warn_when_safe): * event-Xt.c (modwarn): * event-Xt.c (modbarf): * event-Xt.c (check_modifier): * event-Xt.c (store_modifier): * event-Xt.c (emacs_Xt_format_magic_event): * event-Xt.c (describe_event): * event-gtk.c (dragndrop_data_received): * event-gtk.c (store_modifier): * event-gtk.c (gtk_reset_modifier_mapping): * event-msw.c (dde_eval_string): * event-msw.c (Fdde_alloc_advise_item): * event-msw.c (mswindows_dde_callback): * event-msw.c (FROB): * event-msw.c (emacs_mswindows_format_magic_event): * event-stream.c (external_debugging_print_event): * event-stream.c (execute_help_form): * event-stream.c (vars_of_event_stream): * events.c (print_event_1): * events.c (print_event): * events.c (event_equal): * extents.c (print_extent_1): * extents.c (print_extent): * extents.c (vars_of_extents): * faces.c (print_face): * faces.c (complex_vars_of_faces): * file-coding.c: * file-coding.c (print_coding_system): * file-coding.c (print_coding_system_in_print_method): * file-coding.c (default_query_method): * file-coding.c (find_coding_system): * file-coding.c (make_coding_system_1): * file-coding.c (chain_print): * file-coding.c (undecided_print): * file-coding.c (gzip_print): * file-coding.c (vars_of_file_coding): * file-coding.c (complex_vars_of_file_coding): * fileio.c: * fileio.c (report_file_type_error): * fileio.c (report_error_with_errno): * fileio.c (report_file_error): * fileio.c (barf_or_query_if_file_exists): * fileio.c (vars_of_fileio): * floatfns.c (matherr): * fns.c (print_bit_vector): * fns.c (Fmapconcat): * fns.c (add_suffix_to_symbol): * fns.c (add_prefix_to_symbol): * frame-gtk.c: * frame-gtk.c (Fgtk_window_id): * frame-x.c (def): * frame-x.c (x_cde_transfer_callback): * frame.c: * frame.c (Fmake_frame): * gc.c (show_gc_cursor_and_message): * gc.c (vars_of_gc): * glyphs-eimage.c (png_instantiate): * glyphs-eimage.c (tiff_instantiate): * glyphs-gtk.c (gtk_print_image_instance): * glyphs-msw.c (mswindows_print_image_instance): * glyphs-x.c (x_print_image_instance): * glyphs-x.c (update_widget_face): * glyphs.c (make_string_from_file): * glyphs.c (print_image_instance): * glyphs.c (signal_image_error): * glyphs.c (signal_image_error_2): * glyphs.c (signal_double_image_error): * glyphs.c (signal_double_image_error_2): * glyphs.c (xbm_mask_file_munging): * glyphs.c (pixmap_to_lisp_data): * glyphs.h: * gui.c (gui_item_display_flush_left): * hpplay.c (player_error_internal): * hpplay.c (myHandler): * intl-win32.c: * intl-win32.c (langcode_to_lang): * intl-win32.c (sublangcode_to_lang): * intl-win32.c (Fmswindows_get_locale_info): * intl-win32.c (lcid_to_locale_mule_or_no): * intl-win32.c (mswindows_multibyte_to_unicode_print): * intl-win32.c (complex_vars_of_intl_win32): * keymap.c: * keymap.c (print_keymap): * keymap.c (ensure_meta_prefix_char_keymapp): * keymap.c (Fkey_description): * keymap.c (Ftext_char_description): * lisp.h: * lisp.h (struct): * lisp.h (DECLARE_INLINE_HEADER): * lread.c (Fload_internal): * lread.c (locate_file): * lread.c (read_escape): * lread.c (read_raw_string): * lread.c (read1): * lread.c (read_list): * lread.c (read_compiled_function): * lread.c (init_lread): * lrecord.h: * marker.c (print_marker): * marker.c (marker_equal): * menubar-msw.c (displayable_menu_item): * menubar-x.c (command_builder_operate_menu_accelerator): * menubar.c (vars_of_menubar): * minibuf.c (reinit_complex_vars_of_minibuf): * minibuf.c (complex_vars_of_minibuf): * mule-charset.c (Fmake_charset): * mule-charset.c (complex_vars_of_mule_charset): * mule-coding.c (iso2022_print): * mule-coding.c (fixed_width_query): * number.c (bignum_print): * number.c (ratio_print): * number.c (bigfloat_print): * number.c (bigfloat_finalize): * objects-msw.c: * objects-msw.c (mswindows_color_to_string): * objects-msw.c (mswindows_color_list): * objects-tty.c: * objects-tty.c (tty_font_list): * objects-tty.c (tty_find_charset_font): * objects-xlike-inc.c (xft_find_charset_font): * objects-xlike-inc.c (endif): * print.c: * print.c (write_istring): * print.c (write_ascstring): * print.c (Fterpri): * print.c (Fprint): * print.c (print_error_message): * print.c (print_vector_internal): * print.c (print_cons): * print.c (print_string): * print.c (printing_unreadable_object): * print.c (print_internal): * print.c (print_float): * print.c (print_symbol): * process-nt.c (mswindows_report_winsock_error): * process-nt.c (nt_canonicalize_host_name): * process-unix.c (unix_canonicalize_host_name): * process.c (print_process): * process.c (report_process_error): * process.c (report_network_error): * process.c (make_process_internal): * process.c (Fstart_process_internal): * process.c (status_message): * process.c (putenv_internal): * process.c (vars_of_process): * process.h: * profile.c (vars_of_profile): * rangetab.c (print_range_table): * realpath.c (vars_of_realpath): * redisplay.c (vars_of_redisplay): * search.c (wordify): * search.c (Freplace_match): * sheap.c (sheap_adjust_h): * sound.c (report_sound_error): * sound.c (Fplay_sound_file): * specifier.c (print_specifier): * symbols.c (Fsubr_name): * symbols.c (do_symval_forwarding): * symbols.c (set_default_buffer_slot_variable): * symbols.c (set_default_console_slot_variable): * symbols.c (store_symval_forwarding): * symbols.c (default_value): * symbols.c (defsymbol_massage_name_1): * symbols.c (defsymbol_massage_name_nodump): * symbols.c (defsymbol_massage_name): * symbols.c (defsymbol_massage_multiword_predicate_nodump): * symbols.c (defsymbol_massage_multiword_predicate): * symbols.c (defsymbol_nodump): * symbols.c (defsymbol): * symbols.c (defkeyword): * symbols.c (defkeyword_massage_name): * symbols.c (check_module_subr): * symbols.c (deferror_1): * symbols.c (deferror): * symbols.c (deferror_massage_name): * symbols.c (deferror_massage_name_and_message): * symbols.c (defvar_magic): * symeval.h: * symeval.h (DEFVAR_SYMVAL_FWD): * sysdep.c: * sysdep.c (init_system_name): * sysdll.c: * sysdll.c (MAYBE_PREPEND_UNDERSCORE): * sysdll.c (dll_function): * sysdll.c (dll_variable): * sysdll.c (dll_error): * sysdll.c (dll_open): * sysdll.c (dll_close): * sysdll.c (image_for_address): * sysdll.c (my_find_image): * sysdll.c (search_linked_libs): * sysdll.h: * sysfile.h: * sysfile.h (DEFAULT_DIRECTORY_FALLBACK): * syswindows.h: * tests.c (DFC_CHECK_LENGTH): * tests.c (DFC_CHECK_CONTENT): * tests.c (Ftest_hash_tables): * text.c (vars_of_text): * text.h: * tooltalk.c (tt_opnum_string): * tooltalk.c (tt_message_arg_ival_string): * tooltalk.c (Ftooltalk_default_procid): * tooltalk.c (Ftooltalk_default_session): * tooltalk.c (init_tooltalk): * tooltalk.c (vars_of_tooltalk): * ui-gtk.c (Fdll_load): * ui-gtk.c (type_to_marshaller_type): * ui-gtk.c (Fgtk_import_function_internal): * ui-gtk.c (emacs_gtk_object_printer): * ui-gtk.c (emacs_gtk_boxed_printer): * unicode.c (unicode_to_ichar): * unicode.c (unicode_print): * unicode.c (unicode_query): * unicode.c (vars_of_unicode): * unicode.c (complex_vars_of_unicode): * win32.c: * win32.c (mswindows_report_process_error): * window.c (print_window): * xemacs.def.in.in: BASIC IDEA: Further fixing up uses of char * and CIbyte * to reflect their actual semantics; Mule-izing some code; redoing of the not-yet-working code to handle message translation. Clean up code to handle message-translation (not yet working). Create separate versions of build_msg_string() for working with Ibyte *, CIbyte *, and Ascbyte * arguments. Assert that Ascbyte * arguments are pure-ASCII. Make build_msg_string() be the same as build_msg_ascstring(). Create same three versions of GETTEXT() and DEFER_GETTEXT(). Also create build_defer_string() and variants for the equivalent of DEFER_GETTEXT() when building a string. Remove old CGETTEXT(). Clean up code where GETTEXT(), DEFER_GETTEXT(), build_msg_string(), etc. was being called and introduce some new calls to build_msg_string(), etc. Remove GETTEXT() from calls to weird_doc() -- we assume that the message snarfer knows about weird_doc(). Remove uses of DEFER_GETTEXT() from error messages in sysdep.c and instead use special comments /* @@@begin-snarf@@@ */ and /* @@@end-snarf@@@ */ that the message snarfer presumably knows about. Create build_ascstring() and use it in many instances in place of build_string(). The purpose of having Ascbyte * variants is to make the code more self-documenting in terms of what sort of semantics is expected for char * strings. In fact in the process of looking for uses of build_string(), much improperly Mule-ized was discovered. Mule-ize a lot of code as described in previous paragraph, e.g. in sysdep.c. Make the error functions take Ascbyte * strings and fix up a couple of places where non-pure-ASCII strings were being passed in (file-coding.c, mule-coding.c, unicode.c). (It's debatable whether we really need to make the error functions work this way. It helps catch places where code is written in a way that message translation won't work, but we may well never implement message translation.) Make staticpro() and friends take Ascbyte * strings instead of raw char * strings. Create a const_Ascbyte_ptr dynarr type to describe what's held by staticpro_names[] and friends, create pdump descriptions for const_Ascbyte_ptr dynarrs, and use them in place of specially-crafted staticpro descriptions. Mule-ize certain other functions (e.g. x_event_name) by correcting raw use of char * to Ascbyte *, Rawbyte * or another such type, and raw use of char[] buffers to another type (usually Ascbyte[]). Change many uses of write_c_string() to write_msg_string(), write_ascstring(), etc. Mule-ize emodules.c, emodules.h, sysdll.h. Fix some un-Mule-ized code in intl-win32.c. A comment in event-Xt.c and the limitations of the message snarfer (make-msgfile or whatever) is presumably incorrect -- it should be smart enough to handle function calls spread over more than one line. Clean up code in event-Xt.c that was written awkwardly for this reason. In config.h.in, instead of NEED_ERROR_CHECK_TYPES_INLINES, create a more general XEMACS_DEFS_NEEDS_INLINE_DECLS to indicate when inlined functions need to be declared in xemacs.defs.in.in, and make use of it in xemacs.defs.in.in. We need to do this because postgresql.c now calls qxestrdup(), which is an inline function. Make nconc2() and other such functions MODULE_API and put them in xemacs.defs.in.in since postgresql.c now uses them. Clean up indentation in lread.c and a few other places. In text.h, document ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN(), group together the stand-in encodings and add some more for DLL symbols, function and variable names, etc.

--- a/src/emodules.c	Tue Jan 26 22:48:23 2010 -0600
+++ b/src/emodules.c	Tue Jan 26 23:22:30 2010 -0600
@@ -1,5 +1,6 @@
 /* emodules.c - Support routines for dynamic module loading
 (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved.
+(C) Copyright 2010 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -18,6 +19,8 @@
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+/* This file has been Mule-ized, Ben Wing, 1-26-10. */
+
 #include "emodules.h"
 #include "sysdll.h"
 #ifdef HAVE_LTDL
@@ -48,11 +51,11 @@
 typedef struct _emodules_list
 {
   int used;             /* Is this slot used?                              */
-  CIbyte *soname;       /* Name of the shared object loaded (full path)    */
-  CIbyte *modname;      /* The name of the module                          */
-  CIbyte *modver;       /* The module version string                       */
-  CIbyte *modtitle;     /* How the module announces itself                 */
-  void (*unload)(void); /* Module cleanup function to run before unloading */
+  Ibyte *soname;        /* Name of the shared object loaded (full path)    */
+  Ibyte *modname;       /* The name of the module                          */
+  Ibyte *modver;        /* The module version string                       */
+  Ibyte *modtitle;      /* How the module announces itself                 */
+  void (*unload) (void);/* Module cleanup function to run before unloading */
   dll_handle dlhandle;  /* Dynamic lib handle                              */
 } emodules_list;
 
@@ -61,8 +64,8 @@
 static emodules_list *modules;
 static int modnum;
 
-static int find_make_module (const CIbyte *mod, const CIbyte *name,
-			     const CIbyte *ver, int make_or_find);
+static int find_make_module (Lisp_Object mod, const Ibyte *name,
+			     const Ibyte *ver, int make_or_find);
 static Lisp_Object module_load_unwind (Lisp_Object);
 static void attempt_module_delete (int mod);
 
@@ -96,22 +99,22 @@
 */
        (file, name, version))
 {
-  const CIbyte *mod, *mname, *mver;
+  const Ibyte *mod, *mname, *mver;
   int speccount = specpdl_depth();
 
-  CHECK_STRING(file);
+  CHECK_STRING (file);
 
-  mod = (CIbyte *) XSTRING_DATA (file);
+  mod = XSTRING_DATA (file);
 
   if (NILP (name))
-    mname = "";
+    mname = (const Ibyte *) "";
   else
-    mname = (CIbyte *) XSTRING_DATA (name);
+    mname = XSTRING_DATA (name);
 
   if (NILP (version))
-    mver = "";
+    mver = (const Ibyte *) "";
   else
-    mver = (CIbyte *) XSTRING_DATA (version);
+    mver = XSTRING_DATA (version);
 
   dlhandle = 0;
   record_unwind_protect (module_load_unwind, make_int(modnum));
@@ -136,7 +139,7 @@
        (file, name, version))
 {
   int x;
-  const CIbyte *mod, *mname, *mver;
+  const Ibyte *mname, *mver;
   Lisp_Object foundname = Qnil;
   struct gcpro gcpro1;
 
@@ -146,20 +149,19 @@
   if (locate_file (Vmodule_load_path, file, Vmodule_extensions, &foundname, 0)
       < 0)
     return Qt;
-  mod = (CIbyte *) XSTRING_DATA (foundname);
   UNGCPRO;
 
   if (NILP (name))
-    mname = "";
+    mname = (const Ibyte *) "";
   else
-    mname = (CIbyte *) XSTRING_DATA (name);
+    mname = XSTRING_DATA (name);
 
   if (NILP (version))
-    mver = "";
+    mver = (const Ibyte *) "";
   else
-    mver = (CIbyte *) XSTRING_DATA (version);
+    mver = XSTRING_DATA (version);
 
-  x = find_make_module (mod, mname, mver, 1);
+  x = find_make_module (foundname, mname, mver, 1);
   if (x != -1)
     {
       if (modules[x].unload != NULL)
@@ -199,30 +201,31 @@
   for (i = 0; i < modnum; i++)
     {
       if (modules[i].used == 1)
-        mlist = Fcons (list4 (build_string (modules[i].soname),
-                              build_string (modules[i].modname),
-                              build_string (modules[i].modver),
-                              build_string (modules[i].modtitle)), mlist);
+        mlist = Fcons (list4 (build_intstring (modules[i].soname),
+                              build_intstring (modules[i].modname),
+                              build_intstring (modules[i].modver),
+                              build_intstring (modules[i].modtitle)), mlist);
     }
 
   return mlist;
 }
 
 static int
-find_make_module (const CIbyte *mod, const CIbyte *name, const CIbyte *ver,
+find_make_module (Lisp_Object mod, const Ibyte *name, const Ibyte *ver,
 		  int mof)
 {
   int i, fs = -1;
+  Ibyte *modstr = XSTRING_DATA (mod);
 
   for (i = 0; i < modnum; i++)
     {
       if (fs == -1 && modules[i].used == 0)
         fs = i;
-      if (strcmp (modules[i].soname, mod) == 0)
+      if (qxestrcmp (modules[i].soname, modstr) == 0)
         {
-          if (name && name[0] && strcmp (modules[i].modname, name))
+          if (name && name[0] && qxestrcmp (modules[i].modname, name))
             continue;
-          if (ver && ver[0] && strcmp (modules[i].modver, ver))
+          if (ver && ver[0] && qxestrcmp (modules[i].modver, ver))
             continue;
           return i; /* Found a match */
         }
@@ -253,10 +256,10 @@
 {
   if (dll_close (modules[mod].dlhandle) == 0)
     {
-      xfree (modules[mod].soname, CIbyte *);
-      xfree (modules[mod].modname, CIbyte *);
-      xfree (modules[mod].modver, CIbyte *);
-      xfree (modules[mod].modtitle, CIbyte *);
+      xfree (modules[mod].soname, Ibyte *);
+      xfree (modules[mod].modname, Ibyte *);
+      xfree (modules[mod].modver, Ibyte *);
+      xfree (modules[mod].modtitle, Ibyte *);
       modules[mod].dlhandle = 0;
       modules[mod].used = 0;
     }
@@ -330,18 +333,16 @@
  * the cleaning up.
  */
 void
-emodules_load (const CIbyte *module, const CIbyte *modname,
-	       const CIbyte *modver)
+emodules_load (const Ibyte *module, const Ibyte *modname,
+	       const Ibyte *modver)
 {
-  /* !!#### Needs serious work */
   Lisp_Object old_load_list;
   Lisp_Object filename;
   Lisp_Object foundname, lisp_modname;
   int x, mpx;
-  CIbyte *soname;
-  const CIbyte **f;
+  const Extbyte **f;
   const long *ellcc_rev;
-  CIbyte *mver, *mname, *mtitle, *symname;
+  Ibyte *mver, *mname, *mtitle, *symname;
   void (*modload)(void) = 0;
   void (*modsyms)(void) = 0;
   void (*modvars)(void) = 0;
@@ -359,13 +360,12 @@
   if (module == NULL || module[0] == '\0')
     invalid_argument ("Empty module name", Qunbound);
 
-  GCPRO4(filename, foundname, old_load_list, lisp_modname);
-  filename = build_string (module);
+  GCPRO4 (filename, foundname, old_load_list, lisp_modname);
+  filename = build_intstring (module);
   if (locate_file (Vmodule_load_path, filename, Vmodule_extensions,
 		   &foundname, 0) < 0)
     signal_error (Qdll_error, "Cannot open dynamic module", filename);
 
-  LISP_STRING_TO_EXTERNAL (foundname, soname, Qfile_name);
   lisp_modname = call1 (Qfile_name_sans_extension,
 			Ffile_name_nondirectory (foundname));
 
@@ -375,76 +375,83 @@
       signal_error (Qdll_error, "Opening dynamic module", dll_error ());
     }
 
-  ellcc_rev = (const long *)dll_variable (dlhandle, "emodule_compiler");
+  ellcc_rev = (const long *) dll_variable (dlhandle, "emodule_compiler");
   if (ellcc_rev == NULL || *ellcc_rev <= 0L)
     signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_compiler'", Qunbound);
   if (*ellcc_rev > EMODULES_REVISION)
     signal_ferror (Qdll_error, "Invalid dynamic module: Unsupported version `%ld(%ld)'", *ellcc_rev, EMODULES_REVISION);
 
-  f = (const CIbyte **) dll_variable (dlhandle, "emodule_name");
+  f = (const Extbyte **) dll_variable (dlhandle, "emodule_name");
   if (f == NULL || *f == NULL)
     signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_name'", Qunbound);
 
-  mname = (CIbyte *) ALLOCA (strlen (*f) + 1);
-  strcpy (mname, *f);
+  mname = NEW_EXTERNAL_TO_C_STRING (f, Qemodule_string_encoding);
+  /* #### Not obvious we have to force an alloca copy here, but the old
+     code did so */
+  IBYTE_STRING_TO_ALLOCA (mname, mname);
+
   if (mname[0] == '\0')
     signal_error (Qdll_error, "Invalid dynamic module: Empty value for `emodule_name'", Qunbound);
 
-  f = (const CIbyte **) dll_variable (dlhandle, "emodule_version");
+  f = (const Extbyte **) dll_variable (dlhandle, "emodule_version");
   if (f == NULL || *f == NULL)
     signal_error (Qdll_error, "Missing symbol `emodule_version': Invalid dynamic module", Qunbound);
 
-  mver = (CIbyte *) ALLOCA (strlen (*f) + 1);
-  strcpy (mver, *f);
+  mver = NEW_EXTERNAL_TO_C_STRING (f, Qemodule_string_encoding);
+  /* #### Not obvious we have to force an alloca copy here, but the old
+     code did so */
+  IBYTE_STRING_TO_ALLOCA (mver, mver);
 
-  f = (const CIbyte **) dll_variable (dlhandle, "emodule_title");
+  f = (const Extbyte **) dll_variable (dlhandle, "emodule_title");
   if (f == NULL || *f == NULL)
     signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_title'", Qunbound);
 
-  mtitle = (CIbyte *) ALLOCA (strlen (*f) + 1);
-  strcpy (mtitle, *f);
+  mtitle = NEW_EXTERNAL_TO_C_STRING (f, Qemodule_string_encoding);
+  /* #### Not obvious we have to force an alloca copy here, but the old
+     code did so */
+  IBYTE_STRING_TO_ALLOCA (mtitle, mtitle);
 
-  symname = (CIbyte *) ALLOCA (strlen (mname) + 15);
+  symname = alloca_ibytes (qxestrlen (mname) + 15);
 
-  strcpy (symname, "modules_of_");
-  strcat (symname, mname);
-  modload = (void (*)(void))dll_function (dlhandle, symname);
+  qxestrcpy_ascii (symname, "modules_of_");
+  qxestrcat (symname, mname);
+  modload = (void (*)(void)) dll_function (dlhandle, symname);
   /*
    * modload is optional. If the module doesn't require other modules it can
    * be left out.
    */
 
-  strcpy (symname, "syms_of_");
-  strcat (symname, mname);
-  modsyms = (void (*)(void))dll_function (dlhandle, symname);
+  qxestrcpy_ascii (symname, "syms_of_");
+  qxestrcat (symname, mname);
+  modsyms = (void (*)(void)) dll_function (dlhandle, symname);
   if (modsyms == NULL)
     {
     missing_symbol:
       signal_error (Qdll_error, "Invalid dynamic module: Missing symbol",
-		    build_string (symname));
+		    build_intstring (symname));
     }
 
-  strcpy (symname, "vars_of_");
-  strcat (symname, mname);
-  modvars = (void (*)(void))dll_function (dlhandle, symname);
+  qxestrcpy_ascii (symname, "vars_of_");
+  qxestrcat (symname, mname);
+  modvars = (void (*)(void)) dll_function (dlhandle, symname);
   if (modvars == NULL)
     goto missing_symbol;
 
-  strcpy (symname, "docs_of_");
-  strcat (symname, mname);
-  moddocs = (void (*)(void))dll_function (dlhandle, symname);
+  qxestrcpy_ascii (symname, "docs_of_");
+  qxestrcat (symname, mname);
+  moddocs = (void (*)(void)) dll_function (dlhandle, symname);
   if (moddocs == NULL)
     goto missing_symbol;
 
   /* Now look for the optional unload function. */
-  strcpy (symname, "unload_");
-  strcat (symname, mname);
-  modunld = (void (*)(void))dll_function (dlhandle, symname);
+  qxestrcpy_ascii (symname, "unload_");
+  qxestrcat (symname, mname);
+  modunld = (void (*)(void)) dll_function (dlhandle, symname);
 
-  if (modname && modname[0] && strcmp (modname, mname))
+  if (modname && modname[0] && qxestrcmp (modname, mname))
     signal_error (Qdll_error, "Module name mismatch", Qunbound);
 
-  if (modver && modver[0] && strcmp (modver, mver))
+  if (modver && modver[0] && qxestrcmp (modver, mver))
     signal_error (Qdll_error, "Module version mismatch", Qunbound);
 
   /*
@@ -453,7 +460,7 @@
    * If that is non-zero, we know that we have a previously loaded module
    * of the same name and version, and we don't need to go any further.
    */
-  mpx = find_make_module (soname, mname, mver, 0);
+  mpx = find_make_module (foundname, mname, mver, 0);
   mp = &modules[mpx];
   if (mp->used > 0)
     {
@@ -471,10 +478,10 @@
    * module to the list of modules.
    */
   mp->used = emodules_depth + 1;
-  mp->soname = xstrdup (soname);
-  mp->modname = xstrdup (mname);
-  mp->modver = xstrdup (mver);
-  mp->modtitle = xstrdup (mtitle);
+  mp->soname = qxestrdup (XSTRING_DATA (foundname));
+  mp->modname = qxestrdup (mname);
+  mp->modver = qxestrdup (mver);
+  mp->modtitle = qxestrdup (mtitle);
   mp->dlhandle = dlhandle;
   mp->unload = modunld;
   dlhandle = 0;
@@ -489,15 +496,15 @@
    * startup tasks.
    */
   if (modload != 0)
-    (*modload)();
+    (*modload) ();
 
   /*
    * Now we can get the module to initialize its symbols, and then its
    * variables, and lastly the documentation strings.
    */
-  (*modsyms)();
-  (*modvars)();
-  (*moddocs)();
+  (*modsyms) ();
+  (*modvars) ();
+  (*moddocs) ();
 
   if (!load_modules_quietly)
     message ("Loaded module %s v%s (%s)", mname, mver, mtitle);
@@ -521,10 +528,10 @@
 }
 
 void
-emodules_doc_subr(const char *symname, const char *doc)
+emodules_doc_subr (const Ibyte *symname, const Ibyte *doc)
 {
-  Bytecount len = strlen (symname);
-  Lisp_Object sym = oblookup (Vobarray, (const Ibyte *)symname, len);
+  Bytecount len = qxestrlen (symname);
+  Lisp_Object sym = oblookup (Vobarray, symname, len);
   Lisp_Subr *subr;
 
   /* Skip autoload cookies */
@@ -534,7 +541,7 @@
       subr->doc = xstrdup (doc);
     }
   /*
-   * FIXME: I wish there was some way to avoid the xstrdup(). Is it
+   * #### FIXME: I wish there was some way to avoid the xstrdup(). Is it
    * possible to just set a pointer to the string, or somehow create a
    * symbol whose value we can point to the constant string? Can someone
    * look into this?
@@ -542,17 +549,17 @@
 }
 
 void
-emodules_doc_sym (const char *symname, const char *doc)
+emodules_doc_sym (const Ibyte *symname, const Ibyte *doc)
 {
-  Bytecount len = strlen (symname);
-  Lisp_Object sym = oblookup (Vobarray, (const Ibyte *)symname, len);
+  Bytecount len = qxestrlen (symname);
+  Lisp_Object sym = oblookup (Vobarray, symname, len);
   Lisp_Object docstr;
   struct gcpro gcpro1;
 
-  if (SYMBOLP(sym))
+  if (SYMBOLP (sym))
     {
-      docstr = build_string (doc);
-      GCPRO1(docstr);
+      docstr = build_intstring (doc);
+      GCPRO1 (docstr);
       Fput (sym, Qvariable_documentation, docstr);
       UNGCPRO;
     }
@@ -565,9 +572,9 @@
   DEFERROR_STANDARD (Qdll_error, Qerror);
   DEFSYMBOL (Qmodule);
   DEFSYMBOL (Qunload_module);
-  DEFSUBR(Fload_module);
-  DEFSUBR(Flist_modules);
-  DEFSUBR(Funload_module);
+  DEFSUBR (Fload_module);
+  DEFSUBR (Flist_modules);
+  DEFSUBR (Funload_module);
   module_tag = Fcons (Qmodule, Qnil);
   staticpro (&module_tag);
   Fput (Qunload_module, Qdisabled, Qt);
@@ -651,9 +658,9 @@
   DEFVAR_LISP ("module-extensions", &Vmodule_extensions /*
 *List of filename extensions to use when searching for dynamic modules.
 */);
-  Vmodule_extensions = list5 (build_string (".ell"),
-			      build_string (".so"),
-			      build_string (".dll"),
-			      build_string (".dylib"),
-			      build_string (""));
+  Vmodule_extensions = list5 (build_ascstring (".ell"),
+			      build_ascstring (".so"),
+			      build_ascstring (".dll"),
+			      build_ascstring (".dylib"),
+			      build_ascstring (""));
 }