@@ -1,3 +1,6 @@

+0.9.3:

+ -

+

 0.9.2: 

  - block device transfer support

  - character device transfer support

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

 #! /bin/sh

 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.61 for makuosan 0.9.2.

+# Generated by GNU Autoconf 2.61 for makuosan 0.9.3.

 #

 # Report bugs to <info-makuosan@klab.jp>.

 #

@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}

 # Identity of this package.

 PACKAGE_NAME='makuosan'

 PACKAGE_TARNAME='makuosan'

-PACKAGE_VERSION='0.9.2'

-PACKAGE_STRING='makuosan 0.9.2'

+PACKAGE_VERSION='0.9.3'

+PACKAGE_STRING='makuosan 0.9.3'

 PACKAGE_BUGREPORT='info-makuosan@klab.jp'

 ac_unique_file="makuosan.c"

@@ -1209,7 +1209,7 @@ if test "$ac_init_help" = "long"; then

   # Omit some internal or obsolete options to make the list less imposing.

   # This message is too long to be a string in the A/UX 3.1 sh.

   cat <<_ACEOF

-\`configure' configures makuosan 0.9.2 to adapt to many kinds of systems.

+\`configure' configures makuosan 0.9.3 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1275,7 +1275,7 @@ fi

 if test -n "$ac_init_help"; then

   case $ac_init_help in

-     short | recursive ) echo "Configuration of makuosan 0.9.2:";;

+     short | recursive ) echo "Configuration of makuosan 0.9.3:";;

    esac

   cat <<\_ACEOF

@@ -1359,7 +1359,7 @@ fi

 test -n "$ac_init_help" && exit $ac_status

 if $ac_init_version; then

   cat <<\_ACEOF

-makuosan configure 0.9.2

+makuosan configure 0.9.3

 generated by GNU Autoconf 2.61

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

@@ -1373,7 +1373,7 @@ cat >config.log <<_ACEOF

 This file contains any messages produced by compilers while

 running configure, to aid debugging if configure makes a mistake.

-It was created by makuosan $as_me 0.9.2, which was

+It was created by makuosan $as_me 0.9.3, which was

 generated by GNU Autoconf 2.61.  Invocation command line was

   $ $0 $@

@@ -2064,7 +2064,7 @@ fi

 # Define the identity of the package.

  PACKAGE='makuosan'

- VERSION='0.9.2'

+ VERSION='0.9.3'

 cat >>confdefs.h <<_ACEOF

@@ -8845,7 +8845,7 @@ exec 6>&1

 # report actual input values of CONFIG_FILES etc. instead of their

 # values after options handling.

 ac_log="

-This file was extended by makuosan $as_me 0.9.2, which was

+This file was extended by makuosan $as_me 0.9.3, which was

 generated by GNU Autoconf 2.61.  Invocation command line was

   CONFIG_FILES    = $CONFIG_FILES

@@ -8902,7 +8902,7 @@ Report bugs to <bug-autoconf@gnu.org>."

 _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF

 ac_cs_version="\\

-makuosan config.status 0.9.2

+makuosan config.status 0.9.3

 configured by $0, generated by GNU Autoconf 2.61,

   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

@@ -1,8 +1,7 @@

 #                                               -*- Autoconf -*-

 # Process this file with autoconf to produce a configure script.

-

 AC_PREREQ(2.61)

-AC_INIT(makuosan, 0.9.2, info-makuosan@klab.jp)

+AC_INIT(makuosan, 0.9.3, info-makuosan@klab.jp)

 AM_INIT_AUTOMAKE

 AC_CONFIG_SRCDIR([makuosan.c])

 AC_CONFIG_HEADER([config.h])

@@ -32,7 +32,7 @@

 先頭に32バイトのヘッダがあります。

 そのあとに可変長データが続きます。

-データフィールドの最大サイズは1024バイトです。

+データの最大サイズは1024バイトです。

 データフォーマットは OperationCode毎に定義します。

 まくおヘッダの各フィールドの意味は以下の通りです。

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

                       "exit",     /*  */

                       "bye",      /*  */

                       "send",     /*  */

+                      "syncdir",  /*  */

                       "members",  /*  */

                       "status",   /*  */

                       "md5",      /*  */

@@ -237,6 +238,7 @@ int mexec_help(mcomm *c, int 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, "  syncdir [-r] [-t host] [dirname]\n");

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

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

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

@@ -368,6 +370,118 @@ int mexec_send(mcomm *c, int n)

   return(0);

 }

+int mexec_md5(mcomm *c, int n)

+{

+  int i;

+  int r;

+  ssize_t size;

+  char *argv[9];

+  char *fn = NULL;

+  mfile *m = NULL;

+  mhost *t = NULL;

+  mhash *h = NULL;

+  int recursive = 0;

+

+  for(i=0;i<c->argc[n];i++)

+    argv[i] = c->parse[n][i];

+  argv[i] = NULL;

+  optind = 0;

+  while((i=getopt(c->argc[n], argv, "t:r")) != -1){

+    switch(i){

+      case 'r':

+        recursive = 1;

+        break;

+      case 't':

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

+          if(!strcmp(t->hostname, optarg))

+            break;

+        if(!t){

+          cprintf(0, c, "%s is not contained in members\r\n", optarg);

+          return(0);

+        }

+        break;

+      case '?':

+        cprintf(0, c, "invalid option -- %c\r\n", optopt);

+        return(0); 

+    }

+  }

+

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

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

+

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

+  if(recursive){

+    if(c->cpid){

+      cprintf(0, c, "recursive process active now!\n");

+      return(0);

+    }

+    return(mexec_scan(c, fn, t, MAKUO_MEXEC_MD5));

+  }

+

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

+  if(!fn){

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

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

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

+    return(0);

+  }

+

+  /*----- create mfile -----*/

+  m = mfadd(0);

+  if(!m){

+	  lprintf(0, "%s: out of memorry\n", __func__);

+	  cprintf(0, c, "error: out of memorry\n");

+    return(0);

+	}

+	m->mdata.head.reqid  = getrid();

+	m->mdata.head.seqno  = 0;

+	m->mdata.head.opcode = MAKUO_OP_MD5;

+  m->mdata.head.nstate = MAKUO_SENDSTATE_OPEN;

+  m->initstate = 1;

+	m->comm      = c;

+  m->sendto    = 0;

+  m->dryrun    = 0;

+  m->ln[0]     = 0;

+	strcpy(m->fn, fn);

+

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

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

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

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

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

+    mfdel(m);

+    return(0);

+  }

+

+  /*----- md5 -----*/

+  h = (mhash *)m->mdata.data;

+  h->fnlen = strlen(m->fn);

+  r = md5sum(m->fd, h->hash);

+  close(m->fd);

+  m->fd = -1;

+  if(r == -1){

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

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

+    mfdel(m);

+    return(0);

+  }

+  memcpy(h->filename, m->fn, h->fnlen);

+  m->mdata.head.szdata = sizeof(mhash) + h->fnlen;

+  h->fnlen = htons(h->fnlen);

+

+  /*----- sendto address -----*/

+  if(t){

+    m->sendto = 1;

+    memcpy(&(m->addr.sin_addr), &(t->ad), sizeof(m->addr.sin_addr));

+  }

+  return(0);

+}

+

+int mexec_syncdir(mcomm *c, int n)

+{

+  return(0);

+}

+

 int mexec_members(mcomm *c, int n)

 {

   int count=0;

@@ -523,113 +637,6 @@ int mexec_status(mcomm *c, int n)

   return(0);

 }

-int mexec_md5(mcomm *c, int n)

-{

-  int i;

-  int r;

-  ssize_t size;

-  char *argv[9];

-  char *fn = NULL;

-  mfile *m = NULL;

-  mhost *t = NULL;

-  mhash *h = NULL;

-  int recursive = 0;

-

-  for(i=0;i<c->argc[n];i++)

-    argv[i] = c->parse[n][i];

-  argv[i] = NULL;

-  optind = 0;

-  while((i=getopt(c->argc[n], argv, "t:r")) != -1){

-    switch(i){

-      case 'r':

-        recursive = 1;

-        break;

-      case 't':

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

-          if(!strcmp(t->hostname, optarg))

-            break;

-        if(!t){

-          cprintf(0, c, "%s is not contained in members\r\n", optarg);

-          return(0);

-        }

-        break;

-      case '?':

-        cprintf(0, c, "invalid option -- %c\r\n", optopt);

-        return(0); 

-    }

-  }

-

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

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

-

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

-  if(recursive){

-    if(c->cpid){

-      cprintf(0, c, "recursive process active now!\n");

-      return(0);

-    }

-    return(mexec_scan(c, fn, t, MAKUO_MEXEC_MD5));

-  }

-

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

-  if(!fn){

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

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

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

-    return(0);

-  }

-

-  /*----- create mfile -----*/

-  m = mfadd(0);

-  if(!m){

-	  lprintf(0, "%s: out of memorry\n", __func__);

-	  cprintf(0, c, "error: out of memorry\n");

-    return(0);

-	}

-	m->mdata.head.reqid  = getrid();

-	m->mdata.head.seqno  = 0;

-	m->mdata.head.opcode = MAKUO_OP_MD5;

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

-  m->initstate = 1;

-	m->comm      = c;

-  m->sendto    = 0;

-  m->dryrun    = 0;

-  m->ln[0]     = 0;

-	strcpy(m->fn, fn);

-

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

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

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

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

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

-    mfdel(m);

-    return(0);

-  }

-

-  /*----- md5 -----*/

-  h = (mhash *)m->mdata.data;

-  h->fnlen = strlen(m->fn);

-  r = md5sum(m->fd, h->hash);

-  close(m->fd);

-  m->fd = -1;

-  if(r == -1){

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

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

-    mfdel(m);

-    return(0);

-  }

-  memcpy(h->filename, m->fn, h->fnlen);

-  m->mdata.head.szdata = sizeof(mhash) + h->fnlen;

-  h->fnlen = htons(h->fnlen);

-

-  /*----- sendto address -----*/

-  if(t){

-    m->sendto = 1;

-    memcpy(&(m->addr.sin_addr), &(t->ad), sizeof(m->addr.sin_addr));

-  }

-  return(0);

-}

-

 int mexec_password(char *password)

 {

   unsigned char digest[16];

@@ -729,15 +736,17 @@ int mexec(mcomm *c, int n)

     }

     return(-1);

   }

+

   if(n == 1){

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

       if(m->comm == c){

-        if(count++ == 8){

+        if(count++ == MAKUO_PARALLEL_MAX){

           return(-1);

         }

       }

     }

   }

+

   if(!size){

     lprintf(0, "%s: buffer over fllow n=%d\n", __func__, n);

     mexec_close(c, n);

@@ -791,6 +800,9 @@ int mexec(mcomm *c, int n)

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

       return(mexec_md5(c,n));

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

+      return(mexec_syncdir(c,n));

+

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

       return(mexec_members(c,n));

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

 /*

  * msync.c

+ * MAKUOSAN CLI

  * Copyright (C) 2008 KLab Inc. 

  */

 #define _GNU_SOURCE