Module Name: src
Committed By: bouyer
Date: Sat Mar 17 19:17:04 UTC 2012
Modified Files:
src/doc [netbsd-5-1]: CHANGES-5.1.3
src/usr.bin/ktruss [netbsd-5-1]: makeerrnos.sh
Log Message:
ticket 1742
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-5.1.3
cvs rdiff -u -r1.5 -r1.5.12.1 src/usr.bin/ktruss/makeerrnos.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-5.1.3
diff -u src/doc/CHANGES-5.1.3:1.1.2.7 src/doc/CHANGES-5.1.3:1.1.2.8
--- src/doc/CHANGES-5.1.3:1.1.2.7 Sat Mar 17 19:15:29 2012
+++ src/doc/CHANGES-5.1.3 Sat Mar 17 19:17:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1.3,v 1.1.2.7 2012/03/17 19:15:29 bouyer Exp $
+# $NetBSD: CHANGES-5.1.3,v 1.1.2.8 2012/03/17 19:17:04 bouyer Exp $
A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3
release:
@@ -73,3 +73,9 @@ sys/kern/kern_sig.c 1.300
Fixes PR/42309 by Nicolas Joly.
[christos, ticket #1741]
+usr.bin/ktruss/makeerrnos.sh 1.6
+
+ Use 'sort -n -k 3' instead of 'sort -n +2' since the former is more
+ portable. The latter is not supported by Mac OS X Lion.
+ [dyoung, ticket #1742]
+
Index: src/usr.bin/ktruss/makeerrnos.sh
diff -u src/usr.bin/ktruss/makeerrnos.sh:1.5 src/usr.bin/ktruss/makeerrnos.sh:1.5.12.1
--- src/usr.bin/ktruss/makeerrnos.sh:1.5 Sun Oct 19 22:10:05 2008
+++ src/usr.bin/ktruss/makeerrnos.sh Sat Mar 17 19:17:04 2012
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: makeerrnos.sh,v 1.5 2008/10/19 22:10:05 apb Exp $
+# $NetBSD: makeerrnos.sh,v 1.5.12.1 2012/03/17 19:17:04 bouyer Exp $
if [ $# -ne 3 ]; then
echo "usage: makeerrnos.sh errno.h signal.h output"
@@ -35,7 +35,7 @@ ${AWK} '
END {
print " { \"0\", 0 },\n";
}
-' | sort -n +2 >> $CFILE
+' | sort -n -k 3 >> $CFILE
echo " { 0L, 0},
};" >> $CFILE
lines=`wc -l $CFILE | ${AWK} ' { print $1; } ' -`
@@ -59,7 +59,7 @@ ${AWK} '
END {
print " { \"0\", 0 },\n";
}
-' | sort -n +2 >> $CFILE
+' | sort -n -k 3 >> $CFILE
echo " { 0L, 0},
};" >> $CFILE
elines=`grep '{ "SIG' $CFILE | wc -l`
