main: fix parsing of option alias

[src/app-framework-binder.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index b3895cf..74e8745 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -50,34 +50,37 @@ static sigjmp_buf exitPoint; // context save for set/longjmp
 
 
 // Define command line option
- #define SET_VERBOSE        101
- #define SET_BACKGROUND     105
- #define SET_FORGROUND      106
- #define KILL_PREV_EXIT     107
- #define KILL_PREV_REST     108
- #define SET_FAKE_MOD       109
-
- #define SET_TCP_PORT       120
- #define SET_ROOT_DIR       121
- #define SET_ROOT_BASE      122
- #define SET_ROOT_API       123
- #define SET_ROOT_ALIAS     124
-
- #define SET_CACHE_TO       130
- #define SET_USERID         131
- #define SET_PID_FILE       132
- #define SET_SESSION_DIR    133
- #define SET_CONFIG_FILE    134
- #define SET_CONFIG_SAVE    135
- #define SET_CONFIG_EXIT    138
-
- #define SET_AUTH_TOKEN     141
- #define SET_LDPATH        142
- #define SET_APITIMEOUT     143
- #define SET_CNTXTIMEOUT    144
-
- #define DISPLAY_VERSION    150
- #define DISPLAY_HELP       151
+#define SET_VERBOSE        101
+#define SET_BACKGROUND     105
+#define SET_FORGROUND      106
+#define KILL_PREV_EXIT     107
+#define KILL_PREV_REST     108
+#define SET_FAKE_MOD       109
+
+#define SET_TCP_PORT       120
+#define SET_ROOT_DIR       121
+#define SET_ROOT_BASE      122
+#define SET_ROOT_API       123
+#define SET_ROOT_ALIAS     124
+
+#define SET_CACHE_TO       130
+#define SET_USERID         131
+#define SET_PID_FILE       132
+#define SET_SESSION_DIR    133
+#define SET_CONFIG_FILE    134
+#define SET_CONFIG_SAVE    135
+#define SET_CONFIG_EXIT    138
+
+#define SET_AUTH_TOKEN     141
+#define SET_LDPATH         142
+#define SET_APITIMEOUT     143
+#define SET_CNTXTIMEOUT    144
+
+#define DISPLAY_VERSION    150
+#define DISPLAY_HELP       151
+
+#define SET_MODE           160
+#define SET_READYFD        161
 
 
 // Supported option
@@ -111,6 +114,9 @@ static  AFB_options cliOptions [] = {
   
   {DISPLAY_VERSION  ,0,"version"         , "Display version and copyright"},
   {DISPLAY_HELP     ,0,"help"            , "Display this help"},
+
+  {SET_MODE         ,1,"mode"            , "set the mode: either local, remote or global"},
+  {SET_READYFD      ,1,"readyfd"         , "set the #fd to signal when ready"},
   {0, 0, 0}
  };
 
@@ -238,6 +244,12 @@ static void listenLoop (AFB_session *session) {
         err = httpdStart (session);
         if (err != AFB_SUCCESS) return;
 
+       if (session->readyfd != 0) {
+               static const char readystr[] = "READY=1";
+               write(session->readyfd, readystr, sizeof(readystr) - 1);
+               close(session->readyfd);
+       }
+
         // infinite loop
         httpdLoop(session);
 
@@ -333,10 +345,14 @@ int main(int argc, char *argv[])  {
        if (optarg == 0) goto needValueForOption;
        if (aliascount < MAX_ALIAS) {
             aliasdir[aliascount].url  = strsep(&optarg,":");
-            aliasdir[aliascount].path = strsep(&optarg,":");
-            aliasdir[aliascount].len  = strlen(aliasdir[aliascount].url);
-            if (verbose) fprintf(stderr, "Alias url=%s path=%s\n", aliasdir[aliascount].url, aliasdir[aliascount].path);
-            aliascount++;
+            if (optarg == NULL) {
+              fprintf(stderr, "missing ':' in alias %s, ignored\n", aliasdir[aliascount].url);
+            } else {
+              aliasdir[aliascount].path = optarg;
+              aliasdir[aliascount].len  = strlen(aliasdir[aliascount].url);
+              if (verbose) fprintf(stderr, "Alias url=%s path=%s\n", aliasdir[aliascount].url, aliasdir[aliascount].path);
+              aliascount++;
+            }
        } else {
            fprintf(stderr, "Too many aliases [max:%s] %s ignored\n", optarg, MAX_ALIAS-1);
        }     
@@ -413,6 +429,19 @@ int main(int argc, char *argv[])  {
        session->killPrevious  = 2;
        break;
 
+    case SET_MODE:
+       if (optarg == 0) goto needValueForOption;
+       if (!strcmp(optarg, "local")) cliconfig.mode = AFB_MODE_LOCAL;
+       else if (!strcmp(optarg, "remote")) cliconfig.mode = AFB_MODE_REMOTE;
+       else if (!strcmp(optarg, "global")) cliconfig.mode = AFB_MODE_GLOBAL;
+       else goto badMode;
+       break;
+
+    case SET_READYFD:
+       if (optarg == 0) goto needValueForOption;
+       if (!sscanf (optarg, "%u", &session->readyfd)) goto notAnInteger;
+       break;
+
     case DISPLAY_VERSION:
        if (optarg != 0) goto noValueForOption;
        printVersion();
@@ -423,7 +452,7 @@ int main(int argc, char *argv[])  {
        printHelp(programName);
        goto normalExit;
 
-  }
+    }
   }
  
   // if exist merge config file with CLI arguments
@@ -440,9 +469,9 @@ int main(int argc, char *argv[])  {
   if  ((session->background == 0) && (session->foreground == 0)) session->foreground=1;
 
   // open syslog if ever needed
-  openlog("AGB-log", 0, LOG_DAEMON);
+  openlog("AFB-log", 0, LOG_DAEMON);
 
-  // -------------- Try to kill any previsou process if asked ---------------------
+  // -------------- Try to kill any previous process if asked ---------------------
   if (session->killPrevious) {
     pid = readPidFile (session->config);  // enforce commandline option
     switch (pid) {
@@ -574,7 +603,7 @@ int main(int argc, char *argv[])  {
       if (status == -1) goto errorPidFile;
 
       // we are in father process, we don't need this one
-      exit (0);
+      _exit (0);
 
   } // end background-foreground
 
@@ -615,6 +644,11 @@ notAnInteger:
           ,gnuOptions[optionIndex].name, gnuOptions[optionIndex].name);
   exit (-1);
 
+badMode:
+  fprintf (stderr,"\nERR:AFB-daemon option [--%s] only accepts local, global or remote.\n\n"
+          ,gnuOptions[optionIndex].name);
+  exit (-1);
+
 exitOnSignal:
   fprintf (stderr,"\n%s INF:AFB-daemon pid=%d received exit signal (Hopefully crtl-C or --kill-previous !!!)\n\n"
                  ,configTime(), getpid());