@@ -456,12 +456,13 @@ void member_del(mhost *t)

 void member_del_message(mhost *t, char *mess)

 {

   int i;

+  if(!t || !mess){

+    return;

+  }

   for(i=0;i<MAX_COMM;i++){

     if(moption.comm[i].working){

       cprintf(0, &(moption.comm[i]), "error: %s %s(%s)\n", 

-        mess, 

-        inet_ntoa(t->ad), 

-        t->hostname);

+        mess, inet_ntoa(t->ad), t->hostname);

     }

   }

 }

@@ -470,7 +471,6 @@ mmark *markalloc()

 {

   mmark *mm = calloc(1, sizeof(mmark));

   return(mm);

-

 }

 void markfree(mmark *mm)

@@ -512,22 +512,11 @@ mmark *delmark(mmark *mm)

 void seq_addmark(mfile *m, uint32_t l, uint32_t h)

 {

-  mmark *mm;

-  if(!m){

-    return;

-  }

-  if(h == l){

+  if(!m || (h == l)){

     return;

   }

   m->markcount += (h - l);

   m->mark = addmark(m->mark, l, h);

-

-  int c=0;

-  for(mm=m->mark;mm;mm=mm->next){

-    c++;

-  }

-  lprintf(9, "%s: %06d->%06d (%d) markcount=%d marklist=%d %s\n", __func__, l, h, h - l, m->markcount, c, m->fn);

-  return;

 }

 int seq_delmark(mfile *m, uint32_t seq)

@@ -535,6 +524,7 @@ int seq_delmark(mfile *m, uint32_t seq)

   uint32_t l;

   uint32_t h;

   mmark  *mm;

+

   if(!m){

     return(0);

   }

@@ -612,7 +602,6 @@ void seq_setmark(mfile *m, uint32_t l, uint32_t h)

   for(mm=m->mark;mm;mm=mm->next){

     m->markcount += (mm->h - mm->l);

   }

-  lprintf(9, "%s: %06d->%06d (%d) rid=%d %s\n", __func__, l, h, h - l, m->mdata.head.reqid, m->fn);

 }

 uint32_t seq_getmark(mfile *m)

@@ -739,9 +728,7 @@ int ack_check(mfile *m, int state)

       s = get_hoststate(t,m);

       if(!s){

         lprintf(0,"%s: can't get state area host=%s fn=%s\n", 

-          __func__,

-          t->hostname, 

-          m->fn);

+          __func__, t->hostname, m->fn);

       }else{

         if(*s == state){

           return(1);

@@ -752,9 +739,7 @@ int ack_check(mfile *m, int state)

         s = get_hoststate(t,m);

         if(!s){

           lprintf(0,"%s: can't get state area host=%s fn=%s\n", 

-            __func__,

-            t->hostname, 

-            m->fn);

+            __func__, t->hostname, m->fn);

         }else{

           if(*s == state){

             return(1);

@@ -765,8 +750,9 @@ int ack_check(mfile *m, int state)

       }

     }

   }

-  if(m->sendto)

+  if(m->sendto){

     return(-1);

+  }

   return(0);

 }

@@ -821,16 +807,18 @@ int statcmp(struct stat *s1, struct stat *s2)

 int is_dir(char *path)

 {

   struct stat mstat;

-  if(!lstat(path,&mstat))

+  if(!lstat(path,&mstat)){

     return(S_ISDIR(mstat.st_mode));

+  }

   return(0);

 }

 int is_reg(char *path)

 {

   struct stat mstat;

-  if(!lstat(path,&mstat))

+  if(!lstat(path,&mstat)){

     return(S_ISREG(mstat.st_mode));

+  }

   return(0);

 }

@@ -860,6 +848,7 @@ int set_guid(uid_t uid, gid_t gid, gid_t *gids)

       return(-1);

     }

   }

