@@ -1,3 +1,5 @@

+1.1.2:

+

 1.1.1:

  - error message output in detail

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

 bin_PROGRAMS = msync

 sbin_PROGRAMS = makuosan

-makuosan_SOURCES = makuosan.c common.c mexec.c minit.c mrecv.c msend.c makuosan.h

+makuosan_SOURCES = makuosan.c common.c mexec.c minit.c mexit.c mrecv.c msend.c makuosan.h

 msync_SOURCES = msync.c 

 EXTRA_DIST = support

@@ -51,8 +51,8 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)

 am_makuosan_OBJECTS = makuosan.$(OBJEXT) common.$(OBJEXT) \

-	mexec.$(OBJEXT) minit.$(OBJEXT) mrecv.$(OBJEXT) \

-	msend.$(OBJEXT)

+	mexec.$(OBJEXT) minit.$(OBJEXT) mexit.$(OBJEXT) \

+	mrecv.$(OBJEXT) msend.$(OBJEXT)

 makuosan_OBJECTS = $(am_makuosan_OBJECTS)

 makuosan_LDADD = $(LDADD)

 am_msync_OBJECTS = msync.$(OBJEXT)

@@ -165,7 +165,7 @@ sysconfdir = @sysconfdir@

 target_alias = @target_alias@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

-makuosan_SOURCES = makuosan.c common.c mexec.c minit.c mrecv.c msend.c makuosan.h

+makuosan_SOURCES = makuosan.c common.c mexec.c minit.c mexit.c mrecv.c msend.c makuosan.h

 msync_SOURCES = msync.c 

 EXTRA_DIST = support

 all: config.h

@@ -285,6 +285,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makuosan.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mexec.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mexit.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minit.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mrecv.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msend.Po@am__quote@

@@ -1038,41 +1038,6 @@ int space_escape(char *str)

   return(r);

 }

-void chexit()

-{

-  struct utsname uts;

-  char cwd[PATH_MAX];

-  if(moption.chroot){

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

-      return;

-    }

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

-      return;

-    }

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

-    mtempname("",".MAKUOWORK",cwd);

-    mkdir(cwd,0700);

-    chroot(cwd);

-    rmdir(cwd);

-    chdir("..");

-    getcwd(cwd,PATH_MAX);

-    while(strcmp("/", cwd)){

-      chdir("..");

-      getcwd(cwd,PATH_MAX);

-    }

-    chroot(".");

-  }

-  return;

-}

-

-void restoreguid()

-{

-  if(getuid() != geteuid())

-    seteuid(getuid());

-  if(getgid() != getegid())

-    setegid(getgid());

-}

-

 mfile *mkreq(mdata *data, struct sockaddr_in *addr, uint8_t state)

 {

   mfile *a;

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

 #! /bin/sh

 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.61 for makuosan 1.1.1.

+# Generated by GNU Autoconf 2.61 for makuosan 1.1.2.

 #

 # Report bugs to <info-makuosan@klab.jp>.

 #

@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}

 # Identity of this package.

 PACKAGE_NAME='makuosan'

 PACKAGE_TARNAME='makuosan'

-PACKAGE_VERSION='1.1.1'

-PACKAGE_STRING='makuosan 1.1.1'

+PACKAGE_VERSION='1.1.2'

+PACKAGE_STRING='makuosan 1.1.2'

 PACKAGE_BUGREPORT='info-makuosan@klab.jp'

 ac_unique_file="makuosan.c"

@@ -1209,7 +1209,7 @@ if test "$ac_init_help" = "long"; then

   # Omit some internal or obsolete options to make the list less imposing.

   # This message is too long to be a string in the A/UX 3.1 sh.

   cat <<_ACEOF

