aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-03-06 23:14:43 +0000
committerEric Andersen <andersen@codepoet.org>2001-03-06 23:14:43 +0000
commit8b728a25a3569437978c3d32bbcbe6073595c8ed (patch)
tree4ba6914f33722fdbad501dff162ee69778a85b70
parent702ec5926f86653b5a20b7d856de6b3a4c11516f (diff)
downloadbusybox-w32-8b728a25a3569437978c3d32bbcbe6073595c8ed.tar.gz
busybox-w32-8b728a25a3569437978c3d32bbcbe6073595c8ed.tar.bz2
busybox-w32-8b728a25a3569437978c3d32bbcbe6073595c8ed.zip
I made these little simplifications a while back, bug forgot to
check this stuff in. -Erik
-rw-r--r--coreutils/du.c6
-rw-r--r--coreutils/ls.c4
-rw-r--r--du.c6
-rw-r--r--ls.c4
4 files changed, 6 insertions, 14 deletions
diff --git a/coreutils/du.c b/coreutils/du.c
index 6197b0bc1..5636de8ea 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -158,10 +158,8 @@ int du_main(int argc, char **argv)
158#ifdef BB_FEATURE_HUMAN_READABLE 158#ifdef BB_FEATURE_HUMAN_READABLE
159 case 'h': du_disp_hr = 0; break; 159 case 'h': du_disp_hr = 0; break;
160 case 'm': du_disp_hr = MEGABYTE; break; 160 case 'm': du_disp_hr = MEGABYTE; break;
161 case 'k': du_disp_hr = KILOBYTE; break;
162#else
163 case 'k': break;
164#endif 161#endif
162 case 'k': break;
165 default: 163 default:
166 show_usage(); 164 show_usage();
167 } 165 }
@@ -187,7 +185,7 @@ int du_main(int argc, char **argv)
187 return status; 185 return status;
188} 186}
189 187
190/* $Id: du.c,v 1.38 2001/02/20 06:14:07 andersen Exp $ */ 188/* $Id: du.c,v 1.39 2001/03/06 23:14:43 andersen Exp $ */
191/* 189/*
192Local Variables: 190Local Variables:
193c-file-style: "linux" 191c-file-style: "linux"
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 44bb8cddb..d8666152e 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -827,10 +827,8 @@ extern int ls_main(int argc, char **argv)
827#endif 827#endif
828#ifdef BB_FEATURE_HUMAN_READABLE 828#ifdef BB_FEATURE_HUMAN_READABLE
829 case 'h': ls_disp_hr = 0; break; 829 case 'h': ls_disp_hr = 0; break;
830 case 'k': ls_disp_hr = KILOBYTE; break;
831#else
832 case 'k': break;
833#endif 830#endif
831 case 'k': break;
834 default: 832 default:
835 goto print_usage_message; 833 goto print_usage_message;
836 } 834 }
diff --git a/du.c b/du.c
index 6197b0bc1..5636de8ea 100644
--- a/du.c
+++ b/du.c
@@ -158,10 +158,8 @@ int du_main(int argc, char **argv)
158#ifdef BB_FEATURE_HUMAN_READABLE 158#ifdef BB_FEATURE_HUMAN_READABLE
159 case 'h': du_disp_hr = 0; break; 159 case 'h': du_disp_hr = 0; break;
160 case 'm': du_disp_hr = MEGABYTE; break; 160 case 'm': du_disp_hr = MEGABYTE; break;
161 case 'k': du_disp_hr = KILOBYTE; break;
162#else
163 case 'k': break;
164#endif 161#endif
162 case 'k': break;
165 default: 163 default:
166 show_usage(); 164 show_usage();
167 } 165 }
@@ -187,7 +185,7 @@ int du_main(int argc, char **argv)
187 return status; 185 return status;
188} 186}
189 187
190/* $Id: du.c,v 1.38 2001/02/20 06:14:07 andersen Exp $ */ 188/* $Id: du.c,v 1.39 2001/03/06 23:14:43 andersen Exp $ */
191/* 189/*
192Local Variables: 190Local Variables:
193c-file-style: "linux" 191c-file-style: "linux"
diff --git a/ls.c b/ls.c
index 44bb8cddb..d8666152e 100644
--- a/ls.c
+++ b/ls.c
@@ -827,10 +827,8 @@ extern int ls_main(int argc, char **argv)
827#endif 827#endif
828#ifdef BB_FEATURE_HUMAN_READABLE 828#ifdef BB_FEATURE_HUMAN_READABLE
829 case 'h': ls_disp_hr = 0; break; 829 case 'h': ls_disp_hr = 0; break;
830 case 'k': ls_disp_hr = KILOBYTE; break;
831#else
832 case 'k': break;
833#endif 830#endif
831 case 'k': break;
834 default: 832 default:
835 goto print_usage_message; 833 goto print_usage_message;
836 } 834 }