+

   /*----- setuid -----*/

   if(uid != geteuid()){

     if(seteuid(uid) == -1){

@@ -481,6 +481,7 @@ int mexec_send(mcomm *c, int n, int sync)

 int mexec_check(mcomm *c, int n)

 {

+  int e;

   int i;

   int r;

   ssize_t size;

@@ -556,8 +557,9 @@ int mexec_check(mcomm *c, int n)

   /*----- open -----*/

   m->fd = open(m->fn, O_RDONLY);

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

-	  lprintf(0, "%s: file open error (%s) %s\n", __func__, strerror(errno), m->fn);

-    cprintf(0, c, "error: file open error (%s) %s\n", strerror(errno), m->fn);

+    e = errno;

+	  lprintf(0, "%s: %s %s\n", __func__, strerror(e), m->fn);

+    cprintf(0, c, "error: %s %s\n", strerror(e), m->fn);

     mfdel(m);

     return(0);

   }

@@ -569,8 +571,9 @@ int mexec_check(mcomm *c, int n)

   close(m->fd);

   m->fd = -1;

   if(r == -1){

-	  lprintf(0, "%s: file read error (%s) %s\n", __func__, strerror(errno), m->fn);

-    cprintf(0, c, "error: file read error (%s) %s\n", strerror(errno), m->fn);

+    e = errno; 

+	  lprintf(0, "%s: %s %s\n", __func__, strerror(e), m->fn);

+    cprintf(0, c, "error: %s %s\n",     strerror(e), m->fn);

     mfdel(m);

     return(0);

   }

@@ -142,36 +142,36 @@ static int mrecv_ack_search(mhost **lpt, mfile **lpm, mdata *data, struct sockad

   return(0);

 }

-static void mrecv_ack_report(mfile *m, mhost *h, mdata *data)

+static void mrecv_ack_report(mfile *m, mhost *t, mdata *data)

 {

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

-    cprintf(0, m->comm, "error: can't open (%s) %s:%s\n", strerror(data->head.error), h->hostname, m->fn);

-    lprintf(0,          "%s: can't open (%s) rid=%06d %s %s:%s\n", 

+    cprintf(0, m->comm, "error: %s %s:%s\n", strerror(data->head.error), t->hostname, m->fn);

+    lprintf(0,          "%s: %s rid=%06d %s %s:%s\n", 

       __func__,

       strerror(data->head.error),

       data->head.reqid, 

       strrstate(data->head.nstate), 

-      h->hostname, 

+      t->hostname, 

       m->fn);

   }

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

-    cprintf(0, m->comm, "error: can't write (%s) %s:%s\n", strerror(data->head.error), h->hostname, m->fn);

-    lprintf(0,          "%s: can't write (%s) rid=%06d %s %s:%s\n", 

+    cprintf(0, m->comm, "error: %s %s:%s\n", strerror(data->head.error), t->hostname, m->fn);

+    lprintf(0,          "%s: %s rid=%06d %s %s:%s\n", 

       __func__,

       strerror(data->head.error),

       data->head.reqid, 

       strrstate(data->head.nstate), 

-      h->hostname, 

+      t->hostname, 

       m->fn);

   }

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

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

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

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

       __func__,

       strerror(data->head.error),

       data->head.reqid, 

       strrstate(data->head.nstate), 

-      h->hostname, 

+      t->hostname, 

       m->fn);

   }

 }

@@ -461,8 +461,9 @@ static void mrecv_req_send_open(mfile *m, mdata *r)

   char fpath[PATH_MAX];

   char tpath[PATH_MAX];

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

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

     return;

+  }

   mtempname(moption.base_dir, m->fn, m->tn);

   sprintf(fpath, "%s/%s", moption.base_dir, m->fn);

@@ -497,7 +498,7 @@ static void mrecv_req_send_open(mfile *m, mdata *r)

       if(m->fd != -1){

         m->mdata.head.nstate = MAKUO_RECVSTATE_OPEN;

       }else{

-        lprintf(0, "%s: open error %s\n", __func__, m->fn);

+        lprintf(0, "%s: %s %s\n", __func__, strerror(errno), m->fn);

         m->mdata.head.error = errno;

       }

     }

