From 573ba4e92e920df656e80ccdb11677315843ba7f Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 18 Jan 2010 12:25:09 +0100 Subject: [PATCH] fix examples which used non-standard cut -b0-NNN Signed-off-by: Denys Vlasenko --- coreutils/cut.c | 2 +- examples/var_service/dhcp_if/w_log | 2 +- examples/var_service/ftpd/w_log | 2 +- examples/var_service/httpd/w_log | 2 +- examples/var_service/ifplugd_if/w_log | 2 +- examples/var_service/inetd/w_log | 2 +- examples/var_service/ntpd/w_log | 2 +- examples/var_service/tftpd/w_log | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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))'