Skip to content

Added command line option for setting maximum length of input line. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hardlulz wants to merge 2 commits into
base: master
Choose a base branch
from
+15 −3
Open

Added command line option for setting maximum length of input line. #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c125794
Added command line option for setting maximum length of input line.
hardlulz Dec 19, 2017
852b438
Added "note" and "fatal error" error codes to trouble matcher.
hardlulz Jan 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "FixPathInclude.h"
#include "config.h"

#define __STR(x) #x
#define DEFAULT_LINE_LENGTH 4096

class RegEx : public regex_t
{
Expand Down Expand Up @@ -153,6 +155,8 @@ int main(int argc, char** argv)
bool skipCompilerLine = 0;
bool skipDirectoryLine = 0;
bool appendReadyLine = 0;
long maxLineLen = DEFAULT_LINE_LENGTH;


static Option options[] = {
Option("help", no_argument, 0, 'h',
Expand All @@ -175,6 +179,8 @@ int main(int argc, char** argv)
"Skip all lines from output except those recognized as compiler lines."),
Option("append_ready", no_argument, 0, 'r',
"Append a line at end, so its clear we are ready."),
Option("line_length", required_argument, 0, 'l',
"Maximum line length. Default " __STR(DEFAULT_LINE_LENGTH) "."),
// Option("input", required_argument, 0, 'f', "Use infile instead of stdin.", "infile"),
// Option("output", required_argument, 0, 'o', "Use outfile instead of stdout.", "infile"),
Option(0, 0, 0, 0)
Expand Down Expand Up @@ -215,6 +221,12 @@ int main(int argc, char** argv)
case 'r' :
appendReadyLine = true;
break;
case 'l' :
maxLineLen = strtol(optarg, NULL, 0);
if (maxLineLen < 0) {
maxLineLen = DEFAULT_LINE_LENGTH;
}
break;
/*
case 'f' :
infile = optarg;
Expand Down Expand Up @@ -245,7 +257,7 @@ int main(int argc, char** argv)
cout << "appendReadyLine: " << appendReadyLine << endl;
*/
// Recognize the warning/error line
RegEx regex_we("^(.*):([0-9]+):([0-9]+): +(warning|error): +(.*)$");
RegEx regex_we("^(.*):([0-9]+):([0-9]+): +(note|warning|error|fatal error): +(.*)$");

// make: Entering|Leaving directory `/Users/xaljox/GitHub/bash/bash-4.4/build_mac'
RegEx regex_dir("^make(\\[[0-9]+\\])?: ((Entering)|(Leaving)) directory ['`](.*)'");
Expand All @@ -260,8 +272,7 @@ int main(int argc, char** argv)
string common;
string prevCommon;
regmatch_t match[10];
const int maxLineLen = 4096;
char line[maxLineLen];
char* line = new char[maxLineLen];
while (cin.getline(line, maxLineLen))
{
if (regexec(&regex_we, line, 6, match, 0) == 0)
Expand Down Expand Up @@ -347,6 +358,7 @@ int main(int argc, char** argv)
{
cout << "-------------------- Ready --------------------" << endl << flush;
}
delete[] line;

return 0;
}
Expand Down