Mercurial > hg > xemacs-beta
annotate lib-src/hexl.c @ 5127:a9c41067dd88 ben-lisp-object
more cleanups, terminology clarification, lots of doc work
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Introduction to Allocation):
* internals/internals.texi (Integers and Characters):
* internals/internals.texi (Allocation from Frob Blocks):
* internals/internals.texi (lrecords):
* internals/internals.texi (Low-level allocation):
Rewrite section on allocation of Lisp objects to reflect the new
reality. Remove references to nonexistent XSETINT and XSETCHAR.
modules/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (allocate_pgconn):
* postgresql/postgresql.c (allocate_pgresult):
* postgresql/postgresql.h (struct Lisp_PGconn):
* postgresql/postgresql.h (struct Lisp_PGresult):
* ldap/eldap.c (allocate_ldap):
* ldap/eldap.h (struct Lisp_LDAP):
Same changes as in src/ dir. See large log there in ChangeLog,
but basically:
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
../hlo/src/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (very_old_free_lcrecord):
* alloc.c (copy_lisp_object):
* alloc.c (zero_sized_lisp_object):
* alloc.c (zero_nonsized_lisp_object):
* alloc.c (lisp_object_storage_size):
* alloc.c (free_normal_lisp_object):
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (Fcons):
* alloc.c (noseeum_cons):
* alloc.c (make_float):
* alloc.c (make_bignum):
* alloc.c (make_bignum_bg):
* alloc.c (make_ratio):
* alloc.c (make_ratio_bg):
* alloc.c (make_ratio_rt):
* alloc.c (make_bigfloat):
* alloc.c (make_bigfloat_bf):
* alloc.c (size_vector):
* alloc.c (make_compiled_function):
* alloc.c (Fmake_symbol):
* alloc.c (allocate_extent):
* alloc.c (allocate_event):
* alloc.c (make_key_data):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (Fmake_marker):
* alloc.c (noseeum_make_marker):
* alloc.c (size_string_direct_data):
* alloc.c (make_uninit_string):
* alloc.c (make_string_nocopy):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* alloc.c (malloced_storage_size):
* buffer.c (allocate_buffer):
* buffer.c (compute_buffer_usage):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* buffer.c (nuke_all_buffer_slots):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.h (struct buffer_text):
* buffer.h (struct buffer):
* bytecode.c:
* bytecode.c (make_compiled_function_args):
* bytecode.c (size_compiled_function_args):
* bytecode.h (struct compiled_function_args):
* casetab.c (allocate_case_table):
* casetab.h (struct Lisp_Case_Table):
* charset.h (struct Lisp_Charset):
* chartab.c (fill_char_table):
* chartab.c (Fmake_char_table):
* chartab.c (make_char_table_entry):
* chartab.c (copy_char_table_entry):
* chartab.c (Fcopy_char_table):
* chartab.c (put_char_table):
* chartab.h (struct Lisp_Char_Table_Entry):
* chartab.h (struct Lisp_Char_Table):
* console-gtk-impl.h (struct gtk_device):
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h (struct console):
* console-msw-impl.h (struct Lisp_Devmode):
* console-msw-impl.h (struct mswindows_device):
* console-msw-impl.h (struct msprinter_device):
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (struct mswindows_dialog_id):
* console-stream-impl.h (struct stream_console):
* console-stream.c (stream_init_console):
* console-tty-impl.h (struct tty_console):
* console-tty-impl.h (struct tty_device):
* console-tty.c (allocate_tty_console_struct):
* console-x-impl.h (struct x_device):
* console-x-impl.h (struct x_frame):
* console.c (allocate_console):
* console.c (nuke_all_console_slots):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* console.c (common_init_complex_vars_of_console):
* data.c (make_weak_list):
* data.c (make_weak_box):
* data.c (make_ephemeron):
* database.c:
* database.c (struct Lisp_Database):
* database.c (allocate_database):
* database.c (finalize_database):
* device-gtk.c (allocate_gtk_device_struct):
* device-impl.h (struct device):
* device-msw.c:
* device-msw.c (mswindows_init_device):
* device-msw.c (msprinter_init_device):
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device-tty.c (allocate_tty_device_struct):
* device-x.c (allocate_x_device_struct):
* device.c:
* device.c (nuke_all_device_slots):
* device.c (allocate_device):
* dialog-msw.c (handle_question_dialog_box):
* elhash.c:
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (finalize_hash_table):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (Fcopy_hash_table):
* elhash.h (htentry):
* emacs.c (main_1):
* eval.c:
* eval.c (size_multiple_value):
* event-stream.c (finalize_command_builder):
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (event_stream_resignal_wakeup):
* event-stream.c (event_stream_disable_wakeup):
* event-stream.c (event_stream_wakeup_pending_p):
* events.h (struct Lisp_Timeout):
* events.h (struct command_builder):
* extents-impl.h:
* extents-impl.h (struct extent_auxiliary):
* extents-impl.h (struct extent_info):
* extents-impl.h (set_extent_no_chase_aux_field):
* extents-impl.h (set_extent_no_chase_normal_field):
* extents.c:
* extents.c (gap_array_marker):
* extents.c (gap_array):
* extents.c (extent_list_marker):
* extents.c (extent_list):
* extents.c (stack_of_extents):
* extents.c (gap_array_make_marker):
* extents.c (extent_list_make_marker):
* extents.c (allocate_extent_list):
* extents.c (SLOT):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (attach_extent_auxiliary):
* extents.c (size_gap_array):
* extents.c (finalize_extent_info):
* extents.c (allocate_extent_info):
* extents.c (uninit_buffer_extents):
* extents.c (allocate_soe):
* extents.c (copy_extent):
* extents.c (vars_of_extents):
* extents.h:
* faces.c (allocate_face):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.c (sizeof_coding_system):
* file-coding.c (Fcopy_coding_system):
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (MARKED_SLOT):
* fns.c (size_bit_vector):
* font-mgr.c:
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (print_fc_pattern):
* font-mgr.c (Ffc_pattern_p):
* font-mgr.c (Ffc_pattern_create):
* font-mgr.c (Ffc_name_parse):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* font-mgr.c (Ffc_pattern_add):
* font-mgr.c (Ffc_pattern_del):
* font-mgr.c (Ffc_pattern_get):
* font-mgr.c (fc_config_create_using):
* font-mgr.c (fc_strlist_to_lisp_using):
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_p):
* font-mgr.c (Ffc_config_up_to_date):
* font-mgr.c (Ffc_config_build_fonts):
* font-mgr.c (Ffc_config_get_cache):
* font-mgr.c (Ffc_config_get_fonts):
* font-mgr.c (Ffc_config_set_current):
* font-mgr.c (Ffc_config_get_blanks):
* font-mgr.c (Ffc_config_get_rescan_interval):
* font-mgr.c (Ffc_config_set_rescan_interval):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_app_font_clear):
* font-mgr.c (size):
* font-mgr.c (Ffc_config_substitute):
* font-mgr.c (Ffc_font_render_prepare):
* font-mgr.c (Ffc_font_match):
* font-mgr.c (Ffc_font_sort):
* font-mgr.c (finalize_fc_config):
* font-mgr.c (print_fc_config):
* font-mgr.h:
* font-mgr.h (struct fc_pattern):
* font-mgr.h (XFC_PATTERN):
* font-mgr.h (struct fc_config):
* font-mgr.h (XFC_CONFIG):
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-impl.h (struct frame):
* frame-msw.c (mswindows_init_frame_1):
* frame-x.c (allocate_x_frame_struct):
* frame.c (nuke_all_frame_slots):
* frame.c (allocate_frame_core):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c (finalize_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (Fcolorize_image_instance):
* glyphs.c (allocate_glyph):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* glyphs.c (register_ignored_expose):
* glyphs.h (struct Lisp_Image_Instance):
* glyphs.h (struct Lisp_Glyph):
* glyphs.h (struct glyph_cachel):
* glyphs.h (struct expose_ignore):
* gui.c (allocate_gui_item):
* gui.h (struct Lisp_Gui_Item):
* keymap.c (struct Lisp_Keymap):
* keymap.c (make_keymap):
* lisp.h:
* lisp.h (struct Lisp_String_Direct_Data):
* lisp.h (struct Lisp_String_Indirect_Data):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (DECLARE_INLINE_LISP_BIT_VECTOR):
* lisp.h (struct weak_box):
* lisp.h (struct ephemeron):
* lisp.h (struct weak_list):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (struct lcrecord_list):
* lstream.c (finalize_lstream):
* lstream.c (sizeof_lstream):
* lstream.c (Lstream_new):
* lstream.c (Lstream_delete):
* lstream.h (struct lstream):
* marker.c:
* marker.c (finalize_marker):
* marker.c (compute_buffer_marker_usage):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (compute_charset_usage):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty-impl.h (struct tty_color_instance_data):
* objects-tty-impl.h (struct tty_font_instance_data):
* objects-tty.c (tty_initialize_color_instance):
* objects-tty.c (tty_initialize_font_instance):
* objects.c (finalize_color_instance):
* objects.c (Fmake_color_instance):
* objects.c (finalize_font_instance):
* objects.c (Fmake_font_instance):
* objects.c (reinit_vars_of_objects):
* opaque.c:
* opaque.c (sizeof_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (free_opaque_ptr):
* opaque.h:
* opaque.h (Lisp_Opaque):
* opaque.h (Lisp_Opaque_Ptr):
* print.c (printing_unreadable_lcrecord):
* print.c (external_object_printer):
* print.c (debug_p4):
* process.c (finalize_process):
* process.c (make_process_internal):
* procimpl.h (struct Lisp_Process):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.h (struct Lisp_Range_Table):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h (struct scrollbar_instance):
* specifier.c (finalize_specifier):
* specifier.c (sizeof_specifier):
* specifier.c (set_specifier_caching):
* specifier.h (struct Lisp_Specifier):
* specifier.h (struct specifier_caching):
* symeval.h:
* symeval.h (SYMBOL_VALUE_MAGIC_P):
* symeval.h (DEFVAR_SYMVAL_FWD):
* symsinit.h:
* syntax.c (init_buffer_syntax_cache):
* syntax.h (struct syntax_cache):
* toolbar.c:
* toolbar.c (allocate_toolbar_button):
* toolbar.c (update_toolbar_button):
* toolbar.h (struct toolbar_button):
* tooltalk.c (struct Lisp_Tooltalk_Message):
* tooltalk.c (make_tooltalk_message):
* tooltalk.c (struct Lisp_Tooltalk_Pattern):
* tooltalk.c (make_tooltalk_pattern):
* ui-gtk.c:
* ui-gtk.c (allocate_ffi_data):
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_object_data):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* ui-gtk.h:
* window-impl.h (struct window):
* window-impl.h (struct window_mirror):
* window.c (finalize_window):
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (mark_window_as_deleted):
* window.c (make_dummy_parent):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
Overall point of this change and previous ones in this repository:
(1) Introduce new, clearer terminology: everything other than int
or char is a "record" object, which comes in two types: "normal
objects" and "frob-block objects". Fix up all places that
referred to frob-block objects as "simple", "basic", etc.
(2) Provide an advertised interface for doing operations on Lisp
objects, including creating new types, that is clean and
consistent in its naming, uses the above-referenced terms and
avoids referencing "lrecords", "old lcrecords", etc., which should
hide under the surface.
(3) Make the size_in_bytes and finalizer methods take a
Lisp_Object rather than a void * for consistency with other methods.
(4) Separate finalizer method into finalizer and disksaver, so
that normal finalize methods don't have to worry about disksaving.
Other specifics:
(1) Renaming:
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
implementation->basic_p -> implementation->frob_block_p
ALLOCATE_FIXED_TYPE_AND_SET_IMPL -> ALLOC_FROB_BLOCK_LISP_OBJECT
*FCCONFIG*, wrap_fcconfig -> *FC_CONFIG*, wrap_fc_config
*FCPATTERN*, wrap_fcpattern -> *FC_PATTERN*, wrap_fc_pattern
(the last two changes make the naming of these macros consistent
with the naming of all other macros, since the objects are named
fc-config and fc-pattern with a hyphen)
(2) Lots of documentation fixes in lrecord.h.
(3) Eliminate macros for copying, freeing, zeroing objects, getting
their storage size. Instead, new functions:
zero_sized_lisp_object()
zero_nonsized_lisp_object()
lisp_object_storage_size()
free_normal_lisp_object()
(copy_lisp_object() already exists)
LISP_OBJECT_FROB_BLOCK_P() (actually a macro)
Eliminated:
free_lrecord()
zero_lrecord()
copy_lrecord()
copy_sized_lrecord()
old_copy_lcrecord()
old_copy_sized_lcrecord()
old_zero_lcrecord()
old_zero_sized_lcrecord()
LISP_OBJECT_STORAGE_SIZE()
COPY_SIZED_LISP_OBJECT()
COPY_SIZED_LCRECORD()
COPY_LISP_OBJECT()
ZERO_LISP_OBJECT()
FREE_LISP_OBJECT()
(4) Catch the remaining places where lrecord stuff was used directly
and use the advertised interface, e.g. alloc_sized_lrecord() ->
ALLOC_SIZED_LISP_OBJECT().
(5) Make certain statically-declared pseudo-objects
(buffer_local_flags, console_local_flags) have their lheader
initialized correctly, so things like copy_lisp_object() can work
on them. Make extent_auxiliary_defaults a proper heap object
Vextent_auxiliary_defaults, and make extent auxiliaries dumpable
so that this object can be dumped. allocate_extent_auxiliary()
now just creates the object, and attach_extent_auxiliary()
creates an extent auxiliary and attaches to an extent, like the
old allocate_extent_auxiliary().
(6) Create EXTENT_AUXILIARY_SLOTS macro, similar to the foo-slots.h
files but in a macro instead of a file. The purpose is to avoid
duplication when iterating over all the slots in an extent auxiliary.
Use it.
(7) In lstream.c, don't zero out object after allocation because
allocation routines take care of this.
(8) In marker.c, fix a mistake in computing marker overhead.
(9) In print.c, clean up printing_unreadable_lcrecord(),
external_object_printer() to avoid lots of ifdef NEW_GC's.
(10) Separate toolbar-button allocation into a separate
allocate_toolbar_button() function for use in the example code
in lrecord.h.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Mar 2010 04:08:17 -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 } |