svn commit: trunk/busybox/coreutils

[aldot at busybox.net]

Author: aldot
Date: 2005-12-15 03:47:16 -0800 (Thu, 15 Dec 2005)
New Revision: 12897

Log:
- Stephane Billiart writes:
  Fix the compilation of head and tail.

  thanks!


Modified:
   trunk/busybox/coreutils/head.c
   trunk/busybox/coreutils/tail.c


Changeset:
Modified: trunk/busybox/coreutils/head.c
===================================================================
--- trunk/busybox/coreutils/head.c	2005-12-15 11:44:31 UTC (rev 12896)
+++ trunk/busybox/coreutils/head.c	2005-12-15 11:47:16 UTC (rev 12897)
@@ -85,7 +85,7 @@
 #endif
 			case 'n':
 				p = optarg;
-#if ENABLE_FEATURE_FANCY_HEAD
+#if defined CONFIG_FEATURE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
 			GET_COUNT:
 #endif
 				count = bb_xgetularg10(p);

Modified: trunk/busybox/coreutils/tail.c
===================================================================
--- trunk/busybox/coreutils/tail.c	2005-12-15 11:44:31 UTC (rev 12896)
+++ trunk/busybox/coreutils/tail.c	2005-12-15 11:47:16 UTC (rev 12897)
@@ -121,7 +121,7 @@
 	char *s, *buf;
 	const char *fmt;
 
-#ifdef CONFIG_FEATURE_SUSv2
+#if defined CONFIG_FEATURE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
 	/* Allow legacy syntax of an initial numeric option without -n. */
 	if (argc >=2 && ((argv[1][0] == '+') || ((argv[1][0] == '-')
 			/* && (isdigit)(argv[1][1]) */
@@ -142,7 +142,7 @@
 				count_bytes = 1;
 				/* FALLS THROUGH */
 			case 'n':
-#if ENABLE_FEATURE_FANCY_TAIL
+#if defined CONFIG_FEATURE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL
 			GET_COUNT:
 #endif
 				count = bb_xgetlarg10_sfx(optarg, tail_suffixes);