Changeset 5675

Timestamp:

02/24/10 13:51:20 (3 years ago)

Author:

blogic

Message:

adds handling of a virtual root and better allocation of cbi_ctx

Location:

luci2/cbi2

Files:

• cbi.c (modified) (4 diffs)
• cbi.h (modified) (2 diffs)
• luci.c (modified) (2 diffs)

luci2/cbi2/cbi.c

@@ -540 +540 @@
 }
 
-struct cbi_ctx* cbi_load_files(const char *dir)
+static const char* cbi_virt_path(struct cbi_ctx *ctx, const char *path, const char *file)
+{
+    static char buf[256];
+    buf[255] = '\0';
+    snprintf(buf, 255, "%s%s%s", (ctx->vroot)?(ctx->vroot):(""), path, (file)?(file):(""));
+    return buf;
+}
+
+struct cbi_ctx* cbi_load_files(struct cbi_ctx *ctx)
 {
     glob_t gl;
     int gl_flags = GLOB_NOESCAPE | GLOB_NOSORT | GLOB_MARK;
-    struct cbi_ctx *ctx = cbi_alloc_ctx();
-    if(glob(dir, gl_flags, NULL, &gl) >= 0)
+    if(glob(cbi_virt_path(ctx, ctx->path, "*.lucio"), gl_flags, NULL, &gl) >= 0)
     {
         int i;
@@ -568 +575 @@
 }
 
-void cbi_check_new_files(struct cbi_ctx *ctx, const char *dir)
+void cbi_check_new_files(struct cbi_ctx *ctx)
 {
     glob_t gl;
     int gl_flags = GLOB_NOESCAPE | GLOB_NOSORT | GLOB_MARK;
-    if(glob(dir, gl_flags, NULL, &gl) >= 0)
+    if(glob(cbi_virt_path(ctx, ctx->path, "*.luco"), gl_flags, NULL, &gl) >= 0)
     {
         int i;
@@ -581 +588 @@
 }
 
-void cbi_check_new_files_src(struct cbi_ctx *ctx, const char *dir)
+void cbi_check_new_files_src(struct cbi_ctx *ctx)
 {
     glob_t gl;
     int gl_flags = GLOB_NOESCAPE | GLOB_NOSORT | GLOB_MARK;
-    if(glob(dir, gl_flags, NULL, &gl) >= 0)
+    if(glob(cbi_virt_path(ctx, ctx->path, "*.luci"), gl_flags, NULL, &gl) >= 0)
     {
         int i;
@@ -608 +615 @@
 {
     cbi_check_old_files(ctx);
-    cbi_check_new_files_src(ctx, "/lib/luci2/*.luci");
-    cbi_check_new_files(ctx, "/lib/luci2/*.luco");
-}
-
-struct cbi_ctx* cbi_load(void)
-{
-    struct cbi_ctx *ctx = cbi_load_files("/lib/luci2/*.luco");
+    cbi_check_new_files_src(ctx);
+    cbi_check_new_files(ctx);
+}
+
+struct cbi_ctx* cbi_init(const char *vroot, const char *path)
+{
+    struct cbi_ctx *ctx = cbi_alloc_ctx();
+    if(!path)
+        ctx->path = strdup("/lib/luci2/");
+    else
+        ctx->path = strdup(path);
+    if(vroot)
+        ctx->vroot = strdup(vroot);
+    else
+        ctx->vroot = 0;
+    cbi_load_files(ctx);
     cbi_index(ctx);
     cbi_reindex(ctx);
     return ctx;
 }
-

luci2/cbi2/cbi.h

@@ -24 +24 @@
     struct list_head menus;
     struct uvl_context *uvl;
+    const char *vroot;
+    const char *path;
 };
 
@@ -92 +94 @@
 };
 
-struct cbi_ctx* cbi_load(void);
+struct cbi_ctx* cbi_init(const char *vroot, const char *path);
 void cbi_dump(struct cbi_ctx *ctx);
 void cbi_free_context(struct cbi_ctx *ctx);

luci2/cbi2/luci.c

@@ -62 +62 @@
     int daemonize = 0;
     int sock = 0;
-    int blob;
-    char *b_file;
+    int blob = 0;
+    char *b_file = 0;
     int uvl = 0;
     char *u_file = 0;
@@ -129 +129 @@
         daemon(0,0);
 
-    ctx = cbi_load();
+    ctx = cbi_init(vpath, "/lib/luci2/");
 
     cbi_dump(ctx);