From Lars Roland:
[obnox/wireshark/wip.git] / print.c
diff --git a/print.c b/print.c
index 41e294a79040a7954c7d104eb571da62cae79fd5..110ab50c9e03b6d62229ac1b12ce730a4d1752bd 100644 (file)
--- a/print.c
+++ b/print.c
@@ -1,25 +1,24 @@
 /* print.c
  * Routines for printing packet analysis trees.
  *
- * $Id: print.c,v 1.14 1999/07/23 08:29:22 guy Exp $
+ * $Id: print.c,v 1.57 2002/08/28 21:00:40 jmayer Exp $
  *
- * Gilbert Ramirez <gram@verdict.uthscsa.edu>
+ * Gilbert Ramirez <gram@alumni.rice.edu>
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
- * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 # include "config.h"
 #endif
 
-#include <gtk/gtk.h>
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <epan/epan.h>
+#include <epan/epan_dissect.h>
+#include <epan/tvbuff.h>
+#include <epan/packet.h>
 
-#include "ethereal.h"
-#include "packet.h"
-#include "gtkpacket.h"
-#include "prefs.h"
 #include "print.h"
 #include "ps.h"
+#include "util.h"
+#include "packet-data.h"
 
-static void printer_opts_file_cb(GtkWidget *w, gpointer te);
-static void printer_opts_fs_cancel_cb(GtkWidget *w, gpointer data);
-static void printer_opts_fs_ok_cb(GtkWidget *w, gpointer data);
-static void printer_opts_toggle_format(GtkWidget *widget, gpointer data);
-static void printer_opts_toggle_dest(GtkWidget *widget, gpointer data);
-static void proto_tree_print_node_text(GNode *node, gpointer data);
-static void dumpit (FILE *fh, register const u_char *cp, register u_int length);
-static void proto_tree_print_node_ps(GNode *node, gpointer data);
+static void proto_tree_print_node(GNode *node, gpointer data);
+static void print_hex_data_buffer(FILE *fh, register const guchar *cp,
+    register guint length, char_enc encoding, gint format);
 static void ps_clean_string(unsigned char *out, const unsigned char *in,
                        int outbuf_size);
-static void dumpit_ps (FILE *fh, register const u_char *cp, register u_int length);
-
-extern int proto_data; /* in packet-data.c */
-
-/* #include "ps.c" */
-
-/* Key for gtk_object_set_data */
-#define PRINT_CMD_TE_KEY  "printer_command_entry"
-#define PRINT_FILE_TE_KEY "printer_file_entry"
-
-GtkWidget * printer_prefs_show()
-{
-       GtkWidget       *main_vb, *main_tb, *button;
-       GtkWidget       *format_hb, *format_lb;
-       GtkWidget       *dest_hb, *dest_lb;
-       GtkWidget       *cmd_lb, *cmd_te;
-       GtkWidget       *file_bt_hb, *file_bt, *file_te;
-       GSList          *format_grp, *dest_grp;
-
-       /* Enclosing containers for each row of widgets */
-  main_vb = gtk_vbox_new(FALSE, 5);
-  gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
-
-       main_tb = gtk_table_new(4, 2, FALSE);
-       gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0);
-  gtk_table_set_row_spacings(GTK_TABLE(main_tb), 10);
-  gtk_table_set_col_spacings(GTK_TABLE(main_tb), 15);
-  gtk_widget_show(main_tb);
-
-       /* Output format */
-       format_lb = gtk_label_new("Format:");
-  gtk_misc_set_alignment(GTK_MISC(format_lb), 1.0, 0.5);
-  gtk_table_attach_defaults(GTK_TABLE(main_tb), format_lb, 0, 1, 0, 1);
-       gtk_widget_show(format_lb);
-
-       format_hb = gtk_hbox_new(FALSE, 0);
-  gtk_table_attach_defaults(GTK_TABLE(main_tb), format_hb, 1, 2, 0, 1);
-       gtk_widget_show(format_hb);
-
-       button = gtk_radio_button_new_with_label(NULL, "Plain Text");
-       if (prefs.pr_format == PR_FMT_TEXT) {
-               gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), TRUE);
-       }
-       format_grp = gtk_radio_button_group(GTK_RADIO_BUTTON(button));
-       gtk_box_pack_start(GTK_BOX(format_hb), button, FALSE, FALSE, 10);
-       gtk_widget_show(button);
-
-       button = gtk_radio_button_new_with_label(format_grp, "PostScript");
-       if (prefs.pr_format == PR_FMT_PS) {
-               gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), TRUE);
-       }
-       gtk_signal_connect(GTK_OBJECT(button), "toggled",
-                       GTK_SIGNAL_FUNC(printer_opts_toggle_format), NULL);
-       gtk_box_pack_start(GTK_BOX(format_hb), button, FALSE, FALSE, 10);
-       gtk_widget_show(button);
-
-       /* Output destination */
-       dest_lb = gtk_label_new("Print to:");
-  gtk_misc_set_alignment(GTK_MISC(dest_lb), 1.0, 0.5);
-  gtk_table_attach_defaults(GTK_TABLE(main_tb), dest_lb, 0, 1, 1, 2);
-       gtk_widget_show(dest_lb);
-
-       dest_hb = gtk_hbox_new(FALSE, 0);
-  gtk_table_attach_defaults(GTK_TABLE(main_tb), dest_hb, 1, 2, 1, 2);
-       gtk_widget_show(dest_hb);
-
-       button = gtk_radio_button_new_with_label(NULL, "Command");
-       if (prefs.pr_dest == PR_DEST_CMD) {
-               gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), TRUE);
-       }
-       dest_grp = gtk_radio_button_group(GTK_RADIO_BUTTON(button));
-       gtk_box_pack_start(GTK_BOX(dest_hb), button, FALSE, FALSE, 10);
-       gtk_widget_show(button);
-
-       button = gtk_radio_button_new_with_label(dest_grp, "File");
-       if (prefs.pr_dest == PR_DEST_FILE) {
-               gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), TRUE);
-       }
-       gtk_signal_connect(GTK_OBJECT(button), "toggled",
-                       GTK_SIGNAL_FUNC(printer_opts_toggle_dest), NULL);
-       gtk_box_pack_start(GTK_BOX(dest_hb), button, FALSE, FALSE, 10);
-       gtk_widget_show(button);
-
-       /* Command text entry */
-       cmd_lb = gtk_label_new("Command:");
-  gtk_misc_set_alignment(GTK_MISC(cmd_lb), 1.0, 0.5);
-  gtk_table_attach_defaults(GTK_TABLE(main_tb), cmd_lb, 0, 1, 2, 3);
-       gtk_widget_show(cmd_lb);
-
-       cmd_te = gtk_entry_new();
-       gtk_object_set_data(GTK_OBJECT(main_vb), PRINT_CMD_TE_KEY, cmd_te);
-       if (prefs.pr_cmd) gtk_entry_set_text(GTK_ENTRY(cmd_te), prefs.pr_cmd);
-  gtk_table_attach_defaults(GTK_TABLE(main_tb), cmd_te, 1, 2, 2, 3);
-       gtk_widget_show(cmd_te);
-
-       /* File button and text entry */
-       file_bt_hb = gtk_hbox_new(FALSE, 0);
-  gtk_table_attach_defaults(GTK_TABLE(main_tb), file_bt_hb, 0, 1, 3, 4);
-       gtk_widget_show(file_bt_hb);
-
-       file_bt = gtk_button_new_with_label("File:");
-       gtk_box_pack_end(GTK_BOX(file_bt_hb), file_bt, FALSE, FALSE, 0);
-       gtk_widget_show(file_bt);
-
-       file_te = gtk_entry_new();
-       gtk_object_set_data(GTK_OBJECT(main_vb), PRINT_FILE_TE_KEY, file_te);
-       if (prefs.pr_file) gtk_entry_set_text(GTK_ENTRY(file_te), prefs.pr_file);
-  gtk_table_attach_defaults(GTK_TABLE(main_tb), file_te, 1, 2, 3, 4);
-       gtk_widget_show(file_te);
-
-       gtk_signal_connect(GTK_OBJECT(file_bt), "clicked",
-                       GTK_SIGNAL_FUNC(printer_opts_file_cb), GTK_OBJECT(file_te));
-
-       gtk_widget_show(main_vb);
-       return(main_vb);
-}
-
-
-static void
-printer_opts_file_cb(GtkWidget *file_bt, gpointer file_te) {
-  GtkWidget *fs;
-
-  fs = gtk_file_selection_new ("Ethereal: Print to a File");
-       gtk_object_set_data(GTK_OBJECT(fs), PRINT_FILE_TE_KEY, file_te);
-
-  gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION(fs)->ok_button),
-    "clicked", (GtkSignalFunc) printer_opts_fs_ok_cb, fs);
-
-  /* Connect the cancel_button to destroy the widget */
-  gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION(fs)->cancel_button),
-    "clicked", (GtkSignalFunc) printer_opts_fs_cancel_cb, fs);
-
-  gtk_widget_show(fs);
-}
-
-static void
-printer_opts_fs_ok_cb(GtkWidget *w, gpointer data) {
-         
-       gtk_entry_set_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(data),
-       PRINT_FILE_TE_KEY)),
-               gtk_file_selection_get_filename (GTK_FILE_SELECTION(data)));
-       printer_opts_fs_cancel_cb(w, data);
-}
-
-static void
-printer_opts_fs_cancel_cb(GtkWidget *w, gpointer data) {
-         
-       gtk_widget_destroy(GTK_WIDGET(data));
-} 
-
-void
-printer_prefs_ok(GtkWidget *w)
-{
-       if(prefs.pr_cmd) g_free(prefs.pr_cmd);
-       prefs.pr_cmd =  
-               g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(w),
-    PRINT_CMD_TE_KEY))));
-
-       if(prefs.pr_file) g_free(prefs.pr_file);
-       prefs.pr_file =  
-               g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(w),
-    PRINT_FILE_TE_KEY))));
-}
-
-void
-printer_prefs_save(GtkWidget *w)
-{
-       printer_prefs_ok(w);
-}
-
-void
-printer_prefs_cancel(GtkWidget *w)
-{
-}
-
-static void
-printer_opts_toggle_format(GtkWidget *widget, gpointer data)
-{
-               if (GTK_TOGGLE_BUTTON (widget)->active) {
-                       prefs.pr_format = PR_FMT_PS;
-                       /* toggle file/cmd */
-               }
-               else {
-                       prefs.pr_format = PR_FMT_TEXT;
-                       /* toggle file/cmd */
-               }
-}
-
-static void
-printer_opts_toggle_dest(GtkWidget *widget, gpointer data)
-{
-               if (GTK_TOGGLE_BUTTON (widget)->active) {
-                       prefs.pr_dest = PR_DEST_FILE;
-               }
-               else {
-                       prefs.pr_dest = PR_DEST_CMD;
-               }
-}
-
-/* ========================================================== */
 
 typedef struct {
        int             level;
        FILE            *fh;
-       const guint8    *pd;
+       GSList          *src_list;
+       gboolean        print_all_levels;
+       gboolean        print_hex_for_data;
+       char_enc        encoding;
+       gint            format;         /* text or PostScript */
 } print_data;
 
 FILE *open_print_dest(int to_file, const char *dest)
 {
        FILE    *fh;
-       char    *out;
 
        /* Open the file or command for output */
-       out = dest;
        if (to_file)
                fh = fopen(dest, "w");
        else
-               fh = popen(prefs.pr_cmd, "w");
+               fh = popen(dest, "w");
 
        return fh;
 }
