Dear Fujii-san, Thank you for updating! I read your patches and I have only one comment.
> if (strcmp(keywords[i], "application_name") == 0 && > values[i] != NULL && *(values[i]) != '\0') I'm not sure but do we have a case that values[i] becomes NULL even if keywords[i] is "application_name"? I think other parts are perfect. Best Regards, Hayato Kuroda FUJITSU LIMITED