From 80044f0f2b20e7eb537551929999d5788085f5af Mon Sep 17 00:00:00 2001 From: John Blixt Date: Mon, 5 Jun 2017 18:33:46 -0600 Subject: [PATCH 1/2] Linux case sensitive path fix. --- wolfCLU/clu_src/clu_main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/wolfCLU/clu_src/clu_main.c b/wolfCLU/clu_src/clu_main.c index 7488b095..a3f9c225 100644 --- a/wolfCLU/clu_src/clu_main.c +++ b/wolfCLU/clu_src/clu_main.c @@ -31,8 +31,10 @@ int main(int argc, char** argv) { - int ret = 0, option = 0, long_index = 0; - int i; + int ret; + int option; + int i; + int long_index = 0; if (argc == 1) { printf("Main Help.\n"); @@ -42,13 +44,15 @@ int main(int argc, char** argv) /* flexibility: allow users to input any CAPS or lower case, * we will do all processing on lower case only. */ for (i = 0; i < argc; i++) { - convert_to_lower(argv[i], (int) XSTRLEN(argv[i])); + /* Case sensitive systems. */ + if (!(i != 4 || i != 6)) { + convert_to_lower(argv[i], (int) XSTRLEN(argv[i])); + } } while ((option = getopt_long_only(argc, argv,"", long_options, &long_index )) != -1) { - switch (option) { /* Encrypt */ case ENCRYPT: ret = wolfCLU_setup(argc, argv, 'e'); From 21930676915db11b3d68c4ec5b44f8ae645c6509 Mon Sep 17 00:00:00 2001 From: John Blixt Date: Tue, 6 Jun 2017 10:10:22 -0600 Subject: [PATCH 2/2] Update Kaleb's changes. --- wolfCLU/clu_src/clu_main.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/wolfCLU/clu_src/clu_main.c b/wolfCLU/clu_src/clu_main.c index a3f9c225..98d455c4 100644 --- a/wolfCLU/clu_src/clu_main.c +++ b/wolfCLU/clu_src/clu_main.c @@ -31,21 +31,32 @@ int main(int argc, char** argv) { - int ret; - int option; - int i; + int ret = 0; + int option = 0; + int ignoreIn = 0; + int ignoreOut = 0; int long_index = 0; + int i; if (argc == 1) { printf("Main Help.\n"); wolfCLU_help(); } + /* Set ignore variables for -in and -out files */ + ret = wolfCLU_checkForArg("-in", 3, argc, argv); + if (ret > 0) { + ignoreIn = ret + 1; + } + ret = wolfCLU_checkForArg("-out", 4, argc, argv); + if (ret > 0) { + ignoreOut = ret + 1; + } + /* flexibility: allow users to input any CAPS or lower case, * we will do all processing on lower case only. */ for (i = 0; i < argc; i++) { - /* Case sensitive systems. */ - if (!(i != 4 || i != 6)) { + if (i != ignoreIn && i != ignoreOut) { convert_to_lower(argv[i], (int) XSTRLEN(argv[i])); } }