Collect common code from info.[ch] and added tpbar.[ch]

README_en.md

@@ -22,9 +22,9 @@ So for this to work, you must be able to login to the sync-host with SSH.
 This work is required for each sync-host include local-host.
 1. Do the following to build and install.
 ```
-curl -LOJs https://github.com/kobayasy/pSync/releases/download/2.32/psync-2.32.tar.gz
-tar xzf psync-2.32.tar.gz
-cd psync-2.32
+curl -LOJs https://github.com/kobayasy/pSync/releases/download/2.33/psync-2.33.tar.gz
+tar xzf psync-2.33.tar.gz
+cd psync-2.33
 ./configure --prefix=$HOME
 make install
 

README_ja.md

@@ -26,9 +26,9 @@ SSH によって認証/暗号化/圧縮を行い、安全かつ高速にファ
 ローカルホストを含めた全ての同期ホストに対してこの作業が必要です。
 1. 以下の手順でビルドとインストールを行ないます。
 ```
-curl -LOJs https://github.com/kobayasy/pSync/releases/download/2.32/psync-2.32.tar.gz
-tar xzf psync-2.32.tar.gz
-cd psync-2.32
+curl -LOJs https://github.com/kobayasy/pSync/releases/download/2.33/psync-2.33.tar.gz
+tar xzf psync-2.33.tar.gz
+cd psync-2.33
 ./configure --prefix=$HOME
 make install
 

doc/DEV_ja.md

@@ -22,6 +22,7 @@
 |main.c|設定ファイル解析, 引数解析, 通信プロトコル起動|
 |popen3.{c,h}|プロセス起動, プロセス間通信|
 |progress.{c,h}|進捗通知|
+|tpbar.{c,h}|プロブレスバー表示|
 |info.{c,h}|進捗表示|
 |common.{c,h}|エラー判定/分岐, 中断判定/分岐, 数値データ[デ]シリアライザ, リスト処理|
 |ja/|日本語manマニュアル|

src/Makefile.in

@@ -1,7 +1,7 @@
 # @configure_input@
-# Makefile.in - Last modified: 02-Apr-2023 (kobayasy)
+# Makefile.in - Last modified: 03-Feb-2024 (kobayasy)
 #
-# Copyright (C) 2018-2023 by Yuichi Kobayashi <[email protected]>
+# Copyright (C) 2018-2024 by Yuichi Kobayashi <[email protected]>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -25,7 +25,7 @@
 
 TARGET = @PACKAGE_TARNAME@@EXEEXT@
 OBJS  = psync.@OBJEXT@ common.@OBJEXT@ progress.@OBJEXT@ psync_psp1.@OBJEXT@
-OBJS += popen3.@OBJEXT@ info.@OBJEXT@ main.@OBJEXT@
+OBJS += popen3.@OBJEXT@ tpbar.@OBJEXT@ info.@OBJEXT@ main.@OBJEXT@
 MAN1JA = ja/@[email protected]
 MAN5JA = ja/@[email protected]
 
@@ -58,7 +58,8 @@ common.@OBJEXT@ : common.c common.h config.h
 progress.@OBJEXT@ : progress.c progress.h
 psync_psp1.@OBJEXT@ : psync_psp1.c common.h psync.h psync_psp1.h config.h
 popen3.@OBJEXT@ : popen3.c popen3.h
-info.@OBJEXT@ : info.c info.h config.h
+tpbar.@OBJEXT@ : tpbar.c tpbar.h config.h
+info.@OBJEXT@ : info.c tpbar.h info.h config.h
 main.@OBJEXT@ : main.c common.h psync_psp1.h psync.h popen3.h info.h config.h
 
 $(TARGET) : $(OBJS)

src/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pSync 2.32.
+# Generated by GNU Autoconf 2.69 for pSync 2.33.
 #
 # Report bugs to <[email protected]>.
 #
@@ -11,7 +11,7 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright (C) 2018-2023 by Yuichi Kobayashi <[email protected]>
+# Copyright (C) 2018-2024 by Yuichi Kobayashi <[email protected]>
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -582,8 +582,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pSync'
 PACKAGE_TARNAME='psync'
-PACKAGE_VERSION='2.32'
-PACKAGE_STRING='pSync 2.32'
+PACKAGE_VERSION='2.33'
+PACKAGE_STRING='pSync 2.33'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='http://kobayasy.com/psync/'
 
@@ -1258,7 +1258,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 pSync 2.32 to adapt to many kinds of systems.
+\`configure' configures pSync 2.33 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1323,7 +1323,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pSync 2.32:";;
+     short | recursive ) echo "Configuration of pSync 2.33:";;
    esac
   cat <<\_ACEOF
 
@@ -1422,14 +1422,14 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pSync configure 2.32
+pSync configure 2.33
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright (C) 2018-2023 by Yuichi Kobayashi <[email protected]>
+Copyright (C) 2018-2024 by Yuichi Kobayashi <[email protected]>
 _ACEOF
   exit
 fi
@@ -1793,7 +1793,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 pSync $as_me 2.32, which was
+It was created by pSync $as_me 2.33, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2173,9 +2173,6 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-
-
-
 CONFFILE='~/.psync.conf'
 
 BACKUP='3'
@@ -2187,6 +2184,9 @@ SSH='ssh'
 SSHPORT='22'
 
 
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
@@ -5087,7 +5087,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pSync $as_me 2.32, which was
+This file was extended by pSync $as_me 2.33, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5150,7 +5150,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pSync config.status 2.32
+pSync config.status 2.33
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

src/configure.ac

@@ -1,6 +1,6 @@
-# configure.ac - Last modified: 02-Apr-2023 (kobayasy)
+# configure.ac - Last modified: 03-Feb-2024 (kobayasy)
 #
-# Copyright (C) 2018-2023 by Yuichi Kobayashi <[email protected]>
+# Copyright (C) 2018-2024 by Yuichi Kobayashi <[email protected]>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -23,11 +23,17 @@
 # SOFTWARE.
 
 AC_PREREQ(2.69)
-AC_INIT([pSync], [2.32], [[email protected]], [psync], [http://kobayasy.com/psync/])
-AC_COPYRIGHT([Copyright @{:@C@:}@ 2018-2023 by Yuichi Kobayashi <[email protected]>])
+AC_INIT([pSync], [2.33], [[email protected]], [psync], [http://kobayasy.com/psync/])
+AC_COPYRIGHT([Copyright @{:@C@:}@ 2018-2024 by Yuichi Kobayashi <[email protected]>])
 AC_CONFIG_SRCDIR([psync.c])
 AC_CONFIG_AUX_DIR([conf])
 
+AC_SUBST([CONFFILE], ['~/.psync.conf'])
+AC_SUBST([BACKUP], ['3'])
+AC_SUBST([EXPIRE], ['400'])
+AC_SUBST([SSH], ['ssh'])
+AC_SUBST([SSHPORT], ['22'])
+
 AC_DEFUN([MY_ARG_ENABLE],
    [AC_ARG_ENABLE([$1], [AS_HELP_STRING([--$2-$1], [$3])],
        [AS_CASE([$enableval],
@@ -44,12 +50,6 @@ AC_DEFUN([MY_ARG_WITH],
             AS_UNSET([withval]) ] )],
        [AS_UNSET([withval])] )] )
 
-AC_SUBST([CONFFILE], ['~/.psync.conf'])
-AC_SUBST([BACKUP], ['3'])
-AC_SUBST([EXPIRE], ['400'])
-AC_SUBST([SSH], ['ssh'])
-AC_SUBST([SSHPORT], ['22'])
-
 AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_INSTALL