From 4a37dfdf1c709520f99e3d408e418c3446673af3 Mon Sep 17 00:00:00 2001 From: Jehan Date: Wed, 22 Apr 2020 21:05:44 +0200 Subject: [PATCH] Issue #15: support "--" end-of-option. --- src/tools/uchardet.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/tools/uchardet.cpp b/src/tools/uchardet.cpp index b68cb46..e8fface 100644 --- a/src/tools/uchardet.cpp +++ b/src/tools/uchardet.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #ifndef VERSION #define VERSION "Unknown" @@ -125,7 +126,8 @@ int main(int argc, char ** argv) FILE * f = stdin; int error_seen = 0; - if (argc < 2) + if (argc < 2 || + (argc == 2 && strcmp(argv[1], "--") == 0)) { // No file arg, use stdin by default detect(f); @@ -133,6 +135,10 @@ int main(int argc, char ** argv) for (int i = 1; i < argc; i++) { const char *filename = argv[i]; + + if (strcmp(filename, "--") == 0) + continue; + f = fopen(filename, "r"); if (f == NULL) {