@@ -1,5 +1,6 @@

 0.9.3:

- -

+ - change msync command design.

+ - fixed daemonize error message.

 0.9.2: 

  - block device transfer support

@@ -42,19 +42,19 @@ The makuosan must be invoked with -b option specifying the base directory. The t

 Makuosan is terminated by sending SIGTERM

-   # killall makuosan

+   # pkill makuosan

 [How to transfer files]

 The msync command line is used to transfer files.

 Example 1) To send index.html in the base directory.(/var/www/index.html)

-   $ msync send index.html

+   $ msync index.html

 Example 2) To recursively send file system tree in the base directory.

-   $ msync send -r

+   $ msync -r

 Example 3) To show what will be transfered.(dry run)

-   $ msync send -r -n

+   $ msync -r -n

 [Advantages of Makuosan]

@@ -69,14 +69,14 @@ Example;

 In the case of MAKUO, file transfer is done between makuosan daemon. 

 Accordingly, you need to make makuosan up and running on every server, where you want to transfer the files to. As a result, the command line only requires the target files or the target directory.

- $ msync send -r hogehoge/

+ $ msync -r hogehoge/

 This is it. This will have a makuosan send hogehoge/ to all other makuosan daemons in the cluster. This is much simpler and easier than the situation where rsync or scp is used.

 What if a user want to send files only to specified servers?

 There is -t option to specify the receiver.

- $ msync send -t host3 -r hogehoge/

+ $ msync -t host3 -r hogehoge/

 [A case study]

@@ -137,7 +137,7 @@ There is -t option to specify the receiver.

  == Issue file transferring instruction ==

- host1:~$ msync send -r

+ host1:~$ msync -r

  == Confirm the result ==

@@ -51,20 +51,20 @@

 まくおを停止するには、killコマンドなどでSIGTERMを送ります。

-   # killall makuosan

+   # pkill makuosan

 【使用方法】

 　ファイルを転送するには「msyncコマンド」を使用します。

   例1）ベースディレクトリ直下のindex.htmlを転送する(/var/www/index.html)

-   $ msync send index.html

+   $ msync index.html

   例2）ベースディレクトリ以下のディレクトリツリーを全部転送する

-   $ msync send -r

+   $ msync -r

   例3）転送されるファイルを確認する(dry run)

-   $ msync send -r -n

+   $ msync -r -n

 【利用するメリット】

@@ -82,7 +82,7 @@

 そのかわり、ファイル転送は以下の例のように転送したいファイルやディレクトリ

 を伝えるだけで済みます。

- $ msync send -r hogehoge/

+ $ msync -r hogehoge/

 このコマンド一発で、「まくお」が稼働している全てのサーバに hogehoge/を転送す

 ることができます。rsyncやscpを利用する場合と比べて、遥かにシンプルで簡単に転

@@ -91,12 +91,12 @@

 また「指定したサーバにだけ転送したい」というニーズのために、特定のサーバにだ

 け転送するオプション(-t)も用意しています。

- $ msync send -t host3 -r hogehoge/

+ $ msync -t host3 -r hogehoge/

 ただし、この場合でも、host3では makuosanが動いている必要があります。尚、転送

 可能なサーバの一覧は、以下のコマンドで確認することができます。

- $ msync members

+ $ msync --members

 【簡単な使用例】

@@ -158,7 +158,7 @@

  == ファイルを転送する ==

- host1:~$ msync send -r

+ host1:~$ msync -r

  == 転送されたファイルを確認 ==

@@ -176,10 +176,7 @@ void lprintf(int l, char *fmt, ...)

     va_start(arg, fmt);

     vsprintf(msg, fmt, arg);

     va_end(arg);

-    if(moption.dontfork){

-      fprintf(stderr, "%d:",l);

-      fprintf(stderr, msg);

-    }

+    fprintf(stderr, "%d: %s", l, msg);

     syslog(LOG_ERR, "%s: %d: %s", moption.user_name, l, msg);

   }

 }

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

                       "members",  /*  */

                       "status",   /*  */

                       "md5",      /*  */

