Mercurial > hg > xemacs-beta
annotate netinstall/fromcwd.cc @ 4981:4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_lo_import):
* postgresql/postgresql.c (Fpq_lo_export):
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* ldap/eldap.c (Fldap_add):
* ldap/eldap.c (Fldap_modify):
* ldap/eldap.c (Fldap_delete):
* canna/canna_api.c (Fcanna_initialize):
* canna/canna_api.c (Fcanna_store_yomi):
* canna/canna_api.c (Fcanna_parse):
* canna/canna_api.c (Fcanna_henkan_begin):
EXTERNAL_TO_C_STRING returns its argument instead of storing it
in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar
things happen to related macros. See entry in src/ChangeLog.
More Mule-izing of postgresql.c. Extract out common code
between `pq-connectdb' and `pq-connect-start'. Fix places
that signal an error string using a formatted string to instead
follow the standard and have a fixed reason followed by the
particular error message stored as one of the frobs.
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.c (Fmswindows_message_box):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* console.c:
* database.c (dbm_get):
* database.c (dbm_put):
* database.c (dbm_remove):
* database.c (berkdb_get):
* database.c (berkdb_put):
* database.c (berkdb_remove):
* database.c (Fopen_database):
* device-gtk.c (gtk_init_device):
* device-msw.c (msprinter_init_device_internal):
* device-msw.c (msprinter_default_printer):
* device-msw.c (msprinter_init_device):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (Fmsprinter_select_settings):
* device-x.c (sanity_check_geometry_resource):
* device-x.c (Dynarr_add_validified_lisp_string):
* device-x.c (x_init_device):
* device-x.c (Fx_put_resource):
* device-x.c (Fx_valid_keysym_name_p):
* device-x.c (Fx_set_font_path):
* dialog-msw.c (push_lisp_string_as_unicode):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* editfns.c (Fformat_time_string):
* editfns.c (Fencode_time):
* editfns.c (Fset_time_zone_rule):
* emacs.c (make_argc_argv):
* emacs.c (Fdump_emacs):
* emodules.c (emodules_load):
* eval.c:
* eval.c (maybe_signal_error_1):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* fileio.c (report_error_with_errno):
* fileio.c (Fsysnetunam):
* fileio.c (Fdo_auto_save):
* font-mgr.c (extract_fcapi_string):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_filename):
* frame-gtk.c (gtk_set_frame_text_value):
* frame-gtk.c (gtk_create_widgets):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_title_from_ibyte):
* frame-msw.c (msprinter_init_frame_3):
* frame-x.c (x_set_frame_text_value):
* frame-x.c (x_set_frame_properties):
* frame-x.c (start_drag_internal_1):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_create_widgets):
* glyphs-eimage.c (my_jpeg_output_message):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (gif_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (xbm_instantiate_1):
* glyphs-gtk.c (gtk_xbm_instantiate):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_xface_instantiate):
* glyphs-gtk.c (cursor_font_instantiate):
* glyphs-gtk.c (gtk_redisplay_widget):
* glyphs-gtk.c (gtk_widget_instantiate_1):
* glyphs-gtk.c (gtk_add_tab_item):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (bmp_instantiate):
* glyphs-msw.c (mswindows_resource_instantiate):
* glyphs-msw.c (xbm_instantiate_1):
* glyphs-msw.c (mswindows_xbm_instantiate):
* glyphs-msw.c (mswindows_xface_instantiate):
* glyphs-msw.c (mswindows_redisplay_widget):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-msw.c (add_tree_item):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-msw.c (mswindows_widget_query_string_geometry):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (xbm_instantiate_1):
* glyphs-x.c (x_xbm_instantiate):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs-x.c (x_xface_instantiate):
* glyphs-x.c (autodetect_instantiate):
* glyphs-x.c (safe_XLoadFont):
* glyphs-x.c (cursor_font_instantiate):
* glyphs-x.c (x_redisplay_widget):
* glyphs-x.c (Fchange_subwindow_property):
* glyphs-x.c (x_widget_instantiate):
* glyphs-x.c (x_tab_control_redisplay):
* glyphs.c (pixmap_to_lisp_data):
* gui-x.c (menu_separator_style_and_to_external):
* gui-x.c (add_accel_and_to_external):
* gui-x.c (button_item_to_widget_value):
* hpplay.c (player_error_internal):
* hpplay.c (play_sound_file):
* hpplay.c (play_sound_data):
* intl.c (Fset_current_locale):
* lisp.h:
* menubar-gtk.c (gtk_xemacs_set_accel_keys):
* menubar-msw.c (populate_menu_add_item):
* menubar-msw.c (populate_or_checksum_helper):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* nt.c (init_user_info):
* nt.c (get_long_basename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_readdir):
* nt.c (read_unc_volume):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* ntplay.c (nt_play_sound_file):
* objects-gtk.c:
* objects-gtk.c (gtk_valid_color_name_p):
* objects-gtk.c (gtk_initialize_font_instance):
* objects-gtk.c (gtk_font_list):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (parse_font_spec):
* objects-x.c (x_parse_nearest_color):
* objects-x.c (x_valid_color_name_p):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_list):
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-nt.c (nt_open_network_stream):
* process-unix.c:
* process-unix.c (allocate_pty):
* process-unix.c (get_internet_address):
* process-unix.c (unix_canonicalize_host_name):
* process-unix.c (unix_open_network_stream):
* realpath.c:
* select-common.h (lisp_data_to_selection_data):
* select-gtk.c (symbol_to_gtk_atom):
* select-gtk.c (atom_to_symbol):
* select-msw.c (symbol_to_ms_cf):
* select-msw.c (mswindows_register_selection_data_type):
* select-x.c (symbol_to_x_atom):
* select-x.c (x_atom_to_symbol):
* select-x.c (hack_motif_clipboard_selection):
* select-x.c (Fx_store_cutbuffer_internal):
* sound.c (Fplay_sound_file):
* sound.c (Fplay_sound):
* sound.h (sound_perror):
* sysdep.c:
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_execve):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_getpwnam):
* sysdep.c (qxe_ctime):
* sysdll.c (dll_open):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (search_linked_libs):
* sysdll.c (dll_error):
* sysfile.h:
* sysfile.h (PATHNAME_CONVERT_OUT_TSTR):
* sysfile.h (PATHNAME_CONVERT_OUT_UTF_8):
* sysfile.h (PATHNAME_CONVERT_OUT):
* sysfile.h (LISP_PATHNAME_CONVERT_OUT):
* syswindows.h (ITEXT_TO_TSTR):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT):
* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
* syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
* text.h:
* text.h (eicpy_ext_len):
* text.h (enum new_dfc_src_type):
* text.h (EXTERNAL_TO_ITEXT):
* text.h (GET_STRERROR):
* tooltalk.c (check_status):
* tooltalk.c (Fadd_tooltalk_message_arg):
* tooltalk.c (Fadd_tooltalk_pattern_attribute):
* tooltalk.c (Fadd_tooltalk_pattern_arg):
* win32.c (tstr_to_local_file_format):
* win32.c (mswindows_lisp_error_1):
* win32.c (mswindows_report_process_error):
* win32.c (Fmswindows_shell_execute):
* win32.c (mswindows_read_link_1):
Changes involving external/internal format conversion,
mostly code cleanup and renaming.
1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL
that stored its result in a parameter. The new version of
LISP_STRING_TO_EXTERNAL returns its result through the
return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL.
Use the new-style macros throughout the code.
2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL,
in keeping with overall naming rationalization involving
Itext and related types.
Macros involved in previous two:
EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT
EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC
SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT
SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC
C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL
C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC
LISP_STRING_TO_EXTERNAL
LISP_STRING_TO_EXTERNAL_MALLOC
LISP_STRING_TO_TSTR
C_STRING_TO_TSTR -> ITEXT_TO_TSTR
TSTR_TO_C_STRING -> TSTR_TO_ITEXT
The following four still return their values through parameters,
since they have more than one value to return:
C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL
LISP_STRING_TO_SIZED_EXTERNAL
C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC
LISP_STRING_TO_SIZED_EXTERNAL_MALLOC
Sometimes additional casts had to be inserted, since the old
macros played strange games and completely defeated the type system
of the store params.
3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT
occurred with calls to one of the convenience macros listed above,
or to make_extstring().
4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway)
and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT.
4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something
like LISP_STRING_TO_EXTERNAL(..., Qfile_name).
5. Eliminate some temporary variables that are no longer necessary
now that we return a value rather than storing it into a variable.
6. Some Mule-izing in database.c.
7. Error functions:
-- A bit of code cleanup in maybe_signal_error_1.
-- Eliminate report_file_type_error; it's just an alias for
signal_error_2 with params in a different order.
-- Fix some places in the hostname-handling code that directly
inserted externally-retrieved error strings into the
supposed ASCII "reason" param instead of doing the right thing
and sticking text descriptive of what was going on in "reason"
and putting the external message in a frob.
8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one
or two other places.
9. Some code cleanup in copy_in_passwd() in sysdep.c.
10. Fix a real bug due to accidental variable shadowing in
tstr_to_local_file_format() in win32.c.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 11:02:24 -0600 |
| 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 handle the case where we're | |
| 17 installing from files that already exist in the current directory. | |
| 18 If a setup.ini file is present, we set the mirror site to "." and | |
| 19 pretend we're installing from the `internet' ;-) else we have to | |
| 20 find all the .tar.gz files, deduce their versions, and try to | |
| 21 compare versions in the case where the current directory contains | |
| 22 multiple versions of any given package. We do *not* try to compare | |
| 23 versions with already installed packages; we always choose a | |
| 24 package in the current directory over one that's already installed | |
| 25 (otherwise, why would you have asked to install it?). Note | |
| 26 that we search recursively. */ | |
| 27 | |
| 28 #include "win32.h" | |
| 29 | |
| 30 #include <stdio.h> | |
| 31 #include <stdlib.h> | |
| 32 #include <io.h> | |
| 33 #include <ctype.h> | |
| 34 #ifndef WIN32_NATIVE | |
| 35 #include <unistd.h> | |
| 36 #endif | |
| 37 | |
| 38 #include "ini.h" | |
| 39 #include "resource.h" | |
| 40 #include "concat.h" | |
| 41 #include "state.h" | |
| 42 #include "dialog.h" | |
| 43 #include "msg.h" | |
| 44 #include "find.h" | |
| 45 #include "version.h" | |
| 46 | |
| 47 #include "port.h" | |
| 48 | |
| 49 static int | |
| 50 is_test_version (char *v) | |
| 51 { | |
| 52 int i; | |
| 53 for (i=0; v[i] && isdigit (v[i]); i++) ; | |
| 54 return (i >= 6) ? 1 : 0; | |
| 55 } | |
| 56 | |
| 57 char * | |
| 58 canonicalize_version (char *v) | |
| 59 { | |
| 60 static char nv[3][100]; | |
| 61 static int idx = 0; | |
| 62 char *np, *dp; | |
| 63 int i; | |
| 64 | |
| 65 idx = (idx+1) % 3; | |
| 66 np = nv[idx]; | |
| 67 | |
| 68 while (*v) | |
| 69 { | |
| 70 if (isdigit (*v)) | |
| 71 { | |
| 72 for (dp=v; *dp && isdigit (*dp); dp++) ; | |
| 73 for (i=dp-v; i<12; i++) | |
| 74 *np++ = '0'; | |
| 75 while (v < dp) | |
| 76 *np++ = *v++; | |
| 77 } | |
| 78 else | |
| 79 *np++ = *v++; | |
| 80 } | |
| 81 *np++ = 0; | |
| 82 return nv[idx]; | |
| 83 } | |
| 84 | |
| 85 static void | |
| 86 found_file (char *path, unsigned int fsize) | |
| 87 { | |
| 88 char base[_MAX_PATH], *ver; | |
| 89 | |
| 90 int l = strlen (path); | |
| 91 | |
| 92 if (strcmp (path + l - 7, ".tar.gz") != 0) | |
| 93 return; | |
| 94 if (strstr (path, "-src.")) | |
| 95 return; | |
| 96 if (strstr (path, "-patch.")) | |
| 97 return; | |
| 98 | |
| 99 char *sl = strrchr (path, '/'); | |
| 100 if (sl) | |
| 101 sl ++; | |
| 102 else | |
| 103 sl = path; | |
| 104 strcpy (base, sl); | |
| 105 base[strlen (base) - 7] = 0; /* remove .tar.gz */ | |
| 106 for (ver=base; *ver; ver++) | |
| 107 if ((*ver == '-' || *ver == '_') && isdigit (ver[1])) | |
| 108 { | |
| 109 *ver++ = 0; | |
| 110 break; | |
| 111 } | |
| 112 | |
| 113 Package *p = 0; | |
| 114 int i; | |
| 115 | |
| 116 for (i=0; i<npackages; i++) | |
| 117 if (strcmp (package[i].name, base) == 0) | |
| 118 { | |
| 119 p = package + i; | |
| 120 break; | |
| 121 } | |
| 122 if (p == 0) | |
| 123 p = new_package (strdup (base)); | |
| 124 | |
| 125 int trust = is_test_version (ver) ? TRUST_TEST : TRUST_CURR; | |
| 126 if (!*ver) | |
| 127 trust = TRUST_PREV; | |
| 128 | |
| 129 /* See if this version is older than what we have */ | |
| 130 if (p->info[trust].version) | |
| 131 { | |
| 132 char *ov = canonicalize_version (p->info[trust].version); | |
| 133 char *nv = canonicalize_version (ver); | |
| 134 if (strcmp (ov, nv) > 0) | |
| 135 return; | |
| 136 } | |
| 137 | |
| 138 l = strlen (base); | |
| 139 if (l >= 5 && strcmp (base + l - 5, "win32") == 0) | |
| 140 p->type = TY_NATIVE; | |
| 141 if (l >= 8 && strcmp (base + l - 8, "cygwin32") == 0) | |
| 142 p->type = TY_CYGWIN; | |
| 143 | |
| 144 p->info[trust].version = strdup (ver); | |
| 145 p->info[trust].install = strdup (path); | |
| 146 p->info[trust].install_size = fsize; | |
| 147 } | |
| 148 | |
| 149 void | |
| 150 do_fromcwd (HINSTANCE h) | |
| 151 { | |
| 152 if (_access ("./setup.ini", 0) == 0) | |
| 153 { | |
| 154 mirror_site = "."; | |
| 155 next_dialog = IDD_S_LOAD_INI; | |
| 156 return; | |
| 157 } | |
| 158 | |
| 159 next_dialog = IDD_CHOOSE; | |
| 160 | |
| 161 find (".", found_file); | |
| 162 | |
| 163 // Now see about source tarballs | |
| 164 int i, t; | |
| 165 Package *p; | |
| 166 char srcpath[_MAX_PATH]; | |
| 167 for (i=0; i<npackages; i++) | |
| 168 { | |
| 169 p = package+i; | |
| 170 for (t=TRUST_PREV; t<=TRUST_TEST; t++) | |
| 171 if (p->info[t].install) | |
| 172 { | |
| 173 strcpy (srcpath, p->info[t].install); | |
| 174 strcpy (srcpath + strlen (srcpath) - 7, "-src.tar.gz"); | |
| 175 msg ("looking for %s", srcpath); | |
| 176 | |
| 177 WIN32_FIND_DATA wfd; | |
| 178 HANDLE h = FindFirstFile (srcpath, &wfd); | |
| 179 if (h != INVALID_HANDLE_VALUE) | |
| 180 { | |
| 181 msg("-- got it"); | |
| 182 FindClose (h); | |
| 183 p->info[t].source = strdup (srcpath); | |
| 184 p->info[t].source_size = wfd.nFileSizeLow; | |
| 185 } | |
| 186 } | |
| 187 } | |
| 188 | |
| 189 return; | |
| 190 } |