src/libpakfire/packager.c \
src/libpakfire/packagelist.c \
src/libpakfire/pakfire.c \
+ src/libpakfire/parse.c \
src/libpakfire/parser.c \
src/libpakfire/path.c \
src/libpakfire/problem.c \
src/libpakfire/include/pakfire/packager.h \
src/libpakfire/include/pakfire/packagelist.h \
src/libpakfire/include/pakfire/pakfire.h \
+ src/libpakfire/include/pakfire/parse.h \
src/libpakfire/include/pakfire/parser.h \
src/libpakfire/include/pakfire/path.h \
src/libpakfire/include/pakfire/private.h \
--- /dev/null
+/*#############################################################################
+# #
+# Pakfire - The IPFire package management system #
+# Copyright (C) 2023 Pakfire development team #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+#############################################################################*/
+
+#ifndef PAKFIRE_PARSE_H
+#define PAKFIRE_PARSE_H
+
+#ifdef PAKFIRE_PRIVATE
+
+/*
+ A callback that is called for each line that there is to parse.
+*/
+typedef int (*pakfire_parse_line)(char* line, size_t length, void* data);
+
+// Parses the given file
+int pakfire_parse_file(const char* path, pakfire_parse_line parse, void* data);
+
+// Splits a line into two parts separated by the given delimiter
+int pakfire_parse_split_line(char* line, size_t length, char** key, char** value, char delim);
+
+#endif /* PAKFIRE_PRIVATE */
+
+#endif /* PAKFIRE_PARSE_H */
# #
#############################################################################*/
-#include <ctype.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <pakfire/os.h>
+#include <pakfire/parse.h>
#include <pakfire/string.h>
-typedef int (*pakfire_parse_line)(char* line, size_t length, void* data);
-
-static int pakfire_parse_file(const char* path, pakfire_parse_line parse, void* data) {
- FILE* f = NULL;
- char* line = NULL;
- size_t length = 0;
- int r = 0;
-
- ssize_t bytes_read = 0;
-
- // Open the file
- f = fopen(path, "r");
- if (!f)
- return -errno;
-
- // Walk through the file line by line
- for (;;) {
- bytes_read = getline(&line, &length, f);
- if (bytes_read < 0)
- break;
-
- r = parse(line, length, data);
- if (r)
- goto ERROR;
- }
-
-ERROR:
- if (line)
- free(line);
- if (f)
- fclose(f);
-
- return r;
-}
-
-static int pakfire_split_line(char* line, size_t length, char** key, char** value, char delim) {
- char* k = line;
- char* v = NULL;
- char* p = NULL;
-
- // Strip any trailing whitespace
- pakfire_string_strip(line);
-
- if (!*line)
- return 0;
-
- // Find the delimiter
- p = strchr(line, delim);
- if (!p)
- return -EINVAL;
-
- // The value starts somewhere after the delimiter
- v = p + 1;
-
- // Replace the delimiter by NULL
- *p = '\0';
-
- // Strip the key
- pakfire_string_strip(k);
-
- // The key is empty
- if (!*k)
- return -EINVAL;
-
- // Strip the value
- pakfire_string_strip(v);
-
- // Return the pointers
- *key = k;
- *value = v;
-
- return 0;
-}
-
// CPU Info
static int pakfire_parse_cpuinfo(char* line, size_t length, void* data) {
char* v = NULL;
// Split the line
- r = pakfire_split_line(line, length, &k, &v, ':');
+ r = pakfire_parse_split_line(line, length, &k, &v, ':');
if (r)
return r;
char* v = NULL;
// Split the line
- r = pakfire_split_line(line, length, &k, &v, ':');
+ r = pakfire_parse_split_line(line, length, &k, &v, ':');
if (r)
return r;
char* v = NULL;
// Split the line
- r = pakfire_split_line(line, length, &k, &v, '=');
+ r = pakfire_parse_split_line(line, length, &k, &v, '=');
if (r)
return r;
char* v = NULL;
// Split the line
- r = pakfire_split_line(line, length, &k, &v, ':');
+ r = pakfire_parse_split_line(line, length, &k, &v, ':');
if (r)
return r;
--- /dev/null
+/*#############################################################################
+# #
+# Pakfire - The IPFire package management system #
+# Copyright (C) 2023 Pakfire development team #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+#############################################################################*/
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <pakfire/parse.h>
+#include <pakfire/string.h>
+
+int pakfire_parse_file(const char* path, pakfire_parse_line parse, void* data) {
+ FILE* f = NULL;
+ char* line = NULL;
+ size_t length = 0;
+ int r = 0;
+
+ ssize_t bytes_read = 0;
+
+ // Open the file
+ f = fopen(path, "r");
+ if (!f)
+ return -errno;
+
+ // Walk through the file line by line
+ for (;;) {
+ bytes_read = getline(&line, &length, f);
+ if (bytes_read < 0)
+ break;
+
+ r = parse(line, length, data);
+ if (r)
+ goto ERROR;
+ }
+
+ERROR:
+ if (line)
+ free(line);
+ if (f)
+ fclose(f);
+
+ return r;
+}
+
+int pakfire_parse_split_line(char* line, size_t length, char** key, char** value, char delim) {
+ char* k = line;
+ char* v = NULL;
+ char* p = NULL;
+
+ // Strip any trailing whitespace
+ pakfire_string_strip(line);
+
+ if (!*line)
+ return 0;
+
+ // Find the delimiter
+ p = strchr(line, delim);
+ if (!p)
+ return -EINVAL;
+
+ // The value starts somewhere after the delimiter
+ v = p + 1;
+
+ // Replace the delimiter by NULL
+ *p = '\0';
+
+ // Strip the key
+ pakfire_string_strip(k);
+
+ // The key is empty
+ if (!*k)
+ return -EINVAL;
+
+ // Strip the value
+ pakfire_string_strip(v);
+
+ // Return the pointers
+ *key = k;
+ *value = v;
+
+ return 0;
+}