Mercurial > hg > xemacs-beta
annotate netinstall/site.cc @ 4953:304aebb79cd3
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 27 Jan 2010 00:35:36 -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 get the list of mirror sites and ask | |
| 17 the user which mirror site they want to download from. */ | |
| 18 | |
| 19 #include "win32.h" | |
| 20 #include <stdio.h> | |
| 21 #include <stdlib.h> | |
| 22 #include <string.h> | |
| 23 | |
| 24 #include "dialog.h" | |
| 25 #include "resource.h" | |
| 26 #include "state.h" | |
| 27 #include "geturl.h" | |
| 28 #include "msg.h" | |
| 29 #include "concat.h" | |
| 30 #include "regedit.h" | |
| 31 #include "reginfo.h" | |
| 32 #include "log.h" | |
| 33 | |
| 34 #include "port.h" | |
| 35 | |
| 36 #define NO_IDX (-1) | |
| 37 #define OTHER_IDX (-2) | |
| 38 | |
| 39 typedef struct { | |
| 40 char *url; | |
| 41 char *displayed_url; | |
| 42 char *sort_key; | |
| 43 } site_list_type; | |
| 44 | |
| 45 static site_list_type *site_list = 0; | |
| 46 static int list_idx = NO_IDX; | |
| 47 static int mirror_idx = NO_IDX; | |
| 48 | |
| 49 static void | |
| 50 check_if_enable_next (HWND h) | |
| 51 { | |
| 52 EnableWindow (GetDlgItem (h, IDOK), (mirror_idx != NO_IDX) ? 1 : 0); | |
| 53 } | |
| 54 | |
| 55 static void | |
| 56 load_dialog (HWND h) | |
| 57 { | |
| 58 HWND listbox = GetDlgItem (h, IDC_URL_LIST); | |
| 59 SendMessage (listbox, LB_SETCURSEL, list_idx, 0); | |
| 60 check_if_enable_next (h); | |
| 61 } | |
| 62 | |
| 63 static void | |
| 64 save_dialog (HWND h) | |
| 65 { | |
| 66 HWND listbox = GetDlgItem (h, IDC_URL_LIST); | |
| 67 list_idx = SendMessage (listbox, LB_GETCURSEL, 0, 0); | |
| 68 if (list_idx == LB_ERR) | |
| 69 { | |
| 70 mirror_site = 0; | |
| 71 mirror_idx = NO_IDX; | |
| 72 list_idx = NO_IDX; | |
| 73 } | |
| 74 else | |
| 75 { | |
| 76 mirror_idx = SendMessage (listbox, LB_GETITEMDATA, list_idx, 0); | |
| 77 if (mirror_idx == OTHER_IDX) | |
| 78 mirror_site = 0; | |
| 79 else | |
| 80 mirror_site = site_list[mirror_idx].url; | |
| 81 } | |
| 82 } | |
| 83 | |
| 84 static void | |
| 85 get_root_dir () | |
| 86 { | |
| 87 int issystem, isnative; | |
| 88 if (root_dir) | |
| 89 return; | |
| 90 root_dir = find_root_location (&issystem, &isnative); | |
| 91 } | |
| 92 | |
| 93 void | |
| 94 save_site_url () | |
| 95 { | |
| 96 if (! MIRROR_SITE) | |
| 97 return; | |
| 98 | |
| 99 get_root_dir (); | |
| 100 if (! root_dir) | |
| 101 return; | |
| 102 | |
| 103 FILE *f = fopen (concat (root_dir, XEMACS_SETUP_DIR, "last-mirror", 0), "wb"); | |
| 104 if (!f) | |
| 105 return; | |
| 106 fprintf (f, "%s\n", MIRROR_SITE); | |
| 107 fclose (f); | |
| 108 } | |
| 109 | |
| 110 static BOOL | |
| 111 dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
| 112 { | |
| 113 switch (id) | |
| 114 { | |
| 115 | |
| 116 case IDC_URL_LIST: | |
| 117 save_dialog (h); | |
| 118 check_if_enable_next (h); | |
| 119 break; | |
| 120 | |
| 121 case IDOK: | |
| 122 save_dialog (h); | |
| 123 if (mirror_idx == OTHER_IDX) | |
| 124 NEXT (IDD_OTHER_URL); | |
| 125 else | |
| 126 { | |
| 127 other_url = 0; | |
| 128 save_site_url (); | |
| 129 NEXT (IDD_S_LOAD_INI); | |
| 130 } | |
| 131 break; | |
| 132 | |
| 133 case IDC_BACK: | |
| 134 save_dialog (h); | |
| 135 NEXT (IDD_NET); | |
| 136 break; | |
| 137 | |
| 138 case IDCANCEL: | |
| 139 NEXT (0); | |
| 140 break; | |
| 141 } | |
| 142 return FALSE; | |
| 143 } | |
| 144 | |
| 145 static BOOL CALLBACK | |
| 146 dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
| 147 { | |
| 148 int i, j; | |
| 149 HWND listbox; | |
| 150 switch (message) | |
| 151 { | |
| 152 case WM_INITDIALOG: | |
| 153 listbox = GetDlgItem (h, IDC_URL_LIST); | |
| 154 for (i=0; site_list[i].url; i++) | |
| 155 { | |
| 156 j = SendMessage (listbox, LB_ADDSTRING, 0, (LPARAM)site_list[i].displayed_url); | |
| 157 SendMessage (listbox, LB_SETITEMDATA, j, i); | |
| 158 } | |
| 159 j = SendMessage (listbox, LB_ADDSTRING, 0, (LPARAM)"Other URL"); | |
| 160 SendMessage (listbox, LB_SETITEMDATA, j, OTHER_IDX); | |
| 161 load_dialog (h); | |
| 162 return FALSE; | |
| 163 case WM_COMMAND: | |
| 164 return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); | |
| 165 } | |
| 166 return FALSE; | |
| 167 } | |
| 168 | |
| 169 static int CDECL | |
| 170 site_sort (const void *va, const void *vb) | |
| 171 { | |
| 172 site_list_type *a = (site_list_type *)va; | |
| 173 site_list_type *b = (site_list_type *)vb; | |
| 174 return strcmp (a->sort_key, b->sort_key); | |
| 175 } | |
| 176 | |
| 177 static int | |
| 178 get_site_list (HINSTANCE h) | |
| 179 { | |
| 180 char mirror_url[1000]; | |
| 181 if (LoadString (h, IDS_MIRROR_LST, mirror_url, sizeof (mirror_url)) <= 0) | |
| 182 return 1; | |
| 183 char *mirrors = get_url_to_string (mirror_url); | |
| 184 dismiss_url_status_dialog (); | |
| 185 if (!mirrors) | |
| 186 return 1; | |
| 187 | |
| 188 char *bol, *eol, *nl; | |
| 189 | |
| 190 | |
| 191 /* null plus account for possibly missing NL plus account for "Other | |
| 192 URL" from previous run. */ | |
| 193 int nmirrors = 3; | |
| 194 | |
| 195 for (bol=mirrors; *bol; bol++) | |
| 196 if (*bol == '\n') | |
| 197 nmirrors ++; | |
| 198 | |
| 199 site_list = (site_list_type *) malloc (nmirrors * sizeof (site_list_type)); | |
| 200 nmirrors = 0; | |
| 201 | |
| 202 nl = mirrors; | |
| 203 while (*nl) | |
| 204 { | |
| 205 bol = nl; | |
| 206 for (eol = bol; *eol && *eol != '\n'; eol++) ; | |
| 207 if (*eol) | |
| 208 nl = eol+1; | |
| 209 else | |
| 210 nl = eol; | |
| 211 while (eol > bol && eol[-1] == '\r') | |
| 212 eol--; | |
| 213 *eol = 0; | |
| 214 if (bol[0] != '#' && bol[0] > ' ') | |
| 215 { | |
| 216 char *semi = strchr (bol, ';'); | |
| 217 if (semi) | |
| 218 *semi = 0; | |
| 219 site_list[nmirrors].url = _strdup (bol); | |
| 220 site_list[nmirrors].displayed_url = _strdup (bol); | |
| 221 char *dot = strchr (site_list[nmirrors].displayed_url, '.'); | |
| 222 if (dot) | |
| 223 { | |
| 224 dot = strchr (dot, '/'); | |
| 225 if (dot) | |
| 226 *dot = 0; | |
| 227 } | |
| 228 site_list[nmirrors].sort_key = (char *) malloc (2*strlen (bol) + 3); | |
| 229 | |
| 230 dot = site_list[nmirrors].displayed_url; | |
| 231 dot += strlen (dot); | |
| 232 char *dp = site_list[nmirrors].sort_key; | |
| 233 while (dot != site_list[nmirrors].displayed_url) | |
| 234 { | |
| 235 if (*dot == '.' || *dot == '/') | |
| 236 { | |
| 237 char *sp; | |
| 238 if (dot[3] == 0) | |
| 239 *dp++ = '~'; /* sort .com/.edu/.org together */ | |
| 240 for (sp=dot+1; *sp && *sp != '.' && *sp != '/';) | |
| 241 *dp++ = *sp++; | |
| 242 *dp++ = ' '; | |
| 243 } | |
| 244 dot--; | |
| 245 } | |
| 246 *dp++ = ' '; | |
| 247 strcpy (dp, site_list[nmirrors].displayed_url); | |
| 248 | |
| 249 nmirrors++; | |
| 250 } | |
| 251 } | |
| 252 site_list[nmirrors].url = 0; | |
| 253 | |
| 254 qsort (site_list, nmirrors, sizeof (site_list_type), site_sort); | |
| 255 | |
| 256 return 0; | |
| 257 } | |
| 258 | |
| 259 /* List of machines that should not be used by default when saved | |
| 260 in "last-mirror". */ | |
| 261 #define NOSAVE1 "ftp://ftp.xemacs.org/" | |
| 262 #define NOSAVE1_LEN (sizeof ("ftp://ftp.xemacs.org/") - 1) | |
| 263 | |
| 264 static void | |
| 265 get_initial_list_idx () | |
| 266 { | |
| 267 get_root_dir (); | |
| 268 if (! root_dir) | |
| 269 return; | |
| 270 | |
| 271 FILE *f = fopen (concat (root_dir, XEMACS_SETUP_DIR, "last-mirror", 0), "rt"); | |
| 272 if (!f) | |
| 273 return; | |
| 274 | |
| 275 char site[1000]; | |
| 276 site[0]='\0'; | |
| 277 char * fg_ret = fgets (site, 1000, f); | |
| 278 fclose (f); | |
| 279 if (! fg_ret) | |
| 280 return; | |
| 281 | |
| 282 char *eos = site + strlen (site) - 1; | |
| 283 while (eos >= site && (*eos == '\n' || *eos == '\r')) | |
| 284 *eos-- = '\0'; | |
| 285 | |
| 286 if (eos < site) | |
| 287 return; | |
| 288 | |
| 289 int i; | |
| 290 for (i = 0; site_list[i].url; i++) | |
| 291 if (strcmp (site_list[i].url, site) == 0) | |
| 292 break; | |
| 293 | |
| 294 if (! site_list[i].url) | |
| 295 { | |
| 296 /* Don't default to certain machines ever since they suffer | |
| 297 from bandwidth limitations. */ | |
| 298 if (strnicmp (site, NOSAVE1, NOSAVE1_LEN) == 0) | |
| 299 return; | |
| 300 site_list[i].displayed_url = | |
| 301 site_list[i].url = _strdup (site); | |
| 302 site_list[i+1].url = 0; | |
| 303 } | |
| 304 | |
| 305 mirror_idx = list_idx = i; | |
| 306 } | |
| 307 | |
| 308 void | |
| 309 do_site (HINSTANCE h) | |
| 310 { | |
| 311 int rv = 0; | |
| 312 | |
| 313 if (site_list == 0) | |
| 314 if (get_site_list (h)) | |
| 315 { | |
| 316 NEXT (IDD_NET); | |
| 317 return; | |
| 318 } | |
| 319 | |
| 320 get_initial_list_idx (); | |
| 321 | |
| 322 rv = DialogBox (h, MAKEINTRESOURCE (IDD_SITE), 0, dialog_proc); | |
| 323 if (rv == -1) | |
| 324 fatal (IDS_DIALOG_FAILED); | |
| 325 | |
| 326 if (mirror_idx != OTHER_IDX) | |
| 327 log (0, "site: %s", mirror_site); | |
| 328 } | |
| 329 |