Merge branch 'master_devel'

Author: mataneli94

.gitignore

@@ -0,0 +1,39 @@
+*.a
+*.o
+*.lo
+*.so
+.deps/
+
+Makefile
+Makefile.in
+
+
+/aclocal.m4
+/autom4te.cache/
+/common/gitversion.h
+/common/python_wrapper
+/common/tools_version.py
+/config.h
+/config.h.in
+/config.h.in~
+/config.log
+/config.status
+config/
+/configure
+flint/mstflint
+libtool
+/m4/*.m4
+/mlxconfig/mstconfig
+/mlxconfig/mstprivhost
+/mstdump/crd_main/mstregdump
+/mstflint.spec
+/resourcedump/mstresourcedump
+/small_utils/mstcongestion
+/small_utils/mstfwreset
+/small_utils/mstmcra
+/small_utils/mstmread
+/small_utils/mstmtserver
+/small_utils/mstmwrite
+/small_utils/mstvpd
+/stamp-h1
+/tracers/fwtrace/mstfwtrace

Makefile.am

@@ -30,7 +30,7 @@
 # SOFTWARE.
 #--
 
-SUBDIRS = common mft_utils ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DIR} mtcr_py $(MAD_IFC) reg_access cmdif $(XZ_UTILS_DIR) dev_mgt tools_res_mgmt mvpd mflash fw_comps_mgr libmfa pldmlib mlxconfig mlxfwops cmdparser $(FW_MGR_TOOLS) flint small_utils mstdump ${ADABE_TOOLS} tracers resourcedump
+SUBDIRS = common mft_utils mft_utils/hsmclient ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DIR} mtcr_py $(MAD_IFC) reg_access cmdif $(XZ_UTILS_DIR) dev_mgt tools_res_mgmt mvpd mflash fw_comps_mgr libmfa pldmlib mlxconfig mlxfwops cmdparser $(FW_MGR_TOOLS) flint small_utils mstdump ${ADABE_TOOLS} tracers resourcedump resourceparse
 
 DIST_SUBDIRS = tracers
 

adb_parser/adb_parser.cpp

@@ -258,11 +258,10 @@ class AdbParser {
 private:
     // METHODS
     string findFile(string fileName);
-    static bool is_relative(const string path);
-    static void includeFile(AdbParser *adbParser, string fileName,
-        int lineNumber = -1);
-    static void startElement(void *adbParser, const XML_Char *name,
-        const XML_Char **atts);
+    static void addIncludePaths(Adb *adbCtxt, string includePaths);
+    static void includeFile(AdbParser *adbParser, string fileName, int lineNumber = -1);
+    static void startElement(void *adbParser, const XML_Char *name, const XML_Char **atts);
+
     static void startNodesDefElement(const XML_Char **atts, AdbParser *adbParser);
     static void startEnumElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber);
     static void startConfigElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber);
@@ -271,9 +270,9 @@ class AdbParser {
     static void startInstOpAttrReplaceElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber);
     static void startNodeElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber);
     static void startFieldElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber);
+
     static void endElement(void *adbParser, const XML_Char *name);
-    static void addReserved(vector<AdbField*> &reserveds, u_int32_t offset,
-        u_int32_t size);
+    static void addReserved(vector<AdbField*> &reserveds, u_int32_t offset, u_int32_t size);
     static int attrCount(const XML_Char **atts);
     static string attrValue(const XML_Char **atts, const XML_Char *attrName);
     static string attrName(const XML_Char **atts, int i);
@@ -2058,16 +2057,6 @@ string AdbException::what_s() const {
     return _msg;
 }
 
-/**
- * Function: AdbParser::is_relative
- **/
-bool AdbParser::is_relative(const string path) {
-    if (path[0] == '/') {
-        return false;
-    }
-    return true;
-}
-
 /*************************** AdbParser Implementation ***************************/
 /**
  * Function: AdbParser::AdbParser
@@ -2081,8 +2070,28 @@ AdbParser::AdbParser(string fileName, Adb *adbCtxt, bool addReserved,
             _currentConfig(0) {
     _enforceExtraChecks = enforceExtraChecks;
     if (includePath != "") {
-        vector < string > paths;
-        boost::algorithm::split(paths, includePath,
+        addIncludePaths(adbCtxt, includePath);
+    }
+    _xmlParser = XML_ParserCreate(0);
+    XML_SetUserData(_xmlParser, this);
+    XML_SetElementHandler(_xmlParser, startElement, endElement);
+    if (adbCtxt->includePaths.size() == 0) {
+        // first add the opened project path
+        adbCtxt->includePaths.push_back(
+                _fileName.find(OS_PATH_SEP) == string::npos ? "."
+                        : _fileName.substr(0, _fileName.rfind(OS_PATH_SEP)));
+        vector < string > path;
+        boost::algorithm::split(path, fileName,
+                boost::is_any_of(string(OS_PATH_SEP)));
+        IncludeFileInfo info = { fileName, "ROOT", 0 };
+        _adbCtxt->includedFiles[path[path.size() - 1]] = info;
+    }
+    _instanceOps = false;
+}
+
+void AdbParser::addIncludePaths(Adb *adbCtxt, string includePaths) {
+    vector < string > paths;
+        boost::algorithm::split(paths, includePaths,
                 boost::is_any_of(string(";")));
         adbCtxt->includePaths.insert(adbCtxt->includePaths.end(),
                 paths.begin(), paths.end());
@@ -2094,29 +2103,13 @@ AdbParser::AdbParser(string fileName, Adb *adbCtxt, bool addReserved,
 
         for (StringVector::iterator it = adbCtxt->includePaths.begin(); it
                 != adbCtxt->includePaths.end(); it++) {
-            if (AdbParser::is_relative(*it)) {
+            if (projPath != "" && projPath != *it && boost::filesystem::path(*it).is_relative()) {
                 relatives.push_back(projPath + OS_PATH_SEP + *it);
             }
         }
 
         adbCtxt->includePaths.insert(adbCtxt->includePaths.end(),
                 relatives.begin(), relatives.end());
-    }
-    _xmlParser = XML_ParserCreate(0);
-    XML_SetUserData(_xmlParser, this);
-    XML_SetElementHandler(_xmlParser, startElement, endElement);
-    if (adbCtxt->includePaths.size() == 0) {
-        // first add the opened project path
-        adbCtxt->includePaths.push_back(
-                _fileName.find(OS_PATH_SEP) == string::npos ? "."
-                        : _fileName.substr(0, _fileName.rfind(OS_PATH_SEP)));
-        vector < string > path;
-        boost::algorithm::split(path, fileName,
-                boost::is_any_of(string(OS_PATH_SEP)));
-        IncludeFileInfo info = { fileName, "ROOT", 0 };
-        _adbCtxt->includedFiles[path[path.size() - 1]] = info;
-    }
-    _instanceOps = false;
 }
 
 /**
@@ -2362,6 +2355,12 @@ string AdbParser::findFile(string fileName) {
         if (f) {
             fclose(f);
             return filePath;
+        } else if (fileName.find(_adbCtxt->includePaths[i]) != string::npos) { // includePath is part of fileName
+            f = fopen(fileName.c_str(), "r");
+            if (f) {
+                fclose(f);
+                return fileName;
+            }
         }
     }
     return string();
@@ -2462,7 +2461,7 @@ void AdbParser::includeFile(AdbParser *adbParser, string fileName,
     string filePath;
     FILE *probeFile = NULL;
 
-    if (!AdbParser::is_relative(fileName)) {
+    if (!boost::filesystem::path(fileName).is_relative()) {
         probeFile = fopen(fileName.c_str(), "r");
     }
 
@@ -2478,7 +2477,7 @@ void AdbParser::includeFile(AdbParser *adbParser, string fileName,
 
     // Update filename to be only base name with extension to prevent duplications
     boost::filesystem::path boostPath(filePath);
-    fileName = string(boostPath.filename().c_str());
+    fileName = boostPath.filename().string();
 
     if (!adbParser->_adbCtxt->includedFiles.count(fileName)) {
         IncludeFileInfo info = { filePath, adbParser->_fileName, lineNumber };
@@ -2487,7 +2486,7 @@ void AdbParser::includeFile(AdbParser *adbParser, string fileName,
         // parse the included file
         AdbParser p(filePath, adbParser->_adbCtxt, adbParser->_addReserved,
                 adbParser->_progressObj, adbParser->_strict,
-                adbParser->_includePath, adbParser->_enforceExtraChecks);
+                "", adbParser->_enforceExtraChecks);
         if (!p.load()) {
             throw AdbException(p.getError());
         }
@@ -2506,6 +2505,7 @@ void AdbParser::includeAllFilesInDir(AdbParser *adbParser, string dirPath,
         boost::filesystem::path fsPath(*pathIt);
         if (boost::filesystem::exists(fsPath)
                 && boost::filesystem::is_directory(fsPath)) {
+                    addIncludePaths(adbParser->_adbCtxt, *pathIt);
             boost::filesystem::directory_iterator filesIter(fsPath), dirEnd;
             for (; filesIter != dirEnd; ++filesIter) {
                 if (boost::filesystem::is_regular_file(filesIter->status())
@@ -2679,7 +2679,7 @@ void AdbParser::startConfigElement(const XML_Char **atts, AdbParser *adbParser,
             for (StringVector::iterator it =
                     adbParser->_adbCtxt->includePaths.begin(); it
                     != adbParser->_adbCtxt->includePaths.end(); it++) {
-                if (AdbParser::is_relative(*it)) {
+                if (boost::filesystem::path(*it).is_relative()) {
                     relatives.push_back(projPath + OS_PATH_SEP + *it);
                 }
             }

adb_parser/expr.h

@@ -101,6 +101,7 @@
 
 #include <common/compatibility.h>
 
+
 class Expr
 {
 public:
@@ -157,7 +158,6 @@ class Expr
 
     void    ErrorReport(const std::string& msg);
 
-
     /*
      * Pure virtual methods. You must define them to use expr.
      */