+                      "check",    /*  */

                       "echo",     /*  */

                       "exclude",  /*  */

                       "loglevel", /*  */

@@ -84,7 +85,7 @@ int mexec_scan_send(int fd, char *path, char *sendhost, int mode)

       if(!is_reg(path)){

         return(0);

       }

-      sprintf(comm, "md5 %s%s\r\n",     buff, path);

+      sprintf(comm, "check %s%s\r\n",     buff, path);

       break;

   }

   mexec_scan_cmd(fd, comm);

@@ -237,7 +238,7 @@ int mexec_help(mcomm *c, int n)

   cprintf(0, c, "  exclude list\n");

   cprintf(0, c, "  exclude clear\n");

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

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

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

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

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

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

@@ -370,7 +371,7 @@ int mexec_send(mcomm *c, int n)

   return(0);

 }

-int mexec_md5(mcomm *c, int n)

+int mexec_check(mcomm *c, int n)

 {

   int i;

   int r;

@@ -420,7 +421,7 @@ int mexec_md5(mcomm *c, int n)

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

   if(!fn){

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

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

     cprintf(0, c, "  -r  # dir recursive\r\n");

     cprintf(0, c, "  -t  # target host\r\n");

     return(0);

@@ -798,7 +799,10 @@ int mexec(mcomm *c, int n)

       return(mexec_send(c,n));

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

-      return(mexec_md5(c,n));

+      return(mexec_check(c,n));

+

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

+      return(mexec_check(c,n));

     if(!strcmp("syncdir",command_list[r]))

       return(mexec_syncdir(c,n));

@@ -1,10 +1,12 @@

 /*

  * msync.c

- * MAKUOSAN CLI

  * Copyright (C) 2008 KLab Inc. 

  */

 #define _GNU_SOURCE

 #define _FILE_OFFSET_BITS 64

+#ifdef HAVE_CONFIG_H

+#include "config.h"

+#endif

 #include <stdio.h>

 #include <unistd.h>

 #include <stdlib.h>

@@ -16,21 +18,52 @@

 #include <sys/types.h>

 #include <sys/socket.h>

 #include <sys/un.h>

+#include "makuosan.h"

+

+excludeitem *exclude = NULL;

 void usage()

 {

-  printf("usage: msync [-l loglevel] [-c TARGET] [-K PASSWORDFILE] COMMAND [OPT] \n");

-  printf("       msync [-l loglevel] [-c TARGET] [-K PASSWORDFILE] -f SCRIPT_FILE\n");

+  printf("msync version %s (CLI for makuosan)\n", PACKAGE_VERSION);

+  printf("usage: msync [OPTION] [FILENAME]\n");

+  printf("\n");

+  printf("  OPTION\n");

+  printf("    --status            # show makuosan status\n");

+  printf("    --members           # show makuosan members\n");

+  printf("    --check             # file check use md5\n");

+  printf("    --exclude=PATTERN   # \n"); 

+  printf("    --exclude-from=FILE # \n");

+  printf("\n");

+  printf("    -l LOGLEVEL(0-9)    # log level select. default=0\n");

+  printf("    -c MSYNC_TARGET     # \n");

+  printf("    -f SCRIPT_FILE      # \n");

+  printf("    -t HOSTNAME         # distnation hostname\n");

+  printf("    -v                  # log level increment\n");

+  printf("    -n                  # dry run\n");

+  printf("    -r                  # recurse into directories\n");

   printf("\n");

-  printf("  TARGET\n");

-  printf("    tcp:HOST:PORT     ex) tcp:127.0.0.1:5000\n");

-  printf("    unix:SOCKET       ex) unix:makuosan.sock\n");

+  printf("  MSYNC_TARGET\n");

+  printf("    tcp:HOST:PORT  ex) tcp:127.0.0.1:5000\n");

+  printf("    unix:SOCKET    ex) unix:makuosan.sock\n");

+  printf("\n");

+  printf("  SCRIPT_FILE\n");

+  printf("    (It writes later)\n");

   printf("\n");

-  printf("  COMMAND\n");

-  printf("    send [-n] [-r] [-t HOST] [FILENAME]\n");

-  printf("    md5  [-r] [FILENAME]\n");

-  printf("    status\n");

-  printf("    members\n");

+}

+

+excludeitem *add_exclude(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;

+  }

+  exclude = item;

+  return(item);

 }

 int connect_socket_tcp(char *host, char *port)

@@ -216,7 +249,7 @@ int makuo(int s, char *c)

   return(r);

 }

