[Emacs-diffs] Changes to emacs/lib-src/rcs2log

[Paul Eggert]

Index: emacs/lib-src/rcs2log
diff -c emacs/lib-src/rcs2log:1.49 emacs/lib-src/rcs2log:1.50
*** emacs/lib-src/rcs2log:1.49  Wed Nov 28 18:55:08 2001
--- emacs/lib-src/rcs2log       Sun Feb  3 12:31:31 2002
***************
*** 29,37 ****
  
  Report bugs to <address@hidden>.'
  
! Id='$Id: rcs2log,v 1.49 2001/11/28 23:55:08 eggert Exp $'
  
! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001
  #  Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
--- 29,37 ----
  
  Report bugs to <address@hidden>.'
  
! Id='$Id: rcs2log,v 1.50 2002/02/03 17:31:31 eggert Exp $'
  
! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002
  #  Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
***************
*** 49,55 ****
  # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  # Boston, MA 02111-1307, USA.
  
! Copyright='Copyright (C) 2001 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.
--- 49,55 ----
  # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  # Boston, MA 02111-1307, USA.
  
! Copyright='Copyright (C) 2002 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.
***************
*** 79,86 ****
  # Parse options.
  
  # defaults
! : ${AWK=awk}
! : ${TMPDIR=/tmp}
  changelog=ChangeLog # change log file name
  datearg= # rlog date option
  hostname= # name of local host (if empty, will deduce it later)
--- 79,86 ----
  # Parse options.
  
  # defaults
! AWK=${AWK-awk}
! TMPDIR=${TMPDIR-/tmp}
  changelog=ChangeLog # change log file name
  datearg= # rlog date option
  hostname= # name of local host (if empty, will deduce it later)
***************
*** 354,359 ****
--- 354,365 ----
  esac
  
  
+ # Prefer the POSIX-style -k options, since POSIX 1003.1-2001 prohibits
+ # support for the traditional-style +M -N options.
+ SORT_K_OPTIONS='-k 3,4r -k 5 -k 1'
+ 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
  # to awk code that initializes the `fullname' awk associative array.
  # Warning: foreign authors (i.e. not known in the passwd file) are mishandled;
***************
*** 615,621 ****
  # Sort the log entries, first by date+time (in reverse order),
  # then by author, then by log entry, and finally by file name and revision
  # (just in case).
! sort -t"$SOH" +2 -4r +4 +0 |
  
  # Finally, reformat the sorted log entries.
  $AWK -F"$SOH" '
--- 621,627 ----
  # Sort the log entries, first by date+time (in reverse order),
  # then by author, then by log entry, and finally by file name and revision
  # (just in case).
! sort -t"$SOH" $SORT_K_OPTIONS |
  
  # Finally, reformat the sorted log entries.
  $AWK -F"$SOH" '