From b1115825966fa1f2f8f022b466ad6aacccc65b80 Mon Sep 17 00:00:00 2001 From: sk-5 Date: Mon, 13 Jul 2015 18:03:01 -0700 Subject: [PATCH] Fixes --- examples/example2 | Bin 8305 -> 8904 bytes examples/example2.cpp | 4 ++-- libpipecolors.cpp | 8 ++++++-- pipecolors.h | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/examples/example2 b/examples/example2 index 12ea34c46f7daef816597803662394f7e7b6b53f..594842ff80cf42665d0b44055c940179ae97f654 100755 GIT binary patch literal 8904 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 literal 8305 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 CaOYeA diff --git a/examples/example2.cpp b/examples/example2.cpp index 252f45c..8faa824 100644 --- a/examples/example2.cpp +++ b/examples/example2.cpp @@ -8,7 +8,7 @@ int main(void) { int num = 5; const char* str = "My number is"; - pcprintf("|01%s |41|09%d|39\n", str, num); - + int len = pcprintf("|01%s |41|09%d|39\n", str, num); + pcprintf("|10Length of String is : |15|30%d\n", len); return 0; } \ No newline at end of file diff --git a/libpipecolors.cpp b/libpipecolors.cpp index bb345b0..89f00e1 100644 --- a/libpipecolors.cpp +++ b/libpipecolors.cpp @@ -82,7 +82,7 @@ namespace pipecolors { start = s.begin(); end = s.end(); std::string len(s); - + int reallen; colors = getColors(); while(regex_search(start, end, match, re, flags)) @@ -102,7 +102,8 @@ namespace pipecolors { start = match[0].second; flags |= boost::match_prev_avail | boost::match_not_bob; } - return std::make_pair(s, len.length()); + + return std::make_pair(s, len.find("\n") ? len.length() - 1 : len.length()); } @@ -129,4 +130,7 @@ namespace pipecolors { return(result.second); } + int pcsprintf(char **strp, const char *fmt, va_list ap) { + return true; + } } // namespace diff --git a/pipecolors.h b/pipecolors.h index 14b1f95..6b7a662 100644 --- a/pipecolors.h +++ b/pipecolors.h @@ -11,7 +11,7 @@ extern "C" { #endif int pcprintf( const char * format, ... ); -//int pcsprintf(char **strp, const char *fmt, va_list ap); +int pcsprintf(char **strp, const char *fmt, va_list ap); #ifdef __cplusplus }