@@ -1,5 +1,6 @@

 1.1.3:

  - sort msync --members by hostname

+ - fix: msync failed for FreeBSD and MacOSX

 1.1.2:

  - fix: not send shutdown message 

@@ -53,6 +53,9 @@

 /* Define to 1 if you have the `gethostname' function. */

 #undef HAVE_GETHOSTNAME

+/* getopt has optreset support */

+#undef HAVE_GETOPT_OPTRESET

+

 /* Define to 1 if you have the `gettimeofday' function. */

 #undef HAVE_GETTIMEOFDAY

@@ -8592,7 +8592,66 @@ _ACEOF

 fi

 done

+{ echo "$as_me:$LINENO: checking whether getopt has optreset support" >&5

+echo $ECHO_N "checking whether getopt has optreset support... $ECHO_C" >&6; }

+if test "${ac_cv_have_getopt_optreset+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+	cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+#include <unistd.h>

+int

+main ()

+{

+extern int optreset; optreset = 0;

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

+   ac_cv_have_getopt_optreset="yes"

+else

+  echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+	 ac_cv_have_getopt_optreset="no"

+fi

+

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+      conftest$ac_exeext conftest.$ac_ext

+

+fi

+{ echo "$as_me:$LINENO: result: $ac_cv_have_getopt_optreset" >&5

+echo "${ECHO_T}$ac_cv_have_getopt_optreset" >&6; }

+if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then

+

+cat >>confdefs.h <<\_ACEOF

+#define HAVE_GETOPT_OPTRESET 1

+_ACEOF

+

+fi

 ac_config_files="$ac_config_files Makefile"

 cat >confcache <<\_ACEOF

@@ -1,6 +1,3 @@

-#                                               -*- Autoconf -*-

-# Process this file with autoconf to produce a configure script.

-AC_PREREQ(2.61)

 AC_INIT(makuosan, 1.1.3, info-makuosan@klab.jp)

 AM_INIT_AUTOMAKE

 AC_CONFIG_SRCDIR([makuosan.c])

@@ -50,7 +47,12 @@ AC_FUNC_SELECT_ARGTYPES

 AC_FUNC_UTIME_NULL

 AC_FUNC_VPRINTF

 AC_CHECK_FUNCS([ftime getcwd gethostname gettimeofday inet_ntoa memmove memset mkdir realpath rmdir select setenv socket tzset utime])

-

+AC_CACHE_CHECK([whether getopt has optreset support], ac_cv_have_getopt_optreset,[

+	AC_TRY_LINK([#include <unistd.h>], extern int optreset; optreset = 0;, [ ac_cv_have_getopt_optreset="yes" ], [ ac_cv_have_getopt_optreset="no" ])

+])

+if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then

+	AC_DEFINE(HAVE_GETOPT_OPTRESET, 1, [getopt has optreset support])

+fi

 AC_CONFIG_FILES([Makefile])

 AC_OUTPUT

@@ -273,6 +273,7 @@ extern char *optarg;

 extern int optind;

 extern int opterr;

 extern int optopt;

+extern int optreset;

 extern int loop_flag;

 extern char *tzname[2];

 extern int daylight;

@@ -314,10 +314,16 @@ int mexec_send(mcomm *c, int n, int sync)

     cprintf(0, c, "error: this server can't send\n");

     return(0);

   }

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

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

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

+  }

   argv[i] = NULL;

+#ifdef HAVE_GETOPT_OPTRESET

+  optind   = 1;

+  optreset = 1;

+#else

   optind = 0;

+#endif;

   while((i=getopt(c->argc[n], argv, "g:t:nr")) != -1){

     switch(i){

       case 'n':