-\`configure' configures makuosan 1.1.1 to adapt to many kinds of systems.

+\`configure' configures makuosan 1.1.2 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1275,7 +1275,7 @@ fi

 if test -n "$ac_init_help"; then

   case $ac_init_help in

-     short | recursive ) echo "Configuration of makuosan 1.1.1:";;

+     short | recursive ) echo "Configuration of makuosan 1.1.2:";;

    esac

   cat <<\_ACEOF

@@ -1360,7 +1360,7 @@ fi

 test -n "$ac_init_help" && exit $ac_status

 if $ac_init_version; then

   cat <<\_ACEOF

-makuosan configure 1.1.1

+makuosan configure 1.1.2

 generated by GNU Autoconf 2.61

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

@@ -1374,7 +1374,7 @@ cat >config.log <<_ACEOF

 This file contains any messages produced by compilers while

 running configure, to aid debugging if configure makes a mistake.

-It was created by makuosan $as_me 1.1.1, which was

+It was created by makuosan $as_me 1.1.2, which was

 generated by GNU Autoconf 2.61.  Invocation command line was

   $ $0 $@

@@ -2065,7 +2065,7 @@ fi

 # Define the identity of the package.

  PACKAGE='makuosan'

- VERSION='1.1.1'

+ VERSION='1.1.2'

 cat >>confdefs.h <<_ACEOF

@@ -9005,7 +9005,7 @@ exec 6>&1

 # report actual input values of CONFIG_FILES etc. instead of their

 # values after options handling.

 ac_log="

-This file was extended by makuosan $as_me 1.1.1, which was

+This file was extended by makuosan $as_me 1.1.2, which was

 generated by GNU Autoconf 2.61.  Invocation command line was

   CONFIG_FILES    = $CONFIG_FILES

@@ -9062,7 +9062,7 @@ Report bugs to <bug-autoconf@gnu.org>."

 _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF

 ac_cs_version="\\

-makuosan config.status 1.1.1

+makuosan config.status 1.1.2

 configured by $0, generated by GNU Autoconf 2.61,

   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

@@ -1,7 +1,7 @@

 #                                               -*- Autoconf -*-

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

 AC_PREREQ(2.61)

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

+AC_INIT(makuosan, 1.1.2, info-makuosan@klab.jp)

 AM_INIT_AUTOMAKE

 AC_CONFIG_SRCDIR([makuosan.c])

 AC_CONFIG_HEADER([config.h])

@@ -68,30 +68,6 @@ struct timeval *pingpong(int n)

   return(&tv);

 }

-int cleanup()

-{

-  mfile *m;

-  socklen_t namelen;

-  struct sockaddr_un addr;

-

-  /*----- exit notify -----*/

-  pingpong(2);

-  msend(moption.mcsocket, mftop[0]);

-

-  /*----- unlink unix domain socket -----*/

-  namelen=sizeof(addr);

-  if(!getsockname(moption.lisocket, (struct sockaddr *)&addr, &namelen)){

-    if(addr.sun_family == AF_UNIX){

-      unlink(addr.sun_path);

-    }

-  }

-

-  /*----- close -----*/

-  close(moption.mcsocket);

-  close(moption.lisocket);

-  return(0);

-}

-

 int mcomm_accept(mcomm *c, fd_set *fds, int s)

 {

   int i;

@@ -235,7 +211,7 @@ int ismsend(int s, mfile *m, int flag)

 }

 /***** main loop *****/

-int mloop()

+void mloop()

 {

   int para;

   mfile *n;

@@ -294,18 +270,8 @@ int mloop()

     mcomm_read(moption.comm, &rfds);                     /* command exec */

     mrecv_gc();

   }

-  return(0);

-}

-

-void mexit()

-{

-  lprintf(0, "%s: shutdown start\n", __func__);

-  msend_clean(); /* recv object free         */

-  mrecv_clean(); /* recv object free         */

-  restoreguid(); /* euid,egidを元に戻す      */

-  chexit();      /* chrootから脱出(LinuxOnly)*/

-  cleanup();     /* ディスクリプタの開放など */

-  lprintf(0, "%s: shutdown complete\n", __func__);

+  pingpong(2); /* exit notify */

+  msend(moption.mcsocket, mftop[0]);

 }

 int main(int argc, char *argv[])

@@ -22,12 +22,10 @@

 #include <getopt.h>

 #include <pwd.h>

 #include <grp.h>

-#include <poll.h>

 #include <libgen.h>

 #include <fnmatch.h>

 #include <stdarg.h>

 #include <syslog.h>

-#include <pthread.h>

 #include <sys/stat.h>

 #include <sys/wait.h>

 #include <sys/types.h>

@@ -282,62 +280,81 @@ extern char TZ[256];

 extern struct timeval curtime;

 extern BF_KEY EncKey;

-/*----- function -----*/

-char    *strsstate(uint8_t n);

-char    *strrstate(uint8_t n);

-char    *strmstate(mdata *data);

-char    *stropcode(mdata *data);

-char    *strackreq(mdata *data);

-void     mprintf(const char *func, mfile *m);

-void     lprintf(int l, char *fmt, ...);

-void     cprintf(int l, mcomm *c, char *fmt, ...);

-void     fdprintf(int s, char *fmt, ...);

-int      getrid();

-void     chexit();

-void     restoreguid();

-void     mrecv_clean();

-void     msend_clean();

-void     mfdel(mfile *m);

-mfile   *mfadd(int n);

-mfile   *mfins(int n);

-mfile   *mkreq(mdata *data, struct sockaddr_in *addr, uint8_t state);

-mfile   *mkack(mdata *data, struct sockaddr_in *addr, uint8_t state);

-mhost   *member_get(struct in_addr *addr);

-mhost   *member_add(struct in_addr *addr, mdata *recvdata);

-void     member_del(mhost *h);

-int      mrecv(int s);

-void     msend(int s, mfile *m);

-void     set_filestat(char *path, uid_t uid, gid_t gid, mode_t mode);

-int      set_guid(uid_t uid, gid_t gid, gid_t *gids);

-int      set_gids(char *groups);

+/*----- report -----*/

+char *strsstate(uint8_t n);

+char *strrstate(uint8_t n);

+char *strmstate(mdata *data);

+char *stropcode(mdata *data);

+char *strackreq(mdata *data);

+void mprintf(const char *func, mfile *m);

+void lprintf(int l, char *fmt, ...);

+void cprintf(int l, mcomm *c, char *fmt, ...);

+void fdprintf(int s, char *fmt, ...);

+

+/*----- packet data access -----*/

+int data_safeget(mdata *data, void *buff, size_t size);

+int data_safeget16(mdata *data, uint16_t *buff);

+int data_safeget32(mdata *data, uint32_t *buff);

+int data_safeset(mdata *data, void *buff, size_t size);

+int data_safeset16(mdata *data, uint16_t val);

+int data_safeset32(mdata *data, uint32_t val);

+

+/*----- file object operation -----*/

+void mfdel(mfile *m);

+mfile *mfadd(int n);

+mfile *mfins(int n);

+mfile *mkreq(mdata *data, struct sockaddr_in *addr, uint8_t state);

+mfile *mkack(mdata *data, struct sockaddr_in *addr, uint8_t state);

+

+/*----- exclude functions -----*/

+excludeitem *exclude_add(excludeitem *exclude, char *pattern);  /* add list */

+excludeitem *exclude_del(excludeitem *e);                       /* del list */

+excludeitem *mfnmatch(char *str, excludeitem *exclude);         /* is match */

+int isexclude(char *fn, excludeitem *exclude, int dir);         /*          */

+

+/*----- filesystem operation -----*/

+int statcmp(struct stat *s1, struct stat *s2);

+int mremove(char *base, char *name);

+int mcreatedir(char  *base, char *name, mode_t mode);

+int mcreatefile(char *base, char *name, mode_t mode);

+int mcreatelink(char *base, char *name, char *link);

+void set_filestat(char *path, uid_t uid, gid_t gid, mode_t mode);

+

+/*----- uid/gid -----*/

+int set_guid(uid_t uid, gid_t gid, gid_t *gids);

+int set_gids(char *groups);

+

+/*----- node operation -----*/

+void   member_del(mhost *h);

+mhost *member_get(struct in_addr *addr);

+mhost *member_add(struct in_addr *addr, mdata *recvdata);

+

+/*----- mark operation -----*/

 mmark   *delmark(mmark *mm);

 uint32_t seq_getmark(mfile *m);

 void     seq_setmark(mfile *m, uint32_t lseq, uint32_t useq);

 void     seq_addmark(mfile *m, uint32_t lseq, uint32_t useq);

 int      seq_delmark(mfile *m, uint32_t seq);

-int      linkcmp(mfile *m);

-int      statcmp(struct stat *s1, struct stat *s2);

-int      mremove(char *base, char *name);

-int      mcreatedir(char  *base, char *name, mode_t mode);

-int      mcreatefile(char *base, char *name, mode_t mode);

-int      mcreatelink(char *base, char *name, char *link);

-int      space_escape(char *str);

-int      workend(mcomm *c);

+

+/*----- status operation -----*/

+int      ack_clear(mfile *m, int state);

+int      ack_check(mfile *m, int state);

 void     clr_hoststate(mfile *m);

 uint8_t *get_hoststate(mhost *t, mfile *m);

 uint8_t *set_hoststate(mhost *t, mfile *m, uint8_t state);

-int      ack_clear(mfile *m, int state);

-int      ack_check(mfile *m, int state);

-int      mtimeget(struct timeval *tv);

-int      mtimeout(struct timeval *tf, uint32_t msec);

-int      data_safeget(mdata *data, void *buff, size_t size);

-int      data_safeget16(mdata *data, uint16_t *buff);

-int      data_safeget32(mdata *data, uint32_t *buff);

-int      data_safeset(mdata *data, void *buff, size_t size);

-int      data_safeset16(mdata *data, uint16_t val);

-int      data_safeset32(mdata *data, uint32_t val);

-int      isexclude(char *fn, excludeitem *exclude, int dir);

-excludeitem *exclude_add(excludeitem *exclude, char *pattern);

-excludeitem *exclude_del(excludeitem *e);

-excludeitem *mfnmatch(char *str, excludeitem *exclude);

+

+/*----- send/receive -----*/

+void mrecv_clean();

+void msend_clean();

+int  mrecv(int s);

+void msend(int s, mfile *m);

+

+/*----- other -----*/

+int getrid();

+int linkcmp(mfile *m);

+int space_escape(char *str);

+int workend(mcomm *c);

+int mtimeget(struct timeval *tv);

+int mtimeout(struct timeval *tf, uint32_t msec);

+

@@ -535,7 +535,7 @@ static void minit_bootlog()

 /*

  *  まくお初期化関数

- *  main関数から呼び出される

+ *  mainから呼び出される

  */

 void minit(int argc, char *argv[])

 {

@@ -72,13 +72,16 @@ static int msend_packet(int s, mdata *data, struct sockaddr_in *addr)

   senddata.head.error  = htonl(senddata.head.error);

   szdata += sizeof(mhead);

-  while(loop_flag){ 

+  while(1){ 

     FD_ZERO(&fds);

     FD_SET(moption.mcsocket, &fds);

     tv.tv_sec  = 1;

     tv.tv_usec = 0;

     if(select(1024, NULL, &fds, NULL, &tv) != 1){

-      continue;

+      if(loop_flag){

+        continue;

+      }

+      break;

     }

     r = sendto(s, &senddata, szdata, 0, (struct sockaddr*)addr, sizeof(struct sockaddr_in));

     if(r == szdata){