Changeset 5674

Timestamp:

02/24/10 13:02:56 (3 years ago)

Author:

blogic

Message:

add command line options, integrate lucic, add unix socket

Location:

luci2/cbi2

Files:

• cbi.c (modified) (2 diffs)
• luci.c (modified) (2 diffs)
• lucic.c (modified) (2 diffs)
• lucic.h (added)
• lucip.c (modified) (2 diffs)
• lucip.h (modified) (1 diff)
• Makefile (modified) (1 diff)
• u_sock.c (added)
• u_sock.h (added)

luci2/cbi2/cbi.c

@@ -12 +12 @@
 #include <libgen.h>
 
+#include "lucic.h"
 #include "list.h"
 #include "blob.h"
@@ -589 +590 @@
         for(i = 0; i < gl.gl_pathc; i++)
         {
-            char buf[256];
             char *out = strdup(gl.gl_pathv[i]);
             out[strlen(out) - 1] = 'o';
-            snprintf(buf, 255, "./lucic %s %s", gl.gl_pathv[i], out);
-            buf[255] = '\0';
             printf("compiling %s -> %s\n", gl.gl_pathv[i], out);
-            if(!system(buf))
+            if(!lucic_main(gl.gl_pathv[i], out))
             {
                 printf("deleting %s\n", gl.gl_pathv[i]);

luci2/cbi2/luci.c

@@ -7 +7 @@
 #include <unistd.h>
 #include <signal.h>
+#include <libgen.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 
+#define _GNU_SOURCE
+#include <getopt.h>
+
 #include "cbi.h"
+#include "u_sock.h"
+#include "lucic.h"
 
 static int loop = 1;
@@ -31 +37 @@
     sigaction(SIGTERM, &s2, NULL);
 }
+
+int print_help(void)
+{
+    printf("luci2 - cbi daemon\n");
+    printf("  -h,-?\t\t- print this help\n");
+    printf("  -s\t\t- open /tmp/luci2-socket for json testing\n");
+    printf("  -d\t\t- daemonize\n");
+    printf("  -v\t\t- use current folder as virtual root\n");
+    printf("  -b in.luco\t- dump the content of a blob\n");
+    printf("  -c in.luci\t- compile luci file\n");
+    printf("  -u in.uvl\t- compile uvl file\n");
+    printf("  -o out.luco\t- write compiled output to file\n");
+    return 0;
+}
+
 int main(int argc, char **argv)
 {
-    struct cbi_ctx *ctx = cbi_load();
+    int opt;
+    struct cbi_ctx *ctx;
+    int compile = 0;
+    char *c_file = 0;
+    int output = 0;
+    char *o_file = 0;
+    int daemonize = 0;
+    int sock = 0;
+    int blob;
+    char *b_file;
+    int uvl = 0;
+    char *u_file = 0;
+    int vroot = 0;
+    const char *vpath = 0;
+
+    while((opt = getopt(argc, argv, "h?sdvc:o:u:b:")) != -1)
+    {
+        switch(opt)
+        {
+        case '?':
+        case 'h':
+            return print_help();
+        case 's':
+            sock = 1;
+            break;
+        case 'd':
+            daemonize = 1;
+            break;
+        case 'c':
+            compile = 1;
+            c_file = optarg;
+            break;
+        case 'b':
+            blob = 1;
+            b_file = optarg;
+            break;
+        case 'o':
+            output = 1;
+            o_file = optarg;
+            break;
+        case 'u':
+            uvl = 1;
+            u_file = optarg;
+            break;
+        case 'v':
+            vroot = 1;
+            break;
+        default:
+            printf("unhandled parameter %c\n", opt);
+            break;
+        }
+    }
+
+    if(compile)
+        return lucic_main(c_file, o_file);
+
+    if(blob)
+//      return cbi_dump_blob(b_file);
+        return 0;
+
+    if(uvl)
+    {
+        printf("todo when lua is added\n");
+        return 1;
+    }
+
+    if(vroot)
+    {
+        vpath = dirname(*argv);
+        printf("using %s as virtual root\n", vpath);
+    }
+
+    if(daemonize)
+        daemon(0,0);
+
+    ctx = cbi_load();
 
     cbi_dump(ctx);
     setup_signals();
+    if(sock)
+        u_sock_init();
     while(loop)
     {
-        sleep(1);
+        if(sock)
+            u_sock_poll();
+        else
+            sleep(1);
         cbi_reindex(ctx);
     }

luci2/cbi2/lucic.c

@@ -9 +9 @@
 
 #include "lucip.h"
-
-void lucip_blob_dump(const char *path, struct blob_buf *bbuf)
-{
-    if(path)
-    {
-        int fd = open(path, O_CREAT|O_WRONLY, 0644);
-        if (fd < 0)
-            perror("Cannot open output file");
-        write(fd, bbuf->buf, blob_pad_len(bbuf->buf));
-        close(fd);
-    }
-}
+#include "lucic.h"
 
 static bool
@@ -34 +23 @@
 };
 
-void print_usage(void)
+int lucic_main(const char *in, const char *out)
 {
-    printf("lucic <infile> <outfile>\n");
-    exit(-1);
-}
-
-int main(int argc, char **argv)
-{
-    if(argc != 3)
-        print_usage();
-    if(!lucip_load(argv[1], &bbuf))
-        lucip_blob_dump(argv[2], &bbuf);
-    else
-        return printf("error opening %s\n",  argv[1]);
+    if(!lucip_load(in, &bbuf))
+    {
+        printf("Ok!\n");
+        if(out)
+            lucip_blob_dump(out, &bbuf);
+        else
+            printf("use -o to save luco file\n");
+    } else {
+        printf("error opening/compiling %s\n", in);
+        return 1;
+    }
     return 0;
 }

luci2/cbi2/lucip.c

@@ -196 +196 @@
             if(*l->last)
             {
-                //struct lucip_tag *t;
                 if(!l->stackcount)
                     return lucip_fail(l, OUTSIDE_TAG);
@@ -350 +349 @@
 }
 
+void lucip_blob_dump(const char *path, struct blob_buf *bbuf)
+{
+    if(path)
+    {
+        int fd = open(path, O_CREAT|O_WRONLY, 0644);
+        if (fd < 0)
+            perror("Cannot open output file");
+        write(fd, bbuf->buf, blob_pad_len(bbuf->buf));
+        close(fd);
+    }
+}

luci2/cbi2/lucip.h

@@ -60 +60 @@
 
 int lucip_load(const char *path, struct blob_buf *bbuf);
+void lucip_blob_dump(const char *path, struct blob_buf *bbuf);
 
 #endif

luci2/cbi2/Makefile

@@ -4 +4 @@
 LDFLAGS?=
 LIBS=-llua5.1
-BINARY=lucic luci uvl uvlc liblmo.a lmo_po2lmo
+BINARY=luci uvl uvlc liblmo.a lmo_po2lmo
 
 all: $(BINARY)
 
-lucic: lucic.c lucip.c blob.c 
-    $(CC) $(CFLAGS) -o $@ $^
-
-luci: luci.c cbi.c validate.c uvl.c blob.c widget.c validator/boolean.c widgets/page.c widgets/form.c widgets/section.c widgets/option.c widgets/field.c widgets/foreach.c widgets/file.c widgets/tsection.c 
+luci: luci.c lucic.c lucip.c cbi.c u_sock.c validate.c uvl.c blob.c widget.c validator/boolean.c widgets/page.c widgets/form.c widgets/section.c widgets/option.c widgets/field.c widgets/foreach.c widgets/file.c widgets/tsection.c 
     $(CC) $(CFLAGS) -o $@ $^