opkg: remove redundant multiple_providers option and also remove redundant familiar_r...

[oweals/opkg-lede.git] / libopkg / pkg_parse.c

diff --git a/libopkg/pkg_parse.c b/libopkg/pkg_parse.c
index cd0c6dc90b371777dea802f826c6563b5bec5e88..9b43754e04a6e51dcb305f4a6dc5a65c6cf91703 100644 (file)
--- a/libopkg/pkg_parse.c
+++ b/libopkg/pkg_parse.c
@@ -138,14 +138,16 @@ int parseVersion(pkg_t *pkg, char *raw)
   }
 
   pkg->revision = "";
-  pkg->familiar_revision = "";
 
+  if (!pkg->version)
+  {
   pkg->version= malloc(strlen(raw)+1);
   if ( pkg->version == NULL ) {
      fprintf(stderr, "%s: out of memory \n", __FUNCTION__);
      return ENOMEM;
   }
   strcpy(pkg->version, raw);
+  }
 
   hyphen= strrchr(pkg->version,'-');
 
@@ -154,14 +156,6 @@ int parseVersion(pkg_t *pkg, char *raw)
       pkg->revision = hyphen;
   }
 
-/*
-  fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n",
-         pkg->epoch,
-         pkg->version,
-         pkg->revision,
-         pkg->familiar_revision);
-*/
-         
   return 0;
 }
 
@@ -304,6 +298,7 @@ int pkg_parse_raw(pkg_t *pkg, char ***raw, pkg_src_t *src, pkg_dest_t *dest)
            else if(isGenericFieldType("Installed-Time:", *lines)) {
                char *time_str = parseGenericFieldType("Installed-Time", *lines);
                pkg->installed_time = strtoul(time_str, NULL, 0);
+               free (time_str);
            }       
            break;
 
@@ -376,7 +371,11 @@ out:;
     *raw = lines;
 /* If the ipk has not a Provides line, we insert our false line */ 
     if ( pkg_false_provides==1)
-       pkg->provides_str = parseDependsString ((char *)"Provides: opkg_internal_use_only ", &pkg->provides_count);
+    {
+       pkg->provides_count = 1;
+       pkg->provides_str = malloc (sizeof (char*));
+       pkg->provides_str[0] = strdup ("opkg_internal_use_only");
+    }
 
     if (pkg->name) {
        return 0;