From 6cfabd35363c3ef5e3b209b867169a500b3ccc3c Mon Sep 17 00:00:00 2001 From: Fraunhofer IIS FDK Date: Mon, 26 Feb 2018 20:17:00 +0100 Subject: Upgrade to FDKv2 Bug: 71430241 Test: CTS DecoderTest and DecoderTestAacDrc original-Change-Id: Iaa20f749b8a04d553b20247cfe1a8930ebbabe30 Apply clang-format also on header files. original-Change-Id: I14de1ef16bbc79ec0283e745f98356a10efeb2e4 Fixes for MPEG-D DRC original-Change-Id: If1de2d74bbbac84b3f67de3b88b83f6a23b8a15c Catch unsupported tw_mdct at an early stage original-Change-Id: Ied9dd00d754162a0e3ca1ae3e6b854315d818afe Fixing PVC transition frames original-Change-Id: Ib75725abe39252806c32d71176308f2c03547a4e Move qmf bands sanity check original-Change-Id: Iab540c3013c174d9490d2ae100a4576f51d8dbc4 Initialize scaling variable original-Change-Id: I3c4087101b70e998c71c1689b122b0d7762e0f9e Add 16 qmf band configuration to getSlotNrgHQ() original-Change-Id: I49a5d30f703a1b126ff163df9656db2540df21f1 Always apply byte alignment at the end of the AudioMuxElement original-Change-Id: I42d560287506d65d4c3de8bfe3eb9a4ebeb4efc7 Setup SBR element only if no parse error exists original-Change-Id: I1915b73704bc80ab882b9173d6bec59cbd073676 Additional array index check in HCR original-Change-Id: I18cc6e501ea683b5009f1bbee26de8ddd04d8267 Fix fade-in index selection in concealment module original-Change-Id: Ibf802ed6ed8c05e9257e1f3b6d0ac1162e9b81c1 Enable explicit backward compatible parser for AAC_LD original-Change-Id: I27e9c678dcb5d40ed760a6d1e06609563d02482d Skip spatial specific config in explicit backward compatible ASC original-Change-Id: Iff7cc365561319e886090cedf30533f562ea4d6e Update flags description in decoder API original-Change-Id: I9a5b4f8da76bb652f5580cbd3ba9760425c43830 Add QMF domain reset function original-Change-Id: I4f89a8a2c0277d18103380134e4ed86996e9d8d6 DRC upgrade v2.1.0 original-Change-Id: I5731c0540139dab220094cd978ef42099fc45b74 Fix integer overflow in sqrtFixp_lookup() original-Change-Id: I429a6f0d19aa2cc957e0f181066f0ca73968c914 Fix integer overflow in invSqrtNorm2() original-Change-Id: I84de5cbf9fb3adeb611db203fe492fabf4eb6155 Fix integer overflow in GenerateRandomVector() original-Change-Id: I3118a641008bd9484d479e5b0b1ee2b5d7d44d74 Fix integer overflow in adjustTimeSlot_EldGrid() original-Change-Id: I29d503c247c5c8282349b79df940416a512fb9d5 Fix integer overflow in FDKsbrEnc_codeEnvelope() original-Change-Id: I6b34b61ebb9d525b0c651ed08de2befc1f801449 Follow-up on: Fix integer overflow in adjustTimeSlot_EldGrid() original-Change-Id: I6f8f578cc7089e5eb7c7b93e580b72ca35ad689a Fix integer overflow in get_pk_v2() original-Change-Id: I63375bed40d45867f6eeaa72b20b1f33e815938c Fix integer overflow in Syn_filt_zero() original-Change-Id: Ie0c02fdfbe03988f9d3b20d10cd9fe4c002d1279 Fix integer overflow in CFac_CalcFacSignal() original-Change-Id: Id2d767c40066c591b51768e978eb8af3b803f0c5 Fix integer overflow in FDKaacEnc_FDKaacEnc_calcPeNoAH() original-Change-Id: Idcbd0f4a51ae2550ed106aa6f3d678d1f9724841 Fix integer overflow in sbrDecoder_calculateGainVec() original-Change-Id: I7081bcbe29c5cede9821b38d93de07c7add2d507 Fix integer overflow in CLpc_SynthesisLattice() original-Change-Id: I4a95ddc18de150102352d4a1845f06094764c881 Fix integer overflow in Pred_Lt4() original-Change-Id: I4dbd012b2de7d07c3e70a47b92e3bfae8dbc750a Fix integer overflow in FDKsbrEnc_InitSbrFastTransientDetector() original-Change-Id: I788cbec1a4a00f44c2f3a72ad7a4afa219807d04 Fix unsigned integer overflow in FDKaacEnc_WriteBitstream() original-Change-Id: I68fc75166e7d2cd5cd45b18dbe3d8c2a92f1822a Fix unsigned integer overflow in FDK_MetadataEnc_Init() original-Change-Id: Ie8d025f9bcdb2442c704bd196e61065c03c10af4 Fix overflow in pseudo random number generators original-Change-Id: I3e2551ee01356297ca14e3788436ede80bd5513c Fix unsigned integer overflow in sbrDecoder_Parse() original-Change-Id: I3f231b2f437e9c37db4d5b964164686710eee971 Fix unsigned integer overflow in longsub() original-Change-Id: I73c2bc50415cac26f1f5a29e125bbe75f9180a6e Fix unsigned integer overflow in CAacDecoder_DecodeFrame() original-Change-Id: Ifce2db4b1454b46fa5f887e9d383f1cc43b291e4 Fix overflow at CLpdChannelStream_Read() original-Change-Id: Idb9d822ce3a4272e4794b643644f5434e2d4bf3f Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD() original-Change-Id: I1ccf77c0015684b85534c5eb97162740a870b71c Fix unsigned integer overflow in UsacConfig_Parse() original-Change-Id: Ie6d27f84b6ae7eef092ecbff4447941c77864d9f Fix unsigned integer overflow in aacDecoder_drcParse() original-Change-Id: I713f28e883eea3d70b6fa56a7b8f8c22bcf66ca0 Fix unsigned integer overflow in aacDecoder_drcReadCompression() original-Change-Id: Ia34dfeb88c4705c558bce34314f584965cafcf7a Fix unsigned integer overflow in CDataStreamElement_Read() original-Change-Id: Iae896cc1d11f0a893d21be6aa90bd3e60a2c25f0 Fix unsigned integer overflow in transportDec_AdjustEndOfAccessUnit() original-Change-Id: I64cf29a153ee784bb4a16fdc088baabebc0007dc Fix unsigned integer overflow in transportDec_GetAuBitsRemaining() original-Change-Id: I975b3420faa9c16a041874ba0db82e92035962e4 Fix unsigned integer overflow in extractExtendedData() original-Change-Id: I2a59eb09e2053cfb58dfb75fcecfad6b85a80a8f Fix signed integer overflow in CAacDecoder_ExtPayloadParse() original-Change-Id: I4ad5ca4e3b83b5d964f1c2f8c5e7b17c477c7929 Fix unsigned integer overflow in CAacDecoder_DecodeFrame() original-Change-Id: I29a39df77d45c52a0c9c5c83c1ba81f8d0f25090 Follow-up on: Fix integer overflow in CLpc_SynthesisLattice() original-Change-Id: I8fb194ffc073a3432a380845be71036a272d388f Fix signed integer overflow in _interpolateDrcGain() original-Change-Id: I879ec9ab14005069a7c47faf80e8bc6e03d22e60 Fix unsigned integer overflow in FDKreadBits() original-Change-Id: I1f47a6a8037ff70375aa8844947d5681bb4287ad Fix unsigned integer overflow in FDKbyteAlign() original-Change-Id: Id5f3a11a0c9e50fc6f76ed6c572dbd4e9f2af766 Fix unsigned integer overflow in FDK_get32() original-Change-Id: I9d33b8e97e3d38cbb80629cb859266ca0acdce96 Fix unsigned integer overflow in FDK_pushBack() original-Change-Id: Ic87f899bc8c6acf7a377a8ca7f3ba74c3a1e1c19 Fix unsigned integer overflow in FDK_pushForward() original-Change-Id: I3b754382f6776a34be1602e66694ede8e0b8effc Fix unsigned integer overflow in ReadPsData() original-Change-Id: I25361664ba8139e32bbbef2ca8c106a606ce9c37 Fix signed integer overflow in E_UTIL_residu() original-Change-Id: I8c3abd1f437ee869caa8fb5903ce7d3d641b6aad REVERT: Follow-up on: Integer overflow in CLpc_SynthesisLattice(). original-Change-Id: I3d340099acb0414795c8dfbe6362bc0a8f045f9b Follow-up on: Fix integer overflow in CLpc_SynthesisLattice() original-Change-Id: I4aedb8b3a187064e9f4d985175aa55bb99cc7590 Follow-up on: Fix unsigned integer overflow in aacDecoder_drcParse() original-Change-Id: I2aa2e13916213bf52a67e8b0518e7bf7e57fb37d Fix integer overflow in acelp original-Change-Id: Ie6390c136d84055f8b728aefbe4ebef6e029dc77 Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters() original-Change-Id: I391ffd97ddb0b2c184cba76139bfb356a3b4d2e2 Adjust concealment default settings original-Change-Id: I6a95db935a327c47df348030bcceafcb29f54b21 Saturate estimatedStartPos original-Change-Id: I27be2085e0ae83ec9501409f65e003f6bcba1ab6 Negative shift exponent in _interpolateDrcGain() original-Change-Id: I18edb26b26d002aafd5e633d4914960f7a359c29 Negative shift exponent in calculateICC() original-Change-Id: I3dcd2ae98d2eb70ee0d59750863cbb2a6f4f8aba Too large shift exponent in FDK_put() original-Change-Id: Ib7d9aaa434d2d8de4a13b720ca0464b31ca9b671 Too large shift exponent in CalcInvLdData() original-Change-Id: I43e6e78d4cd12daeb1dcd5d82d1798bdc2550262 Member access within null pointer of type SBR_CHANNEL original-Change-Id: Idc5e4ea8997810376d2f36bbdf628923b135b097 Member access within null pointer of type CpePersistentData original-Change-Id: Ib6c91cb0d37882768e5baf63324e429589de0d9d Member access within null pointer FDKaacEnc_psyMain() original-Change-Id: I7729b7f4479970531d9dc823abff63ca52e01997 Member access within null pointer FDKaacEnc_GetPnsParam() original-Change-Id: I9aa3b9f3456ae2e0f7483dbd5b3dde95fc62da39 Member access within null pointer FDKsbrEnc_EnvEncodeFrame() original-Change-Id: I67936f90ea714e90b3e81bc0dd1472cc713eb23a Add HCR sanity check original-Change-Id: I6c1d9732ebcf6af12f50b7641400752f74be39f7 Fix memory issue for HBE edge case with 8:3 SBR original-Change-Id: I11ea58a61e69fbe8bf75034b640baee3011e63e9 Additional SBR parametrization sanity check for ELD original-Change-Id: Ie26026fbfe174c2c7b3691f6218b5ce63e322140 Add MPEG-D DRC channel layout check original-Change-Id: Iea70a74f171b227cce636a9eac4ba662777a2f72 Additional out-of-bounds checks in MPEG-D DRC original-Change-Id: Ife4a8c3452c6fde8a0a09e941154a39a769777d4 Change-Id: Ic63cb2f628720f54fe9b572b0cb528e2599c624e --- libSYS/src/cmdl_parser.cpp | 581 --------------------------------------------- 1 file changed, 581 deletions(-) delete mode 100644 libSYS/src/cmdl_parser.cpp (limited to 'libSYS/src/cmdl_parser.cpp') diff --git a/libSYS/src/cmdl_parser.cpp b/libSYS/src/cmdl_parser.cpp deleted file mode 100644 index 24ec0d5..0000000 --- a/libSYS/src/cmdl_parser.cpp +++ /dev/null @@ -1,581 +0,0 @@ - -/* ----------------------------------------------------------------------------------------------------------- -Software License for The Fraunhofer FDK AAC Codec Library for Android - -© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. - All rights reserved. - - 1. INTRODUCTION -The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software that implements -the MPEG Advanced Audio Coding ("AAC") encoding and decoding scheme for digital audio. -This FDK AAC Codec software is intended to be used on a wide variety of Android devices. - -AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient general perceptual -audio codecs. AAC-ELD is considered the best-performing full-bandwidth communications codec by -independent studies and is widely deployed. AAC has been standardized by ISO and IEC as part -of the MPEG specifications. - -Patent licenses for necessary patent claims for the FDK AAC Codec (including those of Fraunhofer) -may be obtained through Via Licensing (www.vialicensing.com) or through the respective patent owners -individually for the purpose of encoding or decoding bit streams in products that are compliant with -the ISO/IEC MPEG audio standards. Please note that most manufacturers of Android devices already license -these patent claims through Via Licensing or directly from the patent owners, and therefore FDK AAC Codec -software may already be covered under those patent licenses when it is used for those licensed purposes only. - -Commercially-licensed AAC software libraries, including floating-point versions with enhanced sound quality, -are also available from Fraunhofer. Users are encouraged to check the Fraunhofer website for additional -applications information and documentation. - -2. COPYRIGHT LICENSE - -Redistribution and use in source and binary forms, with or without modification, are permitted without -payment of copyright license fees provided that you satisfy the following conditions: - -You must retain the complete text of this software license in redistributions of the FDK AAC Codec or -your modifications thereto in source code form. - -You must retain the complete text of this software license in the documentation and/or other materials -provided with redistributions of the FDK AAC Codec or your modifications thereto in binary form. -You must make available free of charge copies of the complete source code of the FDK AAC Codec and your -modifications thereto to recipients of copies in binary form. - -The name of Fraunhofer may not be used to endorse or promote products derived from this library without -prior written permission. - -You may not charge copyright license fees for anyone to use, copy or distribute the FDK AAC Codec -software or your modifications thereto. - -Your modified versions of the FDK AAC Codec must carry prominent notices stating that you changed the software -and the date of any change. For modified versions of the FDK AAC Codec, the term -"Fraunhofer FDK AAC Codec Library for Android" must be replaced by the term -"Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android." - -3. NO PATENT LICENSE - -NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without limitation the patents of Fraunhofer, -ARE GRANTED BY THIS SOFTWARE LICENSE. Fraunhofer provides no warranty of patent non-infringement with -respect to this software. - -You may use this FDK AAC Codec software or modifications thereto only for purposes that are authorized -by appropriate patent licenses. - -4. DISCLAIMER - -This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright holders and contributors -"AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, including but not limited to the implied warranties -of merchantability and fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, or consequential damages, -including but not limited to procurement of substitute goods or services; loss of use, data, or profits, -or business interruption, however caused and on any theory of liability, whether in contract, strict -liability, or tort (including negligence), arising in any way out of the use of this software, even if -advised of the possibility of such damage. - -5. CONTACT INFORMATION - -Fraunhofer Institute for Integrated Circuits IIS -Attention: Audio and Multimedia Departments - FDK AAC LL -Am Wolfsmantel 33 -91058 Erlangen, Germany - -www.iis.fraunhofer.de/amm -amm-info@iis.fraunhofer.de ------------------------------------------------------------------------------------------------------------ */ - -/************************** Fraunhofer IIS FDK SysLib ********************** - - Author(s): - Description: command line parser - -******************************************************************************/ - - - -#define _CRT_SECURE_NO_WARNINGS - -#include -#include -#include -#include -#include - -#include "cmdl_parser.h" -#include "genericStds.h" - - - -/************************ interface ************************/ - -static INT GetArgFromString(INT argc, TEXTCHAR* argv[], TEXTCHAR* search_string, TEXTCHAR type, TEXTCHAR* found_string , INT* switches_used); -static void RemoveWhiteSpace(const TEXTCHAR* pReqArgs, TEXTCHAR* Removed); -static INT CheckArg(TEXTCHAR* arg, TEXTCHAR* str, UINT numArgs, TEXTCHAR type, TEXTCHAR* current_str); -static INT CheckForUnusedSwitches(INT argc, /*TEXTCHAR* argv[],*/ INT* switches_used); -static INT ParseString(TEXTCHAR* str, INT*, TEXTCHAR*, TEXTCHAR*); -static void GetNumberOfArgs(TEXTCHAR* str, INT* nArgs); - -static -void removeQuotes(char *str) -{ - if (str[0] == '"') { - FDKstrcpy(str, str+1); - str[FDKstrlen(str)-1] = 0; - } -} - - -/********************** implementation *********************/ - -INT IIS_ScanCmdl(INT argc, TEXTCHAR* argv[], const TEXTCHAR* str, ...) -{ - INT i = 0; - INT found_and_set = 0; - INT nArgs = 0; - INT* switches_used = 0; - INT* b_str_opt = 0; - TEXTCHAR* s_str = 0; - TEXTCHAR* c_str_type = 0; - TEXTCHAR* str_clean = 0; - - va_list ap; - - if (argc == 0 || argc == 1) - { - FDKprintf("No command line arguments\n"); - goto bail; - } - - str_clean = (TEXTCHAR*) FDKcalloc((unsigned int)_tcslen(str), sizeof(TEXTCHAR)); - if (str_clean == NULL) { - FDKprintf("Error allocating memory line %d, file %s\n", __LINE__, __FILE__); - return 0; - } - - RemoveWhiteSpace(str, str_clean ); - GetNumberOfArgs(str_clean, &nArgs); - - b_str_opt = (INT*) FDKcalloc(nArgs, sizeof(INT)); - s_str = (TEXTCHAR*) FDKcalloc(nArgs*CMDL_MAX_ARGC, sizeof(TEXTCHAR) ); - c_str_type = (TEXTCHAR*) FDKcalloc(nArgs, sizeof(TEXTCHAR)); - switches_used = (INT*) FDKcalloc(argc, sizeof(INT)); - - if (b_str_opt == NULL || s_str == NULL || c_str_type == NULL || switches_used == NULL) { - FDKprintf("Error allocating memory line %d, file %s\n", __LINE__, __FILE__); - goto bail; - } - - if ( ParseString( str_clean, b_str_opt, s_str, c_str_type )) { - goto bail; - } - - va_start(ap, str); - - for ( i = 0; i < nArgs; i++ ) - { - TEXTCHAR arg[CMDL_MAX_STRLEN] = {L'\0'}; - TEXTCHAR* p_arg = arg; - TEXTCHAR* current_str = &(s_str[i*CMDL_MAX_ARGC]); - - if (GetArgFromString(argc, argv, current_str, c_str_type[i], arg, switches_used ) - && !b_str_opt[i] ) - { -#ifdef _UNICODE - _ftprintf(stderr, _TEXT("\n\nError: Parsing argument for required switch '%ls'.\n" ), current_str); -#else - _ftprintf(stderr, _TEXT("\n\nError: Parsing argument for required switch '%s'.\n" ), current_str); -#endif - found_and_set = 0; - goto bail; - } - if (CheckArg(p_arg, s_str, nArgs, c_str_type[i], current_str)) - { - goto bail; - } - - switch (c_str_type[i] ) - { - case 's': - { - TEXTCHAR* tmp; - tmp = va_arg(ap, TEXTCHAR*); - - if ( arg[0] == '\0' ) - break; - - _tcsncpy( tmp, arg, CMDL_MAX_STRLEN ); - /* Remove quotes. Windows Mobile Workaround. */ - removeQuotes(tmp); - found_and_set++; - break; - } - case 'd': - { - INT* tmp = va_arg(ap, INT*); - - if ( arg[0] == '\0' ) - break; - - *tmp = _tcstol(arg, NULL, 0); - found_and_set++; - break; - } - case 'c': - { - char* tmp = va_arg(ap, char*); - - if ( arg[0] == '\0' ) - break; - - *tmp = *arg; - found_and_set++; - break; - } - case 'u': - { - UCHAR* tmp = va_arg(ap, UCHAR*); - - if ( arg[0] == '\0' ) - break; - - *tmp = _tstoi(arg); - found_and_set++; - break; - } - case 'f': - { - float* tmp = (float*) va_arg( ap,double*); - - if ( arg[0] == '\0' ) - break; - - *tmp = (float) _tstof(arg); - found_and_set++; - break; - } - case 'y': // support 'data type double' - { - double* tmp = (double*) va_arg( ap,double*); - // use sscanf instead _tstof because of gcc - //_tstof(arg,"%lf",tmp); // '%lf' reads as double - *tmp = _tstof(arg); // '%lf' reads as double - found_and_set++; - break; - } - case '1': - { - - INT* tmp = va_arg( ap, INT*); - - if ( arg[0] == '\0' ) - break; - - *tmp = 1; - found_and_set++; - break; - } - - default: - FDKprintfErr("Bug: unsupported data identifier \"%c\"\n", c_str_type[i]); - break; - - } - - } - - va_end(ap); - - CheckForUnusedSwitches(argc, /*argv,*/ switches_used); - -bail: - if (b_str_opt) FDKfree(b_str_opt); - if (s_str) FDKfree(s_str); - if (c_str_type) FDKfree(c_str_type); - if (str_clean) FDKfree(str_clean); - if (switches_used) FDKfree(switches_used); - - return found_and_set; -} - - -void GetNumberOfArgs(TEXTCHAR* str, INT* nArgs) -{ - UINT i = 0; - for ( i = 0; i < _tcslen(str); ++i ) - { - if ( str[i] == '%') - *nArgs+= 1; - } - -} - -INT ParseString(TEXTCHAR* str, INT* b_str_opt, TEXTCHAR* s_str, TEXTCHAR* c_str_type ) -{ - UINT i = 0; - INT argCounter = 0; - - TEXTCHAR* str_start = 0; - TEXTCHAR* str_stop = 0; - - - str_start = str; - str_stop = str_start; - - for ( i = 0; i < _tcslen(str) - 1; ++i ) - { - if ( str[i] == '%' ) /* We have an Argument */ - { - if ( argCounter ) - { - if ( b_str_opt[argCounter-1] ) - str_start = str_stop + 3; - - else - str_start = str_stop + 2; - } - - /* Save Argument type */ - c_str_type[argCounter] = str[i+1]; - - if ( *str_start == '(' ) /* Optional Argument */ - { - b_str_opt[argCounter] = 1; - str_start++; - } - - /* Save Argument */ - str[i] = '\0'; - - _tcsncpy(&(s_str[argCounter*CMDL_MAX_ARGC]), str_start, CMDL_MAX_ARGC ); - - str[i] = '%'; - - str_stop = &(str[i]); - - if ( b_str_opt[argCounter] ) - { - if ( i+2 > ( _tcslen(str) -1 )) - { - _ftprintf(stderr,_TEXT("\n\nInternal Parser Error: Strlen Problem\n") ); - return 1; - } - if ( str[i+2] != ')' ) - { - _ftprintf(stderr,_TEXT("\n\nInternal Parser Error: Missing bracket ')'\n") ); - return 1; - } - - } - - - argCounter++; - } - - - } - - return 0; - } - - - - -void RemoveWhiteSpace(const TEXTCHAR* pReqArgs, TEXTCHAR* pRemoved) -{ - UINT i = 0; - INT k = 0; - UINT len = (UINT)_tcslen(pReqArgs); - - - for ( i = 0; i < len; ++i ) - { - - if ( pReqArgs[i] != ' ' ) - { - pRemoved[k] = pReqArgs[i]; - k++; - } - } -} - - -INT GetArgFromString(INT argc, TEXTCHAR* argv[], TEXTCHAR* search_string, TEXTCHAR type, TEXTCHAR* found_string, INT* sw_used ) -{ - INT i = 0; - - for (i = 1; i < argc; ++i ) { - if ( !_tcscmp(search_string, argv[i]) ) /* Strings are equal */ - { - if ( type == '1' ) /* Switch without argument */ - { - _tcsncpy( found_string, _TEXT("1"), 1); - sw_used[i] = 1; - return 0; - - } - - if ( i == (argc - 1)) /* We have %s or %d but are finished*/ - return 1; - - if ( _tcslen(argv[i+1]) > CMDL_MAX_STRLEN ) - { -#ifdef _UNICODE - _ftprintf (stderr,_TEXT("Warning: Ignoring argument for switch '%ls'. "), search_string ); -#else - _ftprintf (stderr,_TEXT("Warning: Ignoring argument for switch '%s'. "), search_string ); -#endif - _ftprintf (stderr,_TEXT("Argument is too LONG.\n") ); - return 1; - } - else - { - _tcsncpy( found_string, argv[i+1], CMDL_MAX_STRLEN); - sw_used[i] = 1; - sw_used[i+1] = 1; - return 0; - } - } - } - return 1; -} - - - -INT CheckArg(TEXTCHAR* arg, TEXTCHAR* str, UINT numArgs, TEXTCHAR type, TEXTCHAR* cur_str) -{ - UINT i = 0; - - /* No argument given-> return */ - if (arg[0] == '\0') - return 0; - - - /* Check if arg is switch */ - for ( i = 0; i < numArgs; ++i ) - { - if (!_tcscmp(arg, &(str[i*CMDL_MAX_ARGC]))) - { -#ifdef _UNICODE - _ftprintf(stderr, _TEXT("\n\nError: Argument '%ls' for switch '%ls' is not valid \n" ), arg, cur_str ); -#else - _ftprintf(stderr, _TEXT("\n\nError: Argument '%s' for switch '%s' is not valid \n" ), arg, cur_str ); -#endif - return 1; - } - - } - /* Check if type is %d but a string is given */ - - for ( i = 0; i < _tcslen(arg); ++i ) - { - if ( (type == 'd') && !_istdigit(arg[i]) && arg[i] != 'x' && arg[i] != '-') - { -#ifdef _UNICODE - _ftprintf(stderr, _TEXT("\n\nError: Argument '%ls' for switch '%ls' is not a valid number.\n" ), arg, cur_str); -#else - _ftprintf(stderr, _TEXT("\n\nError: Argument '%s' for switch '%s' is not a valid number.\n" ), arg, cur_str); -#endif - return 1; - } - } - - - return 0; -} - - -INT CheckForUnusedSwitches(INT argc, /*TEXTCHAR* argv[],*/ INT* switches_used) -{ - INT i = 0; - - for( i = 1; i < argc; ++i ) - { - if ( !switches_used[i] ) - { - ++i; - } - } - - return 0; -} - - - -static char line[CMDL_MAX_STRLEN*CMDL_MAX_ARGC]; -static char *argv_ptr[CMDL_MAX_ARGC]; -#ifdef CMDFILE_PREFIX -static char tmp[256]; /* this array is used to store the prefix and the filepath/name */ -#endif - -int IIS_ProcessCmdlList(const char* param_filename, int (*pFunction)(int, TEXTCHAR**)) -{ - /* static to reduce required stack size */ - - FDKFILE *config_fp; - int argc; - char *line_ptr; - -#ifdef CMDFILE_PREFIX - FDKstrcpy(tmp, CMDFILE_PREFIX); - FDKstrcpy(tmp+FDKstrlen(CMDFILE_PREFIX), param_filename); - /* Open the file with command lines */ - config_fp = FDKfopen(tmp, "r"); -#else - /* Open the file with command lines */ - config_fp = FDKfopen(param_filename, "r"); -#endif - - if(config_fp == NULL) - { -#ifdef CMDFILE_PREFIX - FDKprintf("\ncould not open config file %s", tmp); -#else - FDKprintf("\ncould not open config file %s", param_filename); -#endif - return 1; - } - - /* Obtain a command line from config file */ - while (FDKfgets(line, CMDL_MAX_STRLEN*CMDL_MAX_ARGC, config_fp) != NULL) - { - argc = 1; - - /* Eat \n */ - line_ptr = (char*)FDKstrchr(line, '\n'); - if (line_ptr != NULL) - *line_ptr = ' '; - - line_ptr = line; - - /* Scan the line and put the command line params into argv */ - do { - /* Skip consecutive blanks. */ - while (*line_ptr == ' ' && line_ptr < line+CMDL_MAX_STRLEN) - line_ptr++; - /* Assign argument. */ - argv_ptr[argc] = line_ptr; - /* Get pointer to next blank. */ - line_ptr = (char*)FDKstrchr(line_ptr, ' '); - /* */ - if (line_ptr != NULL) { - /* Null terminate */ - *line_ptr = 0; - /* Skip former blank (now null character) */ - line_ptr++; - /* Advance argument counter */ - } - argc++; - } while ( line_ptr != NULL && argc < CMDL_MAX_ARGC); - - /* call "would be main()" */ - if (argc > 2 && *argv_ptr[1] != '#' && FDKstrlen(argv_ptr[1])>1) - { - int retval; - - retval = (*pFunction)(argc, argv_ptr); - - FDKprintf("main returned %d\n", retval); - } - } - - FDKfclose(config_fp); - return 0; -} - -- cgit v1.2.3