mirror of
https://github.com/clearlinux/graphene.git
synced 2026-08-28 13:25:43 +00:00
Dmitrii Kuvaiskii
8eee4a4742
The manifest syntax stays exactly the same, including 0 and 1 integers to denote boolean values (this is done for ease of porting and can be fixed in future commits). The only visible change is surrounding strings in the manifest with quotes (requirement of TOML). All manifests and Makefiles of our tests and example apps are ported to the new TOML syntax. Documentation is updated.
203 lines
4.2 KiB
Diff
203 lines
4.2 KiB
Diff
diff --git a/toml.c b/toml.c
|
|
index 1db5a5bf3e8414cb105511155d5e053523eff1e2..674e03e9b25f5d4b96a31b820f389a3a43d0e631 100644
|
|
--- a/toml.c
|
|
+++ b/toml.c
|
|
@@ -24,15 +24,7 @@
|
|
SOFTWARE.
|
|
|
|
*/
|
|
-#define _POSIX_C_SOURCE 200809L
|
|
-#include <stdio.h>
|
|
-#include <stdlib.h>
|
|
-#include <assert.h>
|
|
-#include <errno.h>
|
|
-#include <stdint.h>
|
|
-#include <ctype.h>
|
|
-#include <string.h>
|
|
-#include <stdbool.h>
|
|
+#include "api.h"
|
|
#include "toml.h"
|
|
|
|
|
|
@@ -1406,62 +1398,6 @@ fail:
|
|
return 0;
|
|
}
|
|
|
|
-
|
|
-toml_table_t* toml_parse_file(FILE* fp,
|
|
- char* errbuf,
|
|
- int errbufsz)
|
|
-{
|
|
- int bufsz = 0;
|
|
- char* buf = 0;
|
|
- int off = 0;
|
|
-
|
|
- /* read from fp into buf */
|
|
- while (! feof(fp)) {
|
|
-
|
|
- if (off == bufsz) {
|
|
- int xsz = bufsz + 1000;
|
|
- char* x = expand(buf, bufsz, xsz);
|
|
- if (!x) {
|
|
- snprintf(errbuf, errbufsz, "out of memory");
|
|
- xfree(buf);
|
|
- return 0;
|
|
- }
|
|
- buf = x;
|
|
- bufsz = xsz;
|
|
- }
|
|
-
|
|
- errno = 0;
|
|
- int n = fread(buf + off, 1, bufsz - off, fp);
|
|
- if (ferror(fp)) {
|
|
- snprintf(errbuf, errbufsz, "%s",
|
|
- errno ? strerror(errno) : "Error reading file");
|
|
- xfree(buf);
|
|
- return 0;
|
|
- }
|
|
- off += n;
|
|
- }
|
|
-
|
|
- /* tag on a NUL to cap the string */
|
|
- if (off == bufsz) {
|
|
- int xsz = bufsz + 1;
|
|
- char* x = expand(buf, bufsz, xsz);
|
|
- if (!x) {
|
|
- snprintf(errbuf, errbufsz, "out of memory");
|
|
- xfree(buf);
|
|
- return 0;
|
|
- }
|
|
- buf = x;
|
|
- bufsz = xsz;
|
|
- }
|
|
- buf[off] = 0;
|
|
-
|
|
- /* parse it, cleanup and finish */
|
|
- toml_table_t* ret = toml_parse(buf, errbuf, errbufsz);
|
|
- xfree(buf);
|
|
- return ret;
|
|
-}
|
|
-
|
|
-
|
|
static void xfree_kval(toml_keyval_t* p)
|
|
{
|
|
if (!p) return;
|
|
@@ -1893,11 +1829,7 @@ int toml_rtots(toml_raw_t src_, toml_timestamp_t* ret)
|
|
if (*p == '.') {
|
|
char* qq;
|
|
p++;
|
|
- errno = 0;
|
|
*millisec = strtol(p, &qq, 0);
|
|
- if (errno) {
|
|
- return -1;
|
|
- }
|
|
while (*millisec > 999) {
|
|
*millisec /= 10;
|
|
}
|
|
@@ -2020,72 +1952,19 @@ int toml_rtoi(toml_raw_t src, int64_t* ret_)
|
|
|
|
/* Run strtoll on buf to get the integer */
|
|
char* endp;
|
|
- errno = 0;
|
|
*ret = strtoll(buf, &endp, base);
|
|
- return (errno || *endp) ? -1 : 0;
|
|
+ return (*endp) ? -1 : 0;
|
|
}
|
|
|
|
|
|
int toml_rtod_ex(toml_raw_t src, double* ret_, char* buf, int buflen)
|
|
{
|
|
- if (!src) return -1;
|
|
-
|
|
- char* p = buf;
|
|
- char* q = p + buflen;
|
|
- const char* s = src;
|
|
- double dummy;
|
|
- double* ret = ret_ ? ret_ : &dummy;
|
|
-
|
|
-
|
|
- /* allow +/- */
|
|
- if (s[0] == '+' || s[0] == '-')
|
|
- *p++ = *s++;
|
|
-
|
|
- /* disallow +_1.00 */
|
|
- if (s[0] == '_')
|
|
- return -1;
|
|
-
|
|
- /* disallow +.99 */
|
|
- if (s[0] == '.')
|
|
- return -1;
|
|
-
|
|
- /* zero must be followed by . or 'e', or NUL */
|
|
- if (s[0] == '0' && s[1] && !strchr("eE.", s[1]))
|
|
- return -1;
|
|
-
|
|
- /* just strip underscores and pass to strtod */
|
|
- while (*s && p < q) {
|
|
- int ch = *s++;
|
|
- switch (ch) {
|
|
- case '.':
|
|
- if (s[-2] == '_') return -1;
|
|
- if (s[0] == '_') return -1;
|
|
- break;
|
|
- case '_':
|
|
- // disallow '__'
|
|
- if (s[0] == '_') return -1;
|
|
- continue; /* skip _ */
|
|
- default:
|
|
- break;
|
|
- }
|
|
- *p++ = ch;
|
|
- }
|
|
- if (*s || p == q) return -1; /* reached end of string or buffer is full? */
|
|
-
|
|
- /* last char cannot be '_' */
|
|
- if (s[-1] == '_') return -1;
|
|
-
|
|
- if (p != buf && p[-1] == '.')
|
|
- return -1; /* no trailing zero */
|
|
-
|
|
- /* cap with NUL */
|
|
- *p = 0;
|
|
-
|
|
- /* Run strtod on buf to get the value */
|
|
- char* endp;
|
|
- errno = 0;
|
|
- *ret = strtod(buf, &endp);
|
|
- return (errno || *endp) ? -1 : 0;
|
|
+ /* FIXME: strtod() is not supported by Graphene */
|
|
+ (void)src;
|
|
+ (void)ret_;
|
|
+ (void)buf;
|
|
+ (void)buflen;
|
|
+ return -1;
|
|
}
|
|
|
|
int toml_rtod(toml_raw_t src, double* ret_)
|
|
diff --git a/toml.h b/toml.h
|
|
index d541ec88b24283bb97050aa090f36e0aa7604d87..e7d5a40ed3781035e13d6a5003c05ee38f9a734a 100644
|
|
--- a/toml.h
|
|
+++ b/toml.h
|
|
@@ -26,7 +26,6 @@
|
|
#define TOML_H
|
|
|
|
|
|
-#include <stdio.h>
|
|
#include <stdint.h>
|
|
|
|
|
|
@@ -42,13 +41,6 @@ typedef struct toml_array_t toml_array_t;
|
|
/* A raw value, must be processed by toml_rto* before using. */
|
|
typedef const char* toml_raw_t;
|
|
|
|
-/* Parse a file. Return a table on success, or 0 otherwise.
|
|
- * Caller must toml_free(the-return-value) after use.
|
|
- */
|
|
-TOML_EXTERN toml_table_t* toml_parse_file(FILE* fp,
|
|
- char* errbuf,
|
|
- int errbufsz);
|
|
-
|
|
/* Parse a string containing the full config.
|
|
* Return a table on success, or 0 otherwise.
|
|
* Caller must toml_free(the-return-value) after use.
|