aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkw <markw@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-04-09 23:00:07 +0000
committermarkw <markw@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-04-09 23:00:07 +0000
commit8dbccce70837bd7b541957f58221ca162a44dca8 (patch)
treeb5d0ca9bb0b258199e9b22e24355cf398bf6b7be
parent88ea4d5576ceec648bff7f9bbf919fd3ecdff67b (diff)
downloadbusybox-w32-8dbccce70837bd7b541957f58221ca162a44dca8.tar.gz
busybox-w32-8dbccce70837bd7b541957f58221ca162a44dca8.tar.bz2
busybox-w32-8dbccce70837bd7b541957f58221ca162a44dca8.zip
Fixed option parsing. Grep would continue grepping, even when given a bad /
invalid option. Closes bug #1146. git-svn-id: svn://busybox.net/trunk/busybox@2289 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--findutils/grep.c2
-rw-r--r--grep.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/findutils/grep.c b/findutils/grep.c
index 475b4ef21..8c6797647 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -232,6 +232,8 @@ extern int grep_main(int argc, char **argv)
232 before_buf = (char **)calloc(lines_before, sizeof(char *)); 232 before_buf = (char **)calloc(lines_before, sizeof(char *));
233 break; 233 break;
234#endif /* BB_FEATURE_GREP_CONTEXT */ 234#endif /* BB_FEATURE_GREP_CONTEXT */
235 default:
236 show_usage();
235 } 237 }
236 } 238 }
237 239
diff --git a/grep.c b/grep.c
index 475b4ef21..8c6797647 100644
--- a/grep.c
+++ b/grep.c
@@ -232,6 +232,8 @@ extern int grep_main(int argc, char **argv)
232 before_buf = (char **)calloc(lines_before, sizeof(char *)); 232 before_buf = (char **)calloc(lines_before, sizeof(char *));
233 break; 233 break;
234#endif /* BB_FEATURE_GREP_CONTEXT */ 234#endif /* BB_FEATURE_GREP_CONTEXT */
235 default:
236 show_usage();
235 } 237 }
236 } 238 }
237 239