Mercurial > hg > xemacs-beta
annotate lib-src/hexl.c @ 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 | abe6d1db359e |
| children | 061f4f90f874 06dd936cde16 |
| rev | line source |
|---|---|
| 428 | 1 /* Synched up with: FSF 19.28. */ |
| 2 | |
| 438 | 3 #include <config.h> |
| 428 | 4 |
| 5 #include <stdio.h> | |
| 6 #include <ctype.h> | |
| 442 | 7 #ifdef WIN32_NATIVE |
| 440 | 8 #include <io.h> |
| 428 | 9 #include <fcntl.h> |
| 10 #endif | |
| 11 | |
| 12 #if __STDC__ || defined(STDC_HEADERS) | |
| 13 #include <stdlib.h> | |
| 442 | 14 #ifdef HAVE_UNISTD_H |
| 428 | 15 #include <unistd.h> |
| 442 | 16 #endif |
| 428 | 17 #include <string.h> |
| 18 #endif | |
| 19 | |
| 20 #define DEFAULT_GROUPING 0x01 | |
| 21 #define DEFAULT_BASE 16 | |
| 22 | |
| 23 #undef TRUE | |
| 24 #undef FALSE | |
| 25 #define TRUE (1) | |
| 26 #define FALSE (0) | |
| 27 | |
| 28 int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1; | |
| 29 int group_by = DEFAULT_GROUPING; | |
| 30 char *progname; | |
| 31 | |
| 32 void usage (void); | |
| 33 | |
| 34 int | |
| 35 main (int argc, char *argv[]) | |
| 36 { | |
| 37 register long address; | |
| 38 char string[18]; | |
| 39 FILE *fp; | |
| 40 | |
| 41 progname = *argv++; --argc; | |
| 42 | |
| 43 /* | |
| 44 ** -hex hex dump | |
| 45 ** -oct Octal dump | |
| 46 ** -group-by-8-bits | |
| 47 ** -group-by-16-bits | |
| 48 ** -group-by-32-bits | |
| 49 ** -group-by-64-bits | |
| 50 ** -iso iso character set. | |
| 51 ** -big-endian Big Endian | |
| 52 ** -little-endian Little Endian | |
| 53 ** -un || -de from hexl format to binary. | |
| 54 ** -- End switch list. | |
| 55 ** <filename> dump filename | |
| 56 ** - (as filename == stdin) | |
| 57 */ | |
| 58 | |
| 59 while (*argv && *argv[0] == '-' && (*argv)[1]) | |
| 60 { | |
| 61 /* A switch! */ | |
| 62 if (!strcmp (*argv, "--")) | |
| 63 { | |
| 64 --argc; argv++; | |
| 65 break; | |
| 66 } | |
| 67 else if (!strcmp (*argv, "-un") || !strcmp (*argv, "-de")) | |
| 68 { | |
| 69 un_flag = TRUE; | |
| 70 --argc; argv++; | |
| 71 } | |
| 72 else if (!strcmp (*argv, "-hex")) | |
| 73 { | |
| 74 base = 16; | |
| 75 --argc; argv++; | |
| 76 } | |
| 77 else if (!strcmp (*argv, "-iso")) | |
| 78 { | |
| 79 iso_flag = TRUE; | |
| 80 --argc; argv++; | |
| 81 } | |
| 82 else if (!strcmp (*argv, "-oct")) | |
| 83 { | |
| 84 base = 8; | |
| 85 --argc; argv++; | |
| 86 } | |
| 87 else if (!strcmp (*argv, "-big-endian")) | |
| 88 { | |
| 89 endian = 1; | |
| 90 --argc; argv++; | |
| 91 } | |
| 92 else if (!strcmp (*argv, "-little-endian")) | |
| 93 { | |
| 94 endian = 0; | |
| 95 --argc; argv++; | |
| 96 } | |
| 97 else if (!strcmp (*argv, "-group-by-8-bits")) | |
| 98 { | |
| 99 group_by = 0x00; | |
| 100 --argc; argv++; | |
| 101 } | |
| 102 else if (!strcmp (*argv, "-group-by-16-bits")) | |
| 103 { | |
| 104 group_by = 0x01; | |
| 105 --argc; argv++; | |
| 106 } | |
| 107 else if (!strcmp (*argv, "-group-by-32-bits")) | |
| 108 { | |
| 109 group_by = 0x03; | |
| 110 --argc; argv++; | |
| 111 } | |
| 112 else if (!strcmp (*argv, "-group-by-64-bits")) | |
| 113 { | |
| 114 group_by = 0x07; | |
| 115 endian = 0; | |
| 116 --argc; argv++; | |
| 117 } | |
| 118 else | |
| 119 { | |
| 120 (void) fprintf (stderr, "%s: invalid switch: \"%s\".\n", progname, | |
| 121 *argv); | |
| 122 usage (); | |
| 123 } | |
| 124 } | |
| 125 | |
| 126 do | |
| 127 { | |
| 128 if (*argv == NULL) | |
| 129 fp = stdin; | |
| 130 else | |
| 131 { | |
| 132 char *filename = *argv++; | |
| 133 | |
| 134 if (!strcmp (filename, "-")) | |
| 135 fp = stdin; | |
| 136 else if ((fp = fopen (filename, "r")) == NULL) | |
| 137 { | |
| 138 perror (filename); | |
| 139 continue; | |
| 140 } | |
| 141 } | |
| 142 | |
| 143 if (un_flag) | |
| 144 { | |
| 145 char buf[18]; | |
| 146 | |
| 442 | 147 #ifdef WIN32_NATIVE |
| 440 | 148 _setmode (_fileno (stdout), O_BINARY); |
| 428 | 149 #endif |
| 150 for (;;) | |
| 151 { | |
| 442 | 152 register int i, c = 0, d; |
| 428 | 153 |
| 154 #define hexchar(x) (isdigit (x) ? x - '0' : x - 'a' + 10) | |
| 155 | |
| 156 fread (buf, 1, 10, fp); /* skip 10 bytes */ | |
| 157 | |
| 158 for (i=0; i < 16; ++i) | |
| 159 { | |
| 160 if ((c = getc (fp)) == ' ' || c == EOF) | |
| 161 break; | |
| 162 | |
| 163 d = getc (fp); | |
| 164 c = hexchar (c) * 0x10 + hexchar (d); | |
| 165 putchar (c); | |
| 166 | |
| 167 if ((i&group_by) == group_by) | |
| 168 getc (fp); | |
| 169 } | |
| 170 | |
| 171 if (c == ' ') | |
| 172 { | |
| 173 while ((c = getc (fp)) != '\n' && c != EOF) | |
| 174 ; | |
| 175 | |
| 176 if (c == EOF) | |
| 177 break; | |
| 178 } | |
| 179 else | |
| 180 { | |
| 181 if (i < 16) | |
| 182 break; | |
| 183 | |
| 184 fread (buf, 1, 18, fp); /* skip 18 bytes */ | |
| 185 } | |
| 186 } | |
| 187 } | |
| 188 else | |
| 189 { | |
| 442 | 190 #ifdef WIN32_NATIVE |
| 440 | 191 _setmode (_fileno (fp), O_BINARY); |
| 428 | 192 #endif |
| 193 address = 0; | |
| 194 string[0] = ' '; | |
| 195 string[17] = '\0'; | |
| 196 for (;;) | |
| 197 { | |
| 442 | 198 register int i, c = 0; |
| 428 | 199 |
| 200 for (i=0; i < 16; ++i) | |
| 201 { | |
| 202 if ((c = getc (fp)) == EOF) | |
| 203 { | |
| 204 if (!i) | |
| 205 break; | |
| 206 | |
| 207 fputs (" ", stdout); | |
| 208 string[i+1] = '\0'; | |
| 209 } | |
| 210 else | |
| 211 { | |
| 212 if (!i) | |
| 213 (void) printf ("%08lx: ", address); | |
| 214 | |
| 215 if (iso_flag) | |
| 216 string[i+1] = | |
| 217 (c < 0x20 || (c >= 0x7F && c < 0xa0)) ? '.' :c; | |
| 218 else | |
| 219 string[i+1] = (c < 0x20 || c >= 0x7F) ? '.' : c; | |
| 220 | |
| 221 (void) printf ("%02x", c); | |
| 222 } | |
| 223 | |
| 224 if ((i&group_by) == group_by) | |
| 225 putchar (' '); | |
| 226 } | |
| 227 | |
| 228 if (i) | |
| 229 puts (string); | |
| 230 | |
| 231 if (c == EOF) | |
| 232 break; | |
| 233 | |
| 234 address += 0x10; | |
| 235 | |
| 236 } | |
| 237 } | |
| 238 | |
| 239 if (fp != stdin) | |
| 240 (void) fclose (fp); | |
| 241 | |
| 242 } while (*argv != NULL); | |
| 243 return 0; | |
| 244 } | |
| 245 | |
| 246 void | |
| 442 | 247 usage (void) |
| 428 | 248 { |
| 442 | 249 fprintf (stderr, "Usage: %s [-de] [-iso]\n", progname); |
| 428 | 250 exit (1); |
| 251 } |