-int makuolog(int s, int l)

+int makuo_log(int s, int l)

 {

   int r;

   char cmd[256];

@@ -232,9 +265,45 @@ int makuolog(int s, int l)

   return(0);

 }

-int makuoquit(int s)

+int makuo_exclude(int s)

+{

+  int r;

+  char cmd[1024];

+  excludeitem *item;

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

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

+    r = makuo(s, cmd);

+    if(r == 0){

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

+      return(1);

+    }

+    if(r == -1){

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

+      return(1);

+    }

+  }

+  return(0);

+}

+

+

+int makuo_exec(int s, char *cmd)

+{ 

+  int r = makuo(s, cmd);

+  if(r == 0){

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

+    return(1);

+  }

+  if(r == -1){

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

+    return(1);

+  }

+  return(0);

+}

+

+int makuo_quit(int s)

 { 

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

+  close(s);

   if(r == 0){

     return(0); /* success */

   }

@@ -245,14 +314,13 @@ int makuoquit(int s)

   return(1);

 }

-int fromfile(int s, char *filename)

+int exclude_from(char *filename)

 {

   int  f;

   int  r;

   char line[256];

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

-    /* f = stdin */

     f = dup(0);

   }else{

     f = open(filename, O_RDONLY);

@@ -261,60 +329,49 @@ int fromfile(int s, char *filename)

     fprintf(stderr,"can't open: %s\n", filename);

     return(1);

   }

-

-  /* command read loop */

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

     if(r == -1){

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

       close(f);

       return(1);

     }

-    r = makuo(s, line);

-    if(r == 0){

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

-      close(f);

-      return(1);

-    }

-    if(r == -1){

-      close(f);

-      return(1); /* socket error */

-    }

+    add_exclude(line);

   }

-

-  /* quit */

-  return(makuoquit(s));

+  close(f);

+  return(0);

 }

-int fromargv(int s, int argc, char *argv[], int start)

+int fromfile(int s, char *filename)

 {

-  int i;

-  int r;

-  char cmd[256];

+  int  f;

+  int  r;

+  char line[256];

-  cmd[0] = 0;

-  for(i=start;i<argc;i++){

-    if(strlen(cmd) + strlen(argv[i]) + 2 > sizeof(cmd)){

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

-      return(1);

-    }

-    if(cmd[0]){

-      strcat(cmd, " ");

-    }

-    strcat(cmd, argv[i]);

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

+    /* f = stdin */

+    f = dup(0);

+  }else{

+    f = open(filename, O_RDONLY);

   }

-

-  /* command execute */

-  r = makuo(s, cmd);

-  if(r == 0){

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

+  if(f == -1){

+    fprintf(stderr,"can't open: %s\n", filename);

     return(1);

   }

-  if(r == -1){

-    return(1); /* socket error */

-  }

-  /* quit */

-  return(makuoquit(s));

+  /* command read loop */

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

+    if(r == -1){

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

+      close(f);

+      return(1);

+    }

+    if(makuo_exec(s, line)){

+      close(f);

+      return(1);

+    }

+  }

+  close(f);

+  return(makuo_quit(s));

 }

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

