sync with netbsd 960418

2 files changed, 28 insertions, 24 deletions

diff --git a/share/misc/inter.phone b/share/misc/inter.phone
index 3a4330794cf..c7c6c999d5b 100644
--- a/share/misc/inter.phone
+++ b/share/misc/inter.phone
@@ -1,5 +1,7 @@
 # Country Code : City Code : City : Country
-#	@(#)inter.phone	5.3 (Berkeley) 3/5/90
+#	$OpenBSD: inter.phone,v 1.2 1996/04/22 01:28:28 deraadt Exp $
+#	$NetBSD: inter.phone,v 1.3 1996/04/07 00:53:41 neil Exp $
+#	From: @(#)inter.phone	5.3 (Berkeley) 3/5/90
 20:2:Cairo:Egypt, Arab Rep. of
 20:3:Alexandria:Egypt, Arab Rep. of
 20:66:Port Said:Egypt, Arab Rep. of
@@ -104,27 +106,28 @@
 43:222:Vienna:Austria
 43:316:Graz:Austria
 43:5222:Innsbruck:Austria
-44:1:London, Eng.:United Kingdom
-44:203:Coventry, Eng.:United Kingdom
-44:21:Birmingham, Eng.:United Kingdom
-44:222:Cardiff, Wales:United Kingdom
-44:232:Belfast, N. Ire.:United Kingdom
-44:272:Bristol, Eng.:United Kingdom
-44:274:Bradford, Eng.:United Kingdom
-44:31:Edinburgh, Scot.:United Kingdom
-44:41:Glasgow, Scot.:United Kingdom
-44:484:Huddersfield, Eng.:United Kingdom
-44:485:Hillington, Eng.:United Kingdom
-44:51:Liverpool, Eng.:United Kingdom
-44:532:Leeds, Eng.:United Kingdom
-44:533:Leicester, Eng.:United Kingdom
-44:602:Nottingham, Eng.:United Kingdom
-44:61:Manchester, Eng.:United Kingdom
-44:682:New Castle-on-Tyne, Eng.:United Kingdom
-44:742:Sheffield, Eng.:United Kingdom
-44:752:Plymouth, Eng.:United Kingdom
-44:782:Stoke-on-Trent, Eng.:United Kingdom
-44:902:Wolverhampton, Eng.:United Kingdom
+44:171:Inner-London, Eng.:United Kingdom
+44:181:Outer-London, Eng.:United Kingdom
+44:1203:Coventry, Eng.:United Kingdom
+44:121:Birmingham, Eng.:United Kingdom
+44:1222:Cardiff, Wales:United Kingdom
+44:1232:Belfast, N. Ire.:United Kingdom
+44:1272:Bristol, Eng.:United Kingdom
+44:1274:Bradford, Eng.:United Kingdom
+44:131:Edinburgh, Scot.:United Kingdom
+44:141:Glasgow, Scot.:United Kingdom
+44:1484:Huddersfield, Eng.:United Kingdom
+44:1485:Hillington, Eng.:United Kingdom
+44:151:Liverpool, Eng.:United Kingdom
+44:1532:Leeds, Eng.:United Kingdom
+44:1533:Leicester, Eng.:United Kingdom
+44:1602:Nottingham, Eng.:United Kingdom
+44:161:Manchester, Eng.:United Kingdom
+44:191:Newcastle-upon-Tyne, Eng.:United Kingdom
+44:1742:Sheffield, Eng.:United Kingdom
+44:1752:Plymouth, Eng.:United Kingdom
+44:1782:Stoke-on-Trent, Eng.:United Kingdom
+44:1902:Wolverhampton, Eng.:United Kingdom
 45:3:Copenhagen:Denmark
 45:6:Aarhus:Denmark
 45:8:Aalborg:Denmark
diff --git a/share/misc/style b/share/misc/style
index 0cbf154b246..be87bc1546e 100644
--- a/share/misc/style
+++ b/share/misc/style
@@ -1,8 +1,9 @@
+/*	$OpenBSD: style,v 1.2 1996/04/22 01:28:30 deraadt Exp $	*/
+
 /*
  * Style guide for the 4BSD KNF (Kernel Normal Form).
  *
  *	from: @(#)style	1.12 (Berkeley) 3/18/94
- *	$Id: style,v 1.1 1995/10/18 08:44:44 deraadt Exp $
  */
 
 /*
@@ -122,7 +123,7 @@ main(argc, argv)
 	 * should be checked for accuracy.  Code that cannot be reached should
 	 * have a NOTREACHED comment.
 	 */
-	while ((ch = getopt(argc, argv, "abn")) != EOF)
+	while ((ch = getopt(argc, argv, "abn")) != -1)
 		switch (ch) {		/* Indent the switch. */
 		case 'a':		/* Don't indent the case. */
 			aflag = 1;