Mercurial > hg > xemacs-beta
annotate netinstall/netio.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 coordinate the various access | |
| 17 methods known to setup. To add a new method, create a pair of | |
| 18 nio-*.[ch] files and add the logic to NetIO::open here */ | |
| 19 | |
| 20 #include "win32.h" | |
| 21 #include <stdio.h> | |
| 22 #include <stdlib.h> | |
| 23 #include <string.h> | |
| 24 | |
| 25 #include "resource.h" | |
| 26 #include "state.h" | |
| 27 #include "msg.h" | |
| 28 #include "netio.h" | |
| 29 #include "nio-file.h" | |
| 30 #include "nio-ie5.h" | |
| 31 #include "nio-http.h" | |
| 32 #include "nio-ftp.h" | |
| 33 #include "dialog.h" | |
| 34 #include "log.h" | |
| 35 | |
| 36 #include "port.h" | |
| 37 | |
| 38 NetIO::NetIO (char *Purl) | |
| 39 { | |
| 40 set_url (Purl); | |
| 41 } | |
| 42 | |
| 43 NetIO::~NetIO () | |
| 44 { | |
| 45 if (url) | |
| 46 free (url); | |
| 47 if (proto) | |
| 48 free (proto); | |
| 49 if (host) | |
| 50 free (host); | |
| 51 if (path) | |
| 52 free (path); | |
| 53 } | |
| 54 | |
| 55 void | |
| 56 NetIO::set_url (char *Purl) | |
| 57 { | |
| 58 char *bp, *ep, c; | |
| 59 | |
| 60 file_size = 0; | |
| 61 url = _strdup (Purl); | |
| 62 proto = 0; | |
| 63 host = 0; | |
| 64 port = 0; | |
| 65 path = 0; | |
| 66 | |
| 67 bp = url; | |
| 68 ep = strstr (bp, "://"); | |
| 69 if (!ep) | |
| 70 { | |
| 71 path = url; | |
| 72 return; | |
| 73 } | |
| 74 | |
| 75 *ep = 0; | |
| 76 proto = _strdup (bp); | |
| 77 *ep = ':'; | |
| 78 bp = ep+3; | |
| 79 | |
| 80 ep = bp + strcspn (bp, ":/"); | |
| 81 c = *ep; | |
| 82 *ep = 0; | |
| 83 host = _strdup (bp); | |
| 84 *ep = c; | |
| 85 | |
| 86 if (*ep == ':') | |
| 87 { | |
| 88 port = atoi (ep+1); | |
| 89 ep = strchr (ep, '/'); | |
| 90 } | |
| 91 | |
| 92 if (*ep) | |
| 93 path = _strdup (ep); | |
| 94 } | |
| 95 | |
| 96 int | |
| 97 NetIO::ok () | |
| 98 { | |
| 99 return 0; | |
| 100 } | |
| 101 | |
| 102 int | |
| 103 NetIO::read (char *buf, int nbytes) | |
| 104 { | |
| 105 return 0; | |
| 106 } | |
| 107 | |
| 108 NetIO * | |
| 109 NetIO::open (char *url) | |
| 110 { | |
| 111 NetIO *rv = 0; | |
| 112 enum {http, ftp, file} proto; | |
| 113 if (strncmp (url, "http://", 7) == 0) | |
| 114 proto = http; | |
| 115 else if (strncmp (url, "ftp://", 6) == 0) | |
| 116 proto = ftp; | |
| 117 else | |
| 118 proto = file; | |
| 119 | |
| 120 if (proto == file) | |
| 121 rv = new NetIO_File (url); | |
| 122 else if (net_method == IDC_NET_IE5) | |
| 123 rv = new NetIO_IE5 (url); | |
| 124 else if (net_method == IDC_NET_PROXY) | |
| 125 rv = new NetIO_HTTP (url); | |
| 126 else if (net_method == IDC_NET_DIRECT) | |
| 127 { | |
| 128 switch (proto) | |
| 129 { | |
| 130 case http: | |
| 131 rv = new NetIO_HTTP (url); | |
| 132 break; | |
| 133 case ftp: | |
| 134 rv = new NetIO_FTP (url); | |
| 135 break; | |
| 136 } | |
| 137 } | |
| 138 | |
| 139 if (!rv->ok ()) | |
| 140 { | |
| 141 delete rv; | |
| 142 return 0; | |
| 143 } | |
| 144 | |
| 145 return rv; | |
| 146 } | |
| 147 | |
| 148 | |
| 149 static char **user, **passwd; | |
| 150 static int loading = 0; | |
| 151 | |
| 152 static void | |
| 153 check_if_enable_ok (HWND h) | |
| 154 { | |
| 155 int e = 0; | |
| 156 if (*user && *passwd) | |
| 157 e = 1; | |
| 158 EnableWindow (GetDlgItem (h, IDOK), e); | |
| 159 } | |
| 160 | |
| 161 static void | |
| 162 load_dialog (HWND h) | |
| 163 { | |
| 164 loading = 1; | |
| 165 eset (h, IDC_NET_USER, *user); | |
| 166 eset (h, IDC_NET_PASSWD, *passwd); | |
| 167 check_if_enable_ok (h); | |
| 168 loading = 0; | |
| 169 } | |
| 170 | |
| 171 static void | |
| 172 save_dialog (HWND h) | |
| 173 { | |
| 174 *user = eget (h, IDC_NET_USER, *user); | |
| 175 *passwd = eget (h, IDC_NET_PASSWD, *passwd); | |
| 176 } | |
| 177 | |
| 178 static BOOL | |
| 179 auth_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
| 180 { | |
| 181 switch (id) | |
| 182 { | |
| 183 | |
| 184 case IDC_NET_USER: | |
| 185 case IDC_NET_PASSWD: | |
| 186 if (code == EN_CHANGE && !loading) | |
| 187 { | |
| 188 save_dialog (h); | |
| 189 check_if_enable_ok (h); | |
| 190 } | |
| 191 break; | |
| 192 | |
| 193 case IDOK: | |
| 194 save_dialog (h); | |
| 195 EndDialog (h, 0); | |
| 196 break; | |
| 197 | |
| 198 case IDCANCEL: | |
| 199 EndDialog (h, 1); | |
| 200 exit_setup (1); | |
| 201 break; | |
| 202 } | |
| 203 return FALSE; | |
| 204 } | |
| 205 | |
| 206 static BOOL CALLBACK | |
| 207 auth_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
| 208 { | |
| 209 switch (message) | |
| 210 { | |
| 211 case WM_INITDIALOG: | |
| 212 load_dialog (h); | |
| 213 return FALSE; | |
| 214 case WM_COMMAND: | |
| 215 return HANDLE_WM_COMMAND (h, wParam, lParam, auth_cmd); | |
| 216 } | |
| 217 return FALSE; | |
| 218 } | |
| 219 | |
| 220 static int | |
| 221 auth_common (HINSTANCE h, int id) | |
| 222 { | |
| 223 return DialogBox (h, MAKEINTRESOURCE (id), 0, auth_proc); | |
| 224 } | |
| 225 | |
| 226 int | |
| 227 NetIO::get_auth () | |
| 228 { | |
| 229 user = &net_user; | |
| 230 passwd = &net_passwd; | |
| 231 return auth_common (hinstance, IDD_NET_AUTH); | |
| 232 } | |
| 233 | |
| 234 int | |
| 235 NetIO::get_proxy_auth () | |
| 236 { | |
| 237 user = &net_proxy_user; | |
| 238 passwd = &net_proxy_passwd; | |
| 239 return auth_common (hinstance, IDD_PROXY_AUTH); | |
| 240 } |