@@ -506,7 +507,7 @@ static void mrecv_req_send_open(mfile *m, mdata *r)

         m->mdata.head.nstate = MAKUO_RECVSTATE_OPEN;

         set_filestat(tpath, m->fs.st_uid, m->fs.st_gid, m->fs.st_mode);

       }else{

-        lprintf(0, "%s: can't create character device %s\n", __func__, m->fn);

+        lprintf(0, "%s: %s %s\n", __func__, strerror(errno), m->fn);

         m->mdata.head.error = errno;

       }

     }

@@ -515,7 +516,7 @@ static void mrecv_req_send_open(mfile *m, mdata *r)

         m->mdata.head.nstate = MAKUO_RECVSTATE_OPEN;

         set_filestat(tpath, m->fs.st_uid, m->fs.st_gid, m->fs.st_mode);

       }else{

-        lprintf(0, "%s: can't create block device %s\n", __func__, m->fn);

+        lprintf(0, "%s: %s %s\n", __func__, strerror(errno), m->fn);

         m->mdata.head.error = errno;

       }

     }

@@ -524,7 +525,7 @@ static void mrecv_req_send_open(mfile *m, mdata *r)

         m->mdata.head.nstate = MAKUO_RECVSTATE_OPEN;

         set_filestat(tpath, m->fs.st_uid, m->fs.st_gid, m->fs.st_mode);

       }else{

-        lprintf(0, "%s: can't create fifo %s\n", __func__, m->fn);

+        lprintf(0, "%s: %s %s\n", __func__, strerror(errno), m->fn);

         m->mdata.head.error = errno;

       }

     }

@@ -583,7 +584,8 @@ static void mrecv_req_send_data_write(mfile *m, mdata *r)

   offset = r->head.seqno;

   offset *= MAKUO_BUFFER_SIZE;

   if(lseek(m->fd, offset, SEEK_SET) == -1){

-    lprintf(0, "%s: seek error seq=%d size=%d fd=%d err=%d\n", __func__, (int)r->head.seqno, r->head.szdata, m->fd, errno);

+    lprintf(0, "%s: seek error (%s) seq=%u\n",

+      __func__, strerror(errno), (int)(r->head.seqno));

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

     m->mdata.head.nstate = MAKUO_RECVSTATE_WRITEERROR;

     mrecv_req_send_data_write_error(m, r);

@@ -778,6 +780,10 @@ static mfile *mrecv_req_send_create(mdata *data, struct sockaddr_in *addr)

   uint32_t  hdev;

   uint64_t  rdev;

+  if(m = mrecv_req_search(data, addr)){

+    return(m);

+  }

+

   if(data->head.nstate != MAKUO_SENDSTATE_STAT){

     return(NULL);

   }

@@ -832,12 +838,9 @@ static mfile *mrecv_req_send_create(mdata *data, struct sockaddr_in *addr)

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

 {

-  mfile *m = mrecv_req_search(data, addr); 

+  mfile *m;

-  if(!m){

-    m = mrecv_req_send_create(data, addr);

-  }

-  if(m){

+  if(m = mrecv_req_send_create(data, addr)){

     mtimeget(&(m->lastrecv));

     mrecv_req_send_next(m, data);

   }else{

@@ -1312,9 +1315,7 @@ void mrecv_gc()

   while(m){

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

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

-        __func__, 

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

-        m->fn);

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

       m = mrecv_mfdel(m);

       continue;

     }

@@ -1347,15 +1348,11 @@ void mrecv_clean()

 int mrecv(int s)

 {

-  mhost *t;

   mdata  data;

   struct sockaddr_in addr;

   if(mrecv_packet(s, &data, &addr) == -1){

     return(0);

   }

-  if(t=member_get(&addr.sin_addr)){

-    mtimeget(&t->lastrecv);

-  }

   if(data.head.flags & MAKUO_FLAG_ACK){

     mrecv_ack(&data, &addr);

   }else{

@@ -1096,9 +1096,9 @@ void msend(int s, mfile *m)

   }

   mtimeget(&m->lastsend);

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

-    msend_ack(s, m); /* source node task */

+    msend_ack(s, m); 

   }else{

-    msend_req(s, m); /* destination node task */

+    msend_req(s, m); 

   }

 }