tidy up

update completions for updated options & use -- with TUI pager command

Author: genivia-inc

completions/bash/ug

@@ -285,15 +285,15 @@ cat <<'END'
 -J NUM, --jobs=NUM Specifies the number of threads spawned to search files.
 -j, --smart-case Perform case insensitive matching, unless a pattern is specified with a literal upper case letter.
 --json Output file matches in JSON.
--K [MIN,][MAX], --range=[MIN,][MAX], --min-line=MIN, --max-line=MAX Start searching at line MIN, stop at line MAX when specified.
+-K [MIN,][MAX], --range=[MIN,][MAX], --min-line=MIN, --max-line=MAX Start searching at line MIN, stop reading input after line MAX.
 -k, --column-number The column number of a pattern match is displayed in front of the respective matched line, starting at column 1.
 -L, --files-without-match Only the names of files not containing selected lines are written to standard output.
 -l, --files-with-matches Only the names of files containing selected lines are written to standard output.
 --label=LABEL Displays the LABEL value when input is read from standard input where a file name would normally be printed in the output.
 --line-buffered Force output to be line buffered instead of block buffered.
 --lines Boolean line matching mode for option --bool, the default mode.
 -M MAGIC, --file-magic=MAGIC Only search files matching the magic signature pattern MAGIC.
--m [MIN,][MAX], --min-count=MIN, --max-count=MAX Require MIN matches, stop after MAX matches when specified.
+-m [MIN,][MAX], --min-count=MIN, --max-count=MAX Require MIN matches, stop reading input upon MAX matches.
 --match Match all lines.
 --max-files=NUM Restrict the number of files matched to NUM.
 --max-size=MAX Only search files whose physical size does not exceed MAX bytes.

completions/fish/ug+.fish

@@ -63,15 +63,15 @@ complete -c ug+ -l index -d 'Perform fast index-based recursive search'
 complete -c ug+ -s J -r -l jobs -d 'Specifies the number of threads spawned to search files'
 complete -c ug+ -s j -l smart-case -d 'Perform case insensitive matching, unless a pattern is specified with a literal upper case letter'
 complete -c ug+ -l json -d 'Output file matches in JSON'
-complete -c ug+ -s K -r -l range -l min-line -l max-line -d 'Start searching at line MIN, stop at line MAX when specified'
+complete -c ug+ -s K -r -l range -l min-line -l max-line -d 'Start searching at line MIN, stop reading input after line MAX'
 complete -c ug+ -s k -l column-number -d 'The column number of a pattern match is displayed in front of the respective matched line, starting at column 1'
 complete -c ug+ -s L -l files-without-match -d 'Only the names of files not containing selected lines are written to standard output'
 complete -c ug+ -s l -l files-with-matches -d 'Only the names of files containing selected lines are written to standard output'
 complete -c ug+ -l label -d 'Displays the LABEL value when input is read from standard input where a file name would normally be printed in the output'
 complete -c ug+ -l line-buffered -d 'Force output to be line buffered instead of block buffered'
 complete -c ug+ -l lines -d 'Boolean line matching mode for option --bool, the default mode'
 complete -c ug+ -s M -r -l file-magic -d 'Only search files matching the magic signature pattern MAGIC'
-complete -c ug+ -s m -r -l min-count -l max-count -d 'Require MIN matches, stop after MAX matches when specified'
+complete -c ug+ -s m -r -l min-count -l max-count -d 'Require MIN matches, stop reading input upon MAX matches'
 complete -c ug+ -l match -d 'Match all lines'
 complete -c ug+ -l max-files -d 'Restrict the number of files matched to NUM'
 complete -c ug+ -l max-size -d 'Only search files whose physical size does not exceed MAX bytes'

completions/fish/ug.fish

@@ -63,15 +63,15 @@ complete -c ug -l index -d 'Perform fast index-based recursive search'
 complete -c ug -s J -r -l jobs -d 'Specifies the number of threads spawned to search files'
 complete -c ug -s j -l smart-case -d 'Perform case insensitive matching, unless a pattern is specified with a literal upper case letter'
 complete -c ug -l json -d 'Output file matches in JSON'
