- don't free user-supplied string (via -e)
[oweals/busybox.git] / util-linux / hexdump.c
index 33648f9182f181dc0dcd5420ff75526b04dbe320..48edd70a930e2acf5ac45f68be104e288f35924e 100644 (file)
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * 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.
+ * Licensed under GPLv2 or later, see file License in this tarball for details.
  */
 
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
+#include "libbb.h"
 #include "dump.h"
-#include "busybox.h"
 
-extern off_t skip;                      /* bytes to skip */
+/* This is a NOEXEC applet. Be very careful! */
 
-extern FS *fshead;                             /* head of format strings */
-extern int blocksize;                          /* data block size */
-extern int length;                     /* max bytes to read */
-
-void addfile(char *name)
+static void bb_dump_addfile(dumper_t *dumper, char *name)
 {
-       register char *p;
+       char *p;
        FILE *fp;
-       int ch;
-       char buf[2048 + 1];
+       char *buf;
 
-       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;
+       fp = xfopen_for_read(name);
+       while ((buf = xmalloc_fgetline(fp)) != NULL) {
+               p = skip_whitespace(buf);
+               if (*p && (*p != '#')) {
+                       bb_dump_add(dumper, p);
                }
-               add(p);
+               free(buf);
        }
-       (void)fclose(fp);
+       fclose(fp);
 }
 
+static const char *const add_strings[] = {
+       "\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"",         /* b */
+       "\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"",         /* c */
+       "\"%07.7_ax \" 8/2 \"  %05u \" \"\\n\"",        /* d */
+       "\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"",         /* o */
+       "\"%07.7_ax \" 8/2 \"   %04x \" \"\\n\"",       /* x */
+};
+
+static const char add_first[] ALIGN1 = "\"%07.7_Ax\n\"";
+
+static const char hexdump_opts[] ALIGN1 = "bcdoxCe:f:n:s:v" USE_FEATURE_HEXDUMP_REVERSE("R");
+
+static const struct suffix_mult suffixes[] = {
+       { "b", 512 },
+       { "k", 1024 },
+       { "m", 1024*1024 },
+       { }
+};
+
+int hexdump_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int hexdump_main(int argc, char **argv)
 {
-//     register FS *tfs;
-       char *p;
+       dumper_t *dumper = alloc_dumper();
+       const 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 ENABLE_FEATURE_HEXDUMP_REVERSE
+       FILE *fp;
+       smallint rdump = 0;
+#endif
+
+       if (ENABLE_HD && !applet_name[2]) { /* we are "hd" */
+               ch = 'C';
+               goto hd_applet;
+       }
+
+       /* We cannot use getopt32: in hexdump options are cumulative.
+        * E.g. "hexdump -C -C file" should dump each line twice */
+       while ((ch = getopt(argc, argv, hexdump_opts)) > 0) {
+               p = strchr(hexdump_opts, ch);
+               if (!p)
+                       bb_show_usage();
+               if ((p - hexdump_opts) < 5) {
+                       bb_dump_add(dumper, add_first);
+                       bb_dump_add(dumper, add_strings[(int)(p - hexdump_opts)]);
+               }
+               /* Save a little bit of space below by omitting the 'else's. */
+               if (ch == 'C') {
+ hd_applet:
+                       bb_dump_add(dumper, "\"%08.8_Ax\n\"");
+                       bb_dump_add(dumper, "\"%08.8_ax  \" 8/1 \"%02x \" \"  \" 8/1 \"%02x \" ");
+                       bb_dump_add(dumper, "\"  |\" 16/1 \"%_p\" \"|\\n\"");
                }
+               if (ch == 'e') {
+                       bb_dump_add(dumper, optarg);
+               } /* else */
+               if (ch == 'f') {
+                       bb_dump_addfile(dumper, optarg);
+               } /* else */
+               if (ch == 'n') {
+                       dumper->dump_length = xatoi_u(optarg);
+               } /* else */
+               if (ch == 's') {
+                       dumper->dump_skip = xatoul_range_sfx(optarg, 0, LONG_MAX, suffixes);
+               } /* else */
+               if (ch == 'v') {
+                       dumper->dump_vflag = ALL;
+               }
+#if ENABLE_FEATURE_HEXDUMP_REVERSE
+               if (ch == 'R') {
+                       rdump = 1;
+               }
+#endif
        }
 
-       if (!fshead) {
-               add("\"%07.7_Ax\n\"");
-               add("\"%07.7_ax \" 8/2 \"%04x \" \"\\n\"");
+       if (!dumper->fshead) {
+               bb_dump_add(dumper, add_first);
+               bb_dump_add(dumper, "\"%07.7_ax \" 8/2 \"%04x \" \"\\n\"");
        }
 
        argv += optind;
 
-       return(dump(argv));
+#if !ENABLE_FEATURE_HEXDUMP_REVERSE
+       return bb_dump_dump(dumper, argv);
+#else
+       if (!rdump) {
+               return bb_dump_dump(dumper, argv);
+       }
+
+       /* -R: reverse of 'hexdump -Cv' */
+       fp = stdin;
+       if (!*argv) {
+               argv--;
+               goto jump_in;
+       }
+
+       do {
+               char *buf;
+               fp = xfopen_for_read(*argv);
+ jump_in:
+               while ((buf = xmalloc_fgetline(fp)) != NULL) {
+                       p = buf;
+                       while (1) {
+                               /* skip address or previous byte */
+                               while (isxdigit(*p)) p++;
+                               while (*p == ' ') p++;
+                               /* '|' char will break the line */
+                               if (!isxdigit(*p) || sscanf(p, "%x ", &ch) != 1)
+                                       break;
+                               putchar(ch);
+                       }
+                       free(buf);
+               }
+               fclose(fp);
+       } while (*++argv);
+
+       fflush_stdout_and_exit(EXIT_SUCCESS);
+#endif
 }
-/*
- * 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. 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.
- */