PERFORCE change 57170 for review

David Xu davidxu at FreeBSD.org
Mon Jul 12 04:35:13 PDT 2004


http://perforce.freebsd.org/chv.cgi?CH=57170

Change 57170 by davidxu at davidxu_alona on 2004/07/12 11:34:43

	IFC @57169

Affected files ...

.. //depot/projects/davidxu_ksedbg/src/UPDATING#4 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/top/commands.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/top/top.X#3 integrate
.. //depot/projects/davidxu_ksedbg/src/contrib/top/top.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/etc/services#3 integrate
.. //depot/projects/davidxu_ksedbg/src/games/bcd/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/games/bcd/bcd.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/include/regex.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/README#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/engine.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regcomp.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regerror.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regex.3#4 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regex2.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regexec.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/regex/regfree.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/ptrace.2#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/ia64/include/pthread_md.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/libexec/atrun/atrun.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/Makefile.inc.docports#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/alpha/mkisoimages.sh#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/amd64/mkisoimages.sh#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/i386/mkisoimages.sh#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/ia64/mkisoimages.sh#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/sparc64/mkisoimages.sh#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/man4.i386/fe.4#4 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man9/VFS_ROOT.9#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man9/sx.9#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man9/vflush.9#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/amd64/isa/clock.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/coda/coda_vfsops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/contrib/ipfilter/netinet/ip_fil.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ddb/db_command.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/cx/if_cx.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/cy/cy.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/digi/digi.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/digi/digi.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/fdc/fdc_pccard.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/rc/rc.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/rp/rp.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/rp/rpvar.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/si/si.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/si/si.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/sio/sio.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/sx/sx.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/sx/sx.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/doc/Doxyfile#1 branch
.. //depot/projects/davidxu_ksedbg/src/sys/doc/Makefile#1 branch
.. //depot/projects/davidxu_ksedbg/src/sys/fs/devfs/devfs_vfsops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/fdescfs/fdesc.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/nullfs/null_vfsops.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/portalfs/portal_vfsops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/pseudofs/pseudofs.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/pseudofs/pseudofs.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/umapfs/umap_vfsops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/gnu/ext2fs/ext2_vfsops.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/include/param.h#3 edit
.. //depot/projects/davidxu_ksedbg/src/sys/i386/isa/clock.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/device_if.m#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/init_main.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/init_sysent.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#8 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#10 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.master#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/tty.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_socket.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_default.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netatalk/at_control.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netatalk/ddp_usrreq.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_frame_relay.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_socket.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/nfs4client/nfs4_vfsops.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/nfsclient/nfs_vfsops.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/clock.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/sio.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/pmap.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/conf.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/kdb.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/kse.h#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/mount.h#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/param.h#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/proc.h#6 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/ptrace.h#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/socketvar.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/sx.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.h#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.mk#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/sysproto.h#5 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/tty.h#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/user.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/vnode.h#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/tools/makeobjops.awk#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ufs/ufs/ufs_extattr.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/csplit/csplit.1#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/gprof/gprof.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/m4/main.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/nfsstat/nfsstat.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/split/split.1#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/split/split.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/top/machine.c#5 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/xargs/xargs.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/mrouted/main.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/sliplogin/sliplogin.c#2 integrate

Differences ...

==== //depot/projects/davidxu_ksedbg/src/UPDATING#4 (text+ko) ====

@@ -54,7 +54,7 @@
 20040702:
 	The native preemption has been added to the kernel scheduler.
 	There is some report that ULE scheduler was broken in some
-	machines and we encourage users using ULE schedluer either
+	machines and we encourage users using ULE scheduler either
 	stick with an known good kernel, or temporary switch to 4BSD
 	scheduler as a workaround.
 
@@ -1714,4 +1714,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.324 2004/07/11 04:38:39 marcel Exp $
+$FreeBSD: src/UPDATING,v 1.325 2004/07/11 13:26:44 simon Exp $

==== //depot/projects/davidxu_ksedbg/src/contrib/top/commands.c#3 (text+ko) ====

@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD: src/contrib/top/commands.c,v 1.7 2004/07/08 16:45:55 keramida Exp $
+ * $FreeBSD: src/contrib/top/commands.c,v 1.8 2004/07/12 03:00:50 alfred Exp $
  */
 
 /*
@@ -86,6 +86,7 @@
 	fputs("\
 r       - renice a process\n\
 s       - change number of seconds to delay between updates\n\
+S       - toggle the displaying of system processes\n\
 u       - display processes for only one user (+ selects all users)\n\
 \n\
 \n", stdout);

==== //depot/projects/davidxu_ksedbg/src/contrib/top/top.X#3 (text+ko) ====

@@ -1,6 +1,6 @@
 .\" NOTE:  changes to the manual page for "top" should be made in the
 .\"        file "top.X" and NOT in the file "top.1".
-.\" $FreeBSD: src/contrib/top/top.X,v 1.10 2004/07/01 09:12:38 alfred Exp $
+.\" $FreeBSD: src/contrib/top/top.X,v 1.11 2004/07/12 03:00:50 alfred Exp $
 .nr N %topn%
 .nr D %delay%
 .TH TOP 1 Local
@@ -229,6 +229,9 @@
 Change the number of seconds to delay between displays
 (prompt for new number).
 .TP
+.B S
+Toggle the display of system processes.
+.TP
 .B k
 Send a signal (\*(lqkill\*(rq by default) to a list of processes.  This
 acts similarly to the command

==== //depot/projects/davidxu_ksedbg/src/contrib/top/top.c#4 (text+ko) ====

@@ -13,7 +13,7 @@
  *  Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
  *  Copyright (c) 1996, William LeFebvre, Group sys Consulting
  *
- * $FreeBSD: src/contrib/top/top.c,v 1.13 2004/07/08 16:45:55 keramida Exp $
+ * $FreeBSD: src/contrib/top/top.c,v 1.14 2004/07/12 03:00:50 alfred Exp $
  */
 
 /*
@@ -194,9 +194,9 @@
     fd_set readfds;
 
 #ifdef ORDER
-    static char command_chars[] = "\f qh?en#sdkriIutHmo";
+    static char command_chars[] = "\f qh?en#sdkriIutHmSo";
 #else
-    static char command_chars[] = "\f qh?en#sdkriIutHm";
+    static char command_chars[] = "\f qh?en#sdkriIutHmS";
 #endif
 /* these defines enumerate the "strchr"s of the commands in command_chars */
 #define CMD_redraw	0