@@ -285,7 +79,7 @@ void close_print_dest(int to_file, FILE *fh)
                pclose(fh);
 }
 
-void proto_tree_print(GNode *protocol_tree, const u_char *pd, frame_data *fd,
+void proto_tree_print(print_args_t *print_args, epan_dissect_t *edt,
     FILE *fh)
 {
        print_data data;
@@ -293,30 +87,58 @@ void proto_tree_print(GNode *protocol_tree, const u_char *pd, frame_data *fd,
        /* Create the output */
        data.level = 0;
        data.fh = fh;
-       data.pd = pd;
-       if (prefs.pr_format == PR_FMT_TEXT) {
-               g_node_children_foreach((GNode*) protocol_tree, G_TRAVERSE_ALL,
-                       proto_tree_print_node_text, &data);
-       } else {
-               print_ps_preamble(fh);
-               g_node_children_foreach((GNode*) protocol_tree, G_TRAVERSE_ALL,
-                       proto_tree_print_node_ps, &data);
-               print_ps_finale(fh);
+       data.src_list = edt->pi.data_src;
+       data.encoding = edt->pi.fd->flags.encoding;
+       data.print_all_levels = print_args->expand_all;
+       data.print_hex_for_data = !print_args->print_hex;
+           /* If we're printing the entire packet in hex, don't
+              print uninterpreted data fields in hex as well. */
+       data.format = print_args->format;
+
+       g_node_children_foreach((GNode*) edt->tree, G_TRAVERSE_ALL,
+               proto_tree_print_node, &data);
+}
+
+/*
+ * Find the data source for a specified field, and return a pointer
+ * to the data in it.
+ */
+static const guint8 *
+get_field_data(GSList *src_list, field_info *fi)
+{
+       GSList *src_le;
+       data_source *src;
+       tvbuff_t *src_tvb;
+
+       for (src_le = src_list; src_le != NULL; src_le = src_le->next) {
+               src = src_le->data;
+               src_tvb = src->tvb;
+               if (fi->ds_tvb == src_tvb) {
+                       /*
+                        * Found it.
+                        */
+                       return tvb_get_ptr(src_tvb, fi->start, fi->length);
+               }
        }
+       g_assert_not_reached();
+       return NULL;    /* not found */
 }
 
-/* Print a tree's data, and any child nodes, in plain text */
+#define MAX_INDENT     160
+
+#define MAX_PS_LINE_LENGTH 256
+
+/* Print a tree's data, and any child nodes. */
 static
-void proto_tree_print_node_text(GNode *node, gpointer data)
+void proto_tree_print_node(GNode *node, gpointer data)
 {
-       field_info      *fi = (field_info*) (node->data);
+       field_info      *fi = PITEM_FINFO(node);
        print_data      *pdata = (print_data*) data;
-       int             i;
-       int              num_spaces;
-       char            space[41];
+       const guint8    *pd;
        gchar           label_str[ITEM_LABEL_LENGTH];
        gchar           *label_ptr;
 
+       /* Don't print invisible entries. */
        if (!fi->visible)
                return;
 
@@ -328,109 +150,172 @@ void proto_tree_print_node_text(GNode *node, gpointer data)
                label_ptr = label_str;
                proto_item_fill_label(fi, label_str);
        }
-               
-       /* Prepare the tabs for printing, depending on tree level */
-       num_spaces = pdata->level * 4;
-       if (num_spaces > 40) {
-               num_spaces = 40;
-       }
-       for (i = 0; i < num_spaces; i++) {
-               space[i] = ' ';
+
+       print_line(pdata->fh, pdata->level, pdata->format, label_ptr);
+
+       /* If it's uninterpreted data, dump it (unless our caller will
+          be printing the entire packet in hex). */
+       if (fi->hfinfo->id == proto_data && pdata->print_hex_for_data) {
+               /*
+                * Find the data for this field.
+                */
+               pd = get_field_data(pdata->src_list, fi);
+               print_hex_data_buffer(pdata->fh, pd, fi->length,
+                   pdata->encoding, pdata->format);
        }
-       /* The string is NUL-terminated */
-       space[num_spaces] = 0;
-
-       /* Print the text */
-       fprintf(pdata->fh, "%s%s\n", space, label_ptr);
-
-       /* If it's uninterpreted data, dump it. */
-       if (fi->hfinfo->id == proto_data)
-               dumpit(pdata->fh, &pdata->pd[fi->start], fi->length);
-
-       /* Recurse into the subtree, if it exists */
-       if (g_node_n_children(node) > 0) {
-               pdata->level++;
-               g_node_children_foreach(node, G_TRAVERSE_ALL,
-                       proto_tree_print_node_text, pdata);
-               pdata->level--;
+
+       /* If we're printing all levels, or if this node is one with a
+          subtree and its subtree is expanded, recurse into the subtree,
+          if it exists. */
+       g_assert(fi->tree_type >= -1 && fi->tree_type < num_tree_types);
+       if (pdata->print_all_levels ||
+           (fi->tree_type >= 0 && tree_is_expanded[fi->tree_type])) {
+               if (g_node_n_children(node) > 0) {
+                       pdata->level++;
+                       g_node_children_foreach(node, G_TRAVERSE_ALL,
+                               proto_tree_print_node, pdata);
+                       pdata->level--;
+               }
        }
 }
 
-/* This routine was created by Dan Lasley <DLASLEY@PROMUS.com>, and
-only slightly modified for ethereal by Gilbert Ramirez. */
-static
-void dumpit (FILE *fh, register const u_char *cp, register u_int length)
+void print_hex_data(FILE *fh, gint format, epan_dissect_t *edt)
 {
-        register int ad, i, j, k;
-        u_char c;
-        u_char line[60];
-               static u_char binhex[16] = {
-                       '0', '1', '2', '3', '4', '5', '6', '7',
-                       '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
-        memset (line, ' ', sizeof line);
-        line[sizeof (line)-1] = 0;
-        for (ad=i=j=k=0; i<length; i++) {
-                c = *cp++;
-                line[j++] = binhex[c>>4];
-                line[j++] = binhex[c&0xf];
-                if (i&1) j++;
-                line[42+k++] = c >= ' ' && c < 0x7f ? c : '.';
-                if ((i & 15) == 15) {
-                        fprintf (fh, "\n%4x  %s", ad, line);
-                        /*if (i==15) printf (" %d", length);*/
-                        memset (line, ' ', sizeof line);
-                        line[sizeof (line)-1] = j = k = 0;
-                        ad += 16;
-                }
-        }
-
-        if (line[0] != ' ') fprintf (fh, "\n%4x  %s", ad, line);
-        fprintf(fh, "\n");
-        return;
-
+       gboolean multiple_sources;
+       GSList *src_le;
+       data_source *src;
+       tvbuff_t *tvb;
+       char *name;
+       char *line;
+       const guchar *cp;
+       guint length;
+
+       /*
+        * Set "multiple_sources" iff this frame has more than one
+        * data source; if it does, we need to print the name of
+        * the data source before printing the data from the
+        * data source.
+        */
+       multiple_sources = (edt->pi.data_src->next != NULL);
+
+       for (src_le = edt->pi.data_src; src_le != NULL;
+           src_le = src_le->next) {
+               src = src_le->data;
+               tvb = src->tvb;
+               if (multiple_sources) {
+                       name = src->name;
+                       print_line(fh, 0, format, "");
+                       line = g_malloc(strlen(name) + 2);      /* <name>:\0 */
+                       strcpy(line, name);
+                       strcat(line, ":");
+                       print_line(fh, 0, format, line);
+                       g_free(line);
+               }
+               length = tvb_length(tvb);
+               cp = tvb_get_ptr(tvb, 0, length);
+               print_hex_data_buffer(fh, cp, length,
+                   edt->pi.fd->flags.encoding, format);
+       }
 }
 
-#define MAX_LINE_LENGTH 256
-
-/* Print a node's data, and any child nodes, in PostScript */
-static
-void proto_tree_print_node_ps(GNode *node, gpointer data)
-{
-       field_info      *fi = (field_info*) (node->data);
-       print_data      *pdata = (print_data*) data;
-       gchar           label_str[ITEM_LABEL_LENGTH];
-       gchar           *label_ptr;
-       char            psbuffer[MAX_LINE_LENGTH]; /* static sized buffer! */
+/*
+ * This routine is based on a routine created by Dan Lasley
+ * <DLASLEY@PROMUS.com>.
+ *
+ * It was modified for Ethereal by Gilbert Ramirez and others.
+ */
 
-       if (!fi->visible)
-               return;
+#define MAX_OFFSET_LEN 8       /* max length of hex offset of bytes */
+#define BYTES_PER_LINE 16      /* max byte values printed on a line */
+#define HEX_DUMP_LEN   (BYTES_PER_LINE*3)
+                               /* max number of characters hex dump takes -
+                                  2 digits plus trailing blank */
+#define DATA_DUMP_LEN  (HEX_DUMP_LEN + 2 + BYTES_PER_LINE)
+                               /* number of characters those bytes take;
+                                  3 characters per byte of hex dump,
+                                  2 blanks separating hex from ASCII,
+                                  1 character per byte of ASCII dump */
+#define MAX_LINE_LEN   (MAX_OFFSET_LEN + 2 + DATA_DUMP_LEN)
+                               /* number of characters per line;
+                                  offset, 2 blanks separating offset
+                                  from data dump, data dump */
 
-       /* was a free format label produced? */
-       if (fi->representation) {
-               label_ptr = fi->representation;
-       }
-       else { /* no, make a generic label */
-               label_ptr = label_str;
-               proto_item_fill_label(fi, label_str);
-       }
-               
-       /* Print the text */
-       ps_clean_string(psbuffer, label_ptr, MAX_LINE_LENGTH);
-       fprintf(pdata->fh, "%d (%s) putline\n", pdata->level, psbuffer);
-
-       /* If it's uninterpreted data, dump it. */
-       if (fi->hfinfo->id == proto_data) {
-               print_ps_hex(pdata->fh);
-               dumpit_ps(pdata->fh, &pdata->pd[fi->start], fi->length);
-       }
-
-       /* Recurse into the subtree, if it exists */
-       if (g_node_n_children(node) > 0) {
-               pdata->level++;
-               g_node_children_foreach(node, G_TRAVERSE_ALL,
-                       proto_tree_print_node_ps, pdata);
-               pdata->level--;
+static void
+print_hex_data_buffer(FILE *fh, register const guchar *cp,
+    register guint length, char_enc encoding, gint format)
+{
+       register unsigned int ad, i, j, k, l;
+       guchar c;
+       guchar line[MAX_LINE_LEN + 1];
+       unsigned int use_digits;
+       static guchar binhex[16] = {
+               '0', '1', '2', '3', '4', '5', '6', '7',
+               '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+       print_line(fh, 0, format, "");
+
+       /*
+        * How many of the leading digits of the offset will we supply?
+        * We always supply at least 4 digits, but if the maximum offset
+        * won't fit in 4 digits, we use as many digits as will be needed.
+        */
+       if (((length - 1) & 0xF0000000) != 0)
+               use_digits = 8; /* need all 8 digits */
+       else if (((length - 1) & 0x0F000000) != 0)
+               use_digits = 7; /* need 7 digits */
+       else if (((length - 1) & 0x00F00000) != 0)
+               use_digits = 6; /* need 6 digits */
+       else if (((length - 1) & 0x000F0000) != 0)
+               use_digits = 5; /* need 5 digits */
+       else
+               use_digits = 4; /* we'll supply 4 digits */
+
+       ad = 0;
+       i = 0;
+       j = 0;
+       k = 0;
+       while (i < length) {
+               if ((i & 15) == 0) {
+                       /*
+                        * Start of a new line.
+                        */
+                       j = 0;
+                       k = 0;
+                       l = use_digits;
+                       do {
+                               l--;
+                               c = (ad >> (l*4)) & 0xF;
+                               line[j++] = binhex[c];
+                       } while (l != 0);
+                       line[j++] = ' ';
+                       line[j++] = ' ';
+                       memset(line+j, ' ', DATA_DUMP_LEN);
+
+                       /*
+                        * Offset in line of ASCII dump.
+                        */
+                       k = j + HEX_DUMP_LEN + 2;
+               }
+               c = *cp++;
+               line[j++] = binhex[c>>4];
+               line[j++] = binhex[c&0xf];
+               j++;
+               if (encoding == CHAR_EBCDIC) {
+                       c = EBCDIC_to_ASCII1(c);
+               }
+               line[k++] = c >= ' ' && c < 0x7f ? c : '.';
+               i++;
+               if ((i & 15) == 0 || i == length) {
+                       /*
+                        * We'll be starting a new line, or
+                        * we're finished printing this buffer;
+                        * dump out the line we've constructed,
+                        * and advance the offset.
+                        */
+                       line[k] = '\0';
+                       print_line(fh, 0, format, line);
+                       ad += 16;
+               }
        }
 }
 
@@ -462,38 +347,42 @@ void ps_clean_string(unsigned char *out, const unsigned char *in,
        }
 }
 
-static
-void dumpit_ps (FILE *fh, register const u_char *cp, register u_int length)
+void print_preamble(FILE *fh, gint format)
 {
-        register int ad, i, j, k;
-        u_char c;
-        u_char line[60];
-               static u_char binhex[16] = {
-                       '0', '1', '2', '3', '4', '5', '6', '7',
-                       '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-               u_char psline[MAX_LINE_LENGTH];
-
-        memset (line, ' ', sizeof line);
-        line[sizeof (line)-1] = 0;
-        for (ad=i=j=k=0; i<length; i++) {
-                c = *cp++;
-                line[j++] = binhex[c>>4];
-                line[j++] = binhex[c&0xf];
-                if (i&1) j++;
-                line[42+k++] = c >= ' ' && c < 0x7f ? c : '.';
-                if ((i & 15) == 15) {
-                                               ps_clean_string(psline, line, MAX_LINE_LENGTH);
-                        fprintf (fh, "(%4x  %s) hexdump\n", ad, psline);
-                        memset (line, ' ', sizeof line);
-                        line[sizeof (line)-1] = j = k = 0;
-                        ad += 16;
-                }
-        }
-
-        if (line[0] != ' ') {
-                       ps_clean_string(psline, line, MAX_LINE_LENGTH);
-                       fprintf (fh, "(%4x  %s) hexdump\n", ad, psline);
+       if (format == PR_FMT_PS)
+               print_ps_preamble(fh);
+}
+
+void print_finale(FILE *fh, gint format)
+{
+       if (format == PR_FMT_PS)
+               print_ps_finale(fh);
+}
+
+void print_line(FILE *fh, int indent, gint format, char *line)
+{
+       char            space[MAX_INDENT+1];
+       int             i;
+       int             num_spaces;
+       char            psbuffer[MAX_PS_LINE_LENGTH]; /* static sized buffer! */
+
+       if (format == PR_FMT_PS) {
+               ps_clean_string(psbuffer, line, MAX_PS_LINE_LENGTH);
+               fprintf(fh, "%d (%s) putline\n", indent, psbuffer);
+       } else {
+               /* Prepare the tabs for printing, depending on tree level */
+               num_spaces = indent * 4;
+               if (num_spaces > MAX_INDENT) {
+                       num_spaces = MAX_INDENT;
+               }
+               for (i = 0; i < num_spaces; i++) {
+                       space[i] = ' ';
                }
-        return;
+               /* The string is NUL-terminated */
+               space[num_spaces] = '\0';
 
+               fputs(space, fh);
+               fputs(line, fh);
+               putc('\n', fh);
+       }
 }