Imported Upstream version 0.6.25

[platform/upstream/libsolv.git] / ext / repo_products.c

diff --git a/ext/repo_products.c b/ext/repo_products.c
index 7a164d8..326f8fd 100644 (file)
--- a/ext/repo_products.c
+++ b/ext/repo_products.c
@@ -11,6 +11,9 @@
  * for further information
  */
 
+#define _GNU_SOURCE
+#define _XOPEN_SOURCE
+#include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -57,9 +60,11 @@ enum state {
   STATE_REGISTER,
   STATE_TARGET,
   STATE_REGRELEASE,
+  STATE_REGFLAVOR,
   STATE_PRODUCTLINE,
   STATE_REGUPDATES,
   STATE_REGUPDREPO,
+  STATE_ENDOFLIFE,
   NUMSTATES
 };
 
@@ -88,10 +93,12 @@ static struct stateswitch stateswitches[] = {
   { STATE_PRODUCT,   "linguas",       STATE_LINGUAS,       0 },
   { STATE_PRODUCT,   "updaterepokey", STATE_UPDATEREPOKEY, 1 },
   { STATE_PRODUCT,   "cpeid",         STATE_CPEID,         1 },
+  { STATE_PRODUCT,   "endoflife",     STATE_ENDOFLIFE,     1 },
   { STATE_URLS,      "url",           STATE_URL,           1 },
   { STATE_LINGUAS,   "lang",          STATE_LANG,          0 },
   { STATE_REGISTER,  "target",        STATE_TARGET,        1 },
   { STATE_REGISTER,  "release",       STATE_REGRELEASE,    1 },
+  { STATE_REGISTER,  "flavor",        STATE_REGFLAVOR,     1 },
   { STATE_REGISTER,  "updates",       STATE_REGUPDATES,    0 },
   { STATE_REGUPDATES, "repository",   STATE_REGUPDREPO,    0 },
   { NUMSTATES }
@@ -152,6 +159,29 @@ find_attr(const char *txt, const char **atts)
   return 0;
 }
 
+static time_t
+datestr2timestamp(const char *date)
+{
+  const char *p; 
+  struct tm tm; 
+
+  if (!date || !*date)
+    return 0;
+  for (p = date; *p >= '0' && *p <= '9'; p++)
+    ;   
+  if (!*p)
+    return atoi(date);
+  memset(&tm, 0, sizeof(tm));
+  p = strptime(date, "%F%T", &tm);
+  if (!p)
+    {
+      memset(&tm, 0, sizeof(tm));
+      p = strptime(date, "%F", &tm);
+      if (!p || *p)
+       return 0;
+    }
+  return timegm(&tm);
+}
 
 /*
  * XML callback: startElement
@@ -226,7 +256,12 @@ startElement(void *userData, const char *name, const char **atts)
       {
         const char *repoid = find_attr("repoid", atts);
        if (repoid && *repoid)
-          repodata_add_poolstr_array(pd->data, pd->handle, PRODUCT_UPDATES_REPOID, repoid);
+         {
+           Id h = repodata_new_handle(pd->data);
+           repodata_set_str(pd->data, h, PRODUCT_UPDATES_REPOID, repoid);
+           repodata_add_flexarray(pd->data, pd->handle, PRODUCT_UPDATES, h);
+         }
+       break;
       }
     default:
       break;
@@ -333,9 +368,17 @@ endElement(void *userData, const char *name)
     case STATE_REGRELEASE:
       repodata_set_str(pd->data, pd->handle, PRODUCT_REGISTER_RELEASE, pd->content);
       break;
+    case STATE_REGFLAVOR:
+      repodata_set_str(pd->data, pd->handle, PRODUCT_REGISTER_FLAVOR, pd->content);
+      break;
     case STATE_CPEID:
       if (*pd->content)
         repodata_set_str(pd->data, pd->handle, SOLVABLE_CPEID, pd->content);
+      break;
+    case STATE_ENDOFLIFE:
+      /* FATE#320699: Support tri-state product-endoflife (tag absent, present but nodate(0), present + date) */
+      repodata_set_num(pd->data, pd->handle, PRODUCT_ENDOFLIFE, (*pd->content ? datestr2timestamp(pd->content) : 0));
+      break;
     default:
       break;
     }
@@ -409,8 +452,12 @@ add_code11_product(struct parsedata *pd, FILE *fp)
       if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
        {
          pool_debug(pd->pool, SOLV_ERROR, "%s: %s at line %u:%u\n", pd->filename, XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
-         pool_debug(pd->pool, SOLV_ERROR, "skipping this product\n");
          XML_ParserFree(parser);
+         if (pd->solvable)
+           {
+             repo_free_solvable(pd->repo, pd->solvable - pd->pool->solvables, 1);
+             pd->solvable = 0;
+           }
          return;
        }
       if (l == 0)