*/
#include <string.h>
#include <stdlib.h>
-#include "utils.h"
#include <arpa/inet.h>
#include <netinet/in.h>
+#include <sys/socket.h>
#ifdef __APPLE__
#include <libproc.h>
#endif
+#include "utils.h"
+
void
__vlist_simple_init(struct vlist_simple_tree *tree, int offset)
{
bool check_pid_path(int pid, const char *exe)
{
+ const char deleted[] = " (deleted)";
+ const int deleted_len = strlen(deleted);
int proc_exe_len;
int exe_len = strlen(exe);
proc_exe_len = readlink(proc_exe, proc_exe_buf, exe_len);
#endif
- if (proc_exe_len != exe_len)
+ if (proc_exe_len == exe_len)
+ return !memcmp(exe, proc_exe_buf, exe_len);
+ else if (proc_exe_len == exe_len + deleted_len)
+ return !memcmp(exe, proc_exe_buf, exe_len) &&
+ !memcmp(exe + exe_len, deleted, deleted_len);
+ else
return false;
+}
+
+static const char * const uci_validate_name[__BLOBMSG_TYPE_LAST] = {
+ [BLOBMSG_TYPE_STRING] = "string",
+ [BLOBMSG_TYPE_ARRAY] = "list(string)",
+ [BLOBMSG_TYPE_INT32] = "uinteger",
+ [BLOBMSG_TYPE_BOOL] = "bool",
+};
+
+const char*
+uci_get_validate_string(const struct uci_blob_param_list *p, int i)
+{
+ if (p->validate[i])
+ return p->validate[i];
+
+ else if (uci_validate_name[p->params[i].type])
+ return uci_validate_name[p->params[i].type];
- return !memcmp(exe, proc_exe_buf, exe_len);
+ return p->validate[BLOBMSG_TYPE_STRING];
}