X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=da5984ec25dcc2b955bbb37d8396aac4dbe60e7d;hb=b841c268ae2d7572bc2caf21263692737cfe5648;hp=9769f5269d9e71dc33d3ac5eed06c50cef35d123;hpb=7192018f97f6406ccc6711fc5d76cea63ec080ec;p=src%2Fapp-framework-binder.git

diff --git a/src/main.c b/src/main.c
index 9769f526..da5984ec 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,6 +84,14 @@ static sigjmp_buf exitPoint; // context save for set/longjmp
 #define SET_MODE           160
 #define SET_READYFD        161
 
+// Command line structure hold cli --command + help text
+typedef struct {
+  int  val;        // command number within application
+  int  has_arg;    // command number within application
+  char *name;      // command as used in --xxxx cli
+  char *help;      // help text
+} AFB_options;
+
 
 // Supported option
 static  AFB_options cliOptions [] = {
@@ -279,7 +287,6 @@ int main(int argc, char *argv[])  {
   cliconfig.aliasdir = aliasdir;
 
   // GNU CLI getopts nterface.
-  struct option ggcOption;
   struct option *gnuOptions;
 
   // ------------------ Process Command Line -----------------------
@@ -287,12 +294,12 @@ int main(int argc, char *argv[])  {
   // if no argument print help and return
   if (argc < 2) {
        printHelp(programName);
-       return (-1);
+       return 1;
   }
 
   // build GNU getopt info from cliOptions
   nbcmd = sizeof (cliOptions) / sizeof (AFB_options);
-  gnuOptions = malloc (sizeof (ggcOption) * (unsigned)nbcmd);
+  gnuOptions = malloc (sizeof (*gnuOptions) * (unsigned)nbcmd);
   for (ind=0; ind < nbcmd;ind++) {
     gnuOptions [ind].name    = cliOptions[ind].name;
     gnuOptions [ind].has_arg = cliOptions[ind].has_arg;
@@ -464,7 +471,7 @@ int main(int argc, char *argv[])  {
   // ------------------ sanity check ----------------------------------------
   if  ((session->background) && (session->foreground)) {
     fprintf (stderr, "%s ERR: cannot select foreground & background at the same time\n",configTime());
-     exit (-1);
+     exit (1);
   }
 
   // ------------------ Some useful default values -------------------------
@@ -501,7 +508,7 @@ int main(int argc, char *argv[])  {
   // ------------------ clean exit on CTR-C signal ------------------------
   if (signal (SIGINT, signalQuit) == SIG_ERR) {
     fprintf (stderr, "%s Quit Signal received.",configTime());
-    return (-1);
+    return 1;
   }
 
   // save exitPoint context when returning from longjmp closeSession and exit
@@ -617,57 +624,57 @@ normalExit:
 // ------------- Fatal ERROR display error and quit  -------------
 errorSetuid:
   fprintf (stderr,"\nERR:AFB-daemon Failed to change UID to username=[%s]\n\n", session->config->setuid);
-  exit (-1);
+  exit (1);
   
 //errorNoRoot:
 //  fprintf (stderr,"\nERR:AFB-daemon Not allow to run as root [use --seteuid=username option]\n\n");
-//  exit (-1);
+//  exit (1);
 
 errorPidFile:
   fprintf (stderr,"\nERR:AFB-daemon Failed to write pid file [%s]\n\n", session->config->pidfile);
-  exit (-1);
+  exit (1);
 
 errorFork:
   fprintf (stderr,"\nERR:AFB-daemon Failed to fork son process\n\n");
-  exit (-1);
+  exit (1);
 
 needValueForOption:
   fprintf (stderr,"\nERR:AFB-daemon option [--%s] need a value i.e. --%s=xxx\n\n"
           ,gnuOptions[optionIndex].name, gnuOptions[optionIndex].name);
-  exit (-1);
+  exit (1);
 
 noValueForOption:
   fprintf (stderr,"\nERR:AFB-daemon option [--%s] don't take value\n\n"
           ,gnuOptions[optionIndex].name);
-  exit (-1);
+  exit (1);
 
 notAnInteger:
   fprintf (stderr,"\nERR:AFB-daemon option [--%s] requirer an interger i.e. --%s=9\n\n"
           ,gnuOptions[optionIndex].name, gnuOptions[optionIndex].name);
-  exit (-1);
+  exit (1);
 
 badMode:
   fprintf (stderr,"\nERR:AFB-daemon option [--%s] only accepts local, global or remote.\n\n"
           ,gnuOptions[optionIndex].name);
-  exit (-1);
+  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());
-  exit (-1);
+  exit (1);
 
 errConsole:
   fprintf (stderr,"\nERR:AFB-daemon cannot open /dev/console (use --foreground)\n\n");
-  exit (-1);
+  exit (1);
 
 errSessiondir:
   fprintf (stderr,"\nERR:AFB-daemon cannot read/write session dir\n\n");
-  exit (-1);
+  exit (1);
 
 exitInitLoop:
   // try to unlink pid file if any
   if (session->background && session->config->pidfile != NULL)  unlink (session->config->pidfile);
-  exit (-1);
+  exit (1);
 
 } /* END AFB-daemon() */