@@ -85,7 +85,7 @@ uint8_t rstatenumlist[]={MAKUO_RECVSTATE_NONE,

                          MAKUO_RECVSTATE_CLOSEERROR,

                          MAKUO_STATE_MAX};

-char *SSTATE(uint8_t n)

+char *strsstate(uint8_t n)

 {

   int i;

   for(i=0;sstatenumlist[i] != MAKUO_STATE_MAX;i++){

@@ -96,7 +96,7 @@ char *SSTATE(uint8_t n)

   return(sstatestrlist[i]);

 }

-char *RSTATE(uint8_t n)

+char *strrstate(uint8_t n)

 {

   int i;

   for(i=0;rstatenumlist[i] != MAKUO_STATE_MAX;i++){

@@ -107,11 +107,19 @@ char *RSTATE(uint8_t n)

   return(rstatestrlist[i]);

 }

-char *OPCODE(uint8_t n)

+char *strmstate(mdata *data)

+{

+  if(data->head.flags & MAKUO_FLAG_ACK){

+    return(strrstate(data->head.nstate));

+  }

+  return(strsstate(data->head.nstate));

+}

+

+char *stropcode(mdata *data)

 {

   int i;

   for(i=0;opcodenumlist[i] != MAKUO_STATE_MAX;i++){

-    if(opcodenumlist[i] == n){

+    if(opcodenumlist[i] == data->head.opcode){

       break;

     }

   }

@@ -191,6 +199,11 @@ excludeitem *mfnmatch(char *str, excludeitem *exclude)

   return(NULL);

 }

+int isexclude(char *str, excludeitem *exclude)

+{

+

+}

+

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

 {

   char m[2048];

@@ -241,15 +254,14 @@ void cprintf(int l, mcomm *c, char *fmt, ...)

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

 {

-  char *st;

-  char *op;

-  if(m->mdata.head.flags & MAKUO_FLAG_ACK){

-    st = RSTATE(m->mdata.head.nstate);

-  }else{

-    st = SSTATE(m->mdata.head.nstate);

-  }

-  op = OPCODE(m->mdata.head.opcode);

-  lprintf(9, "%s: rid=%d init=%d wait=%d %s %s %s %s\n", func, m->mdata.head.reqid, m->initstate, m->sendwait, inet_ntoa(m->addr.sin_addr), op, st, m->fn);

+  lprintf(9, "%s: rid=%d init=%d wait=%d %s %s %s %s\n",

+    func, 

+    m->mdata.head.reqid, 

+    m->initstate, m->sendwait, 

+    inet_ntoa(m->addr.sin_addr), 

+    stropcode(&(m->mdata)),

+    strmstate(&(m->mdata)),

+    m->fn);

 }

 int getrid()

@@ -503,7 +515,7 @@ void dump_hoststate(mfile *m, char *func)

   uint8_t *r;

   for(t=members;t;t=t->next){

     if(r=get_hoststate(t,m)){

-      lprintf(9,"%s: rstate=%s from %s %s\n", func, RSTATE(*r), t->hostname, m->fn);

+      lprintf(9,"%s: %s from %s %s\n", func, strrstate(*r), t->hostname, m->fn);

     }

   }

 }

@@ -200,6 +200,9 @@ int mfdirchk(mfile *d){

   if(d->fn[len - 1] == '/'){

     len--;

   }

+  if(d->mdata.head.flags & MAKUO_FLAG_ACK){

+    return(1);

+  }

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

     if(m == d){

       continue;

@@ -8,7 +8,6 @@

 #define PROTOCOL_VERSION 4

 #define _GNU_SOURCE

 #define _FILE_OFFSET_BITS 64

-#define MAKUO_DEBUG

 #include <stdio.h>

 #include <unistd.h>

 #include <stdlib.h>

@@ -276,9 +275,10 @@ extern struct timeval curtime;

 extern BF_KEY EncKey;

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

-char    *SSTATE(uint8_t n);

-char    *RSTATE(uint8_t n);

-char    *OPCODE(uint8_t n);

+char    *strsstate(uint8_t n);

+char    *strrstate(uint8_t n);

+char    *strmstate(mdata *data);

+char    *stropcode(mdata *data);

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

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

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

@@ -337,6 +337,15 @@ int mexec_send(mcomm *c, int n, int sync)

   while(optind < c->argc[n])

     fn = c->parse[n][optind++];

+  if(fn){

+    int len;

+    if(len = strlen(fn)){

+      if(fn[len - 1] == '/'){

+        fn[len - 1] = 0;

+      }

+    }

+  }

+

   /*----- directory scan -----*/

   if(recurs){

     if(c->cpid){

@@ -601,6 +610,15 @@ int mexec_dsync(mcomm *c, int n)

     fn = c->parse[n][optind++];

   }

+  if(fn){

+    int len;

+    if(len = strlen(fn)){

+      if(fn[len - 1] == '/'){

+        fn[len - 1] = 0;

+      }

+    }

+  }

+

   /*----- help -----*/

   if(c->argc[n]<2){

     cprintf(0, c, "dsync [-r] [-t host] [-n] [path]\r\n");

@@ -756,19 +774,14 @@ int mexec_status(mcomm *c, int n)

     if(snow > smax){

       snow = smax;

     }

-    if(m->mdata.head.flags & MAKUO_FLAG_ACK){

-      cprintf(0, c, "  (ack) %s %s %s (%u:%u/%u)\n", 

-        OPCODE(m->mdata.head.opcode), 

-        RSTATE(m->mdata.head.nstate), 

-        m->fn, 

-        m->markcount, snow, smax); 

-    }else{

-      cprintf(0, c, "  (req) %s %s %s (%u:%u/%u)\n", 

-        OPCODE(m->mdata.head.opcode), 

-        SSTATE(m->mdata.head.nstate), 

-        m->fn, 

-        m->markcount, snow, smax); 

-    }

+    cprintf(0, c, "  (ack) %s %s %s (%u:%u/%u) rid=%d\n", 

+      stropcode(&(m->mdata)), 

+      strmstate(&(m->mdata)), 

+      m->fn, 

+      m->markcount,

+      snow, 

+      smax,

+      m->mdata.head.reqid); 

   }

   count = 0;

@@ -777,13 +790,15 @@ int mexec_status(mcomm *c, int n)

   cprintf(0, c, "recv op: %d\n", count);

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

     t = localtime(&(m->lastrecv.tv_sec));

-    cprintf(0, c, "  %s %s %02d:%02d:%02d %s (%d/%d) mark=%d\n",

-      OPCODE(m->mdata.head.opcode), 

-      RSTATE(m->mdata.head.nstate), 

+    cprintf(0, c, "  %s %s %02d:%02d:%02d %s (%d/%d) mark=%d rid=%d\n",

+      stropcode(&(m->mdata)), 

+      strrstate(m->mdata.head.nstate), 

       t->tm_hour, t->tm_min, t->tm_sec, 

       m->fn, 

-      m->recvcount, m->seqnomax, 

-      m->markcount); 

+      m->recvcount,

+      m->seqnomax, 

+      m->markcount,

+      m->mdata.head.reqid); 

   }

   return(0);

 }

@@ -139,7 +139,10 @@ void mrecv_gc()

   while(m){

     if(mtimeout(&(m->lastrecv), MAKUO_RECV_GCWAIT)){

       if(MAKUO_RECVSTATE_CLOSE != m->mdata.head.nstate){

-        lprintf(0,"%s: mfile object GC state=%s %s\n", __func__, RSTATE(m->mdata.head.nstate), m->fn);

+        lprintf(0,"%s: mfile object GC state=%s %s\n",

+          __func__, 

+          strrstate(m->mdata.head.nstate), 

+          m->fn);

       }

       m = mrecv_mfdel(m);

       continue;

@@ -199,17 +202,17 @@ static void mrecv_ack_report(mfile *m, mhost *h, mdata *data)

   if(data->head.nstate == MAKUO_RECVSTATE_OPENERROR){

     cprintf(0, m->comm, "%s: file open error %s\n", h->hostname, m->fn);

     lprintf(0,          "%s: file open error rid=%06d state=%s %s(%s) %s\n", __func__,

-      data->head.reqid, RSTATE(data->head.nstate), inet_ntoa(h->ad), h->hostname, m->fn);

+      data->head.reqid, strrstate(data->head.nstate), inet_ntoa(h->ad), h->hostname, m->fn);

   }

   if(data->head.nstate == MAKUO_RECVSTATE_WRITEERROR){

     cprintf(0, m->comm, "%s: file write error %s\n", h->hostname, m->fn);

     lprintf(0,          "%s: file write error rid=%06d state=%s %s(%s) %s\n", __func__,

-     data->head.reqid, RSTATE(data->head.nstate), inet_ntoa(h->ad), h->hostname, m->fn);

+     data->head.reqid, strrstate(data->head.nstate), inet_ntoa(h->ad), h->hostname, m->fn);

   }

   if(data->head.nstate == MAKUO_RECVSTATE_CLOSEERROR){

     cprintf(0, m->comm, "%s: file close error %s\n", h->hostname, m->fn);

     lprintf(0,          "%s: file close error rid=%06d state=%s %s(%s) %s\n", __func__,

-      data->head.reqid, RSTATE(data->head.nstate), inet_ntoa(h->ad), h->hostname, m->fn);

+      data->head.reqid, strrstate(data->head.nstate), inet_ntoa(h->ad), h->hostname, m->fn);

   }

 }

@@ -289,7 +292,7 @@ static void mrecv_ack_dsync(mdata *data, struct sockaddr_in *addr)

   mhost *t;

   mfile *m;

-  lprintf(9, "%s: rid=%d %s\n", __func__, data->head.reqid, RSTATE(data->head.nstate));

+  lprintf(9, "%s: rid=%d %s\n", __func__, data->head.reqid, strmstate(data));

   if(data->head.nstate == MAKUO_RECVSTATE_CLOSE){

     mkreq(data, addr, MAKUO_SENDSTATE_LAST);

   }

@@ -322,7 +325,7 @@ static void mrecv_ack_del(mdata *data, struct sockaddr_in *addr)

   uint32_t err;

   uint16_t len;

-  lprintf(9, "%s: rid=%d %s\n", __func__, data->head.reqid, RSTATE(data->head.nstate));

+  lprintf(9, "%s: rid=%d %s\n", __func__, data->head.reqid, strmstate(data));

   if(mrecv_ack_search(&t, &m, data, addr)){

     return;

   }

@@ -807,12 +810,12 @@ static void mrecv_req_send_next(mfile *m, mdata *r)

 {

   switch(r->head.nstate){

     case MAKUO_SENDSTATE_STAT:

-      lprintf(9,"%s: %s/%s %s\n", __func__, SSTATE(r->head.nstate), RSTATE(m->mdata.head.nstate), m->fn);

+      lprintf(9,"%s: %s/%s %s\n", __func__, strsstate(r->head.nstate), strrstate(m->mdata.head.nstate), m->fn);

       mrecv_req_send_stat(m, r);

       break;

     case MAKUO_SENDSTATE_OPEN:

-      lprintf(9,"%s: %s/%s %s\n", __func__, SSTATE(r->head.nstate), RSTATE(m->mdata.head.nstate), m->fn);

+      lprintf(9,"%s: %s/%s %s\n", __func__, strsstate(r->head.nstate), strrstate(m->mdata.head.nstate), m->fn);

       mrecv_req_send_open(m, r);

       break;

@@ -822,22 +825,22 @@ static void mrecv_req_send_next(mfile *m, mdata *r)

     case MAKUO_SENDSTATE_MARK:

       lprintf(9,"%s: %s/%s seqno=%d max=%d cnt=%d %s\n", __func__,

-        SSTATE(r->head.nstate), RSTATE(m->mdata.head.nstate), m->mdata.head.seqno, m->seqnomax, m->markcount, m->fn);

+        strsstate(r->head.nstate), strrstate(m->mdata.head.nstate), m->mdata.head.seqno, m->seqnomax, m->markcount, m->fn);

       mrecv_req_send_mark(m, r);

       break;

     case MAKUO_SENDSTATE_CLOSE:

-      lprintf(9,"%s: %s/%s %s\n", __func__, SSTATE(r->head.nstate), RSTATE(m->mdata.head.nstate), m->fn);

+      lprintf(9,"%s: %s/%s %s\n", __func__, strsstate(r->head.nstate), strrstate(m->mdata.head.nstate), m->fn);

       mrecv_req_send_close(m, r);

       break;

     case MAKUO_SENDSTATE_LAST:

-      lprintf(9,"%s: %s/%s %s\n", __func__, SSTATE(r->head.nstate), RSTATE(m->mdata.head.nstate), m->fn);

+      lprintf(9,"%s: %s/%s %s\n", __func__, strsstate(r->head.nstate), strrstate(m->mdata.head.nstate), m->fn);

       mrecv_req_send_last(m, r);

       break;

     case MAKUO_SENDSTATE_BREAK:

-      lprintf(9,"%s: %s/%s %s\n", __func__, SSTATE(r->head.nstate), RSTATE(m->mdata.head.nstate), m->fn);

+      lprintf(9,"%s: %s/%s %s\n", __func__, strsstate(r->head.nstate), strrstate(m->mdata.head.nstate), m->fn);

       mrecv_req_send_break(m, r);

       break;

   }

@@ -1205,7 +1208,7 @@ static void mrecv_req_dsync_break(mfile *m, mdata *data, struct sockaddr_in *add

  */

 static void mrecv_req_dsync(mdata *data, struct sockaddr_in *addr)

 {

-  lprintf(9, "%s: rid=%06d %s %s\n", __func__, data->head.reqid, OPCODE(data->head.opcode), SSTATE(data->head.nstate));

+  lprintf(9, "%s: rid=%06d %s %s\n", __func__, data->head.reqid, stropcode(data), strmstate(data));

   mfile *m = mrecv_req_search(data, addr);

   switch(data->head.nstate){

     case MAKUO_SENDSTATE_OPEN:

@@ -1260,8 +1263,7 @@ static void mrecv_req_del_open(mdata *data, struct sockaddr_in *addr)

   memcpy(a->fn, data->p, len);

   a->fn[len] = 0;

   lprintf(9, "%s: fn=%s\n", __func__, a->fn);

-  

-  strcpy(path, a->fn);

+  sprintf(path, "%s/%s", moption.real_dir, a->fn);

   if(mfnmatch(path, c->exclude)){

     return;

   }

@@ -58,7 +58,6 @@ static int msend_packet(int s, mdata *data, struct sockaddr_in *addr)

 {

   int r;

   int szdata;

-  char *state;

   mdata senddata;

   memcpy(&senddata, data, sizeof(senddata));

@@ -85,16 +84,11 @@ static int msend_packet(int s, mdata *data, struct sockaddr_in *addr)

       }

     }

   }

-  if(data->head.flags & MAKUO_FLAG_ACK){

-    state = RSTATE(data->head.nstate);

-  }else{

-    state = SSTATE(data->head.nstate);

-  }

   if(r != -1){

     lprintf(0, "%s: send size error %s %s rid=%d datasize=%d sendsize=%d seqno=%d\n",

       __func__,

-      OPCODE(data->head.opcode), 

-      state,

+      stropcode(data), 

+      strmstate(data),

       data->head.reqid,

       szdata, 

       r, 

@@ -104,8 +98,8 @@ static int msend_packet(int s, mdata *data, struct sockaddr_in *addr)

   lprintf(0,"%s: send error (%s) %s %s rid=%d size=%d seqno=%d\n",

     __func__,

     strerror(errno), 

-    OPCODE(data->head.opcode), 

-    state,

+    stropcode(data), 

+    strmstate(data),

     data->head.reqid, 

     szdata, 

     data->head.seqno);

@@ -129,8 +123,8 @@ static int msend_retry(mfile *m)

     __func__,

     m->retrycnt, 

     m->mdata.head.reqid, 

-    OPCODE(m->mdata.head.opcode), 

-    SSTATE(m->mdata.head.nstate), 

+    stropcode(&(m->mdata)),

+    strmstate(&(m->mdata)), 

     m->fn);

   for(t=members;t;t=t->next){

     r = get_hoststate(t, m);

@@ -145,7 +139,7 @@ static int msend_retry(mfile *m)

         if(*r == MAKUO_RECVSTATE_NONE){

           lprintf(0, "%s:   %s %s(%s)\n", 

             __func__, 

-           RSTATE(*r), 

+           strrstate(*r), 

            inet_ntoa(t->ad), 

            t->hostname);

         }

@@ -153,7 +147,7 @@ static int msend_retry(mfile *m)

       default:

         lprintf(4, "%s:   %s %s(%s)\n", 

           __func__, 

-          RSTATE(*r), 

+          strrstate(*r), 

           inet_ntoa(t->ad), 

           t->hostname);

         break;

@@ -266,11 +260,13 @@ static void msend_req_send_stat_init(int s, mfile *m)

 {

   mstat    fs;

   uint64_t rdev;

+

   if(!m->comm){

     msend_mfdel(m);

     m = NULL;

     return;

   }

+

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

   m->mdata.head.szdata  = sizeof(fs);

   m->mdata.head.szdata += strlen(m->fn);

@@ -844,7 +840,7 @@ static void msend_req_dsync_break(int s, mfile *m)

 /*----- dsync -----*/

 static void msend_req_dsync(int s, mfile *m)

 {

-  lprintf(9, "%s: rid=%d %s %s\n", __func__, m->mdata.head.reqid, OPCODE(m->mdata.head.opcode), SSTATE(m->mdata.head.nstate));

+  lprintf(9, "%s: rid=%d %s %s\n", __func__, m->mdata.head.reqid, stropcode(&(m->mdata)), strmstate(&(m->mdata)));

   if(m->mdata.head.nstate != MAKUO_SENDSTATE_LAST){

     if(!m->comm){

       if(m->mdata.head.nstate != MAKUO_SENDSTATE_BREAK){

@@ -897,6 +893,7 @@ static void msend_req_del_mark(int s, mfile *m)

 static void msend_req_del_stat(int s, mfile *m)

 {

   int r;

+  mfile *a;

   mfile *d;

   uint8_t stat;

   uint16_t len;

@@ -938,7 +935,12 @@ static void msend_req_del_stat(int s, mfile *m)

   read(m->pipe, d->fn, len);

   d->fn[len]    = 0;

   d->fs.st_mode = mod;

-

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

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

+      msend_mfdel(d);

+      return;

+    }

+  }

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

   *(uint32_t *)(d->mdata.p) = htonl(mod);

   d->mdata.p += sizeof(mod);