svn commit: trunk/busybox/coreutils

[vodz at busybox.net]

Author: vodz
Date: 2006-01-30 03:15:11 -0800 (Mon, 30 Jan 2006)
New Revision: 13704

Log:
support GNU suffixes for fancy mode: b(512), k(1024) and m(1024*1024)

Modified:
   trunk/busybox/coreutils/head.c


Changeset:
Modified: trunk/busybox/coreutils/head.c
===================================================================
--- trunk/busybox/coreutils/head.c	2006-01-30 10:49:14 UTC (rev 13703)
+++ trunk/busybox/coreutils/head.c	2006-01-30 11:15:11 UTC (rev 13704)
@@ -25,6 +25,15 @@
 #endif
 	;
 
+#if ENABLE_FEATURE_FANCY_HEAD
+static const struct suffix_mult head_suffixes[] = {
+	{ "b", 512 },
+	{ "k", 1024 },
+	{ "m", 1024*1024 },
+	{ NULL, 0 }
+};
+#endif
+                                        
 static const char header_fmt_str[] = "\n==> %s <==\n";
 
 int head_main(int argc, char **argv)
@@ -75,7 +84,14 @@
 #if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
 			GET_COUNT:
 #endif
+
+#if !ENABLE_FEATURE_FANCY_HEAD
 				count = bb_xgetularg10(p);
+#else
+				count = bb_xgetularg_bnd_sfx(p, 10, 
+								0, ULONG_MAX, 
+								head_suffixes);
+#endif
 				break;
 			default:
 				bb_show_usage();