-complete -c ug -s K -r -l range -l min-line -l max-line -d 'Start searching at line MIN, stop at line MAX when specified'
+complete -c ug -s K -r -l range -l min-line -l max-line -d 'Start searching at line MIN, stop reading input after line MAX'
 complete -c ug -s k -l column-number -d 'The column number of a pattern match is displayed in front of the respective matched line, starting at column 1'
 complete -c ug -s L -l files-without-match -d 'Only the names of files not containing selected lines are written to standard output'
 complete -c ug -s l -l files-with-matches -d 'Only the names of files containing selected lines are written to standard output'
 complete -c ug -l label -d 'Displays the LABEL value when input is read from standard input where a file name would normally be printed in the output'
 complete -c ug -l line-buffered -d 'Force output to be line buffered instead of block buffered'
 complete -c ug -l lines -d 'Boolean line matching mode for option --bool, the default mode'
 complete -c ug -s M -r -l file-magic -d 'Only search files matching the magic signature pattern MAGIC'
-complete -c ug -s m -r -l min-count -l max-count -d 'Require MIN matches, stop after MAX matches when specified'
+complete -c ug -s m -r -l min-count -l max-count -d 'Require MIN matches, stop reading input upon MAX matches'
 complete -c ug -l match -d 'Match all lines'
 complete -c ug -l max-files -d 'Restrict the number of files matched to NUM'
 complete -c ug -l max-size -d 'Only search files whose physical size does not exceed MAX bytes'

completions/fish/ugrep+.fish

@@ -63,15 +63,15 @@ complete -c ugrep+ -l index -d 'Perform fast index-based recursive search'
 complete -c ugrep+ -s J -r -l jobs -d 'Specifies the number of threads spawned to search files'
 complete -c ugrep+ -s j -l smart-case -d 'Perform case insensitive matching, unless a pattern is specified with a literal upper case letter'
 complete -c ugrep+ -l json -d 'Output file matches in JSON'
-complete -c ugrep+ -s K -r -l range -l min-line -l max-line -d 'Start searching at line MIN, stop at line MAX when specified'
+complete -c ugrep+ -s K -r -l range -l min-line -l max-line -d 'Start searching at line MIN, stop reading input after line MAX'
 complete -c ugrep+ -s k -l column-number -d 'The column number of a pattern match is displayed in front of the respective matched line, starting at column 1'
 complete -c ugrep+ -s L -l files-without-match -d 'Only the names of files not containing selected lines are written to standard output'
 complete -c ugrep+ -s l -l files-with-matches -d 'Only the names of files containing selected lines are written to standard output'
 complete -c ugrep+ -l label -d 'Displays the LABEL value when input is read from standard input where a file name would normally be printed in the output'
 complete -c ugrep+ -l line-buffered -d 'Force output to be line buffered instead of block buffered'
 complete -c ugrep+ -l lines -d 'Boolean line matching mode for option --bool, the default mode'
 complete -c ugrep+ -s M -r -l file-magic -d 'Only search files matching the magic signature pattern MAGIC'
-complete -c ugrep+ -s m -r -l min-count -l max-count -d 'Require MIN matches, stop after MAX matches when specified'
+complete -c ugrep+ -s m -r -l min-count -l max-count -d 'Require MIN matches, stop reading input upon MAX matches'
 complete -c ugrep+ -l match -d 'Match all lines'
 complete -c ugrep+ -l max-files -d 'Restrict the number of files matched to NUM'
 complete -c ugrep+ -l max-size -d 'Only search files whose physical size does not exceed MAX bytes'

completions/fish/ugrep.fish

@@ -63,15 +63,15 @@ complete -c ugrep -l index -d 'Perform fast index-based recursive search'
 complete -c ugrep -s J -r -l jobs -d 'Specifies the number of threads spawned to search files'
 complete -c ugrep -s j -l smart-case -d 'Perform case insensitive matching, unless a pattern is specified with a literal upper case letter'
 complete -c ugrep -l json -d 'Output file matches in JSON'
-complete -c ugrep -s K -r -l range -l min-line -l max-line -d 'Start searching at line MIN, stop at line MAX when specified'
+complete -c ugrep -s K -r -l range -l min-line -l max-line -d 'Start searching at line MIN, stop reading input after line MAX'
 complete -c ugrep -s k -l column-number -d 'The column number of a pattern match is displayed in front of the respective matched line, starting at column 1'
 complete -c ugrep -s L -l files-without-match -d 'Only the names of files not containing selected lines are written to standard output'
 complete -c ugrep -s l -l files-with-matches -d 'Only the names of files containing selected lines are written to standard output'
 complete -c ugrep -l label -d 'Displays the LABEL value when input is read from standard input where a file name would normally be printed in the output'
 complete -c ugrep -l line-buffered -d 'Force output to be line buffered instead of block buffered'
 complete -c ugrep -l lines -d 'Boolean line matching mode for option --bool, the default mode'
 complete -c ugrep -s M -r -l file-magic -d 'Only search files matching the magic signature pattern MAGIC'