@@ -218,8 +218,9 @@
 #define CMD_selftog	15
 #define CMD_thrtog	16
 #define CMD_viewtog	17
+#define CMD_viewsys	18
 #ifdef ORDER
-#define CMD_order       18
+#define CMD_order       19
 #endif
 
     /* set the buffer for stdout */
@@ -1002,6 +1003,9 @@
 				d_header = i_header;
 				reset_display();
 				break;
+			    case CMD_viewsys:
+				ps.system = !ps.system;
+				break;
 #ifdef ORDER
 			    case CMD_order:
 				new_message(MT_standout,

==== //depot/projects/davidxu_ksedbg/src/etc/services#3 (text+ko) ====

@@ -16,7 +16,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-# $FreeBSD: src/etc/services,v 1.100 2004/07/07 06:15:32 cperciva Exp $
+# $FreeBSD: src/etc/services,v 1.101 2004/07/11 19:20:47 cperciva Exp $
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
@@ -51,8 +51,8 @@
 ftp-data	 20/udp	   #File Transfer [Default Data]
 ftp		 21/tcp	   #File Transfer [Control]
 ftp		 21/udp	   #File Transfer [Control]
-ssh		 22/tcp    #Secure Shell Login
-ssh		 22/udp    #Secure Shell Login
+ssh		 22/tcp	   #Secure Shell Login
+ssh		 22/udp	   #Secure Shell Login
 telnet		 23/tcp
 telnet		 23/udp
 #		 24/tcp	   any private mail system
@@ -91,8 +91,8 @@
 ni-ftp		 47/udp	   #NI FTP
 auditd		 48/tcp	   #Digital Audit Daemon
 auditd		 48/udp	   #Digital Audit Daemon
-tacacs		 49/tcp    #Login Host Protocol (TACACS)
-tacacs		 49/udp    #Login Host Protocol (TACACS)
+tacacs		 49/tcp	   #Login Host Protocol (TACACS)
+tacacs		 49/udp	   #Login Host Protocol (TACACS)
 re-mail-ck	 50/tcp	   #Remote Mail Checking Protocol
 re-mail-ck	 50/udp	   #Remote Mail Checking Protocol
 la-maint	 51/tcp	   #IMP Logical Address Maintenance
@@ -157,8 +157,8 @@
 vettcp		 78/udp
 finger		 79/tcp
 finger		 79/udp
-http		 80/tcp	   www www-http		#World Wide Web HTTP
-http		 80/udp	   www www-http		#World Wide Web HTTP
+http		 80/tcp	   www www-http	#World Wide Web HTTP
+http		 80/udp	   www www-http	#World Wide Web HTTP
 hosts2-ns	 81/tcp	   #HOSTS2 Name Server
 hosts2-ns	 81/udp	   #HOSTS2 Name Server
 xfer		 82/tcp	   #XFER Utility
@@ -176,8 +176,8 @@
 #		 87/tcp	   any private terminal link
 #PROBLEMS!===========================================================
 #		 87/udp	   any private terminal link
-kerberos-sec	 88/tcp    kerberos	# krb5	# Kerberos (v5)
-kerberos-sec	 88/udp    kerberos	# krb5	# Kerberos (v5)
+kerberos-sec	 88/tcp	   kerberos	# krb5	# Kerberos (v5)
+kerberos-sec	 88/udp	   kerberos	# krb5	# Kerberos (v5)
 su-mit-tg	 89/tcp	   #SU/MIT Telnet Gateway
 su-mit-tg	 89/udp	   #SU/MIT Telnet Gateway
 dnsix		 90/tcp	   #DNSIX Securit Attribute Token Map
@@ -211,7 +211,7 @@
 acr-nema	104/udp	   #ACR-NEMA Digital Imag. & Comm. 300
 csnet-ns	105/tcp	   cso-ns cso	#Mailbox Name Nameserver
 csnet-ns	105/udp	   cso-ns cso	#Mailbox Name Nameserver
-pop3pw		106/tcp    3com-tsmux	#Eudora compatible PW changer
+pop3pw		106/tcp	   3com-tsmux	#Eudora compatible PW changer
 3com-tsmux	106/udp
 rtelnet		107/tcp	   #Remote Telnet Service
 rtelnet		107/udp	   #Remote Telnet Service
@@ -285,8 +285,8 @@
 emfis-cntl	141/udp	   #EMFIS Control Service
 bl-idm		142/tcp	   #Britton-Lee IDM
 bl-idm		142/udp	   #Britton-Lee IDM
-imap		143/tcp	   imap2 imap4 #Interim Mail Access Protocol v2
-imap		143/udp	   imap2 imap4 #Interim Mail Access Protocol v2
+imap		143/tcp	   imap2 imap4	#Interim Mail Access Protocol v2
+imap		143/udp	   imap2 imap4	#Interim Mail Access Protocol v2
 NeWS		144/tcp	   # Window System
 NeWS		144/udp	   # Window System
 #PROBLEMS!==============================================================
@@ -384,7 +384,7 @@
 qft		189/tcp	   #Queued File Transport
 qft		189/udp	   #Queued File Transport
 gacp		190/tcp	   #Gateway Access Control Protocol
-gacp		190/udp	   cacp 	#Gateway Access Control Protocol
+gacp		190/udp	   cacp		#Gateway Access Control Protocol
 prospero	191/tcp	   #Prospero Directory Service
 prospero	191/udp	   #Prospero Directory Service
 osu-nms		192/tcp	   #OSU Network Monitoring System
@@ -421,8 +421,8 @@
 at-7		207/udp	   #AppleTalk Unused
 at-8		208/tcp	   #AppleTalk Unused
 at-8		208/udp	   #AppleTalk Unused
-qmtp		209/tcp    #The Quick Mail Transfer Protocol
-qmtp		209/udp    #The Quick Mail Transfer Protocol
+qmtp		209/tcp	   #The Quick Mail Transfer Protocol
+qmtp		209/udp	   #The Quick Mail Transfer Protocol
 #PROBLEMS!==============================================================
 #tam		209/tcp	   #Trivial Authenticated Mail Protocol
 #tam		209/udp	   #Trivial Authenticated Mail Protocol
@@ -439,8 +439,8 @@
 vmpwscs		214/udp
 softpc		215/tcp	   #Insignia Solutions
 softpc		215/udp	   #Insignia Solutions
-CAIlic		216/tcp	   atls	      #Computer Associates Int'l License Server
-CAIlic		216/udp	   atls	      #Computer Associates Int'l License Server
+CAIlic		216/tcp	   atls		#Computer Associates Int'l License Server
+CAIlic		216/udp	   atls		#Computer Associates Int'l License Server
 dbase		217/tcp	   #dBASE Unix
 dbase		217/udp	   #dBASE Unix
 mpp		218/tcp	   #Netix Message Posting Protocol
@@ -476,7 +476,7 @@
 set		257/tcp	   #secure electronic transaction
 set		257/udp	   #secure electronic transaction
 yak-chat	258/tcp	   #yak winsock personal chat
-yak-chat	258/udp    #yak winsock personal chat
+yak-chat	258/udp	   #yak winsock personal chat
 esro-gen	259/tcp	   #efficient short remote operations
 esro-gen	259/udp	   #efficient short remote operations
 openport	260/tcp
@@ -538,11 +538,11 @@
 matip-type-b	351/tcp	   #MATIP Type B
 matip-type-b	351/udp
 bhoetty		351/tcp	   #unassigned but widespread use
-bhoetty		351/udp    #unassigned but widespread use
+bhoetty		351/udp	   #unassigned but widespread use
 dtag-ste-sb	352/tcp	   #DTAG
 dtag-ste-sb	352/udp	   #DTAG
-bhoedap4	352/tcp    #unassigned but widespread use
-bhoedap4	352/udp    #unassigned but widespread use
+bhoedap4	352/tcp	   #unassigned but widespread use
+bhoedap4	352/udp	   #unassigned but widespread use
 ndsauth		353/tcp
 ndsauth		353/udp
 bh611		354/tcp
@@ -567,8 +567,8 @@
 rsvp_tunnel	363/udp
 aurora-cmgr	364/tcp
 aurora-cmgr	364/udp
-dtk		365/tcp    #Deception Tool Kit - Fred Cohen <fc at all.net>
-dtk		365/udp    #Deception Tool Kit - Fred Cohen <fc at all.net>
+dtk		365/tcp	   #Deception Tool Kit - Fred Cohen <fc at all.net>
+dtk		365/udp	   #Deception Tool Kit - Fred Cohen <fc at all.net>
 odmr		366/tcp
 odmr		366/udp
 mortgageware	367/tcp
@@ -910,7 +910,7 @@
 utime		519/tcp	   unixtime
 utime		519/udp	   unixtime
 efs		520/tcp	   #extended file name server
-router		520/udp	   route routed	   #local routing process (on site);
+router		520/udp	   route routed	#local routing process (on site);
 #					   uses variant of Xerox NS routing
 #					   information protocol
 ripng		521/tcp
@@ -957,8 +957,8 @@
 uucp-rlogin	541/udp
 commerce	542/tcp
 commerce	542/udp
-klogin		543/tcp			# Kerberos (v4/v5)
-klogin		543/udp			# Kerberos (v4/v5)
+klogin		543/tcp	   # Kerberos (v4/v5)
+klogin		543/udp	   # Kerberos (v4/v5)
 kshell		544/tcp	   krcmd	# Kerberos (v4/v5)
 kshell		544/udp	   krcmd	# Kerberos (v4/v5)
 appleqtcsrvr	545/tcp
@@ -1087,14 +1087,14 @@
 npmp-gui	611/udp
 sshell		614/tcp	   #SSLshell
 sshell		614/udp
-ipp		631/tcp    #IPP (Internet Printing Protocol)
-ipp		631/udp    #IPP (Internet Printing Protocol)
+ipp		631/tcp	   #IPP (Internet Printing Protocol)
+ipp		631/udp	   #IPP (Internet Printing Protocol)
 ginad		634/tcp
 ginad		634/udp
-ldaps		636/tcp    sldap #ldap protocol over TLS/SSL
-ldaps		636/udp    sldap
-aodv		654/tcp    #Ad-Hoc On-Demand Distance Vector Routing Protocol
-aodv		654/udp    #Ad-Hoc On-Demand Distance Vector Routing Protocol
+ldaps		636/tcp	   sldap	#ldap protocol over TLS/SSL
+ldaps		636/udp	   sldap
+aodv		654/tcp	   #Ad-Hoc On-Demand Distance Vector Routing Protocol
+aodv		654/udp	   #Ad-Hoc On-Demand Distance Vector Routing Protocol
 mdqs		666/tcp
 mdqs		666/udp
 #PROBLEMS!===============================================
@@ -1123,10 +1123,10 @@
 fujitsu-dev	747/udp	   #Fujitsu Device Control
 ris-cm		748/tcp	   #Russell Info Sci Calendar Manager
 ris-cm		748/udp	   #Russell Info Sci Calendar Manager
-kerberos-adm	749/tcp    #Kerberos administration (v5)
-kerberos-adm	749/udp    #Kerberos administration (v5)
-kerberos-iv	750/udp		kdc	# Kerberos (v4)
-kerberos-iv	750/tcp		kdc	# Kerberos (v4)
+kerberos-adm	749/tcp	   #Kerberos administration (v5)
+kerberos-adm	749/udp	   #Kerberos administration (v5)
+kerberos-iv	750/udp	   kdc		# Kerberos (v4)
+kerberos-iv	750/tcp	   kdc		# Kerberos (v4)
 #PROBLEMS!========================================================
 #rfile		750/tcp
 #loadav		750/udp
@@ -1141,21 +1141,21 @@
 qrh		752/udp
 rrh		753/tcp
 rrh		753/udp
-krb_prop	754/tcp		krb5_prop	# kerberos/v5 server propagation
+krb_prop	754/tcp	   krb5_prop	# kerberos/v5 server propagation
 #PROBLEMS!========================================================
-tell		754/tcp	    #send
+tell		754/tcp	   #send
 #PROBLEMS!========================================================
-tell		754/udp	    #send
+tell		754/udp	   #send
 nlogin		758/tcp
 nlogin		758/udp
 con		759/tcp
 con		759/udp
-krbupdate	760/tcp		kreg	# Kerberos (v4) registration
+krbupdate	760/tcp	   kreg		# Kerberos (v4) registration
 #PROBLEMS!========================================================
 ns		760/tcp
 #PROBLEMS!========================================================
 ns		760/udp
-kpasswd		761/tcp		kpwd	# Kerberos (v4) "passwd"
+kpasswd		761/tcp	   kpwd		# Kerberos (v4) "passwd"
 #PROBLEMS!========================================================
 rxe		761/tcp
 #PROBLEMS!========================================================
@@ -1194,25 +1194,25 @@
 mdbs_daemon	800/udp
 device		801/tcp
 device		801/udp
-supfilesrv	871/tcp			# for SUP
+supfilesrv	871/tcp	   # for SUP
 rsync		873/tcp
 rsync		873/udp
 accessbuilder	888/tcp
 accessbuilder	888/udp
-swat		901/tcp			# samba web configuration tool
-rndc		953/tcp			# named's rndc control socket
-ftps-data	989/tcp			# ftp protocol, data, over TLS/SSL
+swat		901/tcp	   # samba web configuration tool
+rndc		953/tcp	   # named's rndc control socket
+ftps-data	989/tcp	   # ftp protocol, data, over TLS/SSL
 ftps-data	989/udp
-ftps		990/tcp			# ftp protocol, control, over TLS/SSL
+ftps		990/tcp	   # ftp protocol, control, over TLS/SSL
 ftps		990/udp
-telnets		992/tcp			# telnet protocol over TLS/SSL
+telnets		992/tcp	   # telnet protocol over TLS/SSL
 telnets		992/udp
-imaps		993/tcp			# imap4 protocol over TLS/SSL
+imaps		993/tcp	   # imap4 protocol over TLS/SSL
 imaps		993/udp
-ircs		994/tcp			# irc protocol over TLS/SSL
+ircs		994/tcp	   # irc protocol over TLS/SSL
 ircs		994/udp
-pop3s		995/tcp	spop3		# pop3 protocol over TLS/SSL
-pop3s		995/udp	spop3
+pop3s		995/tcp	   spop3	# pop3 protocol over TLS/SSL
+pop3s		995/udp	   spop3
 vsinet		996/tcp
 vsinet		996/udp
 maitrd		997/tcp
@@ -1220,7 +1220,7 @@
 busboy		998/tcp
 puparp		998/udp
 garcon		999/tcp
-applix		999/udp	       #Applix ac
+applix		999/udp	   #Applix ac
 puprouter	999/tcp
 puprouter	999/udp
 cadlock2	1000/tcp
@@ -1256,7 +1256,7 @@
 kpop		1109/udp   #Unofficial
 nfsd-status	1110/tcp   #Cluster status info
 nfsd-keepalive	1110/udp   #Client status info
-supfiledbg	1127/tcp		# for SUP
+supfiledbg	1127/tcp   # for SUP
 nfa		1155/tcp   #Network File Access
 nfa		1155/udp   #Network File Access
 phone		1167/udp   #conference calling
@@ -1491,34 +1491,34 @@
 esl-lm		1455/udp   #ESL License Manager
 dca		1456/tcp
 dca		1456/udp
-valisys-lm	1457/tcp    #Valisys License Manager
-valisys-lm	1457/udp    #Valisys License Manager
-nrcabq-lm	1458/tcp    #Nichols Research Corp.
-nrcabq-lm	1458/udp    #Nichols Research Corp.
-proshare1	1459/tcp    #Proshare Notebook Application
-proshare1	1459/udp    #Proshare Notebook Application
-proshare2	1460/tcp    #Proshare Notebook Application
-proshare2	1460/udp    #Proshare Notebook Application
-ibm_wrless_lan	1461/tcp    #IBM Wireless LAN
-ibm_wrless_lan	1461/udp    #IBM Wireless LAN
-world-lm	1462/tcp    #World License Manager
-world-lm	1462/udp    #World License Manager
+valisys-lm	1457/tcp   #Valisys License Manager
+valisys-lm	1457/udp   #Valisys License Manager
+nrcabq-lm	1458/tcp   #Nichols Research Corp.
+nrcabq-lm	1458/udp   #Nichols Research Corp.
+proshare1	1459/tcp   #Proshare Notebook Application
+proshare1	1459/udp   #Proshare Notebook Application
+proshare2	1460/tcp   #Proshare Notebook Application
+proshare2	1460/udp   #Proshare Notebook Application
+ibm_wrless_lan	1461/tcp   #IBM Wireless LAN
+ibm_wrless_lan	1461/udp   #IBM Wireless LAN
+world-lm	1462/tcp   #World License Manager
+world-lm	1462/udp   #World License Manager
 nucleus		1463/tcp
 nucleus		1463/udp
-msl_lmd		1464/tcp    #MSL License Manager
-msl_lmd		1464/udp    #MSL License Manager
-pipes		1465/tcp    #Pipes Platform
-pipes		1465/udp    #Pipes Platform  mfarlin at peerlogic.com
-oceansoft-lm	1466/tcp    #Ocean Software License Manager
-oceansoft-lm	1466/udp    #Ocean Software License Manager
+msl_lmd		1464/tcp   #MSL License Manager
+msl_lmd		1464/udp   #MSL License Manager
+pipes		1465/tcp   #Pipes Platform
+pipes		1465/udp   #Pipes Platform  mfarlin at peerlogic.com
+oceansoft-lm	1466/tcp   #Ocean Software License Manager
+oceansoft-lm	1466/udp   #Ocean Software License Manager
 csdmbase	1467/tcp
 csdmbase	1467/udp
 csdm		1468/tcp
 csdm		1468/udp
-aal-lm		1469/tcp    #Active Analysis Limited License Manager
-aal-lm		1469/udp    #Active Analysis Limited License Manager
-uaiact		1470/tcp    #Universal Analytics
-uaiact		1470/udp    #Universal Analytics
+aal-lm		1469/tcp   #Active Analysis Limited License Manager
+aal-lm		1469/udp   #Active Analysis Limited License Manager
+uaiact		1470/tcp   #Universal Analytics
+uaiact		1470/udp   #Universal Analytics
 csdmbase	1471/tcp
 csdmbase	1471/udp
 csdm		1472/tcp
@@ -1527,8 +1527,8 @@
 openmath	1473/udp
 telefinder	1474/tcp
 telefinder	1474/udp
-taligent-lm	1475/tcp    #Taligent License Manager
-taligent-lm	1475/udp    #Taligent License Manager
+taligent-lm	1475/tcp   #Taligent License Manager
+taligent-lm	1475/udp   #Taligent License Manager
 clvm-cfg	1476/tcp
 clvm-cfg	1476/udp
 ms-sna-server	1477/tcp
@@ -1541,12 +1541,12 @@
 pacerforum	1480/udp
 airs		1481/tcp
 airs		1481/udp
-miteksys-lm	1482/tcp    #Miteksys License Manager
-miteksys-lm	1482/udp    #Miteksys License Manager
-afs		1483/tcp    #AFS License Manager
-afs		1483/udp    #AFS License Manager
-confluent	1484/tcp    #Confluent License Manager
-confluent	1484/udp    #Confluent License Manager
+miteksys-lm	1482/tcp   #Miteksys License Manager
+miteksys-lm	1482/udp   #Miteksys License Manager
+afs		1483/tcp   #AFS License Manager
+afs		1483/udp   #AFS License Manager
+confluent	1484/tcp   #Confluent License Manager
+confluent	1484/udp   #Confluent License Manager
 lansource	1485/tcp
 lansource	1485/udp
 nms_topo_serv	1486/tcp
@@ -1575,81 +1575,81 @@
 rfx-lm		1497/udp
 watcom-sql	1498/tcp
 watcom-sql	1498/udp
-fhc		1499/tcp    #Federico Heinz Consultora
-fhc		1499/udp    #Federico Heinz Consultora
-vlsi-lm		1500/tcp    #VLSI License Manager
-vlsi-lm		1500/udp    #VLSI License Manager
-sas-3		1501/tcp    #Satellite-data Acquisition System 3
-sas-3		1501/udp    #Satellite-data Acquisition System 3
-shivadiscovery	1502/tcp    #Shiva
-shivadiscovery	1502/udp    #Shiva
-imtc-mcs	1503/tcp    #Databeam
-imtc-mcs	1503/udp    #Databeam
-evb-elm		1504/tcp    #EVB Software Engineering License Manager
-evb-elm		1504/udp    #EVB Software Engineering License Manager
-funkproxy	1505/tcp    #Funk Software, Inc.
-funkproxy	1505/udp    #Funk Software, Inc.
-utcd		1506/tcp    #Universal Time daemon (utcd)
-utcd		1506/udp    #Universal Time daemon (utcd)
+fhc		1499/tcp   #Federico Heinz Consultora
+fhc		1499/udp   #Federico Heinz Consultora
+vlsi-lm		1500/tcp   #VLSI License Manager
+vlsi-lm		1500/udp   #VLSI License Manager
+sas-3		1501/tcp   #Satellite-data Acquisition System 3
+sas-3		1501/udp   #Satellite-data Acquisition System 3
+shivadiscovery	1502/tcp   #Shiva
+shivadiscovery	1502/udp   #Shiva
+imtc-mcs	1503/tcp   #Databeam
+imtc-mcs	1503/udp   #Databeam
+evb-elm		1504/tcp   #EVB Software Engineering License Manager
+evb-elm		1504/udp   #EVB Software Engineering License Manager
+funkproxy	1505/tcp   #Funk Software, Inc.
+funkproxy	1505/udp   #Funk Software, Inc.
+utcd		1506/tcp   #Universal Time daemon (utcd)
+utcd		1506/udp   #Universal Time daemon (utcd)
 symplex		1507/tcp
 symplex		1507/udp
 diagmond	1508/tcp
 diagmond	1508/udp
-robcad-lm	1509/tcp    #Robcad, Ltd. License Manager
-robcad-lm	1509/udp    #Robcad, Ltd. License Manager
-mvx-lm		1510/tcp    #Midland Valley Exploration Ltd. Lic. Man.
-mvx-lm		1510/udp    #Midland Valley Exploration Ltd. Lic. Man.
+robcad-lm	1509/tcp   #Robcad, Ltd. License Manager
+robcad-lm	1509/udp   #Robcad, Ltd. License Manager
+mvx-lm		1510/tcp   #Midland Valley Exploration Ltd. Lic. Man.
+mvx-lm		1510/udp   #Midland Valley Exploration Ltd. Lic. Man.
 3l-l1		1511/tcp
 3l-l1		1511/udp
-wins		1512/tcp    #Microsoft's Windows Internet Name Service
-wins		1512/udp    #Microsoft's Windows Internet Name Service
-fujitsu-dtc	1513/tcp    #Fujitsu Systems Business of America, Inc
-fujitsu-dtc	1513/udp    #Fujitsu Systems Business of America, Inc
-fujitsu-dtcns	1514/tcp    #Fujitsu Systems Business of America, Inc
-fujitsu-dtcns	1514/udp    #Fujitsu Systems Business of America, Inc
+wins		1512/tcp   #Microsoft's Windows Internet Name Service
+wins		1512/udp   #Microsoft's Windows Internet Name Service
+fujitsu-dtc	1513/tcp   #Fujitsu Systems Business of America, Inc
+fujitsu-dtc	1513/udp   #Fujitsu Systems Business of America, Inc
+fujitsu-dtcns	1514/tcp   #Fujitsu Systems Business of America, Inc
+fujitsu-dtcns	1514/udp   #Fujitsu Systems Business of America, Inc
 ifor-protocol	1515/tcp
 ifor-protocol	1515/udp
-vpad		1516/tcp    #Virtual Places Audio data
-vpad		1516/udp    #Virtual Places Audio data
-vpac		1517/tcp    #Virtual Places Audio control
-vpac		1517/udp    #Virtual Places Audio control
-vpvd		1518/tcp    #Virtual Places Video data
-vpvd		1518/udp    #Virtual Places Video data
-vpvc		1519/tcp    #Virtual Places Video control
-vpvc		1519/udp    #Virtual Places Video control
-atm-zip-office	1520/tcp    #atm zip office
-atm-zip-office	1520/udp    #atm zip office
-ncube-lm	1521/tcp    #nCube License Manager
-ncube-lm	1521/udp    #nCube License Manager
-rna-lm		1522/tcp    #Ricardo North America License Manager
-rna-lm		1522/udp    #Ricardo North America License Manager
+vpad		1516/tcp   #Virtual Places Audio data
+vpad		1516/udp   #Virtual Places Audio data
+vpac		1517/tcp   #Virtual Places Audio control
+vpac		1517/udp   #Virtual Places Audio control
+vpvd		1518/tcp   #Virtual Places Video data
+vpvd		1518/udp   #Virtual Places Video data
+vpvc		1519/tcp   #Virtual Places Video control
+vpvc		1519/udp   #Virtual Places Video control
+atm-zip-office	1520/tcp   #atm zip office
+atm-zip-office	1520/udp   #atm zip office
+ncube-lm	1521/tcp   #nCube License Manager
+ncube-lm	1521/udp   #nCube License Manager
+rna-lm		1522/tcp   #Ricardo North America License Manager
+rna-lm		1522/udp   #Ricardo North America License Manager
 cichild-lm	1523/tcp
 cichild-lm	1523/udp
-ingreslock	1524/tcp    #ingres
-ingreslock	1524/udp    #ingres
-prospero-np	1525/tcp    #Prospero Directory Service non-priv
-prospero-np	1525/udp    #Prospero Directory Service non-priv
+ingreslock	1524/tcp   #ingres
+ingreslock	1524/udp   #ingres
+prospero-np	1525/tcp   #Prospero Directory Service non-priv
+prospero-np	1525/udp   #Prospero Directory Service non-priv
 #PROBLEMS!========================================================
-orasrv		1525/tcp    #oracle
-orasrv		1525/udp    #oracle
+orasrv		1525/tcp   #oracle
+orasrv		1525/udp   #oracle
 #PROBLEMS!========================================================
-pdap-np		1526/tcp    #Prospero Data Access Prot non-priv
-pdap-np		1526/udp    #Prospero Data Access Prot non-priv
-tlisrv		1527/tcp    #oracle
-tlisrv		1527/udp    #oracle
+pdap-np		1526/tcp   #Prospero Data Access Prot non-priv
+pdap-np		1526/udp   #Prospero Data Access Prot non-priv
+tlisrv		1527/tcp   #oracle
+tlisrv		1527/udp   #oracle
 mciautoreg	1528/tcp
 mciautoreg	1528/udp
-support		1529/tcp	prmsd gnatsd	# cygnus bug tracker
-coauthor	1529/tcp    #oracle
-coauthor	1529/udp    #oracle
+support		1529/tcp   prmsd gnatsd	# cygnus bug tracker
+coauthor	1529/tcp   #oracle
+coauthor	1529/udp   #oracle
 rap-service	1530/tcp
 rap-service	1530/udp
 rap-listen	1531/tcp
 rap-listen	1531/udp
 miroconnect	1532/tcp
 miroconnect	1532/udp
-virtual-places	1533/tcp    #Virtual Places Software
-virtual-places	1533/udp    #Virtual Places Software
+virtual-places	1533/tcp   #Virtual Places Software
+virtual-places	1533/udp   #Virtual Places Software
 micromuse-lm	1534/tcp
 micromuse-lm	1534/udp
 ampr-info	1535/tcp
@@ -1660,8 +1660,8 @@
 sdsc-lm		1537/udp
 3ds-lm		1538/tcp
 3ds-lm		1538/udp
-intellistor-lm	1539/tcp    #Intellistor License Manager
-intellistor-lm	1539/udp    #Intellistor License Manager
+intellistor-lm	1539/tcp   #Intellistor License Manager
+intellistor-lm	1539/udp   #Intellistor License Manager
 rds		1540/tcp
 rds		1540/udp
 rds2		1541/tcp
@@ -1678,12 +1678,12 @@
 abbaccuray	1546/udp
 laplink		1547/tcp
 laplink		1547/udp
-axon-lm		1548/tcp    #Axon License Manager
-axon-lm		1548/udp    #Axon License Manager
-shivahose	1549/tcp    #Shiva Hose
-shivasound	1549/udp    #Shiva Sound
-3m-image-lm	1550/tcp    #Image Storage license manager 3M Company
-3m-image-lm	1550/udp    #Image Storage license manager 3M Company
+axon-lm		1548/tcp   #Axon License Manager
+axon-lm		1548/udp   #Axon License Manager
+shivahose	1549/tcp   #Shiva Hose
+shivasound	1549/udp   #Shiva Sound
+3m-image-lm	1550/tcp   #Image Storage license manager 3M Company
+3m-image-lm	1550/udp   #Image Storage license manager 3M Company
 hecmtl-db	1551/tcp
 hecmtl-db	1551/udp
 pciarray	1552/tcp
@@ -1776,13 +1776,13 @@
 wizard		2001/udp   #curry
 globe		2002/tcp
 globe		2002/udp
-cfingerd	2003/tcp    #GNU finger
+cfingerd	2003/tcp   #GNU finger
 mailbox		2004/tcp
-emce		2004/udp    #CCWS mm conf
+emce		2004/udp   #CCWS mm conf
 berknet		2005/tcp
 oracle		2005/udp
 invokator	2006/tcp
-raid-cc		2006/udp    #raid
+raid-cc		2006/udp   #raid
 dectalk		2007/tcp
 raid-am		2007/udp
 conf		2008/tcp
@@ -1791,7 +1791,7 @@
 whosockami	2009/udp
 search		2010/tcp
 pipe_server	2010/udp
-raid-cc		2011/tcp    #raid
+raid-cc		2011/tcp   #raid
 servserv	2011/udp
 ttyinfo		2012/tcp
 raid-ac		2012/udp
@@ -1857,8 +1857,8 @@
 #dls		2047/udp
 dls-monitor	2048/tcp
 dls-monitor	2048/udp
-nfsd		2049/tcp	nfs		# NFS server daemon
-nfsd		2049/udp	nfs		# NFS server daemon
+nfsd		2049/tcp   nfs		# NFS server daemon
+nfsd		2049/udp   nfs		# NFS server daemon
 #PROBLEMS!=============================================================
 #shilp		2049/tcp
 #shilp		2049/udp
@@ -1928,8 +1928,7 @@
 bmap		3421/tcp   #Bull Apprise portmapper
 bmap		3421/udp   #Bull Apprise portmapper
 prsvp		3455/tcp   #RSVP Port
-prsvp		3455/udp   #RSVP Port
-rsvp-encap	3455/udp   #RSVP encapsulated in UDP
+prsvp		3455/udp   rsvp-encap	#RSVP Port
 vat		3456/tcp   #VAT default data
 vat		3456/udp   #VAT default data
 vat-control	3457/tcp   #VAT default control
@@ -1948,7 +1947,7 @@
 mapper-ws_ethd	3986/udp   #MAPPER workstation server
 netcheque	4008/tcp   #NetCheque accounting
 netcheque	4008/udp   #NetCheque accounting
-lockd		4045/udp			# NFS lock daemon/manager
+lockd		4045/udp   # NFS lock daemon/manager
 lockd		4045/tcp
 nuts_dem	4132/tcp   #NUTS Daemon
 nuts_dem	4132/udp   #NUTS Daemon
@@ -2102,16 +2101,12 @@
 amidxtape	10083/tcp  #Amanda tape indexing
 isode-dua	17007/tcp
 isode-dua	17007/udp
-biimenu		18000/tcp #Beckman Instruments, Inc.
-biimenu		18000/udp #Beckman Instruments, Inc.
-wnn4		22273/tcp  #Wnn4 (Japanese input)
-wnn6		22273/tcp  #Wnn6 (Japanese input)
-wnn4_Cn		22289/tcp  #Wnn4 (Chinese input)
-wnn6_Cn		22289/tcp  #Wnn6 (Chinese input)
-wnn4_Kr		22305/tcp  #Wnn4 (Korean input)
-wnn6_Kr		22305/tcp  #Wnn6 (Korean input)
-wnn4_Tw		22321/tcp  #Wnn4 (Taiwanse input)
-wnn6_Tw		22321/tcp  #Wnn6 (Taiwanse input)
+biimenu		18000/tcp  #Beckman Instruments, Inc.
+biimenu		18000/udp  #Beckman Instruments, Inc.
+wnn4		22273/tcp  wnn6		#Wnn4 (Japanese input)
+wnn4_Cn		22289/tcp  wnn6_Cn	#Wnn4 (Chinese input)
+wnn4_Kr		22305/tcp  wnn6_Kr	#Wnn4 (Korean input)
+wnn4_Tw		22321/tcp  wnn6_Tw	#Wnn4 (Taiwanse input)
 wnn6_DS		26208/tcp  #Wnn6 (Dserver)
-dbbrowse	47557/tcp #Databeam Corporation
-dbbrowse	47557/udp #Databeam Corporation
+dbbrowse	47557/tcp  #Databeam Corporation
+dbbrowse	47557/udp  #Databeam Corporation

==== //depot/projects/davidxu_ksedbg/src/games/bcd/Makefile#2 (text+ko) ====

@@ -1,7 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/bcd/Makefile,v 1.5 2001/03/26 14:20:54 ru Exp $
+# $FreeBSD: src/games/bcd/Makefile,v 1.6 2004/07/11 17:26:18 stefanf Exp $
 
 PROG=	bcd
+WARNS?=	6
 MAN=	bcd.6
 MLINKS=	bcd.6 ppt.6
 

==== //depot/projects/davidxu_ksedbg/src/games/bcd/bcd.c#2 (text+ko) ====

@@ -45,7 +45,7 @@
 static char sccsid[] = "@(#)bcd.c	8.2 (Berkeley) 3/20/94";
 #endif
 static const char rcsid[] =
- "$FreeBSD: src/games/bcd/bcd.c,v 1.8 1999/11/30 03:48:41 billf Exp $";
+ "$FreeBSD: src/games/bcd/bcd.c,v 1.9 2004/07/11 17:26:18 stefanf Exp $";
 #endif /* not lint */
 
 /*
@@ -80,9 +80,11 @@
 
 #include <sys/types.h>
 
+#include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
+#include <unistd.h>
 
 u_short holes[256] = {
     0x0,	 0x0,	  0x0,	   0x0,	    0x0,     0x0,     0x0,     0x0,
@@ -119,15 +121,15 @@
     0x202,	 0x201,	  0x082,   0x806,   0x822,   0x600,   0x282,   0x0
 };
 
+void printcard(char *);
+
 /*
  * i'th bit of w.
  */
 #define	bit(w,i)	((w)&(1<<(i)))
 
 int
-main(argc, argv)
-	int argc;
-	char **argv;
+main(int argc, char **argv)
 {
 	char cardline[80];
 
@@ -150,16 +152,15 @@
 
 #define	COLUMNS	48
 
-printcard(str)
-	char *str;
+void
+printcard(char *str)
 {
 	static char rowchars[] = "   123456789";
 	int i, row;
 	char *p;
-	char *index();
 
 	/* ruthlessly remove newlines and truncate at 48 characters. */
-	if ((p = index(str, '\n')))
+	if ((p = strchr(str, '\n')))
 		*p = '\0';
 
 	if (strlen(str) > COLUMNS)
@@ -183,7 +184,7 @@
 	p = str;
 	putchar('/');
 	for (i = 1; *p; i++, p++)
-		if (holes[*p])
+		if (holes[(unsigned char)*p])
 			putchar(*p);
 		else
 			putchar(' ');
@@ -201,7 +202,7 @@
 	for (row = 0; row <= 11; ++row) {
 		putchar('|');
 		for (i = 0, p = str; *p; i++, p++) {
-			if (bit(holes[*p], 11 - row))
+			if (bit(holes[(unsigned char)*p], 11 - row))
 				putchar(']');
 			else
 				putchar(rowchars[row]);

==== //depot/projects/davidxu_ksedbg/src/include/regex.h#2 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)regex.h	8.2 (Berkeley) 1/3/94
- * $FreeBSD: src/include/regex.h,v 1.10 2003/12/18 10:41:39 jkh Exp $
+ * $FreeBSD: src/include/regex.h,v 1.11 2004/07/12 06:07:26 tjr Exp $
  */
 
 #ifndef _REGEX_H_
@@ -92,6 +92,7 @@
 #define	REG_EMPTY	14
 #define	REG_ASSERT	15
 #define	REG_INVARG	16
+#define	REG_ILLSEQ	17
 #define	REG_ATOI	255	/* convert name to number (!) */
 #define	REG_ITOA	0400	/* convert number to name (!) */
 

==== //depot/projects/davidxu_ksedbg/src/lib/libarchive/README#2 (text+ko) ====

@@ -1,23 +1,44 @@
-$FreeBSD: src/lib/libarchive/README,v 1.1 2004/02/09 23:22:53 kientzle Exp $
+$FreeBSD: src/lib/libarchive/README,v 1.2 2004/07/12 01:54:37 kientzle Exp $
 
 libarchive: a library for reading and writing streaming archives
 
 This is all under a BSD license.  Use, enjoy, but don't blame me if it breaks!
 
-As of February, 2004, the library proper is fairly complete and compiles
-cleanly on FreeBSD 5-CURRENT.  The API should be stable now.
-
 Documentation:
- * libarchive(3) gives an overview of the library as a whole
- * archive_read(3) and archive_write(3) provide detailed calling
+ * libarchive.3 gives an overview of the library as a whole
+ * archive_read.3 and archive_write.3 provide detailed calling
    sequences for the read and write APIs
- * archive_entry(3) details the "struct archive_entry" utility class
- * tar(5) documents the "tar" file formats supported by the library
+ * archive_entry.3 details the "struct archive_entry" utility class
+ * tar.5 documents the "tar" file formats supported by the library
 
 You should also read the copious comments in "archive.h" and the source
 code for the sample "bsdtar" program for more details.  Please let me know
 about any errors or omissions you find.  (In particular, I no doubt missed
-a few things when researching the tar(5) page.)
+a few things when researching the tar.5 page.)

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list