cmdif/icmd_cif_open.h

@@ -62,9 +62,9 @@ enum {
 #ifdef MST_UL
 // instead of cib_cif.h in mstflint
 enum {
-    GET_ICMD_QUERY_CAP  = 0x8400,
-    SET_ITRACE          = 0xf003,
-    SET_PORT_SNIFFER    = 0xc002,
+    GET_ICMD_QUERY_CAP = 0x8400,
+    SET_ITRACE = 0xf003,
+    SET_PORT_SNIFFER = 0xc002,
 };
 #endif
 
@@ -79,7 +79,6 @@ int gcif_mh_sync_status(mfile *mf, struct connectx4_icmd_mh_sync *mh_sync);
 
 int gcif_set_port_sniffer(mfile *mf, struct connectib_icmd_set_port_sniffer *set_port_sniffer);
 
-
 #ifdef __cplusplus
 }
 #endif

cmdparser/my_getopt.c

@@ -40,6 +40,7 @@
  #endif
 
  #include <stdio.h>
+ #include <stdlib.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C
@@ -208,12 +209,7 @@ static char *posixly_correct;
 /* Avoid depending on library functions or files
    whose names are inconsistent.  */
 
-char* getenv();
-
-static char* my_index(str, chr)
-const char *str;
-int chr;
-{
+static char* my_index(const char *str, const char chr) {
     while (*str) {
         if (*str == chr) {
             return (char*) str;
@@ -298,8 +294,7 @@ text_set_element(__libc_subinit, store_args_and_env);
 static void exchange(char**);
  #endif
 
-static void exchange(argv)
-char **argv;
+static void exchange(char **argv)
 {
     int bottom = first_nonopt;
     int middle = last_nonopt;
@@ -374,10 +369,7 @@ char **argv;
  #if defined(__STDC__) && __STDC__
 static const char* _getopt_initialize(int, char*const*, const char*);
  #endif
-static const char* _getopt_initialize(argc, argv, optstring)
-int argc;
-char*const *argv;
-const char *optstring;
+static const char* _getopt_initialize(int argc, char* const *argv, const char *optstring)
 {
     /* Start processing options with ARGV-element 1 (since ARGV-element 0
        is the program name); the sequence of previously skipped
@@ -493,13 +485,7 @@ const char *optstring;
    If LONG_ONLY is nonzero, '-' as well as '--' can introduce
    long-named options.  */
 
-int _getopt_internal(argc, argv, optstring, longopts, longind, long_only)
-int argc;
-char*const *argv;
-const char *optstring;
-const struct option *longopts;
-int *longind;
-int long_only;
+int _getopt_internal(int argc, char* const *argv, const char *optstring, const struct option *longopts, int *longind, int long_only)
 {
     tools_optarg = NULL;
 
@@ -918,23 +904,15 @@ int long_only;
     }
 }
 
-int tools_getopt(argc, argv, optstring)
-int argc;
-char*const *argv;
-const char *optstring;
+int tools_getopt(int argc, char* const *argv, const char *optstring)
 {
     return _getopt_internal(argc, argv, optstring,
                             (const struct option*) 0,
                             (int*) 0,
                             0);
 }
 
-int tools_getopt_long(argc, argv, optstring, longopts, longindex)
-int argc;
-char*const *argv;
-const char *optstring;
-const struct option *longopts;
-int *longindex;
+int tools_getopt_long(int argc, char* const *argv, const char *optstring, const struct option *longopts, int *longindex)
 {
     return _getopt_internal(argc, argv, optstring,
                             longopts,
@@ -943,12 +921,7 @@ int *longindex;
 }
 
 
-int tools_getopt_long_only(argc, argv, optstring, longopts, longindex)
-int argc;
-char*const *argv;
-const char *optstring;
-const struct option *longopts;
-int *longindex;
+int tools_getopt_long_only(int argc, char* const *argv, const char *optstring, const struct option *longopts, int *longindex)
 {
     return _getopt_internal(argc, argv, optstring,
                             longopts,
@@ -962,9 +935,7 @@ int *longindex;
 /* Compile with -DTEST to make an executable for use in testing
    the above definition of `getopt'.  */
 
-int main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 {
     int c;
     int digit_optind = 0;