-complete -c ugrep -s m -r -l min-count -l max-count -d 'Require MIN matches, stop after MAX matches when specified'
+complete -c ugrep -s m -r -l min-count -l max-count -d 'Require MIN matches, stop reading input upon MAX matches'
 complete -c ugrep -l match -d 'Match all lines'
 complete -c ugrep -l max-files -d 'Restrict the number of files matched to NUM'
 complete -c ugrep -l max-size -d 'Only search files whose physical size does not exceed MAX bytes'

completions/zsh/_ug

@@ -70,15 +70,15 @@ $matchers{-G,--basic-regexp}'[Interpret patterns as basic regular expressions (B
 {-J,--jobs=-}'[Specifies the number of threads spawned to search files]:NUM:( )'
 {-j,--smart-case}'[Perform case insensitive matching, unless a pattern is specified with a literal upper case letter]'
 --json'[Output file matches in JSON]'
-{-K,--range=-,--min-line=-,--max-line=-}'[Start searching at line MIN, stop at line MAX when specified]:MIN,MAX:( )'
+{-K,--range=-,--min-line=-,--max-line=-}'[Start searching at line MIN, stop reading input after line MAX]:MIN,MAX:( )'
 {-k,--column-number}'[The column number of a pattern match is displayed in front of the respective matched line, starting at column 1]'
 {-L,--files-without-match}'[Only the names of files not containing selected lines are written to standard output]'
 {-l,--files-with-matches}'[Only the names of files containing selected lines are written to standard output]'
 --label=-'[Displays the LABEL value when input is read from standard input where a file name would normally be printed in the output]'
 --line-buffered'[Force output to be line buffered instead of block buffered]'
 --lines'[Boolean line matching mode for option --bool, the default mode]'
 '(1)*'{-M,--file-magic=-}'[Only search files matching the magic signature pattern MAGIC]:PATTERN:( )'
-{-m,--min-count=-,--max-count=-}'[Require MIN matches, stop after MAX matches when specified]:MIN,MAX:( )::(1 1, 1,10)'
+{-m,--min-count=-,--max-count=-}'[Require MIN matches, stop reading input upon MAX matches]:MIN,MAX:( )::(1 1, 1,10)'
 --match'[Match all lines]'
 --max-files=-'[Restrict the number of files matched to NUM]'
 --max-size=-'[Only search files whose physical size does not exceed MAX bytes]'

completions/zsh/_ug+

@@ -70,15 +70,15 @@ $matchers{-G,--basic-regexp}'[Interpret patterns as basic regular expressions (B
 {-J,--jobs=-}'[Specifies the number of threads spawned to search files]:NUM:( )'
 {-j,--smart-case}'[Perform case insensitive matching, unless a pattern is specified with a literal upper case letter]'
 --json'[Output file matches in JSON]'
-{-K,--range=-,--min-line=-,--max-line=-}'[Start searching at line MIN, stop at line MAX when specified]:MIN,MAX:( )'
+{-K,--range=-,--min-line=-,--max-line=-}'[Start searching at line MIN, stop reading input after line MAX]:MIN,MAX:( )'
 {-k,--column-number}'[The column number of a pattern match is displayed in front of the respective matched line, starting at column 1]'
 {-L,--files-without-match}'[Only the names of files not containing selected lines are written to standard output]'
 {-l,--files-with-matches}'[Only the names of files containing selected lines are written to standard output]'
 --label=-'[Displays the LABEL value when input is read from standard input where a file name would normally be printed in the output]'
 --line-buffered'[Force output to be line buffered instead of block buffered]'
 --lines'[Boolean line matching mode for option --bool, the default mode]'
 '(1)*'{-M,--file-magic=-}'[Only search files matching the magic signature pattern MAGIC]:PATTERN:( )'
-{-m,--min-count=-,--max-count=-}'[Require MIN matches, stop after MAX matches when specified]:MIN,MAX:( )::(1 1, 1,10)'
+{-m,--min-count=-,--max-count=-}'[Require MIN matches, stop reading input upon MAX matches]:MIN,MAX:( )::(1 1, 1,10)'
 --match'[Match all lines]'
 --max-files=-'[Restrict the number of files matched to NUM]'
 --max-size=-'[Only search files whose physical size does not exceed MAX bytes]'

