remove obsolete states, add support for product type, fix flags parsing
[platform/upstream/libsolv.git] / ext / repo_products.c
index acff8cd..4609ceb 100644 (file)
@@ -14,6 +14,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <errno.h>
 #include <limits.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include "tools_util.h"
 #include "repo_content.h"
 #include "repo_zyppdb.h"
+#include "repo_products.h"
 #include "repo_releasefile_products.h"
 
 
-//#define DUMPOUT 0
-
 enum state {
-  STATE_START,           // 0
-  STATE_PRODUCT,         // 1
-  STATE_VENDOR,          // 2
-  STATE_NAME,            // 3
-  STATE_VERSION,         // 4
-  STATE_RELEASE,         // 5
-  STATE_ARCH,            // 6
-  STATE_SUMMARY,         // 7
+  STATE_START,
+  STATE_PRODUCT,
+  STATE_VENDOR,
+  STATE_NAME,
+  STATE_VERSION,
+  STATE_RELEASE,
+  STATE_ARCH,
+  STATE_SUMMARY,
   STATE_SHORTSUMMARY,
-  STATE_DESCRIPTION,     // 8
-  STATE_UPDATEREPOKEY,   // 9 should go away
-  STATE_CPEID,         // 9
-  STATE_URLS,            // 10
-  STATE_URL,             // 11
-  STATE_RUNTIMECONFIG,   // 12
-  STATE_LINGUAS,         // 13
-  STATE_LANG,            // 14
-  STATE_REGISTER,        // 15
-  STATE_TARGET,          // 16
-  STATE_REGRELEASE,      // 18
-  STATE_PRODUCTLINE,     // 19
-  NUMSTATES              // 0
+  STATE_DESCRIPTION,
+  STATE_UPDATEREPOKEY,
+  STATE_CPEID,
+  STATE_URLS,
+  STATE_URL,
+  STATE_RUNTIMECONFIG,
+  STATE_LINGUAS,
+  STATE_LANG,
+  STATE_REGISTER,
+  STATE_TARGET,
+  STATE_REGRELEASE,
+  STATE_PRODUCTLINE,
+  NUMSTATES
 };
 
 struct stateswitch {
@@ -162,7 +162,7 @@ startElement(void *userData, const char *name, const char **atts)
   struct stateswitch *sw;
 
 #if 0
-      fprintf(stderr, "start: [%d]%s\n", pd->state, name);
+  fprintf(stderr, "start: [%d]%s\n", pd->state, name);
 #endif
   if (pd->depth != pd->statedepth)
     {
@@ -213,11 +213,8 @@ startElement(void *userData, const char *name, const char **atts)
       /* <summary lang="xy">... */
     case STATE_SUMMARY:
     case STATE_DESCRIPTION:
-      {
-       const char *lang = find_attr("lang", atts);
-       pd->tmplang = lang ? join2(&pd->jd, lang, 0, 0) : 0;
-       break;
-      }
+      pd->tmplang = join_dup(&pd->jd, find_attr("lang", atts));
+      break;
     case STATE_URL:
       pd->urltype = pool_str2id(pd->pool, find_attr("name", atts), 1);
       break;
@@ -234,7 +231,7 @@ endElement(void *userData, const char *name)
   Solvable *s = pd->solvable;
 
 #if 0
-      fprintf(stderr, "end: [%d]%s\n", pd->state, name);
+  fprintf(stderr, "end: [%d]%s\n", pd->state, name);
 #endif
   if (pd->depth != pd->statedepth)
     {
@@ -327,7 +324,7 @@ endElement(void *userData, const char *name)
       repodata_set_str(pd->data, pd->handle, PRODUCT_REGISTER_RELEASE, pd->content);
       break;
     case STATE_CPEID:
-      if (pd->content)
+      if (*pd->content)
         repodata_set_str(pd->data, pd->handle, SOLVABLE_CPEID, pd->content);
     default:
       break;
@@ -387,7 +384,7 @@ add_code11_product(struct parsedata *pd, FILE *fp)
   else
     {
       pd->currentproduct = pd->baseproduct + 1; /* make it != baseproduct if stat fails */
-      perror("fstat");
+      pool_error(pd->pool, 0, "fstat: %s", strerror(errno));
       pd->ctime = 0;
     }
 
@@ -413,7 +410,7 @@ add_code11_product(struct parsedata *pd, FILE *fp)
 }
 
 
-void
+int
 repo_add_code11_products(Repo *repo, const char *dirpath, int flags)
 {
   Repodata *data;
@@ -439,6 +436,8 @@ repo_add_code11_products(Repo *repo, const char *dirpath, int flags)
       pd.sbtab[sw->to] = sw->from;
     }
 
+  if (flags & REPO_USE_ROOTDIR)
+    dirpath = pool_prepend_rootdir(repo->pool, dirpath);
   dir = opendir(dirpath);
   if (dir)
     {
@@ -462,7 +461,7 @@ repo_add_code11_products(Repo *repo, const char *dirpath, int flags)
          fp = fopen(fullpath, "r");
          if (!fp)
            {
-             perror(fullpath);
+             pool_error(repo->pool, 0, "%s: %s", fullpath, strerror(errno));
              continue;
            }
          pd.filename = fullpath;
@@ -474,9 +473,12 @@ repo_add_code11_products(Repo *repo, const char *dirpath, int flags)
     }
   solv_free(pd.content);
   join_freemem(&pd.jd);
+  if (flags & REPO_USE_ROOTDIR)
+    solv_free((char *)dirpath);
 
   if (!(flags & REPO_NO_INTERNALIZE))
     repodata_internalize(data);
+  return 0;
 }
 
 
@@ -494,55 +496,60 @@ repo_add_code11_products(Repo *repo, const char *dirpath, int flags)
 
 /* Oh joy! Three parsers for the price of one! */
 
-void
-repo_add_products(Repo *repo, const char *proddir, const char *root, int flags)
+int
+repo_add_products(Repo *repo, const char *proddir, int flags)
 {
-  char *fullpath;
+  const char *fullpath;
   DIR *dir;
 
   if (proddir)
     {
-      dir = opendir(proddir);
+      dir = opendir(flags & REPO_USE_ROOTDIR ? pool_prepend_rootdir_tmp(repo->pool, proddir) : proddir);
       if (dir)
        {
          /* assume code11 stype products */
          closedir(dir);
-         repo_add_code11_products(repo, proddir, flags);
-         return;
+         return repo_add_code11_products(repo, proddir, flags);
        }
     }
 
   /* code11 didn't work, try old code10 zyppdb */
-  fullpath = solv_dupjoin(root ? root : 0, "/var/lib/zypp/db/products", 0);
+  fullpath = "/var/lib/zypp/db/products";
+  if (flags & REPO_USE_ROOTDIR)
+    fullpath = pool_prepend_rootdir_tmp(repo->pool, fullpath);
   dir = opendir(fullpath);
   if (dir)
     {
       closedir(dir);
       /* assume code10 style products */
-      repo_add_zyppdb_products(repo, fullpath, flags);
-      solv_free(fullpath);
-      return;
+      return repo_add_zyppdb_products(repo, "/var/lib/zypp/db/products", flags);
     }
-  solv_free(fullpath);
 
   /* code10/11 didn't work, try -release files parsing */
-  fullpath = solv_dupjoin(root ? root : 0, "/etc", 0);
+  fullpath = "/etc";
+  if (flags & REPO_USE_ROOTDIR)
+    fullpath = pool_prepend_rootdir_tmp(repo->pool, fullpath);
   dir = opendir(fullpath);
   if (dir)
     {
       closedir(dir);
-      repo_add_releasefile_products(repo, fullpath, flags);
-      solv_free(fullpath);
-      return;
+      return repo_add_releasefile_products(repo, "/etc", flags);
     }
 
-  /* no luck. print an error message in case the root argument is wrong */
-  perror(fullpath);
-  solv_free(fullpath);
+  /* no luck. check if the rootdir exists */
+  fullpath = pool_get_rootdir(repo->pool);
+  if (fullpath && *fullpath)
+    {
+      dir = opendir(fullpath);
+      if (!dir)
+       return pool_error(repo->pool, -1, "%s: %s", fullpath, strerror(errno));
+      closedir(dir);
+    }
 
   /* the least we can do... */
   if (!(flags & REPO_NO_INTERNALIZE) && (flags & REPO_REUSE_REPODATA) != 0)
     repodata_internalize(repo_last_repodata(repo));
+  return 0;
 }
 
 /* EOF */