[trafficserver] branch 7.1.x updated: 7.1.x runroot parsing fix

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/7.1.x by this push:
     new 3001e31  7.1.x runroot parsing fix
3001e31 is described below

commit 3001e31efce46bf23b69243f9def8d533f0ef2b5
Author: Xavier Chi <ch...@gmail.com>
AuthorDate: Thu May 3 10:18:49 2018 -0500

    7.1.x runroot parsing fix
---
 lib/ts/ink_args.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/ts/ink_args.cc b/lib/ts/ink_args.cc
index 37b4be3..a392dd4 100644
--- a/lib/ts/ink_args.cc
+++ b/lib/ts/ink_args.cc
@@ -219,9 +219,12 @@ process_args_ex(const AppVersionInfo *appinfo, const ArgumentDescription *argume
     if ((*argv)[1] == '-') {
       // Deal with long options ...
       for (i = 0; i < n_argument_descriptions; i++) {
-        if (!strcmp(argument_descriptions[i].name, "run-root")) {
+        // handle the runroot arg
+        std::string cur_argv = *argv + 2;
+        if (cur_argv.size() >= 8 && cur_argv.substr(0, 8) == "run-root") {
           break;
         }
+        // handle the args
         if (!strcmp(argument_descriptions[i].name, (*argv) + 2)) {
           *argv += strlen(*argv) - 1;
           if (!process_arg(appinfo, argument_descriptions, n_argument_descriptions, i, &argv)) {

-- 
To stop receiving notification emails like this one, please contact
zwoop@apache.org.