nterface-ip: remove superfluous iface check in interface_ip_set_enabled()

[project/netifd.git] / handler.c

diff --git a/handler.c b/handler.c
index f81a7c5..8608a97 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -34,6 +34,9 @@ netifd_dir_push(int fd)
 static void
 netifd_dir_pop(int prev_fd)
 {
+       if (prev_fd < 0)
+               return;
+
        if (fchdir(prev_fd)) {}
        close(prev_fd);
 }
@@ -105,7 +108,7 @@ netifd_parse_script_handler(const char *name, script_dump_cb cb)
                        tok = json_tokener_new();
 
                obj = json_tokener_parse_ex(tok, start, len);
-               if (!is_error(obj)) {
+               if (obj) {
                        netifd_init_script_handler(name, obj, cb);
                        json_object_put(obj);
                        json_tokener_free(tok);
@@ -128,10 +131,16 @@ void netifd_init_script_handlers(int dir_fd, script_dump_cb cb)
        int i, prev_fd;
 
        prev_fd = netifd_dir_push(dir_fd);
-       glob("./*.sh", 0, NULL, &g);
+       if (glob("./*.sh", 0, NULL, &g)) {
+               netifd_dir_pop(prev_fd);
+               return;
+       }
+
        for (i = 0; i < g.gl_pathc; i++)
                netifd_parse_script_handler(g.gl_pathv[i], cb);
        netifd_dir_pop(prev_fd);
+
+       globfree(&g);
 }
 
 char *