From 53c0dd20ed8d938f63abbff09b72140c3b6f0f80 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 18 May 2022 00:11:37 +1000 Subject: [PATCH] Add `use "program < input", not "program input"` --- example/bzcat/bzcat.c | 5 +++-- example/convert-to-nia/convert-to-nia.c | 4 +++- example/zcat/zcat.c | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/example/bzcat/bzcat.c b/example/bzcat/bzcat.c index 9e3aef49..d1afe10c 100644 --- a/example/bzcat/bzcat.c +++ b/example/bzcat/bzcat.c @@ -146,8 +146,9 @@ main1(int argc, char** argv) { const char* z = parse_flags(argc, argv); if (z) { return z; - } - if (g_flags.fail_if_unsandboxed && !g_sandboxed) { + } else if (g_flags.remaining_argc > 0) { + return "main: bad argument: use \"program < input\", not \"program input\""; + } else if (g_flags.fail_if_unsandboxed && !g_sandboxed) { return "main: unsandboxed"; } diff --git a/example/convert-to-nia/convert-to-nia.c b/example/convert-to-nia/convert-to-nia.c index da9ddd9a..8575b1c3 100644 --- a/example/convert-to-nia/convert-to-nia.c +++ b/example/convert-to-nia/convert-to-nia.c @@ -658,7 +658,9 @@ convert_frames() { const char* // main1(int argc, char** argv) { TRY(parse_flags(argc, argv)); - if (g_flags.fail_if_unsandboxed && !g_sandboxed) { + if (g_flags.remaining_argc > 0) { + return "main: bad argument: use \"program < input\", not \"program input\""; + } else if (g_flags.fail_if_unsandboxed && !g_sandboxed) { return "main: unsandboxed"; } diff --git a/example/zcat/zcat.c b/example/zcat/zcat.c index 4b4abee8..c7fe899b 100644 --- a/example/zcat/zcat.c +++ b/example/zcat/zcat.c @@ -148,8 +148,9 @@ main1(int argc, char** argv) { const char* z = parse_flags(argc, argv); if (z) { return z; - } - if (g_flags.fail_if_unsandboxed && !g_sandboxed) { + } else if (g_flags.remaining_argc > 0) { + return "main: bad argument: use \"program < input\", not \"program input\""; + } else if (g_flags.fail_if_unsandboxed && !g_sandboxed) { return "main: unsandboxed"; }