#include <fcntl.h>
#include <signal.h>
#include <unistd.h>
+#include <stdlib.h>
#include <libubox/uloop.h>
{
void *c;
char line[256];
- char *key, *val;
+ char *key, *val, *next;
struct utsname utsname;
FILE *f;
!strcasecmp(key, "processor") ||
!strcasecmp(key, "model name"))
{
- blobmsg_add_string(&b, "system", val + 2);
- break;
+ strtoul(val + 2, &key, 0);
+
+ if (key == (val + 2) || *key != 0)
+ {
+ blobmsg_add_string(&b, "system", val + 2);
+ break;
+ }
}
}
fclose(f);
}
- if ((f = fopen("/tmp/sysinfo/model", "r")) != NULL)
+ if ((f = fopen("/tmp/sysinfo/model", "r")) != NULL ||
+ (f = fopen("/proc/device-tree/model", "r")) != NULL)
{
if (fgets(line, sizeof(line), f))
{
while (fgets(line, sizeof(line), f))
{
- key = strtok(line, "=\"");
- val = strtok(NULL, "\"\n");
+ char *dest;
+ char ch;
- if (!key || !val)
+ key = line;
+ val = strchr(line, '=');
+ if (!val)
continue;
+ *(val++) = 0;
+
if (!strcasecmp(key, "DISTRIB_ID"))
- blobmsg_add_string(&b, "distribution", val);
+ key = "distribution";
else if (!strcasecmp(key, "DISTRIB_RELEASE"))
- blobmsg_add_string(&b, "version", val);
+ key = "version";
else if (!strcasecmp(key, "DISTRIB_REVISION"))
- blobmsg_add_string(&b, "revision", val);
+ key = "revision";
else if (!strcasecmp(key, "DISTRIB_CODENAME"))
- blobmsg_add_string(&b, "codename", val);
+ key = "codename";
else if (!strcasecmp(key, "DISTRIB_TARGET"))
- blobmsg_add_string(&b, "target", val);
+ key = "target";
else if (!strcasecmp(key, "DISTRIB_DESCRIPTION"))
- blobmsg_add_string(&b, "description", val);
+ key = "description";
+ else
+ continue;
+
+ dest = blobmsg_alloc_string_buffer(&b, key, strlen(val));
+ while (val && (ch = *(val++)) != 0) {
+ switch (ch) {
+ case '\'':
+ case '"':
+ next = strchr(val, ch);
+ if (next)
+ *next = 0;
+
+ strcpy(dest, val);
+
+ if (next)
+ val = next + 1;
+
+ dest += strlen(dest);
+ break;
+ case '\\':
+ *(dest++) = *(val++);
+ break;
+ }
+ }
+ blobmsg_add_string_buffer(&b);
}
blobmsg_close_array(&b, c);
blobmsg_close_array(&b, c);
c = blobmsg_open_table(&b, "memory");
- blobmsg_add_u32(&b, "total", info.mem_unit * info.totalram);
- blobmsg_add_u32(&b, "free", info.mem_unit * info.freeram);
- blobmsg_add_u32(&b, "shared", info.mem_unit * info.sharedram);
- blobmsg_add_u32(&b, "buffered", info.mem_unit * info.bufferram);
+ blobmsg_add_u64(&b, "total", info.mem_unit * info.totalram);
+ blobmsg_add_u64(&b, "free", info.mem_unit * info.freeram);
+ blobmsg_add_u64(&b, "shared", info.mem_unit * info.sharedram);
+ blobmsg_add_u64(&b, "buffered", info.mem_unit * info.bufferram);
blobmsg_close_table(&b, c);
c = blobmsg_open_table(&b, "swap");
- blobmsg_add_u32(&b, "total", info.mem_unit * info.totalswap);
- blobmsg_add_u32(&b, "free", info.mem_unit * info.freeswap);
+ blobmsg_add_u64(&b, "total", info.mem_unit * info.totalswap);
+ blobmsg_add_u64(&b, "free", info.mem_unit * info.freeswap);
blobmsg_close_table(&b, c);
ubus_send_reply(ctx, req, b.head);