@@ -281,6 +281,7 @@ typedef struct

   int sendsize;

   int sendready;

   int sendrate;

+  struct utsname uts;  

   struct sockaddr_in maddr;

   struct sockaddr_in laddr;

   struct sockaddr_un uaddr;

@@ -381,8 +381,13 @@ int mexec_send(mcomm *c, int n, int sync)

     argv[i] = c->parse[n][i];

   }

   argv[i] = NULL;

-  optind  = 0;

-  opterr  = 1;

+  

+  if(!strcmp("SunOS", moption.uts.sysname)){

+    optind = 1; /* solaris */

+  }else{

+    optind = 0; /* other */

+  }

+  opterr = 1;

 #ifdef HAVE_GETOPT_OPTRESET

   optreset = 1;

 #endif

@@ -564,8 +569,12 @@ int mexec_check(mcomm *c, int n)

   for(i=0;i<c->argc[n];i++)

     argv[i] = c->parse[n][i];

   argv[i] = NULL;

-  optind  = 0;

-  opterr  = 1;

+  if(!strcmp("SunOS", moption.uts.sysname)){

+    optind = 1; /* solaris */

+  }else{

+    optind = 0; /* other */

+  }

+  opterr = 1;

 #ifdef HAVE_GETOPT_OPTRESET

   optreset = 1;

 #endif

@@ -671,8 +680,12 @@ int mexec_dsync(mcomm *c, int n)

   for(i=0;i<c->argc[n];i++)

     argv[i] = c->parse[n][i];

   argv[i] = NULL;

-  optind  = 0;

-  opterr  = 1;

+  if(!strcmp("SunOS", moption.uts.sysname)){

+    optind = 1; /* solaris */

+  }else{

+    optind = 0; /* other */

+  }

+  opterr = 1;

 #ifdef HAVE_GETOPT_OPTRESET

   optreset = 1;

 #endif

@@ -6,13 +6,9 @@

 static void chexit()

 {

-  struct utsname uts;

   char cwd[PATH_MAX];

   if(moption.chroot){

-    if(uname(&uts) == -1){

-      return;

-    }

-    if(strcmp("Linux", uts.sysname)){

+    if(strcmp("Linux", moption.uts.sysname)){

       return;

     }

     /*----- chroot exit(linux only) -----*/

@@ -97,6 +97,7 @@ static void minit_option_setdefault()

     moption.comm[i].fd[0] = -1;

     moption.comm[i].fd[1] = -1;

   }

+  uname(&moption.uts);

 }

 static int minit_option_setuid(char *name)

@@ -644,6 +645,7 @@ static void minit_bootlog()

   int i;

   lprintf(0, "makuosan version %s\n", PACKAGE_VERSION);

+  lprintf(0, "sysname   : %s\n", moption.uts.sysname);

   lprintf(0, "loglevel  : %d\n", moption.loglevel);

   if(moption.chroot){

     lprintf(0, "chroot    : %s\n", moption.real_dir);

@@ -705,3 +707,4 @@ void minit(int argc, char *argv[])

   minit_bootlog();           /* ブートメッセージを出力する         */

   minit_daemonize();         /*                                    */

 }

+