Merge pull request #44 from akozumpl/archs

[platform/upstream/libsolv.git] / src / repo_solv.c

diff --git a/src/repo_solv.c b/src/repo_solv.c
index 53792fa..0e8b854 100644 (file)
--- a/src/repo_solv.c
+++ b/src/repo_solv.c
@@ -7,9 +7,9 @@
 
 /*
  * repo_solv.c
- * 
+ *
  * Add a repo in solv format
- * 
+ *
  */
 
 
@@ -453,9 +453,8 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
   char *sp;                           /* pointer into string space */
   Id *idmap;                          /* map of repo Ids to pool Ids */
   Id id, type;
-  unsigned int hashmask, h;
-  int hh;
-  Id *hashtbl;
+  Hashval hashmask, h, hh;
+  Hashtable hashtbl;
   Id name, evr, did;
   int relflags;
   Reldep *ran;
@@ -503,7 +502,7 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
       extendstart = repo->start;
       extendend = repo->end;
     }
-    
+
   memset(&data, 0, sizeof(data));
   data.repo = repo;
   data.fp = fp;
@@ -549,10 +548,10 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
 
   /*
    * read strings and Ids
-   * 
+   *
    */
 
-  
+
   /*
    * alloc buffers
    */
@@ -562,7 +561,7 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
       spool = &pool->ss;
       /* alloc max needed string buffer and string pointers, will shrink again later */
 #if 0
-      spool->stringspace = solv_realloc(spool->stringspace, spool->sstrings + sizeid + 1); 
+      spool->stringspace = solv_realloc(spool->stringspace, spool->sstrings + sizeid + 1);
       spool->strings = solv_realloc2(spool->strings, spool->nstrings + numid, sizeof(Offset));
 #else
       spool->sstrings += sizeid + 1;
@@ -576,7 +575,7 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
     {
       data.localpool = 1;
       spool = &data.spool;
-      spool->stringspace = solv_malloc(7 + sizeid + 1); 
+      spool->stringspace = solv_malloc(7 + sizeid + 1);
       spool->strings = solv_malloc2(numid < 2 ?  2 : numid, sizeof(Offset));
       strcpy(spool->stringspace, "<NULL>");
       spool->sstrings = 7;
@@ -588,12 +587,15 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
   /*
    * read string data and append to old string space
    */
-  
+
   strsp = spool->stringspace + spool->sstrings;        /* append new entries */
   if ((solvflags & SOLV_FLAG_PREFIX_POOL) == 0)
     {
       if (sizeid && fread(strsp, sizeid, 1, fp) != 1)
-        return pool_error(pool, SOLV_ERROR_EOF, "read error while reading strings");
+       {
+         repodata_freedata(&data);
+         return pool_error(pool, SOLV_ERROR_EOF, "read error while reading strings");
+       }
     }
   else
     {
@@ -605,9 +607,10 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
       int freesp = sizeid;
 
       if (pfsize && fread(prefix, pfsize, 1, fp) != 1)
-        {
+       {
          solv_free(prefix);
-          return pool_error(pool, SOLV_ERROR_EOF, "read error while reading strings");
+         repodata_freedata(&data);
+         return pool_error(pool, SOLV_ERROR_EOF, "read error while reading strings");
        }
       for (i = 1; i < numid; i++)
         {
@@ -617,6 +620,7 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
          if (freesp < 0)
            {
              solv_free(prefix);
+             repodata_freedata(&data);
              return pool_error(pool, SOLV_ERROR_OVERFLOW, "overflow while expanding strings");
            }
          if (same)
@@ -628,7 +632,10 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
        }
       solv_free(prefix);
       if (freesp != 0)
-       return pool_error(pool, SOLV_ERROR_CORRUPT, "expanding strings size mismatch");
+       {
+         repodata_freedata(&data);
+         return pool_error(pool, SOLV_ERROR_CORRUPT, "expanding strings size mismatch");
+       }
     }
   strsp[sizeid] = 0;                  /* make string space \0 terminated */
   sp = strsp;
@@ -643,12 +650,16 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
       if (*sp)
        {
          /* we need id 1 to be '' for directories */
+         repodata_freedata(&data);
          return pool_error(pool, SOLV_ERROR_CORRUPT, "store strings don't start with an empty string");
        }
       for (i = 1; i < spool->nstrings; i++)
        {
          if (sp >= strsp + sizeid && numid >= 2)
-           return pool_error(pool, SOLV_ERROR_OVERFLOW, "not enough strings");
+           {
+             repodata_freedata(&data);
+             return pool_error(pool, SOLV_ERROR_OVERFLOW, "not enough strings");
+           }
          str[i] = sp - spool->stringspace;
          sp += strlen(sp) + 1;
        }
@@ -700,6 +711,7 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
              spool->nstrings = oldnstrings;
              spool->sstrings = oldsstrings;
              stringpool_freehash(spool);
+             repodata_freedata(&data);
              return pool_error(pool, SOLV_ERROR_OVERFLOW, "not enough strings %d %d", i, numid);
            }
          if (!*sp)                            /* empty string */
@@ -744,14 +756,14 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
       stringpool_shrink(spool);                /* vacuum */
     }
 
