@@ -331,10 +331,6 @@ void mloop()

   fd_set rfds;

   fd_set wfds;

   while(loop_flag){

-    if(log_level != moption.loglevel){

-      lprintf(0,"%s: loglevel set %d to %d\n", __func__, moption.loglevel, log_level);

-      moption.loglevel = log_level;

-    }

     FD_ZERO(&rfds);

     FD_ZERO(&wfds);

     rfdset(moption.mcsocket, &rfds);

@@ -351,6 +347,10 @@ void mloop()

       do_comexe(moption.comm, &rfds);

       do_exechk(moption.comm);

     }

+    if(log_level != moption.loglevel){

+      lprintf(0, "%s: loglevel change %d to %d\n", __func__, moption.loglevel, log_level);

+      moption.loglevel = log_level;

+    }

   }

 }

@@ -406,8 +406,9 @@ int is_dir(char *path);

 int is_reg(char *path);

 int mcreatenode(char *base, char *name, mode_t mode, dev_t dev);

 int mrename(char *base, char *oldname, char *newname);

+int mexec(mcomm *c, int n);

 void mtempname(char *base, char *fn, char *tn);

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

 void mexit();

-int mexec(mcomm *c, int n);

 void mrecv_gc();

+

@@ -152,31 +152,32 @@ int mexec_scan_dir(int fd, char *base, char *sendhost, int mode, mcomm *c, int b

   d = opendir(base);

   if(!d){

-    /* directory open error */

     mexec_scan_echo(fd, "directory open error %s", base);

-  }else{

-    while((dent=readdir(d))){

-      if(!loop_flag){

-        return(1);

-      }

-      if(!strcmp(dent->d_name, ".")){

-        continue;

-      }

-      if(!strcmp(dent->d_name, "..")){

-        continue;

-      }

-      if(baseflag){

-        sprintf(path, "%s/%s", base, dent->d_name);

-      }else{

-        strcpy(path, dent->d_name);

-      }

-      space_escape(path);

-      if((r = mexec_scan_child(fd, path, sendhost, mode, c, gid))){

-        return(r);

-      }

+    return(0);

+  }

+  while((dent=readdir(d))){

+    if(!loop_flag){

+      closedir(d);

+      return(1);

+    }

+    if(!strcmp(dent->d_name, ".")){

+      continue;

+    }

+    if(!strcmp(dent->d_name, "..")){

+      continue;

+    }

+    if(baseflag){

+      sprintf(path, "%s/%s", base, dent->d_name);

+    }else{

+      strcpy(path, dent->d_name);

+    }

+    space_escape(path);

+    if((r = mexec_scan_child(fd, path, sendhost, mode, c, gid))){

+      closedir(d);

+      return(r);

     }

-    closedir(d);

   }

+  closedir(d);

   return(0);

 }

@@ -190,23 +191,23 @@ int mexec_scan_child(int fd, char *base, char *sendhost, int mode, mcomm *c, gid

   }

   /*----- exclude -----*/

   sprintf(path, "%s/%s", moption.real_dir, base);

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

-    if(!is_dir(base)){

-      return(mexec_scan_send(fd, base, sendhost, mode, gid));

-    }else{

-      /*----- exclude dir -----*/

-      strcat(path, "/");

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

-        return(0);

-      }

-      /*----- scan dir -----*/

-      if((r = mexec_scan_dir(fd, base, sendhost, mode, c, 1, gid))){

-        return(r);

-      }

-      if(loop_flag && (mode != MAKUO_MEXEC_MD5)){

-        return(mexec_scan_send(fd, base, sendhost, mode, gid));

-      }

-    }

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

+    return(0);

+  }

+  if(!is_dir(base)){

+    return(mexec_scan_send(fd, base, sendhost, mode, gid));

+  }

+  /*----- exclude dir -----*/

+  strcat(path, "/");

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

+    return(0);

+  }

+  /*----- scan dir -----*/

+  if((r = mexec_scan_dir(fd, base, sendhost, mode, c, 1, gid))){

+    return(r);

+  }

+  if(loop_flag && (mode != MAKUO_MEXEC_MD5)){

+    return(mexec_scan_send(fd, base, sendhost, mode, gid));

   }

   return(0);

 }

@@ -224,12 +225,14 @@ int mexec_scan(mcomm *c, char *fn, mhost *h, int mode, gid_t gid)

     return(-1);

   }

-  base[0] = 0;

+  base[0]     = 0;

   sendhost[0] = 0;

-  if(h)

+  if(h){

     strcpy(sendhost, h->hostname);

-  if(fn)

+  }

+  if(fn){

     strcpy(base, fn);

+  }

   pid=fork();

   if(pid == -1){

@@ -152,6 +152,9 @@ void lprintf(int l, char *fmt, ...)

   char b[1024];

   char d[2048];

   static char m[2048];

+#ifdef MAKUO_DEBUG

+  struct timeval tv;

+#endif

   if(moption.loglevel < l){

     return;

   }

@@ -167,7 +170,6 @@ void lprintf(int l, char *fmt, ...)

     return;

   }

 #ifdef MAKUO_DEBUG

-  struct timeval tv;

   gettimeofday(&tv, NULL);

   fprintf(stderr, "%02d.%06d %s", tv.tv_sec % 60, tv.tv_usec, m);

 #else