From 1c89a2f8fff4ea272ece3304f38e229a2901a5b9 Mon Sep 17 00:00:00 2001 From: Loic Le Loarer Date: Thu, 16 Jul 2015 01:15:08 +0200 Subject: [PATCH] Use stdin by default as before --- src/tools/uchardet.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/tools/uchardet.cpp b/src/tools/uchardet.cpp index efa589b..b78bab2 100644 --- a/src/tools/uchardet.cpp +++ b/src/tools/uchardet.cpp @@ -122,11 +122,16 @@ int main(int argc, char ** argv) } } - FILE * f = NULL; + FILE * f = stdin; int error_seen = 0; + if (argc < 2) + { + // No file arg, use stdin by default + detect(f); + } for (int i = 1; i < argc; i++) { - char *filename = argv[i]; + const char *filename = argv[i]; f = fopen(filename, "r"); if (f == NULL) { @@ -134,11 +139,11 @@ int main(int argc, char ** argv) error_seen = 1; continue; } - if (argc > 2) { + if (argc > 2) + { printf("%s: ", filename); } detect(f); - fclose(f); } return error_seen;