6 files changed, 381 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index fe889a1..5972bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 DMS Tools and Utilities
 Copyright (C) 2008, 2009 David M. Syzdek <david@syzdek.net>
 
+0.9
+        - Adding bindump utility (syzdek)
+
 0.8     2009/12/31 (syzdek)
         - Adding typedef-info utility (syzdek)
         - Adding bitcopy utility (syzdek)
diff --git a/Makefile.am b/Makefile.am
index 40c03b3..1cc1bc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,11 +39,17 @@ DEFS					= -DLOCALEDIR="\"$(localedir)\"" @DEFS@
 
 
 # automake targets
-bin_PROGRAMS                            = src/bitcopy src/bitops src/numconvert src/typedef-info
+bin_PROGRAMS                            = src/bindump src/bitcopy src/bitops src/numconvert src/typedef-info
 noinst_PROGRAMS                         =
 noinst_HEADERS                          = src/common.h
 man_MANS                                = doc/codetagger.1
 
+# macros for src/bindump
+src_bindump_DEPENDENCIES                = $(lib_LTLIBRARIES) Makefile
+src_bindump_CPPFLAGS                    = -DPROGRAM_NAME="\"bindump\"" $(AM_CPPFLAGS)
+src_bindump_SOURCES                     = $(noinst_HEADERS) \
+                                          src/bindump.c
+
 # macros for src/bitops
 src_bitcopy_DEPENDENCIES                = $(lib_LTLIBRARIES) Makefile
 src_bitcopy_CPPFLAGS                    = -DPROGRAM_NAME="\"bitcopy\"" $(AM_CPPFLAGS)
diff --git a/dmstools.xcodeproj/project.pbxproj b/dmstools.xcodeproj/project.pbxproj
index ecc73ef..c747f49 100644
--- a/dmstools.xcodeproj/project.pbxproj
+++ b/dmstools.xcodeproj/project.pbxproj
@@ -29,6 +29,7 @@
                 A051283C10D987300013335E /* bitcopy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitcopy.c; sourceTree = "<group>"; };
                 A07BC6F10F0210CF00219629 /* bitops.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitops.c; sourceTree = "<group>"; };
                 A0AE375510EAAA3C006B1ADB /* typedef-info.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "typedef-info.c"; sourceTree = "<group>"; };
+                A0AF031210F540EB00CBC28C /* bindump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bindump.c; sourceTree = "<group>"; };
                 A0B6D45D1033A3BA004E87EE /* numconvert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = numconvert.c; sourceTree = "<group>"; };
                 A0B6D4911033B0E0004E87EE /* POTFILES.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = POTFILES.in; sourceTree = "<group>"; };
                 A0C7059E10EFEFE4002DA805 /* Makevars */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = Makevars; sourceTree = "<group>"; usesTabs = 1; };
