Support global prefs through eclient interface.

[disorder] / cgi / options.c

diff --git a/cgi/options.c b/cgi/options.c
index 05712c2a55f08caa7f700427d2e6a0953585ebc9..fca5801caa3024d2acb99df61b095ade57afcaa7 100644 (file)
--- a/cgi/options.c
+++ b/cgi/options.c
@@ -72,7 +72,7 @@ static void option__split_error(const char *msg,
                               void *u) {
   struct read_options_state *cs = u;
   
                               void *u) {
   struct read_options_state *cs = u;
   

-  error(0, "%s:%d: %s", cs->name, cs->line, msg);
+  disorder_error(0, "%s:%d: %s", cs->name, cs->line, msg);

 }
 
 static void option__readfile(const char *name) {
 }
 
 static void option__readfile(const char *name) {


@@ -84,7 +84,7 @@ static void option__readfile(const char *name) {
   if(!(cs.name = mx_find(name, 1/*report*/)))
     return;
   if(!(fp = fopen(cs.name, "r")))
   if(!(cs.name = mx_find(name, 1/*report*/)))
     return;
   if(!(fp = fopen(cs.name, "r")))

-    fatal(errno, "error opening %s", cs.name);
+    disorder_fatal(errno, "error opening %s", cs.name);

   cs.line = 0;
   while(!inputline(cs.name, fp, &buffer, '\n')) {
     ++cs.line;
   cs.line = 0;
   while(!inputline(cs.name, fp, &buffer, '\n')) {
     ++cs.line;


@@ -94,17 +94,17 @@ static void option__readfile(const char *name) {
     if(!n)
       continue;
     if((i = TABLE_FIND(options, name, vec[0])) == -1) {
     if(!n)
       continue;
     if((i = TABLE_FIND(options, name, vec[0])) == -1) {

-      error(0, "%s:%d: unknown option '%s'", cs.name, cs.line, vec[0]);
+      disorder_error(0, "%s:%d: unknown option '%s'", cs.name, cs.line, vec[0]);

       continue;
     }
     ++vec;
     --n;
     if(n < options[i].minargs) {
       continue;
     }
     ++vec;
     --n;
     if(n < options[i].minargs) {

-      error(0, "%s:%d: too few arguments to '%s'", cs.name, cs.line, vec[-1]);
+      disorder_error(0, "%s:%d: too few arguments to '%s'", cs.name, cs.line, vec[-1]);

       continue;
     }
     if(n > options[i].maxargs) {
       continue;
     }
     if(n > options[i].maxargs) {

-      error(0, "%s:%d: too many arguments to '%s'", cs.name, cs.line, vec[-1]);
+      disorder_error(0, "%s:%d: too many arguments to '%s'", cs.name, cs.line, vec[-1]);

       continue;
     }
     options[i].handler(n, vec);
       continue;
     }
     options[i].handler(n, vec);