|
14 | 14 |
|
15 | 15 | #include <QDir>
|
16 | 16 | #include <QFile>
|
17 |
| -#include <QTextStream> |
18 |
| -#include <QStringTokenizer> |
| 17 | +#include <QRegularExpression> |
19 | 18 |
|
20 | 19 | #include <QDebug>
|
21 | 20 |
|
@@ -58,32 +57,33 @@ bool NetrcParser::parse()
|
58 | 57 | }
|
59 | 58 | QString content = netrc.readAll();
|
60 | 59 |
|
61 |
| - auto tokenizer = QStringTokenizer{content, u" \n\t"}; |
| 60 | + auto tokens = content.split(QRegularExpression("\\s+")); |
62 | 61 |
|
63 | 62 | LoginPair pair;
|
64 | 63 | QString machine;
|
65 | 64 | bool isDefault = false;
|
66 |
| - for(auto itToken = tokenizer.cbegin(); itToken != tokenizer.cend(); ++itToken) { |
67 |
| - const auto key = *itToken; |
| 65 | + for(int i=0; i<tokens.count(); i++) { |
| 66 | + const auto key = tokens[i]; |
68 | 67 | if (key == defaultKeyword) {
|
69 | 68 | tryAddEntryAndClear(machine, pair, isDefault);
|
70 | 69 | isDefault = true;
|
71 | 70 | continue; // don't read a value
|
72 | 71 | }
|
73 | 72 |
|
74 |
| - if (itToken != tokenizer.cend()) { |
| 73 | + i++; |
| 74 | + if (i > tokens.count()) { |
75 | 75 | qDebug() << "error fetching value for" << key;
|
76 | 76 | return false;
|
77 | 77 | }
|
78 |
| - auto value = *(++itToken); |
| 78 | + auto value = tokens[i]; |
79 | 79 |
|
80 | 80 | if (key == machineKeyword) {
|
81 | 81 | tryAddEntryAndClear(machine, pair, isDefault);
|
82 |
| - machine = value.toString(); |
| 82 | + machine = value; |
83 | 83 | } else if (key == loginKeyword) {
|
84 |
| - pair.first = value.toString(); |
| 84 | + pair.first = value; |
85 | 85 | } else if (key == passwordKeyword) {
|
86 |
| - pair.second = value.toString(); |
| 86 | + pair.second = value; |
87 | 87 | } // ignore unsupported tokens
|
88 | 88 | }
|
89 | 89 | tryAddEntryAndClear(machine, pair, isDefault);
|
|
0 commit comments