@@ -346,26 +403,113 @@ void defaulttarget(char *target, int size)

 int main(int argc, char *argv[])

 {

+  int i;

   int r;

   int s;

+  if(argc == 1){

+    usage();

+    return(1);

+  }

+

+  /* makuo command */

+  char cmd[1024];

+  char mcmd[256];

+  char mopt[256];

+  strcpy(mcmd,"send");

+  strcpy(mopt,"");

+

   /* option */

+  int loopflag = 1;

   int loglevel = 0;

   char scfile[256];

   char passwd[256];

   char target[256];

+  /* long option */

+  struct option longopt[7];

+  memset(longopt, 0, sizeof(longopt));

+  longopt[0].name    = "help";

+  longopt[0].has_arg = 0;

+  longopt[0].flag    = NULL;

+  longopt[0].val     = 'h';

+  longopt[1].name    = "status";

+  longopt[1].has_arg = 0;

+  longopt[1].flag    = NULL;

+  longopt[1].val     = 'S';

+  longopt[2].name    = "members";

+  longopt[2].has_arg = 0;

+  longopt[2].flag    = NULL;

+  longopt[2].val     = 'M';

+  longopt[3].name    = "check";

+  longopt[3].has_arg = 0;

+  longopt[3].flag    = NULL;

+  longopt[3].val     = 'C';

+  longopt[4].name    = "exclude";

+  longopt[4].has_arg = 1;

+  longopt[4].flag    = NULL;

+  longopt[4].val     = 'E';

+  longopt[5].name    = "exclude-from";

+  longopt[5].has_arg = 1;

+  longopt[5].flag    = NULL;

+  longopt[5].val     = 'F';

+  longopt[6].name    = "delete";

+  longopt[6].has_arg = 0;

+  longopt[6].flag    = NULL;

+  longopt[6].val     = 'D';

+

   /* default */

   scfile[0] = 0;

   passwd[0] = 0;

   defaulttarget(target, sizeof(target));

-  while((r = getopt(argc, argv, "+c:f:K:l:h")) != -1){

+  while((r = getopt_long(argc, argv, "c:f:t:K:l:hvrn", longopt, NULL)) != -1){

     switch(r){

       case 'h':

         usage();

         return(0);

+      case 'S':

+        strcpy(mcmd, "status");

+        loopflag = 0;

+        break;

+

+      case 'M':

+        strcpy(mcmd, "members");

+        loopflag = 0;

+        break;

+

+      case 'C':

+        strcpy(mcmd, "check");

+        break;

+

+      case 'E':

+        add_exclude(optarg);

+        break;

+

+      case 'F':

+        if(exclude_from(optarg)){

+          return(1);

+        }

+        break;

+

+      case 'r':

+        strcat(mopt," -r");

+        break;

+

+      case 'n':

+        strcat(mopt," -n");

+        break;

+

+      case 't':

+        strcat(mopt," -t ");

+        strcat(mopt,optarg);

+        break;

+

+      case 'v':

+        loglevel++;

+        break;

+

       case 'l':

         loglevel = atoi(optarg);

         break;

@@ -393,12 +537,12 @@ int main(int argc, char *argv[])

           return(1);

         }

         break;

-    }

-  }

-  if(!scfile[0] && optind == argc){

-    usage();

-    return(1);

+      case '?':

+        usage();

+        return(1);

+        break;

+    }

   }

   s = connect_socket(target);

@@ -413,23 +557,46 @@ int main(int argc, char *argv[])

     close(s);

     return(1);

   }

+

   if(r == -1){

     fprintf(stderr, "socket read error\n");

     close(s);

     return(1);

   }

-  if(makuolog(s, loglevel)){

+  if(makuo_log(s, loglevel)){

+    close(s);

+    return(1);

+  }

+

+  if(makuo_exclude(s)){

     close(s);

     return(1);

   }

   if(scfile[0]){

-    r = fromfile(s, scfile);

+    return(fromfile(s, scfile));

+  }

+

+  if(loopflag && (optind < argc)){

+    for(i=optind;i<argc;i++){

+      sprintf(cmd, "%s%s %s", mcmd, mopt, argv[i]);

+      if(makuo_exec(s, cmd)){

+        close(s);

+        return(1);

+      }

+    }

   }else{

-    r = fromargv(s, argc, argv, optind);

+    sprintf(cmd, "%s%s", mcmd, mopt);

+    for(i=optind;i<argc;i++){

+      strcat(cmd, " ");

+      strcat(cmd, argv[i]);

+    }

+    if(makuo_exec(s, cmd)){

+      close(s);

+      return(1);

+    }

   }

-  close(s);

-  return(r);

+  return(makuo_quit(s));

 }