Subject: Re: bin/28567: rcs2log not configured
To: None <mlelstv@serpens.de>
From: Greg A. Woods <woods@weird.com>
List: netbsd-bugs
Date: 12/07/2004 14:52:39
[ On Monday, December 6, 2004 at 23:54:00 (+0000), mlelstv@serpens.de wrote: ]
> Subject: bin/28567: rcs2log not configured
>

Here are the changes I use for rcs2log:

Index: gnu/dist/cvs/contrib/rcs2log.sh
===================================================================
RCS file: /cvs/master/m-NetBSD/main/src/gnu/dist/cvs/contrib/rcs2log.sh,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 rcs2log.sh
--- gnu/dist/cvs/contrib/rcs2log.sh	10 Dec 2003 05:58:12 -0000	1.1.1.4
+++ gnu/dist/cvs/contrib/rcs2log.sh	29 Oct 2004 00:31:08 -0000
@@ -57,7 +57,6 @@
 Author: Paul Eggert <eggert@twinsun.com>'
 
 # functions
-@MKTEMP_SH_FUNCTION@
 
 # Use the traditional C locale.
 LANG=C
@@ -82,7 +81,7 @@
 # Parse options.
 
 # defaults
-: ${MKTEMP="@MKTEMP@"}
+: ${MKTEMP="mktemp"}
 : ${AWK=awk}
 : ${TMPDIR=/tmp}
 
@@ -103,6 +102,7 @@
 while :
 do
 	case $1 in
+	-C)	pository=${2?}; shift;;
 	-c)	changelog=${2?}; shift;;
 	-i)	indent=${2?}; shift;;
 	-h)	hostname=${2?}; shift;;
@@ -252,7 +252,7 @@
 		rlog=rlog
 		repository=
 	else
-		rlog='cvs -q log'
+		rlog='cvs -q log -S'
 		repository=`sed 1q <CVS/Repository` || exit
 		test ! -f CVS/Root || CVSROOT=`cat <CVS/Root` || exit
 		case $CVSROOT in
@@ -507,23 +507,18 @@
 		Log = substr(Log, i+3)
 	}
 
-	# If "label: comment" is too long, break the line after the ":".
-	sep = " "
-	i = index(Log, "\n")
-	if ('"$length"' <= '"$indent"' + 1 + length(files) + i) sep = "\n" indent_string
-
 	# Print the label.
-	printf "%s*%s:", indent_string, files
+	printf "%s*%s:\n", indent_string, files
 
-	# Print each line of the log.
+	# Print each line of the log prefixed with indent_string.
+	i = index(Log, "\n")
 	while (i) {
 		logline = substr(Log, 1, i-1)
 		if (logline ~ /[^'"$tab"' ]/) {
-			printf "%s%s\n", sep, logline
+			printf "%s%s\n", indent_string, logline
 		} else {
-			print ""
+			print "%s\n" logline
 		}
-		sep = indent_string
 		Log = substr(Log, i+1)
 		i = index(Log, "\n")
 	}
@@ -546,6 +541,7 @@
 	*)
 		domainname=`(domainname) 2>/dev/null` &&
 		case $domainname in
+		.*.*) hostname=$hostname$domainname;;
 		*.*) hostname=$hostname.$domainname;;
 		esac;;
 	esac;;

-- 
						Greg A. Woods

+1 416 218-0098                  VE3TCP            RoboHack <woods@robohack.ca>
Planix, Inc. <woods@planix.com>          Secrets of the Weird <woods@weird.com>