X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fod.c;h=edcd12a54d39e720bb52e2dea0920ddb55caf0a2;hb=4eed2c6c5092ed95b8ee6d994106c54a9fc6ed3e;hp=228db19ac17240d52273b23e9c544fb79baa2cfd;hpb=f2cbb03a378aa48f2e08b64877d54da3fab4ea6a;p=oweals%2Fbusybox.git

diff --git a/coreutils/od.c b/coreutils/od.c
index 228db19ac..edcd12a54 100644
--- a/coreutils/od.c
+++ b/coreutils/od.c
@@ -4,13 +4,28 @@
  * Based on code from util-linux v 2.11l
  *
  * Copyright (c) 1990
- *	The Regents of the University of California.  All rights reserved.
+ * The Regents of the University of California.  All rights reserved.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Original copyright notice is retained at the end of this file.
  */
+//config:config OD
+//config:	bool "od (11 kb)"
+//config:	default y
+//config:	help
+//config:	  od is used to dump binary files in octal and other formats.
 
+//applet:IF_OD(APPLET(od, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_OD) += od.o
+
+//usage:#if !ENABLE_DESKTOP
+//usage:#define od_trivial_usage
+//usage:       "[-aBbcDdeFfHhIiLlOovXx] [FILE]"
+//usage:#define od_full_usage "\n\n"
+//usage:       "Print FILE (or stdin) unambiguously, as octal bytes by default"
+//usage:#endif
 
 #include "libbb.h"
 #if ENABLE_DESKTOP
@@ -110,7 +125,7 @@ odoffset(dumper_t *dumper, int argc, char ***argvp)
 			 * the offset is changed as well.  This isn't pretty,
 			 * but it's easy.
 			 */
-#define	TYPE_OFFSET	7
+#define TYPE_OFFSET 7
 			{
 				char x_or_d;
 				if (base == 16) {
@@ -130,19 +145,19 @@ odoffset(dumper_t *dumper, int argc, char ***argvp)
 }
 
 static const char *const add_strings[] = {
-	"16/1 \"%3_u \" \"\\n\"",				/* a */
-	"8/2 \" %06o \" \"\\n\"",				/* B, o */
-	"16/1 \"%03o \" \"\\n\"",				/* b */
-	"16/1 \"%3_c \" \"\\n\"",				/* c */
-	"8/2 \"  %05u \" \"\\n\"",				/* d */
-	"4/4 \"     %010u \" \"\\n\"",			/* D */
-	"2/8 \"          %21.14e \" \"\\n\"",	/* e (undocumented in od), F */
-	"4/4 \" %14.7e \" \"\\n\"",				/* f */
-	"4/4 \"       %08x \" \"\\n\"",			/* H, X */
-	"8/2 \"   %04x \" \"\\n\"",				/* h, x */
-	"4/4 \"    %11d \" \"\\n\"",			/* I, L, l */
-	"8/2 \" %6d \" \"\\n\"",				/* i */
-	"4/4 \"    %011o \" \"\\n\"",			/* O */
+	"16/1 \"%3_u \" \"\\n\"",              /* a */
+	"8/2 \" %06o \" \"\\n\"",              /* B, o */
+	"16/1 \"%03o \" \"\\n\"",              /* b */
+	"16/1 \"%3_c \" \"\\n\"",              /* c */
+	"8/2 \"  %05u \" \"\\n\"",             /* d */
+	"4/4 \"     %010u \" \"\\n\"",         /* D */
+	"2/8 \"          %21.14e \" \"\\n\"",  /* e (undocumented in od), F */
+	"4/4 \" %14.7e \" \"\\n\"",            /* f */
+	"4/4 \"       %08x \" \"\\n\"",        /* H, X */
+	"8/2 \"   %04x \" \"\\n\"",            /* h, x */
+	"4/4 \"    %11d \" \"\\n\"",           /* I, L, l */
+	"8/2 \" %6d \" \"\\n\"",               /* i */
+	"4/4 \"    %011o \" \"\\n\"",          /* O */
 };
 
 static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv";
@@ -174,7 +189,7 @@ int od_main(int argc, char **argv)
 				bb_dump_add(dumper, "\"         \"");
 			}
 			bb_dump_add(dumper, add_strings[(int)od_o2si[(p - od_opts)]]);
-		} else {	/* P, p, s, w, or other unhandled */
+		} else {  /* P, p, s, w, or other unhandled */
 			bb_show_usage();
 		}
 	}