@@ -264,7 +264,7 @@ int do_accept(mcomm *c, fd_set *fds)

   c[i].fd[0] = accept(s, (struct sockaddr *)&ss, &sslen);

   switch(ss.ss_family){

     case AF_UNIX:

-      lprintf(5, "%s: socket=%d\n", __func__, i);

+      lprintf(5, "%s: socket=%d from %s\n", __func__, i, moption.uaddr.sun_path);

       break;

     case AF_INET:

     case AF_INET6:

@@ -381,11 +381,9 @@ int mexec_send(mcomm *c, int n, int sync)

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

   }

   argv[i] = NULL;

+  optind  = 1;

 #ifdef HAVE_GETOPT_OPTRESET

-  optind   = 1;

   optreset = 1;

-#else

-  optind   = 1;

 #endif

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

     switch(i){

@@ -565,11 +563,9 @@ 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  = 1;

 #ifdef HAVE_GETOPT_OPTRESET

-  optind   = 1;

   optreset = 1;

-#else

-  optind = 0;

 #endif

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

     switch(i){

@@ -673,11 +669,9 @@ 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  = 1;

 #ifdef HAVE_GETOPT_OPTRESET

-  optind   = 1;

   optreset = 1;

-#else

-  optind = 0;

 #endif

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

     switch(i){

@@ -1225,11 +1225,20 @@ static void mrecv_req_del_open(mdata *data, struct sockaddr_in *addr)

     len -= sizeof(uint32_t);

     data_safeget(data, path, len);

     path[len] =  0;

+#ifdef MAKUO_DEBUG

+    lprintf(9, "%s: %s", __func__, path);

+#endif

     if(lstat(path, &(a->fs)) == -1 && errno == ENOENT){

+#ifdef MAKUO_DEBUG

+      lprintf(9, " [DELETE]");

+#endif

       data_safeset16(&(a->mdata), len + sizeof(uint32_t));

       data_safeset32(&(a->mdata), 0);

       data_safeset(&(a->mdata), path, len);

     }

+#ifdef MAKUO_DEBUG

+    lprintf(9, "\n");

+#endif

   }

   msend(a);

 }

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

 Name:           makuosan

-Version:        1.2.1

+Version:        1.2.2

 Release:        1%{?dist}

 Summary:        Multicasts All-Kinds of Updating Operation for Servers on Administered Network

@@ -41,7 +41,6 @@ also alive. Therefore, it never stalls waiting for a dead server, or timeouts.

 %prep

 %setup -q

-

 %build

 %configure --prefix=/usr

@@ -51,11 +50,8 @@ make %{?_smp_mflags}

 rm -rf %{buildroot}

 make install DESTDIR=%{buildroot}

-# remove memcached-debug

-rm -f %{buildroot}/%{_bindir}/makuosan-debug

-

 # Init script

-install -Dp -m0755 makuosan.sysv %{buildroot}%{_initrddir}/makuosan

+install -Dp -m0755 support/makuosan.sysv %{buildroot}%{_initrddir}/makuosan

 # Default configs

 mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig

@@ -83,10 +79,9 @@ rm -rf %{buildroot}

 %changelog

+* Mon Jun 16 2009 Masanobu Yasui <yasui0906@gmail.com> - 1.2.2

 * Mon Jun 16 2009 Masanobu Yasui <yasui0906@gmail.com> - 1.2.1

-

 * Mon May 25 2009 Masanobu Yasui <yasui0906@gmail.com> - 1.2.0

-

 * Thu Nov  6 2008 Naoya Nakazawa <naoya.n@gmail.com> - 1.0.0

 - Initial version