3 files changed, 171 insertions, 0 deletions

diff --git a/util-linux/Makefile b/util-linux/Makefile
index ddecf50d3..0971acadc 100644
--- a/util-linux/Makefile
+++ b/util-linux/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_FDFLUSH)		+= fdflush.o
 obj-$(CONFIG_FREERAMDISK)       += freeramdisk.o
 obj-$(CONFIG_FSCK_MINIX)        += fsck_minix.o
 obj-$(CONFIG_GETOPT)            += getopt.o
+obj-$(CONFIG_HEXDUMP)           += hexdump.o
 obj-$(CONFIG_MKFS_MINIX)        += mkfs_minix.o
 obj-$(CONFIG_MKSWAP)            += mkswap.o
 obj-$(CONFIG_MORE)              += more.o
diff --git a/util-linux/config.in b/util-linux/config.in
index 3eb8ee0b5..50a874d6c 100644
--- a/util-linux/config.in
+++ b/util-linux/config.in
@@ -13,6 +13,7 @@ bool 'fdflush'		    CONFIG_FDFLUSH
 bool 'freeramdisk'          CONFIG_FREERAMDISK
 bool 'fsck_minix'           CONFIG_FSCK_MINIX
 bool 'getopt'               CONFIG_GETOPT
+bool 'hexdump'              CONFIG_HEXDUMP  
 bool 'mkfs_minix'           CONFIG_MKFS_MINIX
 bool 'mkswap'               CONFIG_MKSWAP
 bool 'more'                 CONFIG_MORE
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
new file mode 100644
index 000000000..4510a5e66
--- /dev/null
+++ b/util-linux/hexdump.c
@@ -0,0 +1,169 @@
+/*
+ * hexdump implementation for busybox
+ * Based on code from util-linux v 2.11l
+ *
+ * Copyright (c) 1989
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * 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
+ *
+ * Original copyright notice is retained at the end of this file.
+ */
+
+#include <getopt.h>
+#include <stdlib.h>
+#include <string.h>
+#include "dump.h"
+#include "busybox.h"
+
+extern off_t skip;                      /* bytes to skip */
+
+extern FS *fshead;                              /* head of format strings */
+extern int blocksize;                           /* data block size */
+extern int length;                      /* max bytes to read */
+
+void addfile(char *name)
+{
+        register char *p;
+        FILE *fp;
+        int ch;
+        char buf[2048 + 1];
+
+        if (!(fp = fopen(name, "r"))) {
+                error_msg_and_die("hexdump: can't read %s.\n", name);
+        }
+        while (fgets(buf, sizeof(buf), fp)) {
+                if (!(p = index(buf, '\n'))) {
+                        error_msg("hexdump: line too long.\n");
+                        while ((ch = getchar()) != '\n' && ch != EOF);
+                        continue;
+                }
+                *p = '\0';
+                for (p = buf; *p && isspace(*p); ++p);
+                if (!*p || *p == '#') {
+                        continue;
+                }
+                add(p);
+        }
+        (void)fclose(fp);
+}
+
+int hexdump_main(int argc, char **argv)
+{
+//      register FS *tfs;
+        char *p;
+        int ch;
+        extern enum _vflag vflag;
+        vflag = FIRST;
+        length = -1;
+
+        while ((ch = getopt(argc, argv, "bcde:f:n:os:vx")) != EOF) {
+                switch (ch) {
+                case 'b':
+                        add("\"%07.7_Ax\n\"");
+                        add("\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"");
+                        break;
+                case 'c':
+                        add("\"%07.7_Ax\n\"");
+                        add("\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"");
+                        break;
+                case 'd':
+                        add("\"%07.7_Ax\n\"");
+                        add("\"%07.7_ax \" 8/2 \"  %05u \" \"\\n\"");
+                        break;
+                case 'e':
+                        add(optarg);
+                        break;
+                case 'f':
+                        addfile(optarg);
+                        break;
+                case 'n':
+                        if ((length = atoi(optarg)) < 0) {
+                                error_msg_and_die("hexdump: bad length value.\n");
+                        }
+                        break;
+                case 'o':
+                        add("\"%07.7_Ax\n\"");
+                        add("\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"");
+                        break;
+                case 's':
+                        if ((skip = strtol(optarg, &p, 0)) < 0) {
+                                error_msg_and_die("hexdump: bad skip value.\n");
+                        }
+                        switch(*p) {
+                                case 'b':
+                                        skip *= 512;
+                                        break;
+                                case 'k':
+                                        skip *= 1024;
+                                        break;
+                                case 'm':
+                                        skip *= 1048576;
+                                        break;
+                        }
+                        break;
+                case 'v':
+                        vflag = ALL;
+                        break;
+                case 'x':
+                        add("\"%07.7_Ax\n\"");
+                        add("\"%07.7_ax \" 8/2 \"   %04x \" \"\\n\"");
+                        break;
+                case '?':
+                        show_usage();
+                }
+        }
+
+        if (!fshead) {
+                add("\"%07.7_Ax\n\"");
+                add("\"%07.7_ax \" 8/2 \"%04x \" \"\\n\"");
+        }
+
+        argv += optind;
+
+        return(dump(argv));
+}
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */