natas_hw
/
OSM-binary
mirror of https://github.com/openstreetmap/OSM-binary
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

always color to stdout

This commit is contained in:
Peter 2011-05-23 21:35:13 +02:00
parent a02882c423
commit 072daaee0a
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/osmpbf-outline.cpp
View File

@ -5,8 +5,6 @@
#include <osmpbf/fileformat.pb.h> #include <osmpbf/fileformat.pb.h>
#include <osmpbf/osmformat.pb.h> #include <osmpbf/osmformat.pb.h>
bool is_a_tty;
const int MAX_BLOB_HEADER_SIZE = 64 * 1024; const int MAX_BLOB_HEADER_SIZE = 64 * 1024;
const int MAX_BLOB_SIZE = 32 * 1024 * 1024; const int MAX_BLOB_SIZE = 32 * 1024 * 1024;
@ -21,12 +19,9 @@ OSMPBF::HeaderBlock osmheader;
* prints a formatted message to stderr, optionally color coded * prints a formatted message to stderr, optionally color coded
*/ */
void msg(const char* format, int color, va_list args) { void msg(const char* format, int color, va_list args) {
if(is_a_tty) fprintf(stderr, "\x1b[0;%dm", color); fprintf(stdout, "\x1b[0;%dm", color);
vfprintf(stdout, format, args);
vfprintf(stderr, format, args); fprintf(stdout, "\x1b[0m\n");
if(is_a_tty) fprintf(stderr, "\x1b[0m\n");
else fprintf(stderr, "\n");
} }
/** /**
@ -74,9 +69,6 @@ void debug(const char* format, ...) {
* application main method * application main method
*/ */
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
// check if stderr is a tty and set a global bool
is_a_tty = (bool)isatty(2);
// check for proper command line args // check for proper command line args
if(argc != 2) if(argc != 2)
err("usage: %s file.osm.pbf", argv[0]); err("usage: %s file.osm.pbf", argv[0]);