@@ -62,6 +63,7 @@
                 A00422710E0E396200B0ED60 /* src */ = {
                         isa = PBXGroup;
                         children = (
+                                A0AF031210F540EB00CBC28C /* bindump.c */,
                                 A051283C10D987300013335E /* bitcopy.c */,
                                 A07BC6F10F0210CF00219629 /* bitops.c */,
                                 A004228B0E0E3C4200B0ED60 /* codetagger.c */,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 71d128d..2d0cfa4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,5 @@
 # List of source files which contain translatable strings.
+src/bindump.c
 src/bitcopy.c
 src/bitops.c
 src/codetagger.c
diff --git a/src/bindump.c b/src/bindump.c
new file mode 100644
index 0000000..5b06eb8
--- /dev/null
+++ b/src/bindump.c
@@ -0,0 +1,361 @@
+/*
+ *  DMS Tools and Utilities
+ *  Copyright (C) 2010 David M. Syzdek <david@syzdek.net>.
+ *
+ *  @SYZDEK_LICENSE_HEADER_START@
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License Version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ *  @SYZDEK_LICENSE_HEADER_END@
+ */
+/**
+ *  @file src/bindump.c simple utility for quick bitwise operations
+ */
+/*
+ *  Simple Build:
+ *     gcc -W -Wall -O2 -c bindump.c
+ *     gcc -W -Wall -O2 -o bindump   bindump.o
+ *
+ *  GNU Libtool Build:
+ *     libtool --mode=compile gcc -W -Wall -g -O2 -c bindump.c
+ *     libtool --mode=link    gcc -W -Wall -g -O2 -o bindump bindump.lo
+ *
+ *  GNU Libtool Install:
+ *     libtool --mode=install install -c bindump /usr/local/bin/bindump
+ *
+ *  GNU Libtool Clean:
+ *     libtool --mode=clean rm -f bindump.lo bindump
+ */
+#define _SCT_SRC_BINDUMP_C 1
+
+///////////////
+//           //
+//  Headers  //
+//           //
+///////////////
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <inttypes.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <fcntl.h>
+
+
+///////////////////
+//               //
+//  i18l Support //
+//               //
+///////////////////
+
+#ifdef HAVE_GETTEXT
+#   include <gettext.h>
+#   include <libintl.h>
+#   define _(String) gettext (String)
+#   define gettext_noop(String) String
+#   define N_(String) gettext_noop (String)
+#else
+#   define _(String) (String)
+#   define N_(String) String
+#   define textdomain(Domain)
+#   define bindtextdomain(Package, Directory)
+#endif
+
+
+///////////////////
+//               //
+//  Definitions  //
+//               //
+///////////////////
+
+#ifndef PROGRAM_NAME
+#define PROGRAM_NAME "bindump"
+#endif
+#ifndef PACKAGE_BUGREPORT
+#define PACKAGE_BUGREPORT "david@syzdek.net"
+#endif
+#ifndef PACKAGE_COPYRIGHT
+#define PACKAGE_COPYRIGHT ""
+#endif
+#ifndef PACKAGE_NAME
+#define PACKAGE_NAME ""
+#endif
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION ""
+#endif
+
+#ifndef PARAMS
+#define PARAMS(protos) protos
+#endif
+
+
+//////////////////
+//              //
+//  Prototypes  //
+//              //
+//////////////////
+
+// main statement
+int main(int argc, char * argv[]);
+
+//displays usage information
+void my_usage();
+
+// displays version information
+void my_version(void);
+
+// displays data in binary notation
+char * my_byte2str(uint8_t data, char * buff);
+
+
+//////////////////
+//              //
+//  Prototypes  //
+//              //
+//////////////////
+
+/// main statement
+/// @param[in] argc   number of arguments
+/// @param[in] argv   array of arguments
+int main(int argc, char * argv[])
+{
+   int         c;
+   int         opt_index;
+   int         fd;
+   char        buff[9];
+   size_t      offset;
+   size_t      s;
+   size_t      pos;
+   size_t      len;
+   ssize_t     code;
+   uint8_t     data;
+   uint32_t    verbose;
+   const char * file;
+
+   // getopt options
+   static char   short_opt[] = "hl:o:vV";
+   static struct option long_opt[] =
+   {
+      {"help",          no_argument, 0, 'h'},
+      {"verbose",       no_argument, 0, 'v'},
+      {"version",       no_argument, 0, 'V'},
+      {NULL,            0,           0, 0  }
+   };
+
+   len      = 0;
+   offset   = 0;
+   verbose  = 0;
+   file     = "-";
+   
+   while((c = getopt_long(argc, argv, short_opt, long_opt, &opt_index)) != -1)
+   {
+      switch(c)
+      {
+         case -1:       /* no more arguments */
+         case 0:        /* long options toggles */
+            break;
+         case 'h':
+            my_usage();
+            return(0);
+         case 'l':
+            len = strtoul(optarg, NULL, 0);
+            break;
+         case 'o':
+            offset = strtoul(optarg, NULL, 0);
+            break;
+         case 'V':
+            my_version();
+            return(0);
+         case 'v':
+            verbose++;
+            break;
+         case '?':
+            fprintf(stderr, _("Try `%s --help' for more information.\n"), PROGRAM_NAME);
+            return(1);
+         default:
+            fprintf(stderr, _("%s: unrecognized option `--%c'\n"
+                  "Try `%s --help' for more information.\n"
+               ),  PROGRAM_NAME, c, PROGRAM_NAME
+            );
+            return(1);
+      };
+   };
+
+   // determines file to process (or STDIN)
+   if ((optind+1) == argc)
+      file = argv[optind];
+   else if (optind == argc)
+      file = "-";
+   else
+   {
+      fprintf(stderr, _("%s: missing required argument\n"
+            "Try `%s --help' for more information.\n"
+         ),  PROGRAM_NAME, PROGRAM_NAME
+      );
+      return(1);
+   };
+
+   // show them who we are
+   if (verbose > 1)
+      printf("%s (%s) %s\n", PROGRAM_NAME, PACKAGE_NAME, PACKAGE_VERSION);
+
+   // open file for reading or set to STDIN
+   if (!(strcmp(file, "-")))
+   {
+      if (verbose > 2)
+         printf("using stdin...\n");
+      fd = STDIN_FILENO;
+   } else {
+      if (verbose > 2)
+         printf("opening %s...\n", file);
+      if ((fd = open(file, O_RDONLY)) == -1)
+      {
+         perror(PROGRAM_NAME ": open()");
+         return(1);
+      };
+   };
+
+   // mark the starting position
+   pos = 0;
+
+   // move to the specified offset
+   if (fd != STDIN_FILENO)
+   {
+      if ((verbose > 2) && (offset))
+         printf("offsetting by %zi bytes...\n", offset);
+      if ((lseek(fd, (off_t)offset, SEEK_SET) == -1))
+      {
+         perror(PROGRAM_NAME ": lseek()");
+         if (verbose)
+            printf("closing file...\n");
+         close(fd);
+         return(1);
+      };
+      pos += offset;
+   } else if (offset) {
+      fprintf(stderr, PROGRAM_NAME ": unable to specify an offset with STDIN\n");
+      return(1);
+   };
+
+   // fill in white space so the offset markings align with the position in the file
+   if (verbose > 2)
+      printf("reading data...\n");
+   printf("offset     00       01       02       03       04       05       06       07 \n");
+   if (pos % 8)
+   {
+      printf("0%04zo0:", (pos/8));
+      for(s = 0; s < (pos % 8); s++)
+         printf("         ");
+   };
+
+   // read data from file handle
+   while((code = read(fd, &data, 1)) > 0)
+   {
+      if ((pos % 8) == 0)
+         printf("0%04zo0:", (pos/8));
+      printf(" %s", my_byte2str(data, buff)); 
+      pos += code;
+      if (!(pos % 8))
+         printf("\n");
+      if ( ((pos-offset) >= len) && (len))
+         break;
+      if ( (!(pos % 8)) && (!(pos % (8 * 23))) )
+         printf("offset     00       01       02       03       04       05       06       07 \n");
+   };
+   if (pos % 8)
+      printf("\n");
+   if (code == -1)
+   {
+      perror(PROGRAM_NAME ": read()");
+      if (verbose > 2)
+         printf("closing file...\n");
+      if (verbose > 0)
+         printf("read %zu bytes\n", (pos-offset));
+      close(fd);
+      return(1);
+   };
+
+   // close file and finish up
+   if (fd != STDIN_FILENO)
+   {
+      if (verbose > 2)
+         printf("closing file...\n");
+      close(fd);
+   };
+   if (verbose > 0)
+      printf("read %zu bytes\n", (pos-offset));
+   printf("\n");
+
+   return(0);
+}
+
+
+/// displays usage information
+void my_usage()
+{
+   // TRANSLATORS: The following strings provide usage for command. These
+   // strings are displayed if the program is passed `--help' on the command
+   // line. The two strings referenced are: PROGRAM_NAME, and
+   // PACKAGE_BUGREPORT
+   printf(_("Usage: %s [options] file\n"
+         "  -h, --help                print this help and exit\n"
+         "  -l bytes                  length of data to display\n"
+         "  -o bytes                  offset to start reading data\n"
+         "  -V, --version             print verbose messages\n"
+         "  -v, --verbose             print version number and exit\n"
+         "\n"
+         "Report bugs to <%s>.\n"
+      ), PROGRAM_NAME, PACKAGE_BUGREPORT
+   );
+   return;
+}
+
+
+/// displays version information
+void my_version(void)
+{
+   // TRANSLATORS: The following strings provide version and copyright
+   // information if the program is passed --version on the command line.
+   // The three strings referenced are: PROGRAM_NAME, PACKAGE_NAME,
+   // PACKAGE_VERSION.
+   printf(_("%s (%s) %s\n"
+         "Written by David M. Syzdek.\n"
+         "\n"
+         "%s\n"
+         "This is free software; see the source for copying conditions.  There is NO\n"
+         "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+      ), PROGRAM_NAME, PACKAGE_NAME, PACKAGE_VERSION, PACKAGE_COPYRIGHT
+   );
+   return;
+}
+
+
+// displays a byte in binary notation
+char * my_byte2str(uint8_t data, char * buff)
+{
+   uint32_t b;
+   for(b = 0; b < 8; b++)
+      buff[b] = (data & (0x01 << b)) ? '1' : '0';
+   buff[b] = '\0';
+   return(buff);
+}
+
+// end of source file
diff --git a/src/bindump.mak b/src/bindump.mak
new file mode 100644
index 0000000..3bba54c
--- /dev/null
+++ b/src/bindump.mak
@@ -0,0 +1,7 @@
+bindump: Makefile bindump.c bindump.mak
+        $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -c bindump.c
+        $(LIBTOOL) --mode=link    --tag=CC $(CC) $(CFLAGS) -o bindump bindump.lo
+
+bindump-clean:
+        $(LIBTOOL) --mode=clean rm -f bindump.lo bindump
+