Merge from origin/emacs-25

[gnu-emacs] / lib-src / rcs2log

diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 242760362e8dc3d1ca2359b092746f31b4e7f750..ff4d470a21a6a1e62e0540867d76026d045710a4 100755 (executable)
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -2,7 +2,7 @@
 
 # RCS to ChangeLog generator
 
 
 # RCS to ChangeLog generator
 

-# Copyright (C) 1992-1998, 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 1992-1998, 2001-2016 Free Software Foundation, Inc.

 
 # Author: Paul Eggert <eggert@twinsun.com>
 
 
 # Author: Paul Eggert <eggert@twinsun.com>
 


@@ -20,7 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 

-Copyright='Copyright (C) 2015 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2016 Free Software Foundation, Inc.

 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.


@@ -130,7 +130,8 @@ do
                case $1 in
                -n)     case ${2?}${3?}${4?} in
                        *"$tab"* | *"$nl"*)
                case $1 in
                -n)     case ${2?}${3?}${4?} in
                        *"$tab"* | *"$nl"*)

-                               echo >&2 "$0: -n '$2' '$3' '$4': tabs, newlines not allowed"
+                               printf '%s\n' >&2 \
+                                 "$0: -n '$2' '$3' '$4': tabs, newlines not allowed"

                                exit 1;;
                        esac
                        login=$2
                                exit 1;;
                        esac
                        login=$2


@@ -140,7 +141,7 @@ do
                        # If $2 is not tab-separated, use colon for separator.
                        case ${2?} in
                        *"$nl"*)
                        # If $2 is not tab-separated, use colon for separator.
                        case ${2?} in
                        *"$nl"*)

-                               echo >&2 "$0: -u '$2': newlines not allowed"
+                               printf '%s\n' >&2 "$0: -u '$2': newlines not allowed"

                                exit 1;;
                        *"$tab"*)
                                t=$tab;;
                                exit 1;;
                        *"$tab"*)
                                t=$tab;;


@@ -149,7 +150,7 @@ do
                        esac
                        case $2 in
                        *"$t"*"$t"*"$t"*)
                        esac
                        case $2 in
                        *"$t"*"$t"*"$t"*)

-                               echo >&2 "$0: -u '$2': too many fields"
+                               printf '%s\n' >&2 "$0: -u '$2': too many fields"

                                exit 1;;
                        *"$t"*"$t"*)
                                uf="[^$t]*$t" # An unselected field, followed by a separator.
                                exit 1;;
                        *"$t"*"$t"*)
                                uf="[^$t]*$t" # An unselected field, followed by a separator.


@@ -161,7 +162,7 @@ do
                                        expr "X$2" : "$uf$uf$sf"
                                `;;
                        *)
                                        expr "X$2" : "$uf$uf$sf"
                                `;;
                        *)

-                               echo >&2 "$0: -u '$2': not enough fields"
+                               printf '%s\n' >&2 "$0: -u '$2': not enough fields"

                                exit 1;;
                        esac
                        shift;;
                                exit 1;;
                        esac
                        shift;;


@@ -186,9 +187,9 @@ do
        --version)
                set $Id
                rcs2logVersion=$3
        --version)
                set $Id
                rcs2logVersion=$3

-               echo >&2 "rcs2log (GNU Emacs) $rcs2logVersion$nl$Copyright"
+               printf '%s\n' >&2 "rcs2log (GNU Emacs) $rcs2logVersion$nl$Copyright"

                exit 0;;
                exit 0;;

-       -*)     echo >&2 "Usage: $0 [OPTION]... [FILE ...]$nl$Help"
+       -*)     printf '%s\n' >&2 "Usage: $0 [OPTION]... [FILE ...]$nl$Help"

                case $1 in
                --help) exit 0;;
                *) exit 1;;
                case $1 in
                --help) exit 0;;
                *) exit 1;;


@@ -303,7 +304,8 @@ case $rlogfile in
                        esac
                        if test ! -d "$repository"
                        then
                        esac
                        if test ! -d "$repository"
                        then

