Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/od.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/od.c (modified) (7 diffs)

branches/2.2.5/mindi-busybox/coreutils/od.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * od implementation for busybox
@@ -6 +7 @@
  *  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
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  * Original copyright notice is retained at the end of this file.
  */
 
-#include <ctype.h>
-#include <string.h>
+
+#include "libbb.h"
+#if ENABLE_DESKTOP
+/* This one provides -t (busybox's own build script needs it) */
+#include "od_bloaty.c"
+#else
 #include <getopt.h>
-#include <stdlib.h>
-#include "busybox.h"
+
 #include "dump.h"
 
-#define isdecdigit(c) (isdigit)(c)
+#define isdecdigit(c) isdigit(c)
 #define ishexdigit(c) (isxdigit)(c)
 
@@ -36 +28 @@
 odoffset(int argc, char ***argvp)
 {
-    register char *num, *p;
+    char *num, *p;
     int base;
     char *end;
@@ -140 +132 @@
 }
 
-static const char * const add_strings[] = {
+static const char *const add_strings[] = {
     "16/1 \"%3_u \" \"\\n\"",               /* a */
     "8/2 \" %06o \" \"\\n\"",               /* B, o */
@@ -156 +148 @@
 };
 
-static const char od_opts[] = "aBbcDdeFfHhIiLlOoXxv";
-
-static const char od_o2si[] = {
+static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv";
+
+static const char od_o2si[] ALIGN1 = {
     0, 1, 2, 3, 5,
     4, 6, 6, 7, 8,
@@ -165 +157 @@
 };
 
+int od_main(int argc, char **argv);
 int od_main(int argc, char **argv)
 {
@@ -199 +192 @@
     odoffset(argc, &argv);
 
-    return(bb_dump_dump(argv));
+    return bb_dump_dump(argv);
 }
+#endif /* ENABLE_DESKTOP */
 
 /*-