completions/zsh/_ugrep

@@ -70,15 +70,15 @@ $matchers{-G,--basic-regexp}'[Interpret patterns as basic regular expressions (B
 {-J,--jobs=-}'[Specifies the number of threads spawned to search files]:NUM:( )'
 {-j,--smart-case}'[Perform case insensitive matching, unless a pattern is specified with a literal upper case letter]'
 --json'[Output file matches in JSON]'
-{-K,--range=-,--min-line=-,--max-line=-}'[Start searching at line MIN, stop at line MAX when specified]:MIN,MAX:( )'
+{-K,--range=-,--min-line=-,--max-line=-}'[Start searching at line MIN, stop reading input after line MAX]:MIN,MAX:( )'
 {-k,--column-number}'[The column number of a pattern match is displayed in front of the respective matched line, starting at column 1]'
 {-L,--files-without-match}'[Only the names of files not containing selected lines are written to standard output]'
 {-l,--files-with-matches}'[Only the names of files containing selected lines are written to standard output]'
 --label=-'[Displays the LABEL value when input is read from standard input where a file name would normally be printed in the output]'
 --line-buffered'[Force output to be line buffered instead of block buffered]'
 --lines'[Boolean line matching mode for option --bool, the default mode]'
 '(1)*'{-M,--file-magic=-}'[Only search files matching the magic signature pattern MAGIC]:PATTERN:( )'
-{-m,--min-count=-,--max-count=-}'[Require MIN matches, stop after MAX matches when specified]:MIN,MAX:( )::(1 1, 1,10)'
+{-m,--min-count=-,--max-count=-}'[Require MIN matches, stop reading input upon MAX matches]:MIN,MAX:( )::(1 1, 1,10)'
 --match'[Match all lines]'
 --max-files=-'[Restrict the number of files matched to NUM]'
 --max-size=-'[Only search files whose physical size does not exceed MAX bytes]'

completions/zsh/_ugrep+

@@ -70,15 +70,15 @@ $matchers{-G,--basic-regexp}'[Interpret patterns as basic regular expressions (B
 {-J,--jobs=-}'[Specifies the number of threads spawned to search files]:NUM:( )'
 {-j,--smart-case}'[Perform case insensitive matching, unless a pattern is specified with a literal upper case letter]'
 --json'[Output file matches in JSON]'
-{-K,--range=-,--min-line=-,--max-line=-}'[Start searching at line MIN, stop at line MAX when specified]:MIN,MAX:( )'
+{-K,--range=-,--min-line=-,--max-line=-}'[Start searching at line MIN, stop reading input after line MAX]:MIN,MAX:( )'
 {-k,--column-number}'[The column number of a pattern match is displayed in front of the respective matched line, starting at column 1]'
 {-L,--files-without-match}'[Only the names of files not containing selected lines are written to standard output]'
 {-l,--files-with-matches}'[Only the names of files containing selected lines are written to standard output]'
 --label=-'[Displays the LABEL value when input is read from standard input where a file name would normally be printed in the output]'
 --line-buffered'[Force output to be line buffered instead of block buffered]'
 --lines'[Boolean line matching mode for option --bool, the default mode]'
 '(1)*'{-M,--file-magic=-}'[Only search files matching the magic signature pattern MAGIC]:PATTERN:( )'
-{-m,--min-count=-,--max-count=-}'[Require MIN matches, stop after MAX matches when specified]:MIN,MAX:( )::(1 1, 1,10)'
+{-m,--min-count=-,--max-count=-}'[Require MIN matches, stop reading input upon MAX matches]:MIN,MAX:( )::(1 1, 1,10)'
 --match'[Match all lines]'
 --max-files=-'[Restrict the number of files matched to NUM]'
 --max-size=-'[Only search files whose physical size does not exceed MAX bytes]'

src/query.cpp

@@ -2529,7 +2529,7 @@ void Query::view()
       else
       {
 #ifdef OS_WIN
-        if (filename.find('"') != std::string::npos)
+        if (filename.empty() || filename.at(0) == '/' || filename.find('"') != std::string::npos)
         {
           // illegal filename in Windows, should never happen, but just in case
           Screen::alert();
@@ -2548,8 +2548,8 @@ void Query::view()
           Screen::alert();
           return;
         }
-        // view file in the pager using system() call
-        command.append(" '").append(filename).append("'");
+        // view file in the pager using system() call, double -- ends options
+        command.append(" -- '").append(filename).append("'");
 #endif
       }