Mercurial > hg > xemacs-beta
annotate netinstall/geturl.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 | 42a8626b741e |
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 act as a pretty interface to | |
17 netio.cc. We add a progress dialog and some convenience functions | |
18 (like collect to string or file */ | |
19 | |
20 #include "win32.h" | |
21 #include "commctrl.h" | |
22 | |
23 #include <stdio.h> | |
24 #include <stdlib.h> | |
25 #include <errno.h> | |
26 | |
27 #include "dialog.h" | |
28 #include "geturl.h" | |
29 #include "resource.h" | |
30 #include "netio.h" | |
31 #include "msg.h" | |
32 #include "log.h" | |
33 | |
34 static int is_showing = 0; | |
35 static HWND gw_dialog = 0; | |
36 static HWND gw_url = 0; | |
37 static HWND gw_rate = 0; | |
38 static HWND gw_progress = 0; | |
39 static HANDLE init_event; | |
40 static int max_bytes = 0; | |
41 | |
42 static BOOL | |
43 dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
44 { | |
45 switch (id) | |
46 { | |
47 case IDCANCEL: | |
48 exit_setup (0); | |
49 } | |
50 return FALSE; | |
51 } | |
52 | |
53 static BOOL CALLBACK | |
54 dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
55 { | |
56 switch (message) | |
57 { | |
58 case WM_INITDIALOG: | |
59 gw_dialog = h; | |
60 gw_url = GetDlgItem (h, IDC_DLS_URL); | |
61 gw_rate = GetDlgItem (h, IDC_DLS_RATE); | |
62 gw_progress = GetDlgItem (h, IDC_DLS_PROGRESS); | |
63 SetEvent (init_event); | |
64 return FALSE; | |
65 case WM_COMMAND: | |
66 return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); | |
67 } | |
68 return FALSE; | |
69 } | |
70 | |
71 static DWORD WINAPI | |
72 dialog (void *) | |
73 { | |
74 MSG m; | |
672 | 75 HWND lgw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS), |
448 | 76 0, dialog_proc); |
672 | 77 ShowWindow (lgw_dialog, SW_SHOWNORMAL); |
78 UpdateWindow (lgw_dialog); | |
448 | 79 while (GetMessage (&m, 0, 0, 0) > 0) { |
80 TranslateMessage (&m); | |
81 DispatchMessage (&m); | |
82 } | |
83 return FALSE; | |
84 } | |
85 | |
86 static DWORD start_tics; | |
87 | |
88 static void | |
89 init_dialog (char *url, int length) | |
90 { | |
91 if (gw_dialog == 0) | |
92 { | |
93 DWORD tid; | |
94 HANDLE thread; | |
95 init_event = CreateEvent (0, 0, 0, 0); | |
96 thread = CreateThread (0, 0, dialog, 0, 0, &tid); | |
97 WaitForSingleObject (init_event, 1000); | |
98 CloseHandle (init_event); | |
99 SendMessage (gw_progress, PBM_SETRANGE, 0, MAKELPARAM (0, 100)); | |
100 is_showing = 0; | |
101 } | |
102 char *sl=url, *cp; | |
103 for (cp=url; *cp; cp++) | |
104 if (*cp == '/' || *cp == '\\' || *cp == ':') | |
105 sl = cp+1; | |
106 max_bytes = length; | |
107 SetWindowText (gw_url, sl); | |
108 SetWindowText (gw_rate, "Connecting..."); | |
109 SendMessage (gw_progress, PBM_SETPOS, (WPARAM) 0, 0); | |
110 ShowWindow (gw_progress, (length > 0) ? SW_SHOW : SW_HIDE); | |
111 ShowWindow (gw_dialog, SW_SHOWNORMAL); | |
112 if (!is_showing) | |
113 { | |
114 SetForegroundWindow (gw_dialog); | |
115 is_showing = 1; | |
116 } | |
117 start_tics = GetTickCount (); | |
118 } | |
119 | |
120 | |
121 static void | |
122 progress (int bytes) | |
123 { | |
124 static char buf[100]; | |
125 int kbps; | |
126 static DWORD last_tics = 0; | |
127 DWORD tics = GetTickCount (); | |
128 if (tics == start_tics) // to prevent division by zero | |
129 return; | |
130 if (tics < last_tics + 200) // to prevent flickering updates | |
131 return; | |
132 last_tics = tics; | |
133 | |
134 kbps = bytes / (tics - start_tics); | |
135 ShowWindow (gw_progress, (max_bytes > 0) ? SW_SHOW : SW_HIDE); | |
136 if (max_bytes > 100) | |
137 { | |
138 int perc = bytes / (max_bytes / 100); | |
139 SendMessage (gw_progress, PBM_SETPOS, (WPARAM) perc, 0); | |
140 sprintf (buf, "%3d %% (%dk/%dk) %d kb/s\n", | |
141 perc, bytes/1000, max_bytes/1000, kbps); | |
142 } | |
143 else | |
144 sprintf (buf, "%d %d kb/s\n", bytes, kbps); | |
145 | |
146 SetWindowText (gw_rate, buf); | |
147 } | |
148 | |
149 struct GUBuf { | |
150 GUBuf *next; | |
151 int count; | |
152 char buf[2000]; | |
153 }; | |
154 | |
155 char * | |
156 get_url_to_string (char *_url) | |
157 { | |
158 log (LOG_BABBLE, "get_url_to_string %s", _url); | |
159 init_dialog (_url, 0); | |
160 NetIO *n = NetIO::open (_url); | |
161 if (!n || !n->ok ()) | |
162 { | |
163 delete n; | |
164 log (LOG_BABBLE, "get_url_to_string failed!"); | |
165 return 0; | |
166 } | |
167 | |
168 if (n->file_size) | |
169 max_bytes = n->file_size; | |
170 | |
171 GUBuf *bufs = 0; | |
172 GUBuf **nextp = &bufs; | |
173 int total_bytes = 1; /* for the NUL */ | |
174 progress (0); | |
175 while (1) | |
176 { | |
177 GUBuf *b = new GUBuf; | |
178 *nextp = b; | |
179 b->next = 0; | |
180 nextp = &(b->next); | |
181 | |
182 b->count = n->read (b->buf, sizeof (b->buf)); | |
183 if (b->count <= 0) | |
184 break; | |
185 total_bytes += b->count; | |
186 progress (total_bytes); | |
187 } | |
188 | |
189 char *rv = (char *) malloc (total_bytes); | |
190 char *rvp = rv; | |
191 while (bufs && bufs->count > 0) | |
192 { | |
193 GUBuf *tmp = bufs->next; | |
194 memcpy (rvp, bufs->buf, bufs->count); | |
195 rvp += bufs->count; | |
196 delete bufs; | |
197 bufs = tmp; | |
198 } | |
199 *rvp = 0; | |
672 | 200 |
201 if (n) | |
202 delete n; | |
203 | |
448 | 204 return rv; |
205 } | |
206 | |
207 int | |
208 get_url_to_file (char *_url, char *_filename, int expected_length) | |
209 { | |
210 log (LOG_BABBLE, "get_url_to_file %s %s", _url, _filename); | |
211 init_dialog (_url, expected_length); | |
212 | |
213 remove (_filename); /* but ignore errors */ | |
214 | |
215 NetIO *n = NetIO::open (_url); | |
216 if (!n || !n->ok ()) | |
217 { | |
218 delete n; | |
219 log (LOG_BABBLE, "get_url_to_file failed!"); | |
220 return 1; | |
221 } | |
222 | |
223 FILE *f = fopen (_filename, "wb"); | |
224 if (!f) | |
225 { | |
226 char *err = strerror (errno); | |
227 if (!err) | |
228 err = "(unknown error)"; | |
229 fatal (IDS_ERR_OPEN_WRITE, _filename, err); | |
230 } | |
231 | |
232 if (n->file_size) | |
233 max_bytes = n->file_size; | |
234 | |
235 int total_bytes = 0; | |
236 progress (0); | |
237 while (1) | |
238 { | |
239 char buf[8192]; | |
240 int count; | |
241 count = n->read (buf, sizeof (buf)); | |
242 if (count <= 0) | |
243 break; | |
244 fwrite (buf, 1, count, f); | |
245 total_bytes += count; | |
246 progress (total_bytes); | |
247 } | |
248 | |
249 fclose (f); | |
250 | |
672 | 251 if (n) |
252 delete n; | |
253 | |
448 | 254 return 0; |
255 } | |
256 | |
257 void | |
258 dismiss_url_status_dialog () | |
259 { | |
260 ShowWindow (gw_dialog, SW_HIDE); | |
261 is_showing = 0; | |
262 } |