-  
+
   /*******  Part 2: Relation IDs  ***************************************/
 
   /*
    * read RelDeps
-   * 
+   *
    */
-  
+
   if (numrel)
     {
       /* extend rels */
@@ -901,7 +913,7 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
       /* cannot handle mapped ids in vertical */
       if (!(flags & REPO_LOCALPOOL) && keys[i].storage == KEY_STORAGE_VERTICAL_OFFSET && (type == REPOKEY_TYPE_ID || type == REPOKEY_TYPE_IDARRAY))
        data.error = pool_error(pool, SOLV_ERROR_UNSUPPORTED, "mapped ids are not supported for STORAGE_VERTICAL_OFFSET");
- 
+
       if (keys[i].type == REPOKEY_TYPE_CONSTANTID && idmap)
        keys[i].size = idmap[keys[i].size];
 #if 0
@@ -924,7 +936,7 @@ repo_add_solv(Repo *repo, FILE *fp, int flags)
     }
 
   /*******  Part 5: Schemata ********************************************/
-  
+
   id = read_id(&data, 0);
   schemadata = solv_calloc(id + 1, sizeof(Id));
   schemadatap = schemadata + 1;
@@ -1089,13 +1101,13 @@ printf("=> %s %s %p\n", pool_id2str(pool, keys[key].name), pool_id2str(pool, key
        case REPOKEY_TYPE_ID:
          dp = data_read_id_max(dp, &did, idmap, numid + numrel, &data);
          if (s && id == SOLVABLE_NAME)
-           s->name = did; 
+           s->name = did;
          else if (s && id == SOLVABLE_ARCH)
-           s->arch = did; 
+           s->arch = did;
          else if (s && id == SOLVABLE_EVR)
-           s->evr = did; 
+           s->evr = did;
          else if (s && id == SOLVABLE_VENDOR)
-           s->vendor = did; 
+           s->vendor = did;
          else if (keys[key].storage == KEY_STORAGE_INCORE)
            incore_add_id(&data, did);
 #if 0
@@ -1278,6 +1290,12 @@ printf("=> %s %s %p\n", pool_id2str(pool, keys[key].name), pool_id2str(pool, key
       data.incoredata = solv_realloc(data.incoredata, data.incoredatalen);
       data.incoredatafree = 0;
     }
+  solv_free(idmap);
+
+  /* fixup the special idarray type */
+  for (i = 1; i < numkeys; i++)
+    if (keys[i].type == REPOKEY_TYPE_REL_IDARRAY)
+      keys[i].type = REPOKEY_TYPE_IDARRAY;
 
   for (i = 1; i < numkeys; i++)
     if (keys[i].storage == KEY_STORAGE_VERTICAL_OFFSET)
@@ -1286,7 +1304,7 @@ printf("=> %s %s %p\n", pool_id2str(pool, keys[key].name), pool_id2str(pool, key
     {
       Id fileoffset = 0;
       unsigned int pagesize;
-      
+
       /* we have vertical data, make it available */
       data.verticaloffset = solv_calloc(numkeys, sizeof(Id));
       for (i = 1; i < numkeys; i++)
@@ -1297,23 +1315,22 @@ printf("=> %s %s %p\n", pool_id2str(pool, keys[key].name), pool_id2str(pool, key
          }
       data.lastverticaloffset = fileoffset;
       pagesize = read_u32(&data);
-      data.error = repopagestore_read_or_setup_pages(&data.store, data.fp, pagesize, fileoffset);
-      if (data.error == SOLV_ERROR_EOF)
-        pool_error(pool, data.error, "repopagestore setup: unexpected EOF");
-      else if (data.error)
-        pool_error(pool, data.error, "repopagestore setup failed");
-    }
-  else
-    {
-      /* no longer needed */
-      data.fp = 0;
+      if (!data.error)
+       {
+         data.error = repopagestore_read_or_setup_pages(&data.store, data.fp, pagesize, fileoffset);
+         if (data.error == SOLV_ERROR_EOF)
+           pool_error(pool, data.error, "repopagestore setup: unexpected EOF");
+         else if (data.error)
+           pool_error(pool, data.error, "repopagestore setup failed");
+       }
     }
-  solv_free(idmap);
+  data.fp = 0; /* no longer needed */
 
   if (data.error)
     {
-      /* XXX: free repodata? */
-      return data.error;
+      i = data.error;
+      repodata_freedata(&data);
+      return i;
     }
 
   if (parent)