Create parse_util with some of the non-public functions from pkg_parse.c

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

diff --git a/libopkg/pkg_parse.c b/libopkg/pkg_parse.c
index ba64269db08eb33a928b22a127407f040c76f968..e0d7fce11f8ada0892cbb03b08bcb97d20bc8420 100644 (file)
--- a/libopkg/pkg_parse.c
+++ b/libopkg/pkg_parse.c
@@ -26,64 +26,7 @@
 #include "pkg_parse.h"
 #include "libbb/libbb.h"
 
 #include "pkg_parse.h"
 #include "libbb/libbb.h"
 

-static int
-is_field(const char *type, const char *line)
-{
-       if (!strncmp(line, type, strlen(type)))
-               return 1;
-       return 0;
-}
-
-static char *
-parse_simple(const char *type, const char *line)
-{
-       return trim_xstrdup(line + strlen(type) + 1);
-}
-
-/*
- * Parse a comma separated string into an array.
- */
-static char **
-parse_comma_separated(const char *raw, unsigned int *count)
-{
-       char **depends = NULL;
-       const char *start, *end;
-       int line_count = 0;
-
-       /* skip past the "Field:" marker */
-       while (*raw && *raw != ':')
-               raw++;
-       raw++;
-
-       if (line_is_blank(raw)) {
-               *count = line_count;
-               return NULL;
-       }
-
-       while (*raw) {
-               depends = xrealloc(depends, sizeof(char *) * (line_count + 1));
-
-               while (isspace(*raw))
-                       raw++;
-
-               start = raw;
-               while (*raw != ',' && *raw)
-                       raw++;
-               end = raw;
-
-               while (end > start && isspace(*end))
-                       end--;
-
-               depends[line_count] = xstrndup(start, end-start);
-
-               line_count++;
-               if (*raw == ',')
-                   raw++;
-       }
-
-       *count = line_count;
-       return depends;
-}
+#include "parse_util.h"

 
 static void
 parse_status(pkg_t *pkg, const char *sstr)
 
 static void
 parse_status(pkg_t *pkg, const char *sstr)


@@ -194,7 +137,7 @@ pkg_parse_line(pkg_t *pkg, const char *line, uint mask)
                        goto dont_reset_flags;
                }
                else if ((mask & PFM_CONFLICTS) && is_field("Conflicts", line))
                        goto dont_reset_flags;
                }
                else if ((mask & PFM_CONFLICTS) && is_field("Conflicts", line))

-                       pkg->conflicts_str = parse_comma_separated(line, &pkg->conflicts_count);
+                       pkg->conflicts_str = parse_list(line, &pkg->conflicts_count, ',', 0);

                break;
 
        case 'D':
                break;
 
        case 'D':


@@ -204,7 +147,7 @@ pkg_parse_line(pkg_t *pkg, const char *line, uint mask)
                        reading_description = 1;
                        goto dont_reset_flags;
                } else if ((mask & PFM_DEPENDS) && is_field("Depends", line))
                        reading_description = 1;
                        goto dont_reset_flags;
                } else if ((mask & PFM_DEPENDS) && is_field("Depends", line))

-                       pkg->depends_str = parse_comma_separated(line, &pkg->depends_count);
+                       pkg->depends_str = parse_list(line, &pkg->depends_count, ',', 0);

                break;
 
        case 'E':
                break;
 
        case 'E':


@@ -250,16 +193,16 @@ pkg_parse_line(pkg_t *pkg, const char *line, uint mask)
                else if ((mask & PFM_PRIORITY) && is_field("Priority", line))
                        pkg->priority = parse_simple("Priority", line);
                else if ((mask & PFM_PROVIDES) && is_field("Provides", line))
                else if ((mask & PFM_PRIORITY) && is_field("Priority", line))
                        pkg->priority = parse_simple("Priority", line);
                else if ((mask & PFM_PROVIDES) && is_field("Provides", line))

-                       pkg->provides_str = parse_comma_separated(line, &pkg->provides_count);
+                       pkg->provides_str = parse_list(line, &pkg->provides_count, ',', 0);

                else if ((mask & PFM_PRE_DEPENDS) && is_field("Pre-Depends", line))
                else if ((mask & PFM_PRE_DEPENDS) && is_field("Pre-Depends", line))

-                       pkg->pre_depends_str = parse_comma_separated(line, &pkg->pre_depends_count);
+                       pkg->pre_depends_str = parse_list(line, &pkg->pre_depends_count, ',', 0);

                break;
 
        case 'R':
                if ((mask & PFM_RECOMMENDS) && is_field("Recommends", line))
                break;
 
        case 'R':
                if ((mask & PFM_RECOMMENDS) && is_field("Recommends", line))

-                       pkg->recommends_str = parse_comma_separated(line, &pkg->recommends_count);
+                       pkg->recommends_str = parse_list(line, &pkg->recommends_count, ',', 0);

                else if ((mask & PFM_REPLACES) && is_field("Replaces", line))
                else if ((mask & PFM_REPLACES) && is_field("Replaces", line))

-                       pkg->replaces_str = parse_comma_separated(line, &pkg->replaces_count);
+                       pkg->replaces_str = parse_list(line, &pkg->replaces_count, ',', 0);

 
                break;
 
 
                break;
 


@@ -279,7 +222,7 @@ pkg_parse_line(pkg_t *pkg, const char *line, uint mask)
                else if ((mask & PFM_STATUS) && is_field("Status", line))
                        parse_status(pkg, line);
                else if ((mask & PFM_SUGGESTS) && is_field("Suggests", line))
                else if ((mask & PFM_STATUS) && is_field("Status", line))
                        parse_status(pkg, line);
                else if ((mask & PFM_SUGGESTS) && is_field("Suggests", line))

-                       pkg->suggests_str = parse_comma_separated(line, &pkg->suggests_count);
+                       pkg->suggests_str = parse_list(line, &pkg->suggests_count, ',', 0);

                break;
 
        case 'T':
                break;
 
        case 'T':