@@ -1227,3 +1227,14 @@ excludeitem *exclude_del(excludeitem *e)

   return(r);

 }

+int pathcmp(char *p1, char *p2)

+{

+  char path1[PATH_MAX];

+  char path2[PATH_MAX];

+

+

+  return(0);

+}

+

+

+

@@ -199,6 +199,8 @@ typedef struct mfile

   char fn[PATH_MAX];

   char tn[PATH_MAX];

   char ln[PATH_MAX];

+  uint16_t len;

+  uint32_t mod;

   uint32_t sendto;

   uint32_t dryrun;

   uint32_t recurs;

@@ -969,10 +969,11 @@ static void dsync_write(int fd, char *base, uint8_t sta, uint16_t len, uint32_t

     base++;

     len--;

   }

-  *(uint16_t *)p = len + sizeof(uint32_t); 

-  p += sizeof(uint16_t);

-  *(uint32_t *)p = htonl(mod); 

-  p += sizeof(uint32_t);

+

+  *(uint16_t *)p = len + sizeof(mod); 

+  p += sizeof(len);

+  *(uint32_t *)p = mod; 

+  p += sizeof(mod);

   memcpy(p, base, len);

   p = buff;

@@ -989,6 +990,10 @@ static void dsync_write(int fd, char *base, uint8_t sta, uint16_t len, uint32_t

     if(FD_ISSET(fd,&wfds)){

       r = write(fd, p, s);

       if(r == -1){

+        if(errno == EINTR){

+          continue;

+        }

+        lprintf(0, "[error] %s: write error\n", __func__);

         return;

       }else{

         s -= r;

@@ -1201,7 +1206,7 @@ static void mrecv_req_del_open(mdata *data, struct sockaddr_in *addr)

   char path[PATH_MAX];

   if(!a){

-    lprintf(0, "%s: arror ack can't create\n", __func__);

+    lprintf(0, "[error] %s: ack can't create\n", __func__);

     return;

   }

   data->p = data->data;

@@ -891,85 +891,106 @@ static void msend_req_del_mark(int s, mfile *m)

   }

 }

-static void msend_req_del_stat(int s, mfile *m)

+static void msend_req_del_stat_read(int s, mfile *m)

 {

-  int    r;

   mfile *a;

   mfile *d;

-  static uint16_t len = 0;

-  static char path[PATH_MAX + sizeof(uint32_t)];

-

-  if(m->pid == 0){

-    for(d=mftop[0];d;d=d->next){

-      if((d->mdata.head.opcode == MAKUO_OP_DEL) && (d->link == m)){

-        m->sendwait = 1;

-        return;

-      }

-    }

-    m->mdata.head.nstate = MAKUO_SENDSTATE_MARK;

-    m->initstate = 1;

-    m->sendwait  = 0;

-    ack_clear(m, -1);

-    return;

-  }

-

-  if(m->pipe == -1){

-    if(waitpid(m->pid, NULL, WNOHANG) == m->pid){

-      m->pid = 0;

-    }else{

-      m->sendwait = 1;

-    }

-    return;

-  }

+  uint16_t len;

   d = mkreq(&(m->mdata), &(m->addr), MAKUO_SENDSTATE_OPEN);

   d->mdata.head.flags = m->mdata.head.flags;

   d->mdata.head.reqid = getrid();

   d->initstate = 1;

   d->sendwait  = 0;

-  d->sendto = 1;

-  d->dryrun = m->dryrun;

-  d->recurs = m->recurs;

-  d->link   = m;

-  d->mdata.p = d->mdata.data;

+  d->sendto    = 1;

+  d->dryrun    = m->dryrun;

+  d->recurs    = m->recurs;

+  d->link      = m;

+  d->mdata.p   = d->mdata.data;

-  if(len){

-    data_safeset16(&(d->mdata), len);

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

+  if(m->len){

+    len = m->len - sizeof(m->mod);

+    data_safeset16(&(d->mdata), m->len);

+    data_safeset32(&(d->mdata), m->mod);

+    data_safeset(&(d->mdata), m->tn, len);

+    m->len = 0;

   }

   while(1){

-    if(atomic_read(m->pipe, &len, sizeof(len))){

-      close(m->pipe);

-      m->pipe = -1;

-      m->initstate = 1;

-      m->sendwait  = 0;

+    if(atomic_read(m->pipe, &(m->len), sizeof(m->len))){

       break;

     }

-    if(atomic_read(m->pipe, path, len)){

-      lprintf(0, "%s: pipe read error\n", __func__);

-      close(m->pipe);

-      m->pipe = -1;

-      m->initstate = 1;

-      m->sendwait  = 0;

+    if(m->len <= sizeof(m->mod)){

+      lprintf(0, "[error] %s: length error\n", __func__);

       break;

     }

-    path[len] = 0;

-

+    len = m->len - sizeof(m->mod);

+    if(atomic_read(m->pipe, &(m->mod), sizeof(m->mod))){

+      lprintf(0, "[error] %s: read error\n", __func__);

+      break;

+    }

+    if(atomic_read(m->pipe, m->tn, len)){

+      lprintf(0, "[error] %s: read error\n", __func__);

+      break;

+    }

+    m->tn[len] = 0;

+    if(lstat(m->tn, &(m->fs)) == -1){

+      if(errno == ENOENT){

+        m->len = 0;

+        continue;

+      }

+    }

     for(a=mftop[1];a;a=a->next){

-      if(!strcmp(a->tn, path + sizeof(uint32_t))){

-        break;

+      if(a->mdata.head.opcode == MAKUO_OP_SEND){

+        if(!strcmp(a->tn, m->tn)){

+          break;

+        }

       }

     }

     if(a){

+      m->len = 0;

       continue;

     }

-    if(d->mdata.head.szdata + sizeof(len) + len > MAKUO_BUFFER_SIZE){

-      break;

+    if(d->mdata.head.szdata + sizeof(m->len) + m->len > MAKUO_BUFFER_SIZE){

+      return;

     }

-    data_safeset16(&(d->mdata), len);

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

+    data_safeset16(&(d->mdata),   m->len);

+    data_safeset32(&(d->mdata),   m->mod);

+    data_safeset(&(d->mdata), m->tn, len);

+    m->len = 0;

+  }

+

+  close(m->pipe);

+  m->pipe      = -1;

+  m->initstate =  1;

+  m->sendwait  =  0;

+}

+

+static void msend_req_del_stat(int s, mfile *m)

+{

+  mfile *a;

+  if(m->pid == 0){

+    for(a=mftop[0];a;a=a->next){

+      if((a->mdata.head.opcode == MAKUO_OP_DEL) && (a->link == m)){

+        m->sendwait = 1;

+        return;

+      }

+    }

+    m->mdata.head.nstate = MAKUO_SENDSTATE_MARK;

+    m->initstate = 1;

+    m->sendwait  = 0;

+    ack_clear(m, -1);

+    return;

+  }

+  if(m->pipe == -1){

+    if(waitpid(m->pid, NULL, WNOHANG) == m->pid){

+      m->pid = 0;

+    }else{

+      m->sendwait = 1;

+    }

+    return;

   }

+  msend_req_del_stat_read(s, m);

 }

 static void msend_req_del_last(int s, mfile *m)