-
Notifications
You must be signed in to change notification settings - Fork 340
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #132 from mzz2017/master
fix: a problem that cannot read mtr output from pipe
- Loading branch information
Showing
3 changed files
with
42 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package common | ||
|
|
||
| import ( | ||
| "bytes" | ||
| ) | ||
|
|
||
| // ScanLines scan lines but keep the suffix \r and \n | ||
| func ScanLines(data []byte, atEOF bool) (advance int, token []byte, err error) { | ||
| if atEOF && len(data) == 0 { | ||
| return 0, nil, nil | ||
| } | ||
| if i, j := bytes.IndexByte(data, '\r'), bytes.IndexByte(data, '\n'); i >= 0 || j >= 0 { | ||
| if i >= 0 && j >= 0 { | ||
| if i+1 == j { | ||
| // case 1: TOKEN\r\nTOKEN | ||
| return i + 2, data[:i+2], nil | ||
| } | ||
| if i < j { | ||
| // case 2: TOKEN\rTOKEN\nTOKEN | ||
| return i + 1, data[:i+1], nil | ||
| } else { | ||
| // case 3: TOKEN\nTOKEN\rTOKEN | ||
| return j + 1, data[:j+1], nil | ||
| } | ||
| } else if i >= 0 { | ||
| // case 4: TOKEN\rTOKEN | ||
| return i + 1, data[:i+1], nil | ||
| } else { | ||
| // case 5: TOKEN\nTOKEN | ||
| return j + 1, data[:j+1], nil | ||
| } | ||
| } | ||
| // If we're at EOF, we have a final, non-terminated line. Return it. | ||
| if atEOF { | ||
| return len(data), data, nil | ||
| } | ||
| // Request more data. | ||
| return 0, nil, nil | ||
| } |