From 224c112e0509ab2aeb28de05efbbce9486a55eff Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Sun, 4 Feb 2018 11:41:06 -0500 Subject: argv: tweak the meaning of zero This commit makes a small tweak to the --max-columns flag. Namely, if the value of the flag is 0, then ripgrep behaves as-if the flag were absent. This is useful in the context of ripgrep reading configuration from the environment. For example, an end user might set --max-columns=150, but we should permit the user to disable this setting when needed. Using -M0 is a nice way to do that. We do this because a zero value for --max-columns isn't particularly meaningful. We do leave the --max-count, --max-filesize and --maxdepth flags alone though, since a zero value for those flags is potentially meaningful. (--max-count even has tests for ripgrep's behavior when given a value of 0.) --- src/app.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/app.rs') diff --git a/src/app.rs b/src/app.rs index 05f411ac..3591dc22 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1034,6 +1034,8 @@ fn flag_max_columns(args: &mut Vec) { const LONG: &str = long!("\ Don't print lines longer than this limit in bytes. Longer lines are omitted, and only the number of matches in that line is printed. + +When this flag is omitted or is set to 0, then it has no effect. "); let arg = RGArg::flag("max-columns", "NUM").short("M") .help(SHORT).long_help(LONG) -- cgit v1.2.3