@@ -108,7 +108,6 @@ int workend(mcomm *c)

         cprintf(0, c, "password: \x1b]E");

       }else{

         cprintf(0,c,"> ");

-        lprintf(1,"mexec: ======= separator =======\n");

       }

     }

   }

@@ -564,8 +563,7 @@ int ack_check(mfile *m, int state)

     if(!m->sendto){

       s = get_hoststate(t,m);

       if(!s){

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

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

+        lprintf(0,"[error] %s: can't get state area host=%s fn=%s\n", __func__, t->hostname, m->fn);

       }else{

         if(*s == state){

           return(1);

@@ -575,8 +573,7 @@ int ack_check(mfile *m, int state)

       if(!memcmp(&(m->addr.sin_addr), &(t->ad), sizeof(m->addr.sin_addr))){

         s = get_hoststate(t,m);

         if(!s){

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

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

+          lprintf(0,"[error] %s: can't get state area host=%s fn=%s\n", __func__, t->hostname, m->fn);

         }else{

           if(*s == state){

             return(1);

@@ -660,17 +657,12 @@ int is_reg(char *path)

   return(0);

 }

-int set_guid(uid_t uid, gid_t gid, gid_t *gids)

+int set_guid(uid_t uid, gid_t gid, size_t gidn, gid_t *gids)

 {

-  size_t num;

-

   /*----- setgids -----*/

-  if(gids){

-    for(num=0;gids[num];num++);

-    if(num){

-      if(setgroups(num, gids) == -1){

-        return(-1);

-      }

+  if(gidn && gids){

+    if(setgroups(gidn, gids) == -1){

+      return(-1);

     }

   }else{

     if(gid != getegid()){

@@ -699,10 +691,25 @@ int set_guid(uid_t uid, gid_t gid, gid_t *gids)

 int set_gids(char *groups)

 {

   char *p;

+  gid_t gid;

   size_t num;

   struct group *g;

   char buff[1024];

+  if(moption.gids){

+    free(moption.gids);

+  }

+  moption.gids = NULL;

+  moption.gidn = 0;

+

+  if(!groups){

+    return(0);

+  }

+

+  if(strlen(groups) >= sizeof(buff)){

+    return(-1);

+  }

+

   num = 0;

   strcpy(buff, groups);

   p = strtok(buff,",");

@@ -710,30 +717,35 @@ int set_gids(char *groups)

     p = strtok(NULL,",");

     num++;

   }

-  if(moption.gids){

-    free(moption.gids);

+  if(!num){

+    return(0);

   }

-  moption.gids = malloc(sizeof(gid_t) * (num + 1));

+  moption.gidn = num;

+  moption.gids = malloc(sizeof(gid_t) * num);

   num = 0; 

   strcpy(buff, groups);

   p = strtok(buff,",");

   while(p){

     if(*p >= '0' && *p <= '9'){

-      moption.gids[num] = atoi(p);

-      if(g = getgrgid(moption.gids[num])){

+      gid = atoi(p);

+      if(g = getgrgid(gid)){

+        moption.gids[num] = gid;

         strcpy(moption.grnames[num], g->gr_name);

+      }else{

+        return(-1);

       }

     }else{

       if(g = getgrnam(p)){

         moption.gids[num] = g->gr_gid;

         strcpy(moption.grnames[num], p);

+      }else{

+        return(-1);

       }

     }

     p = strtok(NULL,",");

     num++;

   }

-  moption.gids[num] = 0;

   return(0);

 }

@@ -241,14 +241,22 @@ void do_exechk(mcomm *c){

   int    i;

   mfile *m;

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

-    if(c[i].working && !c[i].cpid && (c[i].fd[1] == -1)){

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

-        if(m->comm == &c[i]){

-          break; /* working */

+    if(c[i].working){

+      if(c[i].isalive){

+        if(mtimeout(&(c[i].tv), (uint32_t)1000)){

+          cprintf(0, &(c[i]), "alive\n");

+          mtimeget(&(c[i].tv));

         }

       }

-      if(!m){

-        workend(&c[i]);

+      if((c[i].cpid == 0) && (c[i].fd[1] == -1)){

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

+          if(m->comm == &c[i]){

+            break; /* working */

+          }

+        }

+        if(!m){

+          workend(&c[i]);

+        }

       }

     }

   }

@@ -281,13 +289,13 @@ 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(1, "%s: socket[%d]\n", __func__, i);

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

       break;

     case AF_INET:

     case AF_INET6:

       buff[0]=0;

-      getnameinfo((const struct sockaddr*)&ss, sizeof(ss), buff, sizeof(buff), NULL, NULL, NI_NUMERICHOST);

-      lprintf(1, "%s: socket[%d] from %s\n", __func__, i, buff);

+      getnameinfo((const struct sockaddr *)&ss, sizeof(ss), buff, sizeof(buff), NULL, 0, NI_NUMERICHOST);

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

       break;

   }

   c[i].working = 1;

@@ -175,6 +175,7 @@ typedef struct excludeitem

 typedef struct

 {

+  int no;

   int cpid;

   int fd[2];

   int size[2];

@@ -183,10 +184,13 @@ typedef struct

   int loglevel;

   int working;

   int authchk;

+  int isalive;

+  int logflag;

   char cmdline[2][MAKUO_BUFFER_SIZE];

   char parse[2][8][MAKUO_BUFFER_SIZE];

   char readbuff[2][MAKUO_BUFFER_SIZE];

   excludeitem *exclude;

+  struct timeval tv;

 } mcomm;

 typedef struct mmark

@@ -268,6 +272,7 @@ typedef struct

   uid_t uid;

   gid_t gid;

   gid_t *gids;

+  size_t gidn;

   char group_name[64];

   char user_name[64];

   char grnames[32][64];

@@ -335,7 +340,7 @@ int atomic_read(int fd, void *buff, int size, int nb);

 void set_filestat(char *path, uid_t uid, gid_t gid, mode_t mode);

 /*----- uid/gid -----*/

-int set_guid(uid_t uid, gid_t gid, gid_t *gids);

+int set_guid(uid_t uid, gid_t gid, size_t gidn, gid_t *gids);

 int set_gids(char *groups);

 /*----- member operation -----*/

@@ -18,6 +18,7 @@ char *command_list[]={"quit",

                       "echo",

                       "exclude",

                       "loglevel",

+                      "alive",

                       "help",

                       NULL};

@@ -241,6 +242,7 @@ int mexec_scan(mcomm *c, char *fn, mhost *h, int mode, gid_t gid)

     close(p[1]);

     c->cpid  = pid;

     c->fd[1] = p[0];

+    lprintf(9, "  %d: open\n", c->no);

     return(0);

   }else{

     /* child */

@@ -252,29 +254,48 @@ int mexec_scan(mcomm *c, char *fn, mhost *h, int mode, gid_t gid)

   return(0);

 }

+int mexec_open(int l, mcomm *c, int n)

+{

+  if(n){

+    lprintf(9, "  %d> %s\n", c->no, c->cmdline[n]);

+    return(0);

+  }

+  if(c->logflag == 0){

+    if(l <= moption.loglevel){

+      lprintf(1, "======= separator =======\n");

+      lprintf(1, "%d: open\n", c->no);

+      c->logflag = 1;

+    }

+  }

+  if(c->logflag){

+    lprintf(1, "-------------------------\n");

+    lprintf(1, "%d> %s\n", c->no, c->cmdline[n]);

+  }

+  return(0);

+}

+

 int mexec_close(mcomm *c, int n)

 {

-  int i;

   mfile *m;

   if(c->fd[n] != -1){

     close(c->fd[n]);

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

-      if(c == &(moption.comm[i])){

-        break;

-      }

-    }

     if(n){

-      lprintf(8, "%s: socket[%d] (backend)\n", __func__, i);

+      lprintf(9, "  %d: close\n", c->no);

     }else{

-      lprintf(1, "%s: socket[%d]\n", __func__, i);

+      if(c->logflag){

+        lprintf(1, "-------------------------\n");

+        lprintf(1, "%d: close\n", c->no);

+      }

     }

   }

   c->fd[n]  = -1;

   c->size[n] = 0;

   if(!n){

     c->authchk  = 0;

+    c->logflag  = 0;

     c->loglevel = 0;

+    c->isalive  = 0;

     if(c->cpid){

       kill(c->cpid, SIGTERM);

       mexec_close(c, 1);

@@ -310,6 +331,7 @@ int mexec_help(mcomm *c, int n)

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

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

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

+  cprintf(0, c, "  alive on|off\n");

   cprintf(0, c, "  loglevel num (0-9)\n");

   cprintf(0, c, "  members\n");

   cprintf(0, c, "  help\n");

@@ -358,14 +380,16 @@ int mexec_send(mcomm *c, int n, int sync)

         if(*optarg >= '0' && *optarg <='9'){

           gid = atoi(optarg);

         }else{

-          if(moption.gids){

-            for(j=0;moption.gids[j];j++){

-              if(!strcmp(optarg, moption.grnames[j])){

-                gid = moption.gids[j];

-                break;

-              }

+          for(j=0;j<moption.gidn;j++){

+            if(!strcmp(optarg, moption.grnames[j])){

+              gid = moption.gids[j];

+              break;

             }

           }

+          if(gid == -1){

+            cprintf(0, c, "nou found %s group\n", optarg);

+            return(0);

+          }

         }

         break;

       case 't':

@@ -501,7 +525,8 @@ int mexec_send(mcomm *c, int n, int sync)

   if((m->dryrun == 0) && (gid != -1)){

     if(m->fs.st_gid != gid){

       if(lchown(m->fn, -1, gid) == -1){

-        lprintf(0, "%s: chgrp error (%s) [%d->%d] %s\n", __func__, strerror(errno),  m->fs.st_gid, gid, m->fn);

+        cprintf(0, c,   "error: can't chgrp (%s) [%d->%d] %s\n", strerror(errno),  m->fs.st_gid, gid, m->fn);

+        lprintf(0, "[error] %s: can't chgrp (%s) [%d->%d] %s\n", __func__, strerror(errno),  m->fs.st_gid, gid, m->fn);

       }else{

         m->fs.st_gid = gid;

       }

@@ -926,6 +951,22 @@ int mexec_status(mcomm *c, int n)

   return(0);

 }

+int mexec_alive(mcomm *c, int n)

+{

+  if(c->argc[n] != 2){

+    return(mexec_help(c, n));

+  }

+  if(!strcmp("on", c->parse[n][1])){

+    c->isalive = 1;

+    return(0);

+  }

+  if(!strcmp("off", c->parse[n][1])){

+    c->isalive = 0;

+    return(0);

+  }

+  return(mexec_help(c, n));

+}

+

 int mexec_password(char *password)

 {

   unsigned char digest[16];

@@ -1013,17 +1054,20 @@ int mexec(mcomm *c, int n)

   mfile *m   = NULL;

   int count  = 0;

-  if(n == 0 && c->working){

-    c->size[n] = 0;

-    r = read(c->fd[n], buff, size);

-    if(r>0){

-    }else{

-      if(r == -1){

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

+  if(n == 0){

+    mtimeget(&(c->tv));

+    if(c->working){

+      c->size[n] = 0;

+      r = read(c->fd[n], buff, size);

+      if(r>0){

+      }else{

+        if(r == -1){

+          lprintf(0, "[error] %s: read error n=%d fd=%d\n", __func__, n, c->fd[n]);

+        }

+        mexec_close(c, n);

       }

-      mexec_close(c, n);

+      return(-1);

     }

-    return(-1);

   }

   if(n == 1){

@@ -1049,7 +1093,7 @@ int mexec(mcomm *c, int n)

       c->size[n] += r;

     }else{

       if(r < 0){

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

+        lprintf(0, "[error] %s: read error(%s) n=%d fd=%d\n", __func__, strerror(errno), n, c->fd[n]);

       }

       mexec_close(c, n);

       return(-1);

@@ -1069,51 +1113,67 @@ int mexec(mcomm *c, int n)

       cprintf(0, c, "> ");

     }

   }else{

-    lprintf(1 + n * 7, "%s: %s\n", __func__, c->cmdline[n]);

     c->working = 1;

-

-    if(!strcmp("help",command_list[r]))

-      return(mexec_help(c,n));

-

-    if(!strcmp("quit",command_list[r]))

-      return(mexec_quit(c,n));

-

-    if(!strcmp("exit",command_list[r]))

-      return(mexec_quit(c,n));

-

-    if(!strcmp("bye",command_list[r]))

-      return(mexec_quit(c,n));

-

-    if(!strcmp("send",command_list[r]))

-      return(mexec_send(c,n,0));

-

-    if(!strcmp("sync",command_list[r]))

-      return(mexec_send(c,n,1));

-

-    if(!strcmp("md5",command_list[r]))

-      return(mexec_check(c,n));

-

-    if(!strcmp("check",command_list[r]))

-      return(mexec_check(c,n));

-

-    if(!strcmp("dsync",command_list[r]))

-      return(mexec_dsync(c,n));

-

-    if(!strcmp("members",command_list[r]))

-      return(mexec_members(c,n));

-

-    if(!strcmp("echo",command_list[r]))

-      return(mexec_echo(c,n));

-

-    if(!strcmp("loglevel",command_list[r]))

-      return(mexec_loglevel(c,n));

-

-    if(!strcmp("exclude",command_list[r]))

-      return(mexec_exclude(c,n));

-

-    if(!strcmp("status",command_list[r]))

-      return(mexec_status(c,n));

-

+    if(!strcmp("help", command_list[r])){

+      mexec_open(1, c, n);

+      return(mexec_help(c, n));

+    }

+    if(!strcmp("quit", command_list[r])){

+      mexec_open(8, c, n);

+      return(mexec_quit(c, n));

+    }

+    if(!strcmp("exit", command_list[r])){

+      mexec_open(8, c, n);

+      return(mexec_quit(c, n));

+    }

+    if(!strcmp("bye", command_list[r])){

+      mexec_open(8, c, n);

+      return(mexec_quit(c, n));

+    }

+    if(!strcmp("send", command_list[r])){

+      mexec_open(1, c, n);

+      return(mexec_send(c, n, 0));

+    }

+    if(!strcmp("sync", command_list[r])){

+      mexec_open(1, c, n);

+      return(mexec_send(c, n, 1));

+    }

+    if(!strcmp("md5", command_list[r])){

+      mexec_open(1, c, n);

+      return(mexec_check(c, n));

+    }

+    if(!strcmp("check", command_list[r])){

+      mexec_open(1, c, n);

+      return(mexec_check(c, n));

+    }

+    if(!strcmp("dsync", command_list[r])){

+      mexec_open(1, c, n);

+      return(mexec_dsync(c, n));

+    }

+    if(!strcmp("members", command_list[r])){

+      mexec_open(5, c, n);

+      return(mexec_members(c, n));

+    }

+    if(!strcmp("echo", command_list[r])){

+      mexec_open(5, c, n);

+      return(mexec_echo(c, n));

+    }

+    if(!strcmp("loglevel", command_list[r])){

+      mexec_open(5, c, n);

+      return(mexec_loglevel(c, n));

+    }

+    if(!strcmp("exclude", command_list[r])){

+      mexec_open(1, c, n);

+      return(mexec_exclude(c, n));

+    }

+    if(!strcmp("status", command_list[r])){

+      mexec_open(5, c, n);

+      return(mexec_status(c, n));

+    }

+    if(!strcmp("alive", command_list[r])){

+      mexec_open(8, c, n);

+      return(mexec_alive(c, n));

+    }

     c->working = 0;

   }

   return(r);

@@ -82,6 +82,7 @@ static void minit_option_setdefault()

   moption.gids                  = NULL;

   getcwd(moption.base_dir, PATH_MAX);

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

+    moption.comm[i].no = i;

     moption.comm[i].fd[0] = -1;

     moption.comm[i].fd[1] = -1;

   }

@@ -93,6 +94,9 @@ static void minit_option_getenv()

   struct passwd *pw;

   struct group  *gr;

+  if(env=getenv("MAKUOSAN_BASE")){

+    realpath(env, moption.base_dir);

+  }

   if(env=getenv("MAKUOSAN_PORT")){

     moption.maddr.sin_port = htons(atoi(env));

     moption.laddr.sin_port = htons(atoi(env));

@@ -247,6 +251,9 @@ static void minit_getopt(int argc, char *argv[])

           if(pw = getpwnam(optarg)){

             moption.uid = pw->pw_uid;

             moption.gid = pw->pw_gid;

+          }else{

+            lprintf(0, "%s: not found user %s\n", __func__, optarg);

+            exit(1);

           }

         }

         break;

@@ -257,13 +264,16 @@ static void minit_getopt(int argc, char *argv[])

         }else{

          if(gr = getgrnam(optarg)){

             moption.gid = gr->gr_gid;

+          }else{

+            lprintf(0, "%s: not found group %s\n", __func__, optarg);

+            exit(1);

           }

         }

         break;

       case 'G':

         if(set_gids(optarg) == -1){

-          lprintf(0, "%s: set gids error\n", __func__);

+          lprintf(0, "%s: can't set gids %s\n", __func__, optarg);

           exit(1);

         }

         break;

@@ -448,10 +458,10 @@ static void minit_chroot()

 static void minit_setguid()

 {

   size_t num;

-  if(set_guid(moption.uid, moption.gid, moption.gids) == -1){

+  if(set_guid(moption.uid, moption.gid, moption.gidn, moption.gids) == -1){

     fprintf(stderr, "%s: can't setguid %d:%d", __func__, moption.uid, moption.gid);

-    if(moption.gids){

-      for(num=0;moption.gids[num];num++){

+    if(moption.gidn){

+      for(num=0;num<moption.gidn;num++){

         fprintf(stderr, ",%d", moption.gids[num]);

       }

     }

@@ -1242,11 +1242,11 @@ static void mrecv_req_del_data_report(mfile *m, mcomm *c, uint32_t err, char *hn

     dryrun = "(dryrun) ";

   }

   if(err){

-    cprintf(0, c,  "(%s) delete error %s:%s\n", strerror(err), hn, path);

-    lprintf(1, "%s: (%s) delete error %s:%s\n", __func__, strerror(err), hn, path);

+    cprintf(0, c,  "delete error (%s) %s:%s\n", strerror(err), hn, path);

+    lprintf(1, "delete error (%s) %s:%s\n", strerror(err), hn, path);

   }else{

     cprintf(0, c,  "%sdelete %s:%s\n", dryrun, hn, path);

-    lprintf(1, "%s: %sdelete %s:%s\n", __func__, dryrun, hn, path);

+    lprintf(1, "%sdelete %s:%s\n", dryrun, hn, path);

   }

 }

@@ -554,7 +554,7 @@ static void msend_req_send_filedata(int s, mfile *m)

       cprintf(0, m->comm, "error: can't read (%s) seqno=%d %s\n", strerror(errno), m->mdata.head.seqno, m->fn);

     }else{

       /* eof */

-      lprintf(4, "%s: block send count=%d %s\n", __func__, m->mdata.head.seqno, m->fn);

+      lprintf(9, "%s: block send count=%d %s\n", __func__, m->mdata.head.seqno, m->fn);

       m->mdata.head.seqno  = 0;

       m->mdata.head.nstate = MAKUO_SENDSTATE_MARK;

       m->initstate = 1;

@@ -638,7 +638,7 @@ static void msend_req_send_close(int s, mfile *m)

   if(m->mdata.head.ostate == MAKUO_SENDSTATE_MARK || 

      m->mdata.head.ostate == MAKUO_SENDSTATE_DATA ||

      m->mdata.head.ostate == MAKUO_SENDSTATE_OPEN){

-    lprintf(6,"%s: update complate %s \n", __func__, m->fn);

+    lprintf(4, "update complate %s\n", m->fn);

   }

   m->initstate = 1;

   m->mdata.head.nstate = MAKUO_SENDSTATE_LAST;

@@ -20,7 +20,23 @@

 #include <sys/un.h>

 #include "makuosan.h"

-excludeitem *exclude = NULL;

+typedef struct msyncdata

+{

+  int s;                /* */

+  int loopflag;         /* */

+  int loglevel;         /* */

+  int sendflag;         /* */

+  int delflag;          /* */

+  int grpflag;          /* */

+  char scfile[256];     /* */

+  char passwd[256];     /* */

+  char target[256];     /* */

+  char mcmd[256];       /* */

+  char mopt[256];       /* */

+  char sopt[256];       /* */

+  char path[PATH_MAX];  /* */

+  excludeitem *exclude; /* */

+} msyncdata;

 void usage()

 {

@@ -53,18 +69,18 @@ void usage()

   printf("\n");

 }

-excludeitem *add_exclude(char *pattern)

+excludeitem *add_exclude(msyncdata *md, char *pattern)

 {

   excludeitem *item = malloc(sizeof(excludeitem));

   item->pattern = malloc(strlen(pattern) + 1);

   strcpy(item->pattern, pattern);

   item->prev = NULL;

   item->next = NULL;

-  if(exclude){

-    exclude->prev = item;

-    item->next = exclude;

+  if(md->exclude){

+    md->exclude->prev = item;

+    item->next = md->exclude;

   }

-  exclude = item;

+  md->exclude = item;

   return(item);

 }

@@ -214,31 +230,41 @@ int readline(int s, char *buff, int size, int prompt, char *passwd)

   return(-1); /* over flow */

 }

-int wait_prompt(int s, char *passwd){

+int wait_prompt(int s, char *passwd, int view, int *line){

   int  r;

   char buff[8192];

-

   while(r = readline(s, buff, sizeof(buff), 1, passwd)){

     if(r == -1){

       /* read error */

-      return(-1);

+      r = -1;

+      break;

     }

     if(r == -2){

       /* return prompt */

-      return(1);

+      r = 1;

+      break;

     }

-    if(!memcmp(buff, "error:", 6)){

-      fprintf(stderr, "%s\n", buff);

-    }else{

-      fprintf(stdout, "%s\n", buff);

+    if(!memcmp(buff, "alive", 5)){

+      continue;

+    }

+    if(line){

+      (*line)++;

+    }

+    if(view){

+      if(!memcmp(buff, "error:", 6)){

+        fprintf(stderr, "%s\n", buff);

+      }else{

+        fprintf(stdout, "%s\n", buff);

+      }

     }

   }

-  return(0);

+  return(r);

 } 

-int makuo(int s, char *c)

+int makuo(int s, char *c, int view)

 {

   int  r;

+  int  line = 1;

   char buff[256];

   if(sizeof(buff) < strlen(c) + 2){

     fprintf(stderr, "error: command too long\n");

@@ -249,54 +275,77 @@ int makuo(int s, char *c)

     fprintf(stderr, "error: can't write socket\n");

     return(-1);

   }

-  r = wait_prompt(s, NULL);

+  r = wait_prompt(s, NULL, view, &line);

   if(r == -1){

     fprintf(stderr, "error: can't read socket\n");

     return(-1);

   }

-  return(r);

+  if(r == 0){

+    return(0);

+  }

+  return(line);

+}

+

+void makuo_aliveon(msyncdata *md)

+{

+  int r;

+  char cmd[256];

+  struct timeval tv;

+  sprintf(cmd, "alive on");

+  r = makuo(md->s, cmd, 0);

+  if(r == 0){

+    exit(1);

+  }

+  if(r == -1){

+    exit(1);

+  }

+  if(r == 1){

+    tv.tv_sec  = 30;

+    tv.tv_usec = 0;

+  }else{

+    tv.tv_sec  = 0;

+    tv.tv_usec = 0;

+  }

+  setsockopt(md->s, SOL_SOCKET, SO_RCVTIMEO, (void *)&tv, sizeof(tv));

 }

-int makuo_log(int s, int l)

+void makuo_log(msyncdata *md)

 {

   int r;

   char cmd[256];

-  sprintf(cmd, "loglevel %d", l);

-  r = makuo(s, cmd);

+  sprintf(cmd, "loglevel %d", md->loglevel);

+  r = makuo(md->s, cmd, 0);

   if(r == 0){

     fprintf(stderr, "error: remote close\n");

-    return(1);

+    exit(1);

   }

   if(r == -1){

-    return(1);

+    exit(1);

   }

-  return(0);

 }

-int makuo_exclude(int s)

+void makuo_exclude(msyncdata *md)

 {

   int r;

   char cmd[1024];

   excludeitem *item;

-  for(item=exclude;item;item=item->next){

+  for(item=md->exclude;item;item=item->next){

     sprintf(cmd, "exclude add %s", item->pattern);

-    r = makuo(s, cmd);

+    r = makuo(md->s, cmd, 0);

     if(r == 0){

       fprintf(stderr, "error: makuosan remote close. (%s)\n", cmd);

-      return(1);

+      exit(1);

     }

     if(r == -1){

       fprintf(stderr, "error: makuosan socket error. (%s)\n", cmd);

-      return(1);

+      exit(1);

     }

   }

-  return(0);

 }

-

 int makuo_exec(int s, char *cmd)

 { 

-  int r = makuo(s, cmd);

+  int r = makuo(s, cmd, 1);

   if(r == 0){

     fprintf(stderr, "error: makuosan remote close. (%s)\n", cmd);

     return(1);

@@ -308,10 +357,31 @@ int makuo_exec(int s, char *cmd)

   return(0);

 }

-int makuo_quit(int s)

+void makuo_send(msyncdata *md)

+{

+  char cmd[1024];

+  if(md->delflag){

+    sprintf(cmd, "dsync%s %s", md->mopt, md->path);

+    if(makuo_exec(md->s, cmd)){

+      close(md->s);

+      exit(1);

+    }

+  }

+  if(md->sendflag){

+    sprintf(cmd, "%s%s%s %s", md->mcmd, md->mopt, md->sopt, md->path);

+  }else{

+    sprintf(cmd, "%s%s %s", md->mcmd, md->mopt, md->path);

+  }

+  if(makuo_exec(md->s, cmd)){

+    close(md->s);

+    exit(1);

+  }

+}

+

+int makuo_quit(msyncdata *md)

 { 

-  int r = makuo(s, "quit");

-  close(s);

+  int r = makuo(md->s, "quit", 0);

+  close(md->s);

   if(r == 0){

     return(0); /* success */

   }

@@ -322,7 +392,7 @@ int makuo_quit(int s)

   return(1);

 }

-int exclude_from(char *filename)

+int exclude_from(msyncdata *md, char *filename)

 {

   int  f;

   int  r;

@@ -344,19 +414,24 @@ int exclude_from(char *filename)

       return(1);

     }

     if((*line != '\r') && (*line != '\n') && (*line !=0)){

-      add_exclude(line);

+      add_exclude(md, line);

     }

   }

   close(f);

   return(0);

 }

-int fromfile(int s, char *filename)

+int makuo_file(msyncdata *md)

 {

   int  f;

   int  r;

   char line[256];

+  char *filename;

+  filename = md->scfile;

+  if(!strlen(filename)){

+    return(0);

+  }

   if(!strcmp(filename, "-")){

     /* f = stdin */

     f = dup(0);

@@ -372,16 +447,15 @@ int fromfile(int s, char *filename)

   while(r = readline(f, line, sizeof(line), 0, NULL)){

     if(r == -1){

       fprintf(stderr, "file read error: %s\n", filename);

-      close(f);

-      return(1);

+      break;

     }

-    if(makuo_exec(s, line)){

+    if(makuo_exec(md->s, line)){

       close(f);

-      return(1);

+      exit(1);

     }

   }

   close(f);

-  return(makuo_quit(s));

+  return(1);

 }

 int loadpass(char *filename, char *passwd, int size)

@@ -402,48 +476,18 @@ int loadpass(char *filename, char *passwd, int size)

   return(0);

 }

-void defaulttarget(char *target, int size)

+void defaulttarget(msyncdata *md)

 {

   char *p = getenv("MSYNC_TARGET");

-  strcpy(target, "tcp:127.0.0.1:5000");

-  if(p && (strlen(p) < size)){

-    strcpy(target, p);

+  strcpy(md->target, "tcp:127.0.0.1:5000");

+  if(p && (strlen(p) < sizeof(md->target))){

+    strcpy(md->target, p);

   }