From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 18 Jan 2010 11:25:09 +0000 (+0100)
Subject: fix examples which used non-standard cut -b0-NNN
X-Git-Tag: 1_16_0~29
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=573ba4e92e920df656e80ccdb11677315843ba7f;p=oweals%2Fbusybox.git

fix examples which used non-standard cut -b0-NNN

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/coreutils/cut.c b/coreutils/cut.c
index 240ce4bb9..53f343a33 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -264,7 +264,7 @@ int cut_main(int argc UNUSED_PARAM, char **argv)
 		/* now that the lists are parsed, we need to sort them to make life
 		 * easier on us when it comes time to print the chars / fields / lines
 		 */
-		qsort(cut_lists, nlists, sizeof(struct cut_list), cmpfunc);
+		qsort(cut_lists, nlists, sizeof(cut_lists[0]), cmpfunc);
 	}
 
 	{
diff --git a/examples/var_service/dhcp_if/w_log b/examples/var_service/dhcp_if/w_log
index 34b19b373..aa36ef13b 100755
--- a/examples/var_service/dhcp_if/w_log
+++ b/examples/var_service/dhcp_if/w_log
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd log/logdir || exit 1
-watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b0-$((w-2))'
+watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))'
diff --git a/examples/var_service/ftpd/w_log b/examples/var_service/ftpd/w_log
index 34b19b373..aa36ef13b 100755
--- a/examples/var_service/ftpd/w_log
+++ b/examples/var_service/ftpd/w_log
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd log/logdir || exit 1
-watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b0-$((w-2))'
+watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))'
diff --git a/examples/var_service/httpd/w_log b/examples/var_service/httpd/w_log
index 34b19b373..aa36ef13b 100755
--- a/examples/var_service/httpd/w_log
+++ b/examples/var_service/httpd/w_log
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd log/logdir || exit 1
-watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b0-$((w-2))'
+watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))'
diff --git a/examples/var_service/ifplugd_if/w_log b/examples/var_service/ifplugd_if/w_log
index 34b19b373..aa36ef13b 100755
--- a/examples/var_service/ifplugd_if/w_log
+++ b/examples/var_service/ifplugd_if/w_log
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd log/logdir || exit 1
-watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b0-$((w-2))'
+watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))'
diff --git a/examples/var_service/inetd/w_log b/examples/var_service/inetd/w_log
index 34b19b373..aa36ef13b 100755
--- a/examples/var_service/inetd/w_log
+++ b/examples/var_service/inetd/w_log
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd log/logdir || exit 1
-watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b0-$((w-2))'
+watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))'
diff --git a/examples/var_service/ntpd/w_log b/examples/var_service/ntpd/w_log
index 34b19b373..aa36ef13b 100755
--- a/examples/var_service/ntpd/w_log
+++ b/examples/var_service/ntpd/w_log
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd log/logdir || exit 1
-watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b0-$((w-2))'
+watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))'
diff --git a/examples/var_service/tftpd/w_log b/examples/var_service/tftpd/w_log
index 34b19b373..aa36ef13b 100755
--- a/examples/var_service/tftpd/w_log
+++ b/examples/var_service/tftpd/w_log
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd log/logdir || exit 1
-watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b0-$((w-2))'
+watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))'