diff options
| author | Alexander Pyhalov <apyhalov@gmail.com> | 2017-12-19 08:48:38 +0300 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-01-09 14:12:32 -0500 |
| commit | d2d52addd50254d1b7c318c6784172d8d7de20c6 (patch) | |
| tree | 0c378517379e7cd6076434359ca24fc303fbb66b /usr/src/cmd/diff3/diff3.sh | |
| parent | da61ddb06d5ac64f86b2dfb126769267c1ebcd67 (diff) | |
| download | illumos-gate-d2d52addd50254d1b7c318c6784172d8d7de20c6.tar.gz | |
8858 /usr/bin/grep doesn't support -E option
4580 /usr/bin/grep can't handle multibyte characters
8929 8868 tests are not delivered with system/test/utiltest
8860 Example in grep(1) is incorrect
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Yuri Pankov <yuripv@gmx.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/cmd/diff3/diff3.sh')
| -rw-r--r-- | usr/src/cmd/diff3/diff3.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/cmd/diff3/diff3.sh b/usr/src/cmd/diff3/diff3.sh index fe115c517e..f29059a587 100644 --- a/usr/src/cmd/diff3/diff3.sh +++ b/usr/src/cmd/diff3/diff3.sh @@ -27,8 +27,6 @@ # Copyright (c) 1999, 2001 by Sun Microsystems, Inc. # All rights reserved. -#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.4 */ - usage="usage: diff3 file1 file2 file3" # mktmpdir - Create a private (mode 0700) temporary directory inside of /tmp @@ -80,7 +78,7 @@ fi STATUS=$? if [ $STATUS -eq 1 ] then - /usr/xpg4/bin/grep -q "^[<>]" $tmpdir/d3a$$ + /usr/bin/grep -q "^[<>]" $tmpdir/d3a$$ RET=$? if [ $RET -eq 1 ] then @@ -105,7 +103,7 @@ fi STATUS=$? if [ $STATUS -eq 1 ] then - /usr/xpg4/bin/grep -q "^[<>]" $tmpdir/d3b$$ + /usr/bin/grep -q "^[<>]" $tmpdir/d3b$$ RET=$? if [ $RET -eq 1 ] then |