-                               echo >&2 "$0: $repository: bad repository (see CVS/Repository)"
+                               printf '%s\n' >&2 \
+                                 "$0: $repository: bad repository (see CVS/Repository)"

                                exit 1
                        fi
                        pository=$repository;;
                                exit 1
                        fi
                        pository=$repository;;


@@ -330,7 +332,7 @@ case $rlogfile in
                                T?*)
                                        rlog_options=-r`expr "$CVSTAG" : 'T\(.*\)'`;;
                                *)
                                T?*)
                                        rlog_options=-r`expr "$CVSTAG" : 'T\(.*\)'`;;
                                *)

-                                       echo >&2 "$0: invalid CVS/Tag"; exit 1;;
+                                       printf '%s\n' >&2 "$0: invalid CVS/Tag"; exit 1;;

                                esac
                        fi;;
                esac
                                esac
                        fi;;
                esac


@@ -401,8 +403,8 @@ case $rlogfile in
        esac
 
        case $datearg in
        esac
 
        case $datearg in

-       ?*) $rlog $rlog_options "$datearg" ${1+"$@"} >$rlogfile;;
-       '') $rlog $rlog_options ${1+"$@"} >$rlogfile;;
+       ?*) $rlog $rlog_options "$datearg" "$@" >$rlogfile;;
+       '') $rlog $rlog_options "$@" >$rlogfile;;

        esac || exit;;
 esac
 
        esac || exit;;
 esac
 


@@ -414,7 +416,7 @@ sort $SORT_K_OPTIONS </dev/null 2>/dev/null || SORT_K_OPTIONS='+2 -4r +4 +0'
 
 
 # Get the full name of each author the logs mention, and set initialize_fullname
 
 
 # Get the full name of each author the logs mention, and set initialize_fullname

-# to awk code that initializes the `fullname' awk associative array.
+# to awk code that initializes the 'fullname' awk associative array.

 # Warning: foreign authors (i.e. not known in the passwd file) are mishandled;
 # you have to fix the resulting output by hand.
 
 # Warning: foreign authors (i.e. not known in the passwd file) are mishandled;
 # you have to fix the resulting output by hand.
 


@@ -546,8 +548,8 @@ esac
 
 # Function to print a single log line.
 # We don't use awk functions, to stay compatible with old awk versions.
 
 # Function to print a single log line.
 # We don't use awk functions, to stay compatible with old awk versions.

-# `Log' is the log message.
-# `files' contains the affected files.
+# 'Log' is the log message.
+# 'files' contains the affected files.

 printlogline='{
 
        # Following the GNU coding standards, rewrite
 printlogline='{
 
        # Following the GNU coding standards, rewrite


@@ -587,7 +589,7 @@ printlogline='{
        }
 }'
 
        }
 }'
 

-# Pattern to match the `revision' line of rlog output.
+# Pattern to match the 'revision' line of rlog output.

 rlog_revision_pattern='^revision [0-9]+\.[0-9]+(\.[0-9]+\.[0-9]+)*(['"$tab"' ]+locked by: [^'"$tab"' $,.0-9:;@]*[^'"$tab"' $,:;@][^'"$tab"' $,.0-9:;@]*;)?['"$tab"' ]*$'
 
 case $hostname in
 rlog_revision_pattern='^revision [0-9]+\.[0-9]+(\.[0-9]+\.[0-9]+)*(['"$tab"' ]+locked by: [^'"$tab"' $,.0-9:;@]*[^'"$tab"' $,:;@][^'"$tab"' $,.0-9:;@]*;)?['"$tab"' ]*$'
 
 case $hostname in


@@ -595,7 +597,7 @@ case $hostname in
        hostname=`(
                hostname || uname -n || uuname -l || cat /etc/whoami
        ) 2>/dev/null` || {
        hostname=`(
                hostname || uname -n || uuname -l || cat /etc/whoami
        ) 2>/dev/null` || {

-               echo >&2 "$0: cannot deduce hostname"
+               printf '%s\n' >&2 "$0: cannot deduce hostname"

                exit 1
        }
 
                exit 1
        }