diff options
Diffstat (limited to 'apps/cmdline.c')
| -rw-r--r-- | apps/cmdline.c | 308 |
1 files changed, 154 insertions, 154 deletions
diff --git a/apps/cmdline.c b/apps/cmdline.c index fe09b7b1..b9ecafb5 100644 --- a/apps/cmdline.c +++ b/apps/cmdline.c @@ -19,18 +19,18 @@ #include "cmdline.h" -static int xmlSecAppCmdLineMatchParam (const char* argvParam, - const char* paramName, - int canHaveNameString); -static xmlSecAppCmdLineParamPtr xmlSecAppCmdLineParamsListFind (xmlSecAppCmdLineParamPtr* params, - xmlSecAppCmdLineParamTopic topics, - const char* name); -static int xmlSecAppCmdLineParamRead (xmlSecAppCmdLineParamPtr param, - const char** argv, - int argc, - int pos); -static int xmlSecAppCmdLineTimeParamRead (const char* str, - time_t* t); +static int xmlSecAppCmdLineMatchParam (const char* argvParam, + const char* paramName, + int canHaveNameString); +static xmlSecAppCmdLineParamPtr xmlSecAppCmdLineParamsListFind (xmlSecAppCmdLineParamPtr* params, + xmlSecAppCmdLineParamTopic topics, + const char* name); +static int xmlSecAppCmdLineParamRead (xmlSecAppCmdLineParamPtr param, + const char** argv, + int argc, + int pos); +static int xmlSecAppCmdLineTimeParamRead (const char* str, + time_t* t); int xmlSecAppCmdLineParamIsSet(xmlSecAppCmdLineParamPtr param) { @@ -40,8 +40,8 @@ xmlSecAppCmdLineParamIsSet(xmlSecAppCmdLineParamPtr param) { const char* xmlSecAppCmdLineParamGetString(xmlSecAppCmdLineParamPtr param) { if(param->type != xmlSecAppCmdLineParamTypeString) { - fprintf(stderr, "Error: parameter \"%s\" is not string.\n", param->fullName); - return(NULL); + fprintf(stderr, "Error: parameter \"%s\" is not string.\n", param->fullName); + return(NULL); } return((param->value != NULL) ? param->value->strValue : NULL); } @@ -49,8 +49,8 @@ xmlSecAppCmdLineParamGetString(xmlSecAppCmdLineParamPtr param) { const char* xmlSecAppCmdLineParamGetStringList(xmlSecAppCmdLineParamPtr param) { if(param->type != xmlSecAppCmdLineParamTypeStringList) { - fprintf(stderr, "Error: parameter \"%s\" is not string list.\n", param->fullName); - return(NULL); + fprintf(stderr, "Error: parameter \"%s\" is not string list.\n", param->fullName); + return(NULL); } return((param->value != NULL) ? param->value->strListValue : NULL); } @@ -58,8 +58,8 @@ xmlSecAppCmdLineParamGetStringList(xmlSecAppCmdLineParamPtr param) { int xmlSecAppCmdLineParamGetInt(xmlSecAppCmdLineParamPtr param, int def) { if(param->type != xmlSecAppCmdLineParamTypeNumber) { - fprintf(stderr, "Error: parameter \"%s\" is not integer.\n", param->fullName); - return(def); + fprintf(stderr, "Error: parameter \"%s\" is not integer.\n", param->fullName); + return(def); } return((param->value != NULL) ? param->value->intValue : def); } @@ -67,16 +67,16 @@ xmlSecAppCmdLineParamGetInt(xmlSecAppCmdLineParamPtr param, int def) { time_t xmlSecAppCmdLineParamGetTime(xmlSecAppCmdLineParamPtr param, time_t def) { if(param->type != xmlSecAppCmdLineParamTypeTime) { - fprintf(stderr, "Error: parameter \"%s\" is not time.\n", param->fullName); - return(def); + fprintf(stderr, "Error: parameter \"%s\" is not time.\n", param->fullName); + return(def); } return((param->value != NULL) ? param->value->timeValue : def); } int xmlSecAppCmdLineParamsListParse(xmlSecAppCmdLineParamPtr* params, - xmlSecAppCmdLineParamTopic topics, - const char** argv, int argc, int pos) { + xmlSecAppCmdLineParamTopic topics, + const char** argv, int argc, int pos) { xmlSecAppCmdLineParamPtr param; int ii; int ret; @@ -85,27 +85,27 @@ xmlSecAppCmdLineParamsListParse(xmlSecAppCmdLineParamPtr* params, assert(argv != NULL); while((pos < argc) && (argv[pos][0] == '-')) { - param = xmlSecAppCmdLineParamsListFind(params, topics, argv[pos]); - if(param == NULL) { - fprintf(stderr, "Error: parameter \"%s\" is not supported or the requested\nfeature might have been disabled during compilation.\n", argv[pos]); - return(-1); - } - - ret = xmlSecAppCmdLineParamRead(param, argv, argc, pos); - if(ret < pos) { - fprintf(stderr, "Error: failed to parse parameter \"%s\".\n", argv[pos]); - return(-1); - } - pos = ret + 1; + param = xmlSecAppCmdLineParamsListFind(params, topics, argv[pos]); + if(param == NULL) { + fprintf(stderr, "Error: parameter \"%s\" is not supported or the requested\nfeature might have been disabled during compilation.\n", argv[pos]); + return(-1); + } + + ret = xmlSecAppCmdLineParamRead(param, argv, argc, pos); + if(ret < pos) { + fprintf(stderr, "Error: failed to parse parameter \"%s\".\n", argv[pos]); + return(-1); + } + pos = ret + 1; } /* check that all parameters at the end are filenames */ for(ii = pos; (ii < argc); ++ii) { - if(argv[ii][0] == '-') { - fprintf(stderr, "Error: filename is expected instead of parameter \"%s\".\n", argv[ii]); - return(-1); - - } + if(argv[ii][0] == '-') { + fprintf(stderr, "Error: filename is expected instead of parameter \"%s\".\n", argv[ii]); + return(-1); + + } } @@ -121,27 +121,27 @@ xmlSecAppCmdLineParamsListClean(xmlSecAppCmdLineParamPtr* params) { assert(params != NULL); for(i = 0; params[i] != NULL; ++i) { - while(params[i]->value != NULL) { - tmp = params[i]->value; - params[i]->value = params[i]->value->next; - xmlSecAppCmdLineValueDestroy(tmp); - } + while(params[i]->value != NULL) { + tmp = params[i]->value; + params[i]->value = params[i]->value->next; + xmlSecAppCmdLineValueDestroy(tmp); + } } } void xmlSecAppCmdLineParamsListPrint(xmlSecAppCmdLineParamPtr* params, - xmlSecAppCmdLineParamTopic topics, - FILE* output) { + xmlSecAppCmdLineParamTopic topics, + FILE* output) { size_t i; assert(params != NULL); assert(output != NULL); for(i = 0; params[i] != NULL; ++i) { - if(((params[i]->topics & topics) != 0) && (params[i]->help != NULL)) { - fprintf(output, " %s\n", params[i]->help); - } + if(((params[i]->topics & topics) != 0) && (params[i]->help != NULL)) { + fprintf(output, " %s\n", params[i]->help); + } } } @@ -152,8 +152,8 @@ xmlSecAppCmdLineValueCreate(xmlSecAppCmdLineParamPtr param, int pos) { assert(param != NULL); value = (xmlSecAppCmdLineValuePtr) malloc(sizeof(xmlSecAppCmdLineValue)); if(value == NULL) { - fprintf(stderr, "Error: malloc failed (%d bytes).\n", sizeof(xmlSecAppCmdLineValue)); - return(NULL); + fprintf(stderr, "Error: malloc failed (%d bytes).\n", sizeof(xmlSecAppCmdLineValue)); + return(NULL); } memset(value, 0, sizeof(xmlSecAppCmdLineValue)); @@ -167,34 +167,34 @@ xmlSecAppCmdLineValueDestroy(xmlSecAppCmdLineValuePtr value) { assert(value != NULL); if(value->strListValue != NULL) { - free((void*)value->strListValue); + free((void*)value->strListValue); } free(value); } static int xmlSecAppCmdLineMatchParam(const char* argvParam, const char* paramName, - int canHaveNameString) { + int canHaveNameString) { assert(argvParam != NULL); assert(paramName != NULL); if(canHaveNameString != 0) { - int len = strlen(paramName); - - if((strncmp(argvParam, paramName, len) == 0) && - ((argvParam[len] == '\0') || (argvParam[len] == ':'))) { - - return(1); - } + int len = strlen(paramName); + + if((strncmp(argvParam, paramName, len) == 0) && + ((argvParam[len] == '\0') || (argvParam[len] == ':'))) { + + return(1); + } } else if(strcmp(argvParam, paramName) == 0) { - return(1); + return(1); } return(0); } -static xmlSecAppCmdLineParamPtr +static xmlSecAppCmdLineParamPtr xmlSecAppCmdLineParamsListFind(xmlSecAppCmdLineParamPtr* params, xmlSecAppCmdLineParamTopic topics, - const char* name) { + const char* name) { size_t i; int canHaveNameString; @@ -202,22 +202,22 @@ xmlSecAppCmdLineParamsListFind(xmlSecAppCmdLineParamPtr* params, xmlSecAppCmdLin assert(name != NULL); for(i = 0; params[i] != NULL; ++i) { - if((params[i]->topics & topics) == 0) { - continue; - } + if((params[i]->topics & topics) == 0) { + continue; + } - canHaveNameString = ((params[i]->flags & xmlSecAppCmdLineParamFlagParamNameValue) != 0) ? 1 : 0; - if((params[i]->fullName != NULL) && - (xmlSecAppCmdLineMatchParam(name, params[i]->fullName, canHaveNameString) == 1)) { - - return(params[i]); - } + canHaveNameString = ((params[i]->flags & xmlSecAppCmdLineParamFlagParamNameValue) != 0) ? 1 : 0; + if((params[i]->fullName != NULL) && + (xmlSecAppCmdLineMatchParam(name, params[i]->fullName, canHaveNameString) == 1)) { + + return(params[i]); + } - if((params[i]->shortName != NULL) && - (xmlSecAppCmdLineMatchParam(name, params[i]->shortName, canHaveNameString) == 1)) { - - return(params[i]); - } + if((params[i]->shortName != NULL) && + (xmlSecAppCmdLineMatchParam(name, params[i]->shortName, canHaveNameString) == 1)) { + + return(params[i]); + } } return(NULL); @@ -235,90 +235,90 @@ xmlSecAppCmdLineParamRead(xmlSecAppCmdLineParamPtr param, const char** argv, int /* first find the previous value in the list */ if((param->flags & xmlSecAppCmdLineParamFlagMultipleValues) != 0) { - prev = param->value; - while((prev != NULL) && (prev->next != NULL)) { - prev = prev->next; - } + prev = param->value; + while((prev != NULL) && (prev->next != NULL)) { + prev = prev->next; + } } else if(param->value != NULL) { - fprintf(stderr, "Error: only one parameter \"%s\" is allowed.\n", argv[pos]); - return(-1); + fprintf(stderr, "Error: only one parameter \"%s\" is allowed.\n", argv[pos]); + return(-1); } /* create new value and add to the list */ value = xmlSecAppCmdLineValueCreate(param, pos); if(value == NULL) { - fprintf(stderr, "Error: failed to create value for parameter \"%s\".\n", argv[pos]); - return(-1); + fprintf(stderr, "Error: failed to create value for parameter \"%s\".\n", argv[pos]); + return(-1); } if(prev != NULL) { - assert(prev->next == NULL); - prev->next = value; + assert(prev->next == NULL); + prev->next = value; } else { - param->value = value; + param->value = value; } /* if we can have a string value after the name, parse it */ if((param->flags & xmlSecAppCmdLineParamFlagParamNameValue) != 0) { - value->paramNameValue = strchr(argv[pos], ':'); - if(value->paramNameValue != NULL) { - ++value->paramNameValue; - } + value->paramNameValue = strchr(argv[pos], ':'); + if(value->paramNameValue != NULL) { + ++value->paramNameValue; + } } switch(param->type) { - case xmlSecAppCmdLineParamTypeFlag: - /* do nothing */ - break; - case xmlSecAppCmdLineParamTypeString: - if(pos + 1 >= argc) { - fprintf(stderr, "Error: string argument expected for parameter \"%s\".\n", argv[pos]); - return(-1); - } - value->strValue = argv[++pos]; - break; - case xmlSecAppCmdLineParamTypeStringList: - if(pos + 1 >= argc) { - fprintf(stderr, "Error: string list argument expected for parameter \"%s\".\n", argv[pos]); - return(-1); - } - value->strValue = argv[++pos]; - buf = (char*)malloc(strlen(value->strValue) + 2); - if(buf == NULL) { - fprintf(stderr, "Error: failed to allocate memory (%d bytes).\n", strlen(value->strValue) + 2); - return(-1); - } - memset(buf, 0, strlen(value->strValue) + 2); - memcpy(buf, value->strValue, strlen(value->strValue)); - value->strListValue = buf; - while((*buf) != '\0') { - if((*buf) == ',') { - (*buf) = '\0'; - } - ++buf; - } - break; - case xmlSecAppCmdLineParamTypeNumber: - if(pos + 1 >= argc) { - fprintf(stderr, "Error: integer argument expected for parameter \"%s\".\n", argv[pos]); - return(-1); - } - value->strValue = argv[++pos]; - if(sscanf(value->strValue, "%d", &(value->intValue)) != 1) { - fprintf(stderr, "Error: integer argument \"%s\" is invalid.\n", value->strValue); - return(-1); - } - break; - case xmlSecAppCmdLineParamTypeTime: - if(pos + 1 >= argc) { - fprintf(stderr, "Error: time argument expected for parameter \"%s\".\n", argv[pos]); - return(-1); - } - value->strValue = argv[++pos]; - if(xmlSecAppCmdLineTimeParamRead(value->strValue, &(value->timeValue)) < 0) { - fprintf(stderr, "Error: time argument \"%s\" is invalid, expected format is \"YYYY-MM-DD HH:MM:SS\").\n", value->strValue); - return(-1); - } - break; + case xmlSecAppCmdLineParamTypeFlag: + /* do nothing */ + break; + case xmlSecAppCmdLineParamTypeString: + if(pos + 1 >= argc) { + fprintf(stderr, "Error: string argument expected for parameter \"%s\".\n", argv[pos]); + return(-1); + } + value->strValue = argv[++pos]; + break; + case xmlSecAppCmdLineParamTypeStringList: + if(pos + 1 >= argc) { + fprintf(stderr, "Error: string list argument expected for parameter \"%s\".\n", argv[pos]); + return(-1); + } + value->strValue = argv[++pos]; + buf = (char*)malloc(strlen(value->strValue) + 2); + if(buf == NULL) { + fprintf(stderr, "Error: failed to allocate memory (%d bytes).\n", strlen(value->strValue) + 2); + return(-1); + } + memset(buf, 0, strlen(value->strValue) + 2); + memcpy(buf, value->strValue, strlen(value->strValue)); + value->strListValue = buf; + while((*buf) != '\0') { + if((*buf) == ',') { + (*buf) = '\0'; + } + ++buf; + } + break; + case xmlSecAppCmdLineParamTypeNumber: + if(pos + 1 >= argc) { + fprintf(stderr, "Error: integer argument expected for parameter \"%s\".\n", argv[pos]); + return(-1); + } + value->strValue = argv[++pos]; + if(sscanf(value->strValue, "%d", &(value->intValue)) != 1) { + fprintf(stderr, "Error: integer argument \"%s\" is invalid.\n", value->strValue); + return(-1); + } + break; + case xmlSecAppCmdLineParamTypeTime: + if(pos + 1 >= argc) { + fprintf(stderr, "Error: time argument expected for parameter \"%s\".\n", argv[pos]); + return(-1); + } + value->strValue = argv[++pos]; + if(xmlSecAppCmdLineTimeParamRead(value->strValue, &(value->timeValue)) < 0) { + fprintf(stderr, "Error: time argument \"%s\" is invalid, expected format is \"YYYY-MM-DD HH:MM:SS\").\n", value->strValue); + return(-1); + } + break; } return(pos); } @@ -329,21 +329,21 @@ xmlSecAppCmdLineTimeParamRead(const char* str, time_t* t) { int n; if((str == NULL) || (t == NULL)) { - return(-1); + return(-1); } memset(&tm, 0, sizeof(tm)); tm.tm_isdst = -1; n = sscanf(str, "%4d-%2d-%2d%*c%2d:%2d:%2d", - &tm.tm_year, &tm.tm_mon, &tm.tm_mday, - &tm.tm_hour, &tm.tm_min, &tm.tm_sec); + &tm.tm_year, &tm.tm_mon, &tm.tm_mday, + &tm.tm_hour, &tm.tm_min, &tm.tm_sec); if((n != 6) || (tm.tm_year < 1900) - || (tm.tm_mon < 1) || (tm.tm_mon > 12) - || (tm.tm_mday < 1) || (tm.tm_mday > 31) - || (tm.tm_hour < 0) || (tm.tm_hour > 23) - || (tm.tm_min < 0) || (tm.tm_min > 59) - || (tm.tm_sec < 0) || (tm.tm_sec > 61)) { - return(-1); + || (tm.tm_mon < 1) || (tm.tm_mon > 12) + || (tm.tm_mday < 1) || (tm.tm_mday > 31) + || (tm.tm_hour < 0) || (tm.tm_hour > 23) + || (tm.tm_min < 0) || (tm.tm_min > 59) + || (tm.tm_sec < 0) || (tm.tm_sec > 61)) { + return(-1); } tm.tm_year -= 1900; /* tm relative format year */ |