aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarry Jeffery <harry@exec64.co.uk>2015-11-12 13:20:32 +0000
committerHarry Jeffery <harry@exec64.co.uk>2015-11-12 13:20:32 +0000
commitf14f099682d8edb19332bd26b3a77a92d9b8e297 (patch)
tree45e16994738ecf878d846b3058d2705416512f62
parent9cd0c1bd65cd056cdbc36cb3b9afa892e52553cf (diff)
downloadimv-f14f099682d8edb19332bd26b3a77a92d9b8e297.tar.gz
Use just '-' to signify stdin file list
Fixes #7
-rw-r--r--src/main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index e60a83a..b19d551 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,7 +84,10 @@ void parse_arg(const char* name, const char* arg)
for(const char *o = arg; *o != 0; ++o) {
switch(*o) {
case 'f': g_options.fullscreen = 1; break;
- case 'i': g_options.stdin = 1; break;
+ case 'i':
+ g_options.stdin = 1;
+ fprintf(stderr, "Warning: '-i' is deprecated. Just use '-' instead.\n");
+ break;
case 'r': g_options.recursive = 1; break;
case 'a': g_options.actual = 1; break;
case 'h': print_usage(name); exit(0); break;
@@ -106,7 +109,9 @@ int main(int argc, char** argv)
imv_init_navigator(&nav);
for(int i = 1; i < argc; ++i) {
- if(argv[i][0] == '-') {
+ if(strcmp(argv[i], "-") == 0) {
+ g_options.stdin = 1;
+ } else if(argv[i][0] == '-') {
parse_arg(argv[0], &argv[i][1]);
} else {
if(g_options.recursive) {