From 0af22fcb06802515d42380edc3558994a79747fc Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 16 Apr 2024 13:11:53 +0900 Subject: [PATCH 1/5] add default message for pvget --- pvtoolsSrc/pvget.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pvtoolsSrc/pvget.cpp b/pvtoolsSrc/pvget.cpp index f5081908..36a0c7d1 100644 --- a/pvtoolsSrc/pvget.cpp +++ b/pvtoolsSrc/pvget.cpp @@ -276,6 +276,12 @@ int MAIN (int argc, char *argv[]) // ================ Parse Arguments + if(argc == 1){ + /* No arguments specified */ + fprintf(stderr, "No arguments specified. Please use " EXECNAME" -h for help"); + return 1; + } + while ((opt = getopt(argc, argv, ":hvVRM:r:w:tmp:qdcF:f:ni")) != -1) { switch (opt) { case 'h': /* Print usage */ @@ -355,12 +361,12 @@ int MAIN (int argc, char *argv[]) "Unrecognized option: '-%c'. ('" EXECNAME " -h' for help.)\n", optopt); return 1; - case ':': + case ':': fprintf(stderr, "Option '-%c' requires an argument. ('" EXECNAME " -h' for help.)\n", optopt); return 1; - default : + default : /* Invalid argument */ usage(); return 1; } From eb63a204dacdd65d4255a9a53c3c3939dac8b75c Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 16 Apr 2024 13:15:09 +0900 Subject: [PATCH 2/5] remove default case --- pvtoolsSrc/pvget.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pvtoolsSrc/pvget.cpp b/pvtoolsSrc/pvget.cpp index 36a0c7d1..7e68c15d 100644 --- a/pvtoolsSrc/pvget.cpp +++ b/pvtoolsSrc/pvget.cpp @@ -361,14 +361,11 @@ int MAIN (int argc, char *argv[]) "Unrecognized option: '-%c'. ('" EXECNAME " -h' for help.)\n", optopt); return 1; - case ':': + case ':': fprintf(stderr, "Option '-%c' requires an argument. ('" EXECNAME " -h' for help.)\n", optopt); return 1; - default : /* Invalid argument */ - usage(); - return 1; } } From 800e88274b10e41cb1951c476bba8d38d9191d4e Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 16 Apr 2024 13:21:39 +0900 Subject: [PATCH 3/5] get rid of "Magic number" --- pvtoolsSrc/pvget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvtoolsSrc/pvget.cpp b/pvtoolsSrc/pvget.cpp index 7e68c15d..9f736707 100644 --- a/pvtoolsSrc/pvget.cpp +++ b/pvtoolsSrc/pvget.cpp @@ -276,7 +276,7 @@ int MAIN (int argc, char *argv[]) // ================ Parse Arguments - if(argc == 1){ + if(argc <= optind){ /* No arguments specified */ fprintf(stderr, "No arguments specified. Please use " EXECNAME" -h for help"); return 1; From b593e3da157751d642747e1d8327ef38bb373830 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Mon, 29 Jul 2024 09:22:47 +0100 Subject: [PATCH 4/5] add default case back --- pvtoolsSrc/pvget.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pvtoolsSrc/pvget.cpp b/pvtoolsSrc/pvget.cpp index 9f736707..878a455f 100644 --- a/pvtoolsSrc/pvget.cpp +++ b/pvtoolsSrc/pvget.cpp @@ -366,6 +366,12 @@ int MAIN (int argc, char *argv[]) "Option '-%c' requires an argument. ('" EXECNAME " -h' for help.)\n", optopt); return 1; + default : + fprintf(stderr, + "Option '-%c' is not supported - it is a valid option but is not implemented. \n", + optopt); + usage(); + return 1; } } From 8af6ee2b9339a07a53dc97ba28afa1f8fb30bedb Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Wed, 9 Apr 2025 11:42:01 +0100 Subject: [PATCH 5/5] fix indentation --- pvtoolsSrc/pvget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pvtoolsSrc/pvget.cpp b/pvtoolsSrc/pvget.cpp index 878a455f..4d516b52 100644 --- a/pvtoolsSrc/pvget.cpp +++ b/pvtoolsSrc/pvget.cpp @@ -368,10 +368,10 @@ int MAIN (int argc, char *argv[]) return 1; default : fprintf(stderr, - "Option '-%c' is not supported - it is a valid option but is not implemented. \n", - optopt); - usage(); - return 1; + "Option '-%c' is not supported - it is a valid option but is not implemented. \n", + optopt); + usage(); + return 1; } }