summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-10-28 00:00:00 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-10-28 00:00:00 +0000
commitd6f987883e262363e2689803a36a7c32736476cc (patch)
tree1158893c08ead8fccdd4ac523d3492f68c4c1cda /usr.bin
parent94ea65f5c4b7bedff1d6c9caca5363f926955d43 (diff)
rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and
unmaintainable). these days, people use source. these id's do not provide any benefit, and do hurt the small install media (the 33,000 line diff is essentially mechanical) ok with the idea millert, ok dms
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/apply/apply.c10
-rw-r--r--usr.bin/apropos/apropos.c16
-rw-r--r--usr.bin/ar/append.c10
-rw-r--r--usr.bin/ar/ar.c16
-rw-r--r--usr.bin/ar/archive.c10
-rw-r--r--usr.bin/ar/contents.c10
-rw-r--r--usr.bin/ar/delete.c10
-rw-r--r--usr.bin/ar/extract.c10
-rw-r--r--usr.bin/ar/misc.c10
-rw-r--r--usr.bin/ar/move.c10
-rw-r--r--usr.bin/ar/print.c10
-rw-r--r--usr.bin/ar/replace.c10
-rw-r--r--usr.bin/arch/arch.c4
-rw-r--r--usr.bin/asa/asa.c6
-rw-r--r--usr.bin/at/at.c6
-rw-r--r--usr.bin/at/parsetime.c6
-rw-r--r--usr.bin/banner/banner.c12
-rw-r--r--usr.bin/banner/chset.c10
-rw-r--r--usr.bin/basename/basename.c15
-rw-r--r--usr.bin/bc/bc.y6
-rw-r--r--usr.bin/bc/scan.l6
-rw-r--r--usr.bin/bdes/bdes.c16
-rw-r--r--usr.bin/biff/biff.c16
-rw-r--r--usr.bin/cal/cal.c13
-rw-r--r--usr.bin/calendar/calendar.c16
-rw-r--r--usr.bin/calendar/day.c16
-rw-r--r--usr.bin/calendar/io.c16
-rw-r--r--usr.bin/calendar/ostern.c8
-rw-r--r--usr.bin/calendar/paskha.c6
-rw-r--r--usr.bin/calendar/pesach.c6
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.c15
-rw-r--r--usr.bin/cap_mkdb/getinfo.c6
-rw-r--r--usr.bin/checknr/checknr.c16
-rw-r--r--usr.bin/chpass/chpass.c16
-rw-r--r--usr.bin/chpass/edit.c10
-rw-r--r--usr.bin/chpass/field.c10
-rw-r--r--usr.bin/chpass/pw_yp.c9
-rw-r--r--usr.bin/chpass/table.c10
-rw-r--r--usr.bin/chpass/util.c10
-rw-r--r--usr.bin/cmp/cmp.c16
-rw-r--r--usr.bin/cmp/misc.c10
-rw-r--r--usr.bin/cmp/regular.c10
-rw-r--r--usr.bin/cmp/special.c10
-rw-r--r--usr.bin/col/col.c15
-rw-r--r--usr.bin/colcrt/colcrt.c16
-rw-r--r--usr.bin/colrm/colrm.c15
-rw-r--r--usr.bin/column/column.c15
-rw-r--r--usr.bin/comm/comm.c15
-rw-r--r--usr.bin/ctags/C.c10
-rw-r--r--usr.bin/ctags/ctags.c15
-rw-r--r--usr.bin/ctags/fortran.c10
-rw-r--r--usr.bin/ctags/lisp.c10
-rw-r--r--usr.bin/ctags/print.c10
-rw-r--r--usr.bin/ctags/tree.c10
-rw-r--r--usr.bin/ctags/yacc.c10
-rw-r--r--usr.bin/cut/cut.c15
-rw-r--r--usr.bin/cvs/diff3.c13
-rw-r--r--usr.bin/dc/bcode.c6
-rw-r--r--usr.bin/dc/dc.c6
-rw-r--r--usr.bin/dc/inout.c6
-rw-r--r--usr.bin/dc/mem.c6
-rw-r--r--usr.bin/dc/stack.c6
-rw-r--r--usr.bin/deroff/deroff.c16
-rw-r--r--usr.bin/diff/diff.c6
-rw-r--r--usr.bin/diff/diffdir.c6
-rw-r--r--usr.bin/diff/diffreg.c6
-rw-r--r--usr.bin/diff3/diff3prog.c12
-rw-r--r--usr.bin/dirname/dirname.c6
-rw-r--r--usr.bin/du/du.c16
-rw-r--r--usr.bin/env/env.c13
-rw-r--r--usr.bin/expand/expand.c15
-rw-r--r--usr.bin/file/apprentice.c6
-rw-r--r--usr.bin/file/ascmagic.c6
-rw-r--r--usr.bin/file/compress.c6
-rw-r--r--usr.bin/file/file.c6
-rw-r--r--usr.bin/file/file.h12
-rw-r--r--usr.bin/file/fsmagic.c6
-rw-r--r--usr.bin/file/funcs.c6
-rw-r--r--usr.bin/file/is_tar.c6
-rw-r--r--usr.bin/file/magic.c6
-rw-r--r--usr.bin/file/print.c6
-rw-r--r--usr.bin/file/readelf.c6
-rw-r--r--usr.bin/file/softmagic.c6
-rw-r--r--usr.bin/find/find.c7
-rw-r--r--usr.bin/find/function.c7
-rw-r--r--usr.bin/find/ls.c7
-rw-r--r--usr.bin/find/main.c7
-rw-r--r--usr.bin/find/misc.c7
-rw-r--r--usr.bin/find/operator.c7
-rw-r--r--usr.bin/find/option.c7
-rw-r--r--usr.bin/finger/finger.c13
-rw-r--r--usr.bin/finger/lprint.c7
-rw-r--r--usr.bin/finger/net.c7
-rw-r--r--usr.bin/finger/sprint.c7
-rw-r--r--usr.bin/finger/util.c7
-rw-r--r--usr.bin/fmt/fmt.c9
-rw-r--r--usr.bin/fold/fold.c15
-rw-r--r--usr.bin/from/from.c15
-rw-r--r--usr.bin/fsplit/fsplit.c13
-rw-r--r--usr.bin/fstat/fstat.c13
-rw-r--r--usr.bin/gencat/gencat.c6
-rw-r--r--usr.bin/getcap/getcap.c6
-rw-r--r--usr.bin/getconf/getconf.c6
-rw-r--r--usr.bin/getopt/getopt.c6
-rw-r--r--usr.bin/gprof/arcs.c10
-rw-r--r--usr.bin/gprof/arm.c6
-rw-r--r--usr.bin/gprof/dfn.c10
-rw-r--r--usr.bin/gprof/gprof.c16
-rw-r--r--usr.bin/gprof/i386.c6
-rw-r--r--usr.bin/gprof/lookup.c10
-rw-r--r--usr.bin/gprof/m68k.c6
-rw-r--r--usr.bin/gprof/m88k.c6
-rw-r--r--usr.bin/gprof/mips64.c10
-rw-r--r--usr.bin/gprof/ns32k.c6
-rw-r--r--usr.bin/gprof/pmax.c10
-rw-r--r--usr.bin/gprof/printgprof.c10
-rw-r--r--usr.bin/gprof/printlist.c10
-rw-r--r--usr.bin/gprof/sh.c6
-rw-r--r--usr.bin/gprof/sparc.c10
-rw-r--r--usr.bin/gprof/tahoe.c10
-rw-r--r--usr.bin/gprof/vax.c10
-rw-r--r--usr.bin/head/head.c10
-rw-r--r--usr.bin/hexdump/conv.c7
-rw-r--r--usr.bin/hexdump/display.c7
-rw-r--r--usr.bin/hexdump/hexdump.c13
-rw-r--r--usr.bin/hexdump/hexsyntax.c7
-rw-r--r--usr.bin/hexdump/odsyntax.c7
-rw-r--r--usr.bin/hexdump/parse.c7
-rw-r--r--usr.bin/id/id.c13
-rw-r--r--usr.bin/indent/args.c7
-rw-r--r--usr.bin/indent/indent.c16
-rw-r--r--usr.bin/indent/io.c7
-rw-r--r--usr.bin/indent/lexi.c7
-rw-r--r--usr.bin/indent/parse.c7
-rw-r--r--usr.bin/indent/pr_comment.c7
-rw-r--r--usr.bin/join/join.c13
-rw-r--r--usr.bin/jot/jot.c15
-rw-r--r--usr.bin/kdump/kdump.c15
-rw-r--r--usr.bin/ktrace/ktrace.c15
-rw-r--r--usr.bin/ktrace/subr.c9
-rw-r--r--usr.bin/lam/lam.c15
-rw-r--r--usr.bin/last/last.c15
-rw-r--r--usr.bin/lastcomm/lastcomm.c15
-rw-r--r--usr.bin/leave/leave.c15
-rw-r--r--usr.bin/lex/main.c10
-rw-r--r--usr.bin/locate/bigram/locate.bigram.c18
-rw-r--r--usr.bin/locate/code/locate.code.c18
-rw-r--r--usr.bin/locate/locate/locate.c19
-rw-r--r--usr.bin/lock/lock.c15
-rw-r--r--usr.bin/logger/logger.c15
-rw-r--r--usr.bin/login/failedlogin.c6
-rw-r--r--usr.bin/login/login.c15
-rw-r--r--usr.bin/logname/logname.c15
-rw-r--r--usr.bin/look/look.c15
-rw-r--r--usr.bin/mail/aux.c10
-rw-r--r--usr.bin/mail/cmd1.c10
-rw-r--r--usr.bin/mail/cmd2.c10
-rw-r--r--usr.bin/mail/cmd3.c10
-rw-r--r--usr.bin/mail/cmdtab.c10
-rw-r--r--usr.bin/mail/collect.c10
-rw-r--r--usr.bin/mail/edit.c10
-rw-r--r--usr.bin/mail/fio.c10
-rw-r--r--usr.bin/mail/getname.c10
-rw-r--r--usr.bin/mail/head.c10
-rw-r--r--usr.bin/mail/lex.c10
-rw-r--r--usr.bin/mail/list.c10
-rw-r--r--usr.bin/mail/main.c16
-rw-r--r--usr.bin/mail/names.c10
-rw-r--r--usr.bin/mail/popen.c10
-rw-r--r--usr.bin/mail/quit.c10
-rw-r--r--usr.bin/mail/send.c10
-rw-r--r--usr.bin/mail/strings.c10
-rw-r--r--usr.bin/mail/temp.c10
-rw-r--r--usr.bin/mail/tty.c10
-rw-r--r--usr.bin/mail/v7.local.c10
-rw-r--r--usr.bin/mail/vars.c10
-rw-r--r--usr.bin/mail/version.c10
-rw-r--r--usr.bin/man/config.c10
-rw-r--r--usr.bin/man/man.c16
-rw-r--r--usr.bin/mesg/mesg.c15
-rw-r--r--usr.bin/mkstr/mkstr.c16
-rw-r--r--usr.bin/mktemp/mktemp.c6
-rw-r--r--usr.bin/msgs/msgs.c16
-rw-r--r--usr.bin/newsyslog/newsyslog.c6
-rw-r--r--usr.bin/nfsstat/nfsstat.c17
-rw-r--r--usr.bin/nice/nice.c15
-rw-r--r--usr.bin/nm/elf.c6
-rw-r--r--usr.bin/nohup/nohup.c15
-rw-r--r--usr.bin/oldrdist/docmd.c7
-rw-r--r--usr.bin/oldrdist/expand.c7
-rw-r--r--usr.bin/oldrdist/gram.y5
-rw-r--r--usr.bin/oldrdist/lookup.c7
-rw-r--r--usr.bin/oldrdist/main.c13
-rw-r--r--usr.bin/oldrdist/server.c7
-rw-r--r--usr.bin/passwd/local_passwd.c7
-rw-r--r--usr.bin/passwd/passwd.c13
-rw-r--r--usr.bin/passwd/yp_passwd.c6
-rw-r--r--usr.bin/paste/paste.c13
-rw-r--r--usr.bin/patch/backupfile.c6
-rw-r--r--usr.bin/patch/inp.c6
-rw-r--r--usr.bin/patch/patch.c6
-rw-r--r--usr.bin/patch/pch.c6
-rw-r--r--usr.bin/patch/util.c6
-rw-r--r--usr.bin/pkill/pkill.c6
-rw-r--r--usr.bin/pr/egetopt.c7
-rw-r--r--usr.bin/pr/pr.c13
-rw-r--r--usr.bin/printenv/printenv.c13
-rw-r--r--usr.bin/printf/printf.c13
-rw-r--r--usr.bin/quota/quota.c14
-rw-r--r--usr.bin/ranlib/build.c7
-rw-r--r--usr.bin/ranlib/misc.c7
-rw-r--r--usr.bin/ranlib/ranlib.c13
-rw-r--r--usr.bin/ranlib/touch.c7
-rw-r--r--usr.bin/rcs/diff3.c13
-rw-r--r--usr.bin/rdist/child.c19
-rw-r--r--usr.bin/rdist/client.c19
-rw-r--r--usr.bin/rdist/common.c18
-rw-r--r--usr.bin/rdist/distopt.c18
-rw-r--r--usr.bin/rdist/docmd.c18
-rw-r--r--usr.bin/rdist/expand.c19
-rw-r--r--usr.bin/rdist/gram.y20
-rw-r--r--usr.bin/rdist/isexec.c19
-rw-r--r--usr.bin/rdist/lookup.c19
-rw-r--r--usr.bin/rdist/message.c19
-rw-r--r--usr.bin/rdist/rdist.c20
-rw-r--r--usr.bin/rdistd/filesys-os.c18
-rw-r--r--usr.bin/rdistd/filesys.c19
-rw-r--r--usr.bin/rdistd/rdistd.c19
-rw-r--r--usr.bin/rdistd/server.c19
-rw-r--r--usr.bin/renice/renice.c6
-rw-r--r--usr.bin/rev/rev.c16
-rw-r--r--usr.bin/rpcgen/rpc_clntout.c6
-rw-r--r--usr.bin/rpcgen/rpc_cout.c6
-rw-r--r--usr.bin/rpcgen/rpc_hout.c6
-rw-r--r--usr.bin/rpcgen/rpc_main.c8
-rw-r--r--usr.bin/rpcgen/rpc_parse.c6
-rw-r--r--usr.bin/rpcgen/rpc_sample.c6
-rw-r--r--usr.bin/rpcgen/rpc_scan.c6
-rw-r--r--usr.bin/rpcgen/rpc_svcout.c6
-rw-r--r--usr.bin/rpcgen/rpc_tblout.c6
-rw-r--r--usr.bin/rpcgen/rpc_util.c6
-rw-r--r--usr.bin/rpcinfo/rpcinfo.c8
-rw-r--r--usr.bin/rs/rs.c16
-rw-r--r--usr.bin/rsh/rsh.c13
-rw-r--r--usr.bin/rup/rup.c6
-rw-r--r--usr.bin/ruptime/ruptime.c13
-rw-r--r--usr.bin/rusers/rusers.c6
-rw-r--r--usr.bin/rwall/rwall.c13
-rw-r--r--usr.bin/rwho/rwho.c16
-rw-r--r--usr.bin/script/script.c15
-rw-r--r--usr.bin/sed/compile.c7
-rw-r--r--usr.bin/sed/main.c10
-rw-r--r--usr.bin/sed/misc.c7
-rw-r--r--usr.bin/sed/process.c7
-rw-r--r--usr.bin/showmount/showmount.c15
-rw-r--r--usr.bin/soelim/soelim.c15
-rw-r--r--usr.bin/sort/append.c10
-rw-r--r--usr.bin/sort/fields.c10
-rw-r--r--usr.bin/sort/files.c10
-rw-r--r--usr.bin/sort/fsort.c10
-rw-r--r--usr.bin/sort/init.c10
-rw-r--r--usr.bin/sort/msort.c10
-rw-r--r--usr.bin/sort/sort.c16
-rw-r--r--usr.bin/sort/tmp.c10
-rw-r--r--usr.bin/spell/look.c9
-rw-r--r--usr.bin/spell/spellprog.c16
-rw-r--r--usr.bin/split/split.c16
-rw-r--r--usr.bin/strings/strings.c15
-rw-r--r--usr.bin/strip/strip.c13
-rw-r--r--usr.bin/su/su.c16
-rw-r--r--usr.bin/systat/vmstat.c9
-rw-r--r--usr.bin/tail/forward.c9
-rw-r--r--usr.bin/tail/misc.c10
-rw-r--r--usr.bin/tail/read.c9
-rw-r--r--usr.bin/tail/reverse.c9
-rw-r--r--usr.bin/tail/tail.c15
-rw-r--r--usr.bin/talk/ctl.c9
-rw-r--r--usr.bin/talk/ctl_transact.c9
-rw-r--r--usr.bin/talk/display.c9
-rw-r--r--usr.bin/talk/get_addrs.c9
-rw-r--r--usr.bin/talk/get_names.c9
-rw-r--r--usr.bin/talk/init_disp.c9
-rw-r--r--usr.bin/talk/invite.c9
-rw-r--r--usr.bin/talk/io.c9
-rw-r--r--usr.bin/talk/look_up.c9
-rw-r--r--usr.bin/talk/msgs.c9
-rw-r--r--usr.bin/talk/talk.c15
-rw-r--r--usr.bin/tcopy/tcopy.c15
-rw-r--r--usr.bin/tee/tee.c15
-rw-r--r--usr.bin/telnet/auth.c7
-rw-r--r--usr.bin/telnet/genget.c8
-rw-r--r--usr.bin/telnet/getent.c6
-rw-r--r--usr.bin/telnet/main.c8
-rw-r--r--usr.bin/telnet/misc.c6
-rw-r--r--usr.bin/tftp/main.c16
-rw-r--r--usr.bin/tftp/tftp.c10
-rw-r--r--usr.bin/tftp/tftpsubs.c10
-rw-r--r--usr.bin/time/time.c15
-rw-r--r--usr.bin/tip/acu.c9
-rw-r--r--usr.bin/tip/aculib/biz22.c9
-rw-r--r--usr.bin/tip/aculib/biz31.c9
-rw-r--r--usr.bin/tip/aculib/courier.c9
-rw-r--r--usr.bin/tip/aculib/df.c9
-rw-r--r--usr.bin/tip/aculib/dn11.c9
-rw-r--r--usr.bin/tip/aculib/hayes.c9
-rw-r--r--usr.bin/tip/aculib/t3000.c9
-rw-r--r--usr.bin/tip/aculib/v3451.c9
-rw-r--r--usr.bin/tip/aculib/v831.c9
-rw-r--r--usr.bin/tip/aculib/ventel.c9
-rw-r--r--usr.bin/tip/acutab.c9
-rw-r--r--usr.bin/tip/cmds.c9
-rw-r--r--usr.bin/tip/cmdtab.c9
-rw-r--r--usr.bin/tip/cu.c9
-rw-r--r--usr.bin/tip/hunt.c9
-rw-r--r--usr.bin/tip/log.c9
-rw-r--r--usr.bin/tip/partab.c9
-rw-r--r--usr.bin/tip/remote.c15
-rw-r--r--usr.bin/tip/tip.c15
-rw-r--r--usr.bin/tip/tipout.c9
-rw-r--r--usr.bin/tip/uucplock.c9
-rw-r--r--usr.bin/tip/value.c9
-rw-r--r--usr.bin/tip/vars.c9
-rw-r--r--usr.bin/tn3270/api/api_bsd.c7
-rw-r--r--usr.bin/tn3270/api/api_exch.c7
-rw-r--r--usr.bin/tn3270/api/apilib.c7
-rw-r--r--usr.bin/tn3270/api/asc_ebc.c7
-rw-r--r--usr.bin/tn3270/api/astosc.c7
-rw-r--r--usr.bin/tn3270/api/dctype.c7
-rw-r--r--usr.bin/tn3270/api/disp_asc.c7
-rw-r--r--usr.bin/tn3270/api/ebc_disp.c7
-rw-r--r--usr.bin/tn3270/ascii/map3270.c7
-rw-r--r--usr.bin/tn3270/ascii/mset.c13
-rw-r--r--usr.bin/tn3270/ascii/termin.c7
-rw-r--r--usr.bin/tn3270/ctlr/api.c7
-rw-r--r--usr.bin/tn3270/ctlr/function.c7
-rw-r--r--usr.bin/tn3270/ctlr/inbound.c7
-rw-r--r--usr.bin/tn3270/ctlr/oia.c7
-rw-r--r--usr.bin/tn3270/ctlr/options.c7
-rw-r--r--usr.bin/tn3270/ctlr/outbound.c7
-rw-r--r--usr.bin/tn3270/general/genbsubs.c7
-rw-r--r--usr.bin/tn3270/general/globals.c7
-rw-r--r--usr.bin/tn3270/sys_curses/system.c7
-rw-r--r--usr.bin/tn3270/sys_curses/termout.c7
-rw-r--r--usr.bin/tn3270/tools/mkastods/mkastods.c13
-rw-r--r--usr.bin/tn3270/tools/mkastosc/mkastosc.c13
-rw-r--r--usr.bin/tn3270/tools/mkdctype/ectype.c7
-rw-r--r--usr.bin/tn3270/tools/mkdctype/mkdctype.c13
-rw-r--r--usr.bin/tn3270/tools/mkdstoas/mkdstoas.c13
-rw-r--r--usr.bin/tn3270/tools/mkhits/dohits.c6
-rw-r--r--usr.bin/tn3270/tools/mkhits/mkhits.c13
-rw-r--r--usr.bin/tn3270/tools/mkmake.y5
-rw-r--r--usr.bin/tn3270/tools/prt3270.c13
-rw-r--r--usr.bin/tput/tput.c15
-rw-r--r--usr.bin/tr/str.c9
-rw-r--r--usr.bin/tr/tr.c15
-rw-r--r--usr.bin/tset/termcap.c6
-rw-r--r--usr.bin/tty/tty.c15
-rw-r--r--usr.bin/ul/ul.c15
-rw-r--r--usr.bin/uname/uname.c6
-rw-r--r--usr.bin/unexpand/unexpand.c15
-rw-r--r--usr.bin/unifdef/unifdef.c13
-rw-r--r--usr.bin/uniq/uniq.c15
-rw-r--r--usr.bin/unvis/unvis.c15
-rw-r--r--usr.bin/users/users.c15
-rw-r--r--usr.bin/uudecode/uudecode.c15
-rw-r--r--usr.bin/uuencode/uuencode.c15
-rw-r--r--usr.bin/vacation/vacation.c15
-rw-r--r--usr.bin/vgrind/RETEST/retest.c15
-rw-r--r--usr.bin/vgrind/regexp.c15
-rw-r--r--usr.bin/vgrind/vfontedpr.c15
-rw-r--r--usr.bin/vgrind/vgrindefs.c9
-rw-r--r--usr.bin/vi/catalog/dump.c12
-rw-r--r--usr.bin/vi/cl/cl_bsd.c6
-rw-r--r--usr.bin/vi/cl/cl_funcs.c6
-rw-r--r--usr.bin/vi/cl/cl_main.c6
-rw-r--r--usr.bin/vi/cl/cl_read.c6
-rw-r--r--usr.bin/vi/cl/cl_screen.c6
-rw-r--r--usr.bin/vi/cl/cl_term.c6
-rw-r--r--usr.bin/vi/common/api.c6
-rw-r--r--usr.bin/vi/common/cut.c6
-rw-r--r--usr.bin/vi/common/delete.c6
-rw-r--r--usr.bin/vi/common/exf.c6
-rw-r--r--usr.bin/vi/common/key.c6
-rw-r--r--usr.bin/vi/common/line.c6
-rw-r--r--usr.bin/vi/common/log.c6
-rw-r--r--usr.bin/vi/common/main.c14
-rw-r--r--usr.bin/vi/common/mark.c6
-rw-r--r--usr.bin/vi/common/msg.c6
-rw-r--r--usr.bin/vi/common/options.c6
-rw-r--r--usr.bin/vi/common/options_f.c6
-rw-r--r--usr.bin/vi/common/put.c6
-rw-r--r--usr.bin/vi/common/recover.c6
-rw-r--r--usr.bin/vi/common/screen.c6
-rw-r--r--usr.bin/vi/common/search.c6
-rw-r--r--usr.bin/vi/common/seq.c6
-rw-r--r--usr.bin/vi/common/util.c6
-rw-r--r--usr.bin/vi/ex/ex.c6
-rw-r--r--usr.bin/vi/ex/ex_abbrev.c6
-rw-r--r--usr.bin/vi/ex/ex_append.c6
-rw-r--r--usr.bin/vi/ex/ex_args.c6
-rw-r--r--usr.bin/vi/ex/ex_argv.c6
-rw-r--r--usr.bin/vi/ex/ex_at.c6
-rw-r--r--usr.bin/vi/ex/ex_bang.c6
-rw-r--r--usr.bin/vi/ex/ex_cd.c6
-rw-r--r--usr.bin/vi/ex/ex_cmd.c6
-rw-r--r--usr.bin/vi/ex/ex_cscope.c6
-rw-r--r--usr.bin/vi/ex/ex_delete.c6
-rw-r--r--usr.bin/vi/ex/ex_display.c6
-rw-r--r--usr.bin/vi/ex/ex_edit.c6
-rw-r--r--usr.bin/vi/ex/ex_equal.c6
-rw-r--r--usr.bin/vi/ex/ex_file.c6
-rw-r--r--usr.bin/vi/ex/ex_filter.c6
-rw-r--r--usr.bin/vi/ex/ex_global.c6
-rw-r--r--usr.bin/vi/ex/ex_init.c6
-rw-r--r--usr.bin/vi/ex/ex_join.c6
-rw-r--r--usr.bin/vi/ex/ex_map.c6
-rw-r--r--usr.bin/vi/ex/ex_mark.c6
-rw-r--r--usr.bin/vi/ex/ex_mkexrc.c6
-rw-r--r--usr.bin/vi/ex/ex_move.c6
-rw-r--r--usr.bin/vi/ex/ex_open.c6
-rw-r--r--usr.bin/vi/ex/ex_perl.c6
-rw-r--r--usr.bin/vi/ex/ex_preserve.c6
-rw-r--r--usr.bin/vi/ex/ex_print.c6
-rw-r--r--usr.bin/vi/ex/ex_put.c6
-rw-r--r--usr.bin/vi/ex/ex_quit.c6
-rw-r--r--usr.bin/vi/ex/ex_read.c6
-rw-r--r--usr.bin/vi/ex/ex_screen.c6
-rw-r--r--usr.bin/vi/ex/ex_script.c6
-rw-r--r--usr.bin/vi/ex/ex_set.c6
-rw-r--r--usr.bin/vi/ex/ex_shell.c6
-rw-r--r--usr.bin/vi/ex/ex_shift.c7
-rw-r--r--usr.bin/vi/ex/ex_source.c6
-rw-r--r--usr.bin/vi/ex/ex_stop.c6
-rw-r--r--usr.bin/vi/ex/ex_subst.c6
-rw-r--r--usr.bin/vi/ex/ex_tag.c6
-rw-r--r--usr.bin/vi/ex/ex_tcl.c6
-rw-r--r--usr.bin/vi/ex/ex_txt.c6
-rw-r--r--usr.bin/vi/ex/ex_undo.c6
-rw-r--r--usr.bin/vi/ex/ex_usage.c6
-rw-r--r--usr.bin/vi/ex/ex_util.c6
-rw-r--r--usr.bin/vi/ex/ex_version.c6
-rw-r--r--usr.bin/vi/ex/ex_visual.c6
-rw-r--r--usr.bin/vi/ex/ex_write.c6
-rw-r--r--usr.bin/vi/ex/ex_yank.c6
-rw-r--r--usr.bin/vi/ex/ex_z.c6
-rw-r--r--usr.bin/vi/perl_api/perl.xs6
-rw-r--r--usr.bin/vi/perl_api/perlsfio.c6
-rw-r--r--usr.bin/vi/vi/getc.c6
-rw-r--r--usr.bin/vi/vi/v_at.c6
-rw-r--r--usr.bin/vi/vi/v_ch.c6
-rw-r--r--usr.bin/vi/vi/v_cmd.c6
-rw-r--r--usr.bin/vi/vi/v_delete.c6
-rw-r--r--usr.bin/vi/vi/v_ex.c6
-rw-r--r--usr.bin/vi/vi/v_increment.c6
-rw-r--r--usr.bin/vi/vi/v_init.c6
-rw-r--r--usr.bin/vi/vi/v_itxt.c6
-rw-r--r--usr.bin/vi/vi/v_left.c6
-rw-r--r--usr.bin/vi/vi/v_mark.c6
-rw-r--r--usr.bin/vi/vi/v_match.c6
-rw-r--r--usr.bin/vi/vi/v_paragraph.c6
-rw-r--r--usr.bin/vi/vi/v_put.c6
-rw-r--r--usr.bin/vi/vi/v_redraw.c6
-rw-r--r--usr.bin/vi/vi/v_replace.c6
-rw-r--r--usr.bin/vi/vi/v_right.c6
-rw-r--r--usr.bin/vi/vi/v_screen.c6
-rw-r--r--usr.bin/vi/vi/v_scroll.c6
-rw-r--r--usr.bin/vi/vi/v_search.c6
-rw-r--r--usr.bin/vi/vi/v_section.c6
-rw-r--r--usr.bin/vi/vi/v_sentence.c6
-rw-r--r--usr.bin/vi/vi/v_status.c6
-rw-r--r--usr.bin/vi/vi/v_txt.c6
-rw-r--r--usr.bin/vi/vi/v_ulcase.c6
-rw-r--r--usr.bin/vi/vi/v_undo.c6
-rw-r--r--usr.bin/vi/vi/v_util.c6
-rw-r--r--usr.bin/vi/vi/v_word.c6
-rw-r--r--usr.bin/vi/vi/v_xchar.c6
-rw-r--r--usr.bin/vi/vi/v_yank.c6
-rw-r--r--usr.bin/vi/vi/v_z.c6
-rw-r--r--usr.bin/vi/vi/v_zexit.c6
-rw-r--r--usr.bin/vi/vi/vi.c6
-rw-r--r--usr.bin/vi/vi/vs_line.c6
-rw-r--r--usr.bin/vi/vi/vs_msg.c6
-rw-r--r--usr.bin/vi/vi/vs_refresh.c6
-rw-r--r--usr.bin/vi/vi/vs_relative.c6
-rw-r--r--usr.bin/vi/vi/vs_smap.c6
-rw-r--r--usr.bin/vi/vi/vs_split.c6
-rw-r--r--usr.bin/vis/foldit.c9
-rw-r--r--usr.bin/vis/vis.c15
-rw-r--r--usr.bin/vmstat/vmstat.c16
-rw-r--r--usr.bin/w/pr_time.c10
-rw-r--r--usr.bin/w/proc_compare.c10
-rw-r--r--usr.bin/w/w.c16
-rw-r--r--usr.bin/wall/ttymsg.c9
-rw-r--r--usr.bin/wall/wall.c15
-rw-r--r--usr.bin/wc/wc.c16
-rw-r--r--usr.bin/what/what.c15
-rw-r--r--usr.bin/whatis/whatis.c12
-rw-r--r--usr.bin/which/which.c6
-rw-r--r--usr.bin/who/who.c15
-rw-r--r--usr.bin/write/write.c15
-rw-r--r--usr.bin/xargs/strnsubst.c6
-rw-r--r--usr.bin/xargs/xargs.c16
-rw-r--r--usr.bin/xinstall/xinstall.c15
-rw-r--r--usr.bin/xstr/xstr.c15
-rw-r--r--usr.bin/yacc/closure.c10
-rw-r--r--usr.bin/yacc/error.c10
-rw-r--r--usr.bin/yacc/lalr.c10
-rw-r--r--usr.bin/yacc/lr0.c10
-rw-r--r--usr.bin/yacc/main.c16
-rw-r--r--usr.bin/yacc/mkpar.c10
-rw-r--r--usr.bin/yacc/output.c10
-rw-r--r--usr.bin/yacc/reader.c10
-rw-r--r--usr.bin/yacc/skeleton.c18
-rw-r--r--usr.bin/yacc/symtab.c10
-rw-r--r--usr.bin/yacc/verbose.c10
-rw-r--r--usr.bin/yacc/warshall.c10
-rw-r--r--usr.bin/yes/yes.c15
-rw-r--r--usr.bin/ypcat/ypcat.c6
-rw-r--r--usr.bin/ypmatch/ypmatch.c6
-rw-r--r--usr.bin/ypwhich/ypwhich.c6
520 files changed, 521 insertions, 4474 deletions
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index 867a55631bb..bfb5e34270c 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apply.c,v 1.23 2007/05/09 01:54:40 ray Exp $ */
+/* $OpenBSD: apply.c,v 1.24 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: apply.c,v 1.3 1995/03/25 03:38:23 glass Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94";
-#else
-static const char rcsid[] = "$OpenBSD: apply.c,v 1.23 2007/05/09 01:54:40 ray Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/wait.h>
#include <ctype.h>
diff --git a/usr.bin/apropos/apropos.c b/usr.bin/apropos/apropos.c
index 6780dc10204..ca07f0dc65a 100644
--- a/usr.bin/apropos/apropos.c
+++ b/usr.bin/apropos/apropos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apropos.c,v 1.14 2008/12/24 09:05:17 jmc Exp $ */
+/* $OpenBSD: apropos.c,v 1.15 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: apropos.c,v 1.5 1995/09/04 20:46:20 tls Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)apropos.c 8.8 (Berkeley) 5/4/95";
-#else
-static char rcsid[] = "$OpenBSD: apropos.c,v 1.14 2008/12/24 09:05:17 jmc Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/ar/append.c b/usr.bin/ar/append.c
index 9fe0499f18a..139ddda52c0 100644
--- a/usr.bin/ar/append.c
+++ b/usr.bin/ar/append.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: append.c,v 1.5 2003/06/12 20:58:08 deraadt Exp $ */
+/* $OpenBSD: append.c,v 1.6 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: append.c,v 1.5 1995/03/26 03:27:37 glass Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)append.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: append.c,v 1.5 2003/06/12 20:58:08 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index 19a6ef47543..bbd527f277a 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar.c,v 1.11 2003/06/12 20:58:08 deraadt Exp $ */
+/* $OpenBSD: ar.c,v 1.12 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: ar.c,v 1.5 1995/03/26 03:27:44 glass Exp $ */
/*-
@@ -33,20 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ar.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: ar.c,v 1.11 2003/06/12 20:58:08 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <ar.h>
diff --git a/usr.bin/ar/archive.c b/usr.bin/ar/archive.c
index 0c47b300b0c..dbef7a10f49 100644
--- a/usr.bin/ar/archive.c
+++ b/usr.bin/ar/archive.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: archive.c,v 1.10 2003/06/12 20:58:08 deraadt Exp $ */
+/* $OpenBSD: archive.c,v 1.11 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: archive.c,v 1.7 1995/03/26 03:27:46 glass Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)archive.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: archive.c,v 1.10 2003/06/12 20:58:08 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/ar/contents.c b/usr.bin/ar/contents.c
index 81375e68e73..74f55575817 100644
--- a/usr.bin/ar/contents.c
+++ b/usr.bin/ar/contents.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: contents.c,v 1.4 2003/06/12 20:58:08 deraadt Exp $ */
+/* $OpenBSD: contents.c,v 1.5 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: contents.c,v 1.5 1995/03/26 03:27:49 glass Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)contents.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: contents.c,v 1.4 2003/06/12 20:58:08 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.bin/ar/delete.c b/usr.bin/ar/delete.c
index df8ebde4724..583df4b2e2e 100644
--- a/usr.bin/ar/delete.c
+++ b/usr.bin/ar/delete.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: delete.c,v 1.5 2003/06/12 20:58:08 deraadt Exp $ */
+/* $OpenBSD: delete.c,v 1.6 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: delete.c,v 1.5 1995/03/26 03:27:52 glass Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)delete.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: delete.c,v 1.5 2003/06/12 20:58:08 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/ar/extract.c b/usr.bin/ar/extract.c
index 81aa3a404a2..32ca1d94a15 100644
--- a/usr.bin/ar/extract.c
+++ b/usr.bin/ar/extract.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: extract.c,v 1.7 2004/09/07 09:41:43 miod Exp $ */
+/* $OpenBSD: extract.c,v 1.8 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: extract.c,v 1.5 1995/03/26 03:27:53 glass Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)extract.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: extract.c,v 1.7 2004/09/07 09:41:43 miod Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/usr.bin/ar/misc.c b/usr.bin/ar/misc.c
index fe09b9dd1e8..4c4c57b87d6 100644
--- a/usr.bin/ar/misc.c
+++ b/usr.bin/ar/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.6 2003/06/12 20:58:08 deraadt Exp $ */
+/* $OpenBSD: misc.c,v 1.7 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.6 1995/03/26 03:27:55 glass Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.6 2003/06/12 20:58:08 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <dirent.h>
diff --git a/usr.bin/ar/move.c b/usr.bin/ar/move.c
index ed9f58ae3da..5cae8cd063f 100644
--- a/usr.bin/ar/move.c
+++ b/usr.bin/ar/move.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: move.c,v 1.5 2003/06/12 20:58:08 deraadt Exp $ */
+/* $OpenBSD: move.c,v 1.6 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: move.c,v 1.5 1995/03/26 03:27:57 glass Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)move.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: move.c,v 1.5 2003/06/12 20:58:08 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/ar/print.c b/usr.bin/ar/print.c
index 73912ea3f33..41e34b045c7 100644
--- a/usr.bin/ar/print.c
+++ b/usr.bin/ar/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.4 2003/06/12 20:58:08 deraadt Exp $ */
+/* $OpenBSD: print.c,v 1.5 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: print.c,v 1.5 1995/03/26 03:27:59 glass Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.4 2003/06/12 20:58:08 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <dirent.h>
diff --git a/usr.bin/ar/replace.c b/usr.bin/ar/replace.c
index cee82cea5b8..ffc59591a94 100644
--- a/usr.bin/ar/replace.c
+++ b/usr.bin/ar/replace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: replace.c,v 1.6 2003/06/12 20:58:08 deraadt Exp $ */
+/* $OpenBSD: replace.c,v 1.7 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: replace.c,v 1.6 1995/03/26 03:28:01 glass Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)replace.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: replace.c,v 1.6 2003/06/12 20:58:08 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/arch/arch.c b/usr.bin/arch/arch.c
index 93eec651617..e0e5ad13784 100644
--- a/usr.bin/arch/arch.c
+++ b/usr.bin/arch/arch.c
@@ -23,10 +23,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: arch.c,v 1.11 2004/05/09 03:20:45 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c
index 1c135d0dab8..c0a0bb4c502 100644
--- a/usr.bin/asa/asa.c
+++ b/usr.bin/asa/asa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asa.c,v 1.8 2007/05/19 16:11:59 moritz Exp $ */
+/* $OpenBSD: asa.c,v 1.9 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: asa.c,v 1.10 1995/04/21 03:01:41 cgd Exp $ */
/*
@@ -31,10 +31,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: asa.c,v 1.8 2007/05/19 16:11:59 moritz Exp $";
-#endif
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 42b102695e2..e6c393ebd7f 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: at.c,v 1.55 2009/10/05 20:47:19 deraadt Exp $ */
+/* $OpenBSD: at.c,v 1.56 2009/10/27 23:59:35 deraadt Exp $ */
/*
* at.c : Put file into atrun queue
@@ -41,10 +41,6 @@
#define ALARMC 10 /* Number of seconds to wait for timeout */
#define TIMESIZE 50 /* Size of buffer passed to strftime() */
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: at.c,v 1.55 2009/10/05 20:47:19 deraadt Exp $";
-#endif
-
/* Variables to remove from the job's environment. */
char *no_export[] =
{
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index ce59527f961..a661ef74fb4 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parsetime.c,v 1.16 2007/05/23 19:50:28 millert Exp $ */
+/* $OpenBSD: parsetime.c,v 1.17 2009/10/27 23:59:35 deraadt Exp $ */
/*
* parsetime.c - parse time for at(1)
@@ -140,10 +140,6 @@ static size_t sc_len; /* scanner - length of token buffer */
static int sc_tokid; /* scanner - token id */
static int sc_tokplur; /* scanner - is token plural? */
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: parsetime.c,v 1.16 2007/05/23 19:50:28 millert Exp $";
-#endif
-
/*
* parse a token, checking if it's something special to us
*/
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index 261d7f02cc4..6a297e04150 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: banner.c,v 1.8 2003/06/10 22:20:44 deraadt Exp $ */
+/* $OpenBSD: banner.c,v 1.9 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: banner.c,v 1.2 1995/04/09 06:00:15 cgd Exp $ */
/*
@@ -48,16 +48,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#if 0
-static char sccsid[] = "@(#)printjob.c 8.2 (Berkeley) 4/16/94";
-#else
-static const char rcsid[] = "$OpenBSD: banner.c,v 1.8 2003/06/10 22:20:44 deraadt Exp $";
-#endif
-#endif /* not lint */
#include <stdio.h>
#include <unistd.h>
diff --git a/usr.bin/banner/chset.c b/usr.bin/banner/chset.c
index f158f758ada..13881b003ce 100644
--- a/usr.bin/banner/chset.c
+++ b/usr.bin/banner/chset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chset.c,v 1.4 2003/06/03 02:56:06 millert Exp $ */
+/* $OpenBSD: chset.c,v 1.5 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: chset.c,v 1.2 1995/04/09 06:00:26 cgd Exp $ */
/*
@@ -48,14 +48,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lpdchar.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: chset.c,v 1.4 2003/06/03 02:56:06 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "banner.h"
/*
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index c49a1a42d63..add243864d3 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: basename.c,v 1.8 2005/04/12 06:43:44 otto Exp $ */
+/* $OpenBSD: basename.c,v 1.9 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: basename.c,v 1.9 1995/09/02 05:29:46 jtc Exp $ */
/*-
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95";
-#endif
-static char rcsid[] = "$OpenBSD: basename.c,v 1.8 2005/04/12 06:43:44 otto Exp $";
-#endif /* not lint */
-
#include <err.h>
#include <libgen.h>
#include <stdio.h>
diff --git a/usr.bin/bc/bc.y b/usr.bin/bc/bc.y
index 13de85c241b..2604dc42146 100644
--- a/usr.bin/bc/bc.y
+++ b/usr.bin/bc/bc.y
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: bc.y,v 1.32 2006/05/18 05:49:53 otto Exp $ */
+/* $OpenBSD: bc.y,v 1.33 2009/10/27 23:59:36 deraadt Exp $ */
/*
* Copyright (c) 2003, Otto Moerbeek <otto@drijf.net>
@@ -30,10 +30,6 @@
* easy regression testing.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: bc.y,v 1.32 2006/05/18 05:49:53 otto Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/usr.bin/bc/scan.l b/usr.bin/bc/scan.l
index 51a091bd182..5c6cb55b4d6 100644
--- a/usr.bin/bc/scan.l
+++ b/usr.bin/bc/scan.l
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: scan.l,v 1.22 2008/12/15 19:46:29 otto Exp $ */
+/* $OpenBSD: scan.l,v 1.23 2009/10/27 23:59:36 deraadt Exp $ */
/*
* Copyright (c) 2003, Otto Moerbeek <otto@drijf.net>
@@ -17,10 +17,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: scan.l,v 1.22 2008/12/15 19:46:29 otto Exp $";
-#endif /* not lint */
-
#include <err.h>
#include <signal.h>
#include <stdbool.h>
diff --git a/usr.bin/bdes/bdes.c b/usr.bin/bdes/bdes.c
index 768fc508a15..ce072188fbb 100644
--- a/usr.bin/bdes/bdes.c
+++ b/usr.bin/bdes/bdes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bdes.c,v 1.15 2007/09/02 15:19:31 deraadt Exp $ */
+/* $OpenBSD: bdes.c,v 1.16 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: bdes.c,v 1.2 1995/03/26 03:33:19 glass Exp $ */
/*-
@@ -37,20 +37,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)bdes.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: bdes.c,v 1.15 2007/09/02 15:19:31 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* BDES -- DES encryption package for Berkeley Software Distribution 4.4
* options:
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index 0bc13268232..1af7fd2b539 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: biff.c,v 1.10 2007/02/20 13:41:19 jmc Exp $ */
+/* $OpenBSD: biff.c,v 1.11 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: biff.c,v 1.3 1995/03/26 02:34:22 glass Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: biff.c,v 1.10 2007/02/20 13:41:19 jmc Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/cal/cal.c b/usr.bin/cal/cal.c
index 9d65b68f81e..27fc2e59e50 100644
--- a/usr.bin/cal/cal.c
+++ b/usr.bin/cal/cal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cal.c,v 1.24 2009/01/01 21:07:17 otto Exp $ */
+/* $OpenBSD: cal.c,v 1.25 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: cal.c,v 1.6 1995/03/26 03:10:24 glass Exp $ */
/*
@@ -33,17 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#if 0
-static char sccsid[] = "@(#)cal.c 8.4 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] = "$OpenBSD: cal.c,v 1.24 2009/01/01 21:07:17 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 71a7ed21332..525fd0f00af 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: calendar.c,v 1.25 2005/11/16 16:45:11 deraadt Exp $ */
+/* $OpenBSD: calendar.c,v 1.26 2009/10/27 23:59:36 deraadt Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94";
-#else
-static const char rcsid[] = "$OpenBSD: calendar.c,v 1.25 2005/11/16 16:45:11 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 1a0f5953c3b..73e0c39272b 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: day.c,v 1.21 2008/04/13 00:22:17 djm Exp $ */
+/* $OpenBSD: day.c,v 1.22 2009/10/27 23:59:36 deraadt Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94";
-#else
-static const char rcsid[] = "$OpenBSD: day.c,v 1.21 2008/04/13 00:22:17 djm Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index baddceef2df..8cd3e94b01f 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.34 2007/10/17 20:10:44 chl Exp $ */
+/* $OpenBSD: io.c,v 1.35 2009/10/27 23:59:36 deraadt Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94";
-#else
-static const char rcsid[] = "$OpenBSD: io.c,v 1.34 2007/10/17 20:10:44 chl Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index aed15d996fd..c86c577eb62 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ostern.c,v 1.6 2005/11/16 16:45:11 deraadt Exp $ */
+/* $OpenBSD: ostern.c,v 1.7 2009/10/27 23:59:36 deraadt Exp $ */
/*
* Copyright (c) 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
@@ -25,13 +25,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ostern.c,v 1.6 2005/11/16 16:45:11 deraadt Exp $
+ * $Id: ostern.c,v 1.7 2009/10/27 23:59:36 deraadt Exp $
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ostern.c,v 1.6 2005/11/16 16:45:11 deraadt Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <time.h>
#include <tzfile.h>
diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c
index 0200d53aebf..fb958cdcfc9 100644
--- a/usr.bin/calendar/paskha.c
+++ b/usr.bin/calendar/paskha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: paskha.c,v 1.5 2005/11/16 16:45:11 deraadt Exp $ */
+/* $OpenBSD: paskha.c,v 1.6 2009/10/27 23:59:36 deraadt Exp $ */
/*
* Copyright (C) 1993-1996 by Andrey A. Chernov, Moscow, Russia.
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: paskha.c,v 1.5 2005/11/16 16:45:11 deraadt Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <tzfile.h>
diff --git a/usr.bin/calendar/pesach.c b/usr.bin/calendar/pesach.c
index a661902e844..70bbff26021 100644
--- a/usr.bin/calendar/pesach.c
+++ b/usr.bin/calendar/pesach.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pesach.c,v 1.2 2004/12/10 20:50:45 mickey Exp $ */
+/* $OpenBSD: pesach.c,v 1.3 2009/10/27 23:59:36 deraadt Exp $ */
/*
* Copyright (c) 2004 Michael Shalayeff
@@ -17,10 +17,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: pesach.c,v 1.2 2004/12/10 20:50:45 mickey Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <tzfile.h>
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index 6d5cfafd079..a2c899ac63c 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cap_mkdb.c,v 1.15 2009/08/28 11:43:50 nicm Exp $ */
+/* $OpenBSD: cap_mkdb.c,v 1.16 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: cap_mkdb.c,v 1.5 1995/09/02 05:47:12 jtc Exp $ */
/*-
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cap_mkdb.c 8.2 (Berkeley) 4/27/95";
-#endif
-static char rcsid[] = "$OpenBSD: cap_mkdb.c,v 1.15 2009/08/28 11:43:50 nicm Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/cap_mkdb/getinfo.c b/usr.bin/cap_mkdb/getinfo.c
index 2ce08800356..5133de1aa6f 100644
--- a/usr.bin/cap_mkdb/getinfo.c
+++ b/usr.bin/cap_mkdb/getinfo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getinfo.c,v 1.14 2007/05/09 03:07:19 deraadt Exp $ */
+/* $OpenBSD: getinfo.c,v 1.15 2009/10/27 23:59:36 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -29,10 +29,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: getinfo.c,v 1.14 2007/05/09 03:07:19 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c
index f8aad7d6241..1012d5cf876 100644
--- a/usr.bin/checknr/checknr.c
+++ b/usr.bin/checknr/checknr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: checknr.c,v 1.15 2007/06/27 03:29:31 ray Exp $ */
+/* $OpenBSD: checknr.c,v 1.16 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: checknr.c,v 1.4 1995/03/26 04:10:19 glass Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)checknr.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: checknr.c,v 1.15 2007/06/27 03:29:31 ray Exp $";
-#endif
-#endif /* not lint */
-
/*
* checknr: check an nroff/troff input file for matching macro calls.
* we also attempt to match size and font changes, but only the embedded
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index c7ba2f05234..dd32cb4c86d 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chpass.c,v 1.36 2008/07/08 21:30:15 sobrado Exp $ */
+/* $OpenBSD: chpass.c,v 1.37 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: chpass.c,v 1.36 2008/07/08 21:30:15 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/resource.h>
#include <sys/stat.h>
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index 6476164d6ad..e25e46344a6 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: edit.c,v 1.32 2009/03/05 20:53:13 millert Exp $ */
+/* $OpenBSD: edit.c,v 1.33 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: edit.c,v 1.6 1996/05/15 21:50:45 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)edit.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: edit.c,v 1.32 2009/03/05 20:53:13 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c
index f4146264bb3..27a61edb46b 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: field.c,v 1.11 2009/04/30 20:03:53 jacekm Exp $ */
+/* $OpenBSD: field.c,v 1.12 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: field.c,v 1.3 1995/03/26 04:55:28 glass Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)field.c 8.4 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: field.c,v 1.11 2009/04/30 20:03:53 jacekm Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <ctype.h>
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index 4240ecb769c..b8764fbc456 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pw_yp.c,v 1.22 2009/02/15 21:43:40 deraadt Exp $ */
+/* $OpenBSD: pw_yp.c,v 1.23 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: pw_yp.c,v 1.5 1995/03/26 04:55:33 glass Exp $ */
/*
@@ -29,13 +29,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pw_yp.c 1.0 2/2/93";
-#else
-static char rcsid[] = "$OpenBSD: pw_yp.c,v 1.22 2009/02/15 21:43:40 deraadt Exp $";
-#endif
-#endif /* not lint */
#ifdef YP
diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c
index a03131f5c08..9cadb2b23fd 100644
--- a/usr.bin/chpass/table.c
+++ b/usr.bin/chpass/table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: table.c,v 1.5 2003/06/03 02:56:06 millert Exp $ */
+/* $OpenBSD: table.c,v 1.6 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: table.c,v 1.3 1995/03/26 04:55:34 glass Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)table.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: table.c,v 1.5 2003/06/03 02:56:06 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stddef.h>
#include "chpass.h"
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index 64c13d1d848..8e9c5e99bcf 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.11 2009/03/05 20:53:13 millert Exp $ */
+/* $OpenBSD: util.c,v 1.12 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: util.c,v 1.4 1995/03/26 04:55:35 glass Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)util.c 8.4 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: util.c,v 1.11 2009/03/05 20:53:13 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index cb7ae3765b2..80c9a1db8c8 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmp.c,v 1.11 2003/06/10 22:20:45 deraadt Exp $ */
+/* $OpenBSD: cmp.c,v 1.12 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: cmp.c,v 1.7 1995/09/08 03:22:56 tls Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: cmp.c,v 1.11 2003/06/10 22:20:45 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index a3677f75048..c9a4cb56b55 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.4 2003/06/03 02:56:06 millert Exp $ */
+/* $OpenBSD: misc.c,v 1.5 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.2 1995/09/08 03:22:58 tls Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.4 2003/06/03 02:56:06 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index 3056b0eaa2d..fdcca69a5e4 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: regular.c,v 1.8 2003/11/21 21:41:38 mickey Exp $ */
+/* $OpenBSD: regular.c,v 1.9 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: regular.c,v 1.2 1995/09/08 03:22:59 tls Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: regular.c,v 1.8 2003/11/21 21:41:38 mickey Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index 6753312855f..0fcc85031cb 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: special.c,v 1.5 2003/06/03 02:56:06 millert Exp $ */
+/* $OpenBSD: special.c,v 1.6 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: special.c,v 1.2 1995/09/08 03:23:00 tls Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: special.c,v 1.5 2003/06/03 02:56:06 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 9fd96c0827f..819a8c3bee6 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: col.c,v 1.10 2007/05/01 01:26:19 jdixon Exp $ */
+/* $OpenBSD: col.c,v 1.11 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: col.c,v 1.7 1995/09/02 05:48:50 jtc Exp $ */
/*-
@@ -33,19 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95";
-#endif
-static char rcsid[] = "$OpenBSD: col.c,v 1.10 2007/05/01 01:26:19 jdixon Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <string.h>
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index b704ff382b6..dc0108c9578 100644
--- a/usr.bin/colcrt/colcrt.c
+++ b/usr.bin/colcrt/colcrt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: colcrt.c,v 1.9 2008/07/06 13:36:09 sobrado Exp $ */
+/* $OpenBSD: colcrt.c,v 1.10 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: colcrt.c,v 1.3 1995/03/26 05:31:00 glass Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)colcrt.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: colcrt.c,v 1.9 2008/07/06 13:36:09 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index abc50882b3b..2c5e4d86462 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: colrm.c,v 1.8 2003/06/10 22:20:45 deraadt Exp $ */
+/* $OpenBSD: colrm.c,v 1.9 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: colrm.c,v 1.4 1995/09/02 05:51:37 jtc Exp $ */
/*-
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)colrm.c 8.2 (Berkeley) 5/4/95";
-#endif
-static char rcsid[] = "$OpenBSD: colrm.c,v 1.8 2003/06/10 22:20:45 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index d3d4079112a..d3b96a2822c 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: column.c,v 1.14 2007/08/01 13:30:21 millert Exp $ */
+/* $OpenBSD: column.c,v 1.15 2009/10/27 23:59:36 deraadt Exp $ */
/* $NetBSD: column.c,v 1.4 1995/09/02 05:53:03 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95";
-#endif
-static char rcsid[] = "$OpenBSD: column.c,v 1.14 2007/08/01 13:30:21 millert Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 7d2e71d10d8..56271f464fc 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: comm.c,v 1.7 2003/06/10 22:20:45 deraadt Exp $ */
+/* $OpenBSD: comm.c,v 1.8 2009/10/27 23:59:37 deraadt Exp $ */
/* $NetBSD: comm.c,v 1.10 1995/09/05 19:57:43 jtc Exp $ */
/*
@@ -33,19 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)comm.c 8.4 (Berkeley) 5/4/95";
-#endif
-static char rcsid[] = "$OpenBSD: comm.c,v 1.7 2003/06/10 22:20:45 deraadt Exp $";
-#endif /* not lint */
-
#include <err.h>
#include <limits.h>
#include <locale.h>
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index 99fa7795178..d3d63fafe04 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: C.c,v 1.11 2003/10/28 13:23:59 avsm Exp $ */
+/* $OpenBSD: C.c,v 1.12 2009/10/27 23:59:37 deraadt Exp $ */
/* $NetBSD: C.c,v 1.3 1995/03/26 20:14:02 glass Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)C.c 8.4 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: C.c,v 1.11 2003/10/28 13:23:59 avsm Exp $";
-#endif
-#endif /* not lint */
-
#include <limits.h>
#include <stdio.h>
#include <string.h>
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index 41f11775b5c..916c63d3679 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctags.c,v 1.11 2007/03/15 22:41:17 jmc Exp $ */
+/* $OpenBSD: ctags.c,v 1.12 2009/10/27 23:59:37 deraadt Exp $ */
/* $NetBSD: ctags.c,v 1.4 1995/09/02 05:57:23 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95";
-#endif
-static char rcsid[] = "$OpenBSD: ctags.c,v 1.11 2007/03/15 22:41:17 jmc Exp $";
-#endif /* not lint */
-
#include <err.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index 1d3b28069e0..91bebacd468 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fortran.c,v 1.6 2003/06/12 20:58:09 deraadt Exp $ */
+/* $OpenBSD: fortran.c,v 1.7 2009/10/27 23:59:37 deraadt Exp $ */
/* $NetBSD: fortran.c,v 1.3 1995/03/26 20:14:08 glass Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)fortran.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: fortran.c,v 1.6 2003/06/12 20:58:09 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index d4f2788fd66..7dafeb9ec9b 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lisp.c,v 1.5 2003/06/12 20:58:09 deraadt Exp $ */
+/* $OpenBSD: lisp.c,v 1.6 2009/10/27 23:59:37 deraadt Exp $ */
/* $NetBSD: lisp.c,v 1.3 1995/03/26 20:14:09 glass Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lisp.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: lisp.c,v 1.5 2003/06/12 20:58:09 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index 5fcc8383f8b..a7746657f84 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.5 2003/06/12 20:58:09 deraadt Exp $ */
+/* $OpenBSD: print.c,v 1.6 2009/10/27 23:59:37 deraadt Exp $ */
/* $NetBSD: print.c,v 1.4 1995/09/27 01:06:58 jtc Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.5 2003/06/12 20:58:09 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index 48123fd8ffe..cb6952efa25 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tree.c,v 1.9 2006/02/11 18:52:14 otto Exp $ */
+/* $OpenBSD: tree.c,v 1.10 2009/10/27 23:59:37 deraadt Exp $ */
/* $NetBSD: tree.c,v 1.4 1995/03/26 20:14:11 glass Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tree.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: tree.c,v 1.9 2006/02/11 18:52:14 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index 87dc7c35953..ef302faadb6 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yacc.c,v 1.7 2003/06/12 20:58:09 deraadt Exp $ */
+/* $OpenBSD: yacc.c,v 1.8 2009/10/27 23:59:37 deraadt Exp $ */
/* $NetBSD: yacc.c,v 1.3 1995/03/26 20:14:12 glass Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)yacc.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: yacc.c,v 1.7 2003/06/12 20:58:09 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index a43b0e9f28a..bca1a868697 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cut.c,v 1.13 2008/06/27 08:02:13 sobrado Exp $ */
+/* $OpenBSD: cut.c,v 1.14 2009/10/27 23:59:37 deraadt Exp $ */
/* $NetBSD: cut.c,v 1.9 1995/09/02 05:59:23 jtc Exp $ */
/*
@@ -33,19 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95";
-#endif
-static char rcsid[] = "$OpenBSD: cut.c,v 1.13 2008/06/27 08:02:13 sobrado Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c
index 91290eaaaa1..3a9339aaf54 100644
--- a/usr.bin/cvs/diff3.c
+++ b/usr.bin/cvs/diff3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff3.c,v 1.50 2009/06/07 08:39:13 ray Exp $ */
+/* $OpenBSD: diff3.c,v 1.51 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
@@ -64,17 +64,6 @@
* @(#)diff3.c 8.1 (Berkeley) 6/6/93
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: diff3.c,v 1.50 2009/06/07 08:39:13 ray Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/usr.bin/dc/bcode.c b/usr.bin/dc/bcode.c
index 8949a4c4bd3..2f76e879e01 100644
--- a/usr.bin/dc/bcode.c
+++ b/usr.bin/dc/bcode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcode.c,v 1.39 2009/09/06 13:33:33 otto Exp $ */
+/* $OpenBSD: bcode.c,v 1.40 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) 2003, Otto Moerbeek <otto@drijf.net>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: bcode.c,v 1.39 2009/09/06 13:33:33 otto Exp $";
-#endif /* not lint */
-
#include <ssl/ssl.h>
#include <err.h>
#include <limits.h>
diff --git a/usr.bin/dc/dc.c b/usr.bin/dc/dc.c
index 66c564987f7..a0f79c84d9f 100644
--- a/usr.bin/dc/dc.c
+++ b/usr.bin/dc/dc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dc.c,v 1.10 2007/07/29 17:12:18 sobrado Exp $ */
+/* $OpenBSD: dc.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) 2003, Otto Moerbeek <otto@drijf.net>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: dc.c,v 1.10 2007/07/29 17:12:18 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/stat.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/dc/inout.c b/usr.bin/dc/inout.c
index 9518bce82f7..c30dc9bd264 100644
--- a/usr.bin/dc/inout.c
+++ b/usr.bin/dc/inout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inout.c,v 1.14 2006/01/15 19:11:59 otto Exp $ */
+/* $OpenBSD: inout.c,v 1.15 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) 2003, Otto Moerbeek <otto@drijf.net>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: inout.c,v 1.14 2006/01/15 19:11:59 otto Exp $";
-#endif /* not lint */
-
#include <ssl/ssl.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.bin/dc/mem.c b/usr.bin/dc/mem.c
index 125370e0b6d..d39603697fa 100644
--- a/usr.bin/dc/mem.c
+++ b/usr.bin/dc/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.4 2004/07/11 06:41:48 otto Exp $ */
+/* $OpenBSD: mem.c,v 1.5 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) 2003, Otto Moerbeek <otto@drijf.net>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: mem.c,v 1.4 2004/07/11 06:41:48 otto Exp $";
-#endif /* not lint */
-
#include <ssl/err.h>
#include <err.h>
diff --git a/usr.bin/dc/stack.c b/usr.bin/dc/stack.c
index a6ad404aabe..0ed3164ae13 100644
--- a/usr.bin/dc/stack.c
+++ b/usr.bin/dc/stack.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stack.c,v 1.10 2008/04/28 06:35:09 otto Exp $ */
+/* $OpenBSD: stack.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) 2003, Otto Moerbeek <otto@drijf.net>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: stack.c,v 1.10 2008/04/28 06:35:09 otto Exp $";
-#endif /* not lint */
-
#include <err.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/deroff/deroff.c b/usr.bin/deroff/deroff.c
index 9fa51d3ca29..6cbb53d23b8 100644
--- a/usr.bin/deroff/deroff.c
+++ b/usr.bin/deroff/deroff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: deroff.c,v 1.7 2005/07/05 18:27:41 jmc Exp $ */
+/* $OpenBSD: deroff.c,v 1.8 2009/10/27 23:59:37 deraadt Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -62,20 +62,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)deroff.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: deroff.c,v 1.7 2005/07/05 18:27:41 jmc Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include <limits.h>
#include <stdio.h>
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
index 940124bca6c..d0fe473d117 100644
--- a/usr.bin/diff/diff.c
+++ b/usr.bin/diff/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.53 2009/06/07 08:39:13 ray Exp $ */
+/* $OpenBSD: diff.c,v 1.54 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -20,10 +20,6 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: diff.c,v 1.53 2009/06/07 08:39:13 ray Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c
index 83ba4c5b8c1..42288d7cf3b 100644
--- a/usr.bin/diff/diffdir.c
+++ b/usr.bin/diff/diffdir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diffdir.c,v 1.34 2009/06/07 08:39:13 ray Exp $ */
+/* $OpenBSD: diffdir.c,v 1.35 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -20,10 +20,6 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: diffdir.c,v 1.34 2009/06/07 08:39:13 ray Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
index 95ea5089dca..ac0a5416bfc 100644
--- a/usr.bin/diff/diffreg.c
+++ b/usr.bin/diff/diffreg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diffreg.c,v 1.72 2009/06/07 08:39:13 ray Exp $ */
+/* $OpenBSD: diffreg.c,v 1.73 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
@@ -64,10 +64,6 @@
* @(#)diffreg.c 8.1 (Berkeley) 6/6/93
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: diffreg.c,v 1.72 2009/06/07 08:39:13 ray Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/usr.bin/diff3/diff3prog.c b/usr.bin/diff3/diff3prog.c
index 73054824a5a..1d0aa17d70f 100644
--- a/usr.bin/diff3/diff3prog.c
+++ b/usr.bin/diff3/diff3prog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff3prog.c,v 1.10 2008/02/27 18:10:05 tobias Exp $ */
+/* $OpenBSD: diff3prog.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
@@ -64,16 +64,6 @@
* @(#)diff3.c 8.1 (Berkeley) 6/6/93
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: diff3prog.c,v 1.10 2008/02/27 18:10:05 tobias Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index 8202a6b2489..ef4b9d80679 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dirname.c,v 1.11 2005/04/07 07:16:21 otto Exp $ */
+/* $OpenBSD: dirname.c,v 1.12 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: dirname.c,v 1.11 2005/04/07 07:16:21 otto Exp $";
-#endif /* not lint */
-
#include <err.h>
#include <libgen.h>
#include <locale.h>
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index e1f816b041a..bb1bdee93b2 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: du.c,v 1.21 2009/08/27 11:29:30 millert Exp $ */
+/* $OpenBSD: du.c,v 1.22 2009/10/27 23:59:37 deraadt Exp $ */
/* $NetBSD: du.c,v 1.11 1996/10/18 07:20:35 thorpej Exp $ */
/*
@@ -33,20 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95";
-#else
-static const char rcsid[] = "$OpenBSD: du.c,v 1.21 2009/08/27 11:29:30 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index b747629f90d..cce897ee7eb 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: env.c,v 1.13 2009/03/01 17:02:25 millert Exp $ */
+/* $OpenBSD: env.c,v 1.14 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "@(#)env.c 8.3 (Berkeley) 4/2/94";*/
-static char rcsid[] = "$OpenBSD: env.c,v 1.13 2009/03/01 17:02:25 millert Exp $";
-#endif /* not lint */
-
#include <err.h>
#include <errno.h>
#include <locale.h>
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 3e36855bd62..634b9e758d7 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expand.c,v 1.10 2005/12/27 19:19:55 moritz Exp $ */
+/* $OpenBSD: expand.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */
/* $NetBSD: expand.c,v 1.5 1995/09/02 06:19:46 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93";
-#endif
-static const char rcsid[] = "$OpenBSD: expand.c,v 1.10 2005/12/27 19:19:55 moritz Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c
index 8d2d78347fd..1e825b6c2a5 100644
--- a/usr.bin/file/apprentice.c
+++ b/usr.bin/file/apprentice.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apprentice.c,v 1.27 2009/08/27 16:26:42 deraadt Exp $ */
+/* $OpenBSD: apprentice.c,v 1.28 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
@@ -50,10 +50,6 @@
#endif
#include <dirent.h>
-#ifndef lint
-FILE_RCSID("@(#)$Id: apprentice.c,v 1.27 2009/08/27 16:26:42 deraadt Exp $")
-#endif /* lint */
-
#define EATAB {while (isascii((unsigned char) *l) && \
isspace((unsigned char) *l)) ++l;}
#define LOWCASE(l) (isupper((unsigned char) (l)) ? \
diff --git a/usr.bin/file/ascmagic.c b/usr.bin/file/ascmagic.c
index 7dcf0d3d99a..abb785e6aaf 100644
--- a/usr.bin/file/ascmagic.c
+++ b/usr.bin/file/ascmagic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ascmagic.c,v 1.10 2009/04/24 18:54:34 chl Exp $ */
+/* $OpenBSD: ascmagic.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
@@ -49,10 +49,6 @@
#endif
#include "names.h"
-#ifndef lint
-FILE_RCSID("@(#)$Id: ascmagic.c,v 1.10 2009/04/24 18:54:34 chl Exp $")
-#endif /* lint */
-
#define MAXLINELEN 300 /* longest sane line length */
#define ISSPC(x) ((x) == ' ' || (x) == '\t' || (x) == '\r' || (x) == '\n' \
|| (x) == 0x85 || (x) == '\f')
diff --git a/usr.bin/file/compress.c b/usr.bin/file/compress.c
index 6da92b83202..a0e04f9ac47 100644
--- a/usr.bin/file/compress.c
+++ b/usr.bin/file/compress.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compress.c,v 1.13 2009/04/24 18:54:34 chl Exp $ */
+/* $OpenBSD: compress.c,v 1.14 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
@@ -56,10 +56,6 @@
#endif
-#ifndef lint
-FILE_RCSID("@(#)$Id: compress.c,v 1.13 2009/04/24 18:54:34 chl Exp $")
-#endif
-
private const struct {
const char magic[8];
size_t maglen;
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index 692650a6c5b..02a222b4fe0 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.21 2009/10/26 21:03:55 ajacoutot Exp $ */
+/* $OpenBSD: file.c,v 1.22 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
@@ -71,10 +71,6 @@ int getopt_long(int argc, char * const *argv, const char *optstring, const struc
#include "patchlevel.h"
-#ifndef lint
-FILE_RCSID("@(#)$Id: file.c,v 1.21 2009/10/26 21:03:55 ajacoutot Exp $")
-#endif /* lint */
-
#ifdef S_IFLNK
#define SYMLINKFLAG "Lh"
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index 5cef2e7e2b3..dd191bad58e 100644
--- a/usr.bin/file/file.h
+++ b/usr.bin/file/file.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.h,v 1.21 2009/08/27 16:26:43 deraadt Exp $ */
+/* $OpenBSD: file.h,v 1.22 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
@@ -28,7 +28,7 @@
*/
/*
* file.h - definitions for file(1) program
- * @(#)$Id: file.h,v 1.21 2009/08/27 16:26:43 deraadt Exp $
+ * @(#)$Id: file.h,v 1.22 2009/10/27 23:59:37 deraadt Exp $
*/
#ifndef __file_h__
@@ -382,12 +382,4 @@ int asprintf(char **ptr, const char *format_string, ...);
#define O_BINARY 0
#endif
-#if defined(__GNUC__) && (__GNUC__ >= 3)
-static const char *rcsid(const char *) __attribute__((__used__));
-#endif
-#define FILE_RCSID(id) \
-static const char *rcsid(const char *p) { \
- return rcsid(p = id); \
-}
-
#endif /* __file_h__ */
diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c
index 74f1349d331..80ccf6e46d0 100644
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsmagic.c,v 1.13 2009/04/24 18:54:34 chl Exp $ */
+/* $OpenBSD: fsmagic.c,v 1.14 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
@@ -57,10 +57,6 @@
#endif
#undef HAVE_MAJOR
-#ifndef lint
-FILE_RCSID("@(#)$Id: fsmagic.c,v 1.13 2009/04/24 18:54:34 chl Exp $")
-#endif /* lint */
-
private int
bad_link(struct magic_set *ms, int err, char *buf)
{
diff --git a/usr.bin/file/funcs.c b/usr.bin/file/funcs.c
index 2b4f34be86c..754b110ed71 100644
--- a/usr.bin/file/funcs.c
+++ b/usr.bin/file/funcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: funcs.c,v 1.6 2009/04/24 18:54:34 chl Exp $ */
+/* $OpenBSD: funcs.c,v 1.7 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) Christos Zoulas 2003.
* All Rights Reserved.
@@ -38,10 +38,6 @@
#include <wctype.h>
#endif
-#ifndef lint
-FILE_RCSID("@(#)$Id: funcs.c,v 1.6 2009/04/24 18:54:34 chl Exp $")
-#endif /* lint */
-
/*
* Like printf, only we append to a buffer.
*/
diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c
index 8e0dc6d37c9..6d84bfccd5a 100644
--- a/usr.bin/file/is_tar.c
+++ b/usr.bin/file/is_tar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: is_tar.c,v 1.9 2009/04/24 18:54:34 chl Exp $ */
+/* $OpenBSD: is_tar.c,v 1.10 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
@@ -45,10 +45,6 @@
#include <sys/types.h>
#include "tar.h"
-#ifndef lint
-FILE_RCSID("@(#)$Id: is_tar.c,v 1.9 2009/04/24 18:54:34 chl Exp $")
-#endif
-
#define isodigit(c) ( ((c) >= '0') && ((c) <= '7') )
private int is_tar(const unsigned char *, size_t);
diff --git a/usr.bin/file/magic.c b/usr.bin/file/magic.c
index 4e821d4890e..39df3711940 100644
--- a/usr.bin/file/magic.c
+++ b/usr.bin/file/magic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: magic.c,v 1.7 2009/08/27 16:26:43 deraadt Exp $ */
+/* $OpenBSD: magic.c,v 1.8 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) Christos Zoulas 2003.
* All Rights Reserved.
@@ -64,10 +64,6 @@
#include "patchlevel.h"
-#ifndef lint
-FILE_RCSID("@(#)$Id: magic.c,v 1.7 2009/08/27 16:26:43 deraadt Exp $")
-#endif /* lint */
-
#ifndef PIPE_BUF
/* Get the PIPE_BUF from pathconf */
#ifdef _PC_PIPE_BUF
diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c
index 32dee304645..cfcddaee99e 100644
--- a/usr.bin/file/print.c
+++ b/usr.bin/file/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.15 2009/04/24 18:54:34 chl Exp $ */
+/* $OpenBSD: print.c,v 1.16 2009/10/27 23:59:37 deraadt Exp $ */
/*
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
@@ -41,10 +41,6 @@
#endif
#include <time.h>
-#ifndef lint
-FILE_RCSID("@(#)$Id: print.c,v 1.15 2009/04/24 18:54:34 chl Exp $")
-#endif /* lint */
-
#define SZOF(a) (sizeof(a) / sizeof(a[0]))
#ifndef COMPILE_ONLY
diff --git a/usr.bin/file/readelf.c b/usr.bin/file/readelf.c
index e41f217ec51..e3570ec53ca 100644
--- a/usr.bin/file/readelf.c
+++ b/usr.bin/file/readelf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readelf.c,v 1.10 2009/04/24 18:54:34 chl Exp $ */
+/* $OpenBSD: readelf.c,v 1.11 2009/10/27 23:59:38 deraadt Exp $ */
/*
* Copyright (c) Christos Zoulas 2003.
* All Rights Reserved.
@@ -38,10 +38,6 @@
#include "readelf.h"
#include "magic.h"
-#ifndef lint
-FILE_RCSID("@(#)$Id: readelf.c,v 1.10 2009/04/24 18:54:34 chl Exp $")
-#endif
-
#ifdef ELFCORE
private int dophn_core(struct magic_set *, int, int, int, off_t, int, size_t,
off_t, int *);
diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c
index 5290b613334..cde4a21f9e5 100644
--- a/usr.bin/file/softmagic.c
+++ b/usr.bin/file/softmagic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softmagic.c,v 1.14 2009/04/24 18:54:34 chl Exp $ */
+/* $OpenBSD: softmagic.c,v 1.15 2009/10/27 23:59:38 deraadt Exp $ */
/*
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
@@ -38,10 +38,6 @@
#include <time.h>
-#ifndef lint
-FILE_RCSID("@(#)$Id: softmagic.c,v 1.14 2009/04/24 18:54:34 chl Exp $")
-#endif /* lint */
-
private int match(struct magic_set *, struct magic *, uint32_t,
const unsigned char *, size_t, int);
private int mget(struct magic_set *, const unsigned char *,
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index 0f1488c0ee5..edfd7a4a52b 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: find.c,v 1.13 2007/05/10 09:00:18 jmc Exp $ */
+/* $OpenBSD: find.c,v 1.14 2009/10/27 23:59:38 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)find.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: find.c,v 1.13 2007/05/10 09:00:18 jmc Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index eea475c824b..89b0db7cc19 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: function.c,v 1.33 2009/09/16 12:06:33 millert Exp $ */
+/* $OpenBSD: function.c,v 1.34 2009/10/27 23:59:38 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)function.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: function.c,v 1.33 2009/09/16 12:06:33 millert Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ucred.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index 18ffbc11c9c..d757ba07e63 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ls.c,v 1.12 2003/07/06 22:35:59 deraadt Exp $ */
+/* $OpenBSD: ls.c,v 1.13 2009/10/27 23:59:38 deraadt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)ls.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: ls.c,v 1.12 2003/07/06 22:35:59 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 3ec0cf8e546..8c2190b98d1 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.23 2007/05/10 09:00:18 jmc Exp $ */
+/* $OpenBSD: main.c,v 1.24 2009/10/27 23:59:38 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: main.c,v 1.23 2007/05/10 09:00:18 jmc Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index 0635129f850..95bec3833b3 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.10 2003/09/26 22:22:26 tedu Exp $ */
+/* $OpenBSD: misc.c,v 1.11 2009/10/27 23:59:38 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)misc.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: misc.c,v 1.10 2003/09/26 22:22:26 tedu Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/uio.h>
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index 7abd6c3a051..2d7ace589ac 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: operator.c,v 1.9 2004/06/02 15:00:51 tom Exp $ */
+/* $OpenBSD: operator.c,v 1.10 2009/10/27 23:59:38 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)operator.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: operator.c,v 1.9 2004/06/02 15:00:51 tom Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index 697a3ec55b7..9c60c241f78 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: option.c,v 1.17 2003/07/02 21:04:10 deraadt Exp $ */
+/* $OpenBSD: option.c,v 1.18 2009/10/27 23:59:38 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)option.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: option.c,v 1.17 2003/07/02 21:04:10 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index af78432b3f8..b7e4dcde466 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: finger.c,v 1.16 2004/03/15 02:50:29 tedu Exp $ */
+/* $OpenBSD: finger.c,v 1.17 2009/10/27 23:59:38 deraadt Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -42,17 +42,6 @@
* login time is < 6 days.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)finger.c 5.22 (Berkeley) 6/29/90";*/
-static const char rcsid[] = "$OpenBSD: finger.c,v 1.16 2004/03/15 02:50:29 tedu Exp $";
-#endif /* not lint */
-
/*
* Finger prints out information about users. It is not portable since
* certain fields (e.g. the full user name, office, and phone numbers) are
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index de80f3d2825..2ea3d260335 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lprint.c,v 1.9 2005/08/23 13:43:53 espie Exp $ */
+/* $OpenBSD: lprint.c,v 1.10 2009/10/27 23:59:38 deraadt Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)lprint.c 5.13 (Berkeley) 10/31/90";*/
-static const char rcsid[] = "$OpenBSD: lprint.c,v 1.9 2005/08/23 13:43:53 espie Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 73b5e23bec2..62cac5d18fc 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: net.c,v 1.11 2006/01/23 17:29:22 millert Exp $ */
+/* $OpenBSD: net.c,v 1.12 2009/10/27 23:59:38 deraadt Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)net.c 5.5 (Berkeley) 6/1/90";*/
-static const char rcsid[] = "$OpenBSD: net.c,v 1.11 2006/01/23 17:29:22 millert Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index bf6ee98c963..7810aedc902 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sprint.c,v 1.12 2007/09/02 15:19:32 deraadt Exp $ */
+/* $OpenBSD: sprint.c,v 1.13 2009/10/27 23:59:38 deraadt Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)sprint.c 5.8 (Berkeley) 12/4/90";*/
-static const char rcsid[] = "$OpenBSD: sprint.c,v 1.12 2007/09/02 15:19:32 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <tzfile.h>
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 67bfa46b742..8cf7997a554 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.22 2005/08/23 13:43:53 espie Exp $ */
+/* $OpenBSD: util.c,v 1.23 2009/10/27 23:59:38 deraadt Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -33,11 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)util.c 5.14 (Berkeley) 1/17/91";*/
-static const char rcsid[] = "$OpenBSD: util.c,v 1.22 2005/08/23 13:43:53 espie Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/uio.h>
#include <sys/param.h>
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index 42b3574ce52..1ce6f7e05f0 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fmt.c,v 1.26 2007/03/20 03:50:39 tedu Exp $ */
+/* $OpenBSD: fmt.c,v 1.27 2009/10/27 23:59:38 deraadt Exp $ */
/* Sensible version of fmt
*
@@ -168,13 +168,6 @@
* Initial revision
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: fmt.c,v 1.26 2007/03/20 03:50:39 tedu Exp $";
-static const char copyright[] =
- "Copyright (c) 1997 Gareth McCaughan. All rights reserved.\n";
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <locale.h>
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 50d8babc2c3..822aa4e786e 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fold.c,v 1.11 2007/04/07 23:20:18 tedu Exp $ */
+/* $OpenBSD: fold.c,v 1.12 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: fold.c,v 1.6 1995/09/01 01:42:44 jtc Exp $ */
/*-
@@ -33,19 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)fold.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: fold.c,v 1.11 2007/04/07 23:20:18 tedu Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 5310d6333f7..b31dec53f79 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: from.c,v 1.13 2007/02/20 13:52:22 jmc Exp $ */
+/* $OpenBSD: from.c,v 1.14 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: from.c,v 1.6 1995/09/01 01:39:10 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)from.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: from.c,v 1.13 2007/02/20 13:52:22 jmc Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
#include <pwd.h>
diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c
index 9c20ee1c157..8a41fda22d7 100644
--- a/usr.bin/fsplit/fsplit.c
+++ b/usr.bin/fsplit/fsplit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsplit.c,v 1.17 2008/11/01 22:39:04 sobrado Exp $ */
+/* $OpenBSD: fsplit.c,v 1.18 2009/10/27 23:59:38 deraadt Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -32,17 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)fsplit.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: fsplit.c,v 1.17 2008/11/01 22:39:04 sobrado Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 9a41950ea9e..f87ae1d0e71 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fstat.c,v 1.69 2009/07/12 21:33:30 nicm Exp $ */
+/* $OpenBSD: fstat.c,v 1.70 2009/10/27 23:59:38 deraadt Exp $ */
/*
* Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -45,17 +45,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static const char sccsid[] = "from: @(#)fstat.c 8.1 (Berkeley) 6/6/93";*/
-static const char rcsid[] = "$OpenBSD: fstat.c,v 1.69 2009/07/12 21:33:30 nicm Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/mount.h>
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c
index 823c8cd73cc..f2fa6f50286 100644
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gencat.c,v 1.12 2009/01/04 18:42:32 sobrado Exp $ */
+/* $OpenBSD: gencat.c,v 1.13 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: gencat.c,v 1.9 1998/10/09 17:00:56 itohy Exp $ */
/*-
@@ -31,10 +31,6 @@
*/
#include <sys/cdefs.h>
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: gencat.c,v 1.12 2009/01/04 18:42:32 sobrado Exp $";
-#endif /* not lint */
/***********************************************************
Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
diff --git a/usr.bin/getcap/getcap.c b/usr.bin/getcap/getcap.c
index 562aa6f75e5..7fb81159a7d 100644
--- a/usr.bin/getcap/getcap.c
+++ b/usr.bin/getcap/getcap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getcap.c,v 1.2 2006/01/28 22:35:54 millert Exp $ */
+/* $OpenBSD: getcap.c,v 1.3 2009/10/27 23:59:38 deraadt Exp $ */
/*
* Copyright (c) 2005 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: getcap.c,v 1.2 2006/01/28 22:35:54 millert Exp $";
-#endif /* not lint */
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c
index 451ecb7dd9f..8df444694f3 100644
--- a/usr.bin/getconf/getconf.c
+++ b/usr.bin/getconf/getconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getconf.c,v 1.11 2008/11/08 01:29:10 chl Exp $ */
+/* $OpenBSD: getconf.c,v 1.12 2009/10/27 23:59:38 deraadt Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -40,10 +40,6 @@
* J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: getconf.c,v 1.11 2008/11/08 01:29:10 chl Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c
index be708200093..f0c3869181f 100644
--- a/usr.bin/getopt/getopt.c
+++ b/usr.bin/getopt/getopt.c
@@ -1,14 +1,10 @@
-/* $OpenBSD: getopt.c,v 1.7 2006/06/07 07:33:23 jmc Exp $ */
+/* $OpenBSD: getopt.c,v 1.8 2009/10/27 23:59:38 deraadt Exp $ */
/*
* This material, written by Henry Spencer, was released by him
* into the public domain and is thus not subject to any copyright.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: getopt.c,v 1.7 2006/06/07 07:33:23 jmc Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index 1b91dbd22de..824e99a8725 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arcs.c,v 1.11 2007/11/26 09:28:34 martynas Exp $ */
+/* $OpenBSD: arcs.c,v 1.12 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: arcs.c,v 1.6 1995/04/19 07:15:52 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)arcs.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: arcs.c,v 1.11 2007/11/26 09:28:34 martynas Exp $";
-#endif
-#endif /* not lint */
-
#include "gprof.h"
#ifdef DEBUG
diff --git a/usr.bin/gprof/arm.c b/usr.bin/gprof/arm.c
index 94877e642c6..8a359ff47e8 100644
--- a/usr.bin/gprof/arm.c
+++ b/usr.bin/gprof/arm.c
@@ -1,10 +1,6 @@
-/* $OpenBSD: arm.c,v 1.2 2006/03/25 19:06:35 espie Exp $ */
+/* $OpenBSD: arm.c,v 1.3 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: arm32.c,v 1.1 1996/04/01 21:51:22 mark Exp $ */
-#ifndef lint
-static char rcsid[] = "$OpenBSD: arm.c,v 1.2 2006/03/25 19:06:35 espie Exp $";
-#endif /* not lint */
-
#include "gprof.h"
/*
diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c
index 7747ea350bb..8651f151726 100644
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dfn.c,v 1.6 2006/03/25 19:06:35 espie Exp $ */
+/* $OpenBSD: dfn.c,v 1.7 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: dfn.c,v 1.5 1995/04/19 07:15:56 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dfn.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: dfn.c,v 1.6 2006/03/25 19:06:35 espie Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "gprof.h"
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index f6edc1f965f..d3abfad9c72 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gprof.c,v 1.18 2008/06/25 15:09:32 deraadt Exp $ */
+/* $OpenBSD: gprof.c,v 1.19 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: gprof.c,v 1.8 1995/04/19 07:15:59 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)gprof.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: gprof.c,v 1.18 2008/06/25 15:09:32 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "gprof.h"
int valcmp(const void *, const void *);
diff --git a/usr.bin/gprof/i386.c b/usr.bin/gprof/i386.c
index ea2c2228746..f2d753fc123 100644
--- a/usr.bin/gprof/i386.c
+++ b/usr.bin/gprof/i386.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i386.c,v 1.9 2006/03/25 19:06:36 espie Exp $ */
+/* $OpenBSD: i386.c,v 1.10 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: i386.c,v 1.5 1995/04/19 07:16:04 cgd Exp $ */
/*-
@@ -26,10 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: i386.c,v 1.9 2006/03/25 19:06:36 espie Exp $";
-#endif /* not lint */
-
#include "gprof.h"
#define iscall(off) ((*(u_char *)&textspace[off]) == 0xE8)
diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index 3051604a8f4..af77a615c71 100644
--- a/usr.bin/gprof/lookup.c
+++ b/usr.bin/gprof/lookup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lookup.c,v 1.7 2006/03/25 19:06:36 espie Exp $ */
+/* $OpenBSD: lookup.c,v 1.8 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: lookup.c,v 1.5 1995/04/19 07:16:06 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lookup.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: lookup.c,v 1.7 2006/03/25 19:06:36 espie Exp $";
-#endif
-#endif /* not lint */
-
#include "gprof.h"
/*
diff --git a/usr.bin/gprof/m68k.c b/usr.bin/gprof/m68k.c
index c692b35fff3..a69a5aa8cca 100644
--- a/usr.bin/gprof/m68k.c
+++ b/usr.bin/gprof/m68k.c
@@ -1,10 +1,6 @@
-/* $OpenBSD: m68k.c,v 1.4 2006/03/25 19:06:36 espie Exp $ */
+/* $OpenBSD: m68k.c,v 1.5 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: m68k.c,v 1.4 1995/04/19 07:16:07 cgd Exp $ */
-#ifndef lint
-static char rcsid[] = "$OpenBSD: m68k.c,v 1.4 2006/03/25 19:06:36 espie Exp $";
-#endif /* not lint */
-
#include "gprof.h"
/*
diff --git a/usr.bin/gprof/m88k.c b/usr.bin/gprof/m88k.c
index 23d7c1bcdbe..7734a3f6f74 100644
--- a/usr.bin/gprof/m88k.c
+++ b/usr.bin/gprof/m88k.c
@@ -1,10 +1,6 @@
-/* $OpenBSD: m88k.c,v 1.3 2006/03/25 19:06:36 espie Exp $ */
+/* $OpenBSD: m88k.c,v 1.4 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: m88k.c,v 1.4 1995/04/19 07:16:07 cgd Exp $ */
-#ifndef lint
-static char rcsid[] = "$OpenBSD: m88k.c,v 1.3 2006/03/25 19:06:36 espie Exp $";
-#endif /* not lint */
-
#include "gprof.h"
/*
diff --git a/usr.bin/gprof/mips64.c b/usr.bin/gprof/mips64.c
index ef89fee9b2c..fe481026af7 100644
--- a/usr.bin/gprof/mips64.c
+++ b/usr.bin/gprof/mips64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mips64.c,v 1.2 2006/03/25 19:06:36 espie Exp $ */
+/* $OpenBSD: mips64.c,v 1.3 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: mips.c,v 1.4 1995/04/19 07:16:11 cgd Exp $ */
/*
@@ -36,14 +36,6 @@
* From: sparc.c 5.1 (Berkeley) 7/7/92
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mips.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: mips64.c,v 1.2 2006/03/25 19:06:36 espie Exp $";
-#endif
-#endif /* not lint */
-
#include "gprof.h"
/*
diff --git a/usr.bin/gprof/ns32k.c b/usr.bin/gprof/ns32k.c
index 5c766776e84..ef55d369c8d 100644
--- a/usr.bin/gprof/ns32k.c
+++ b/usr.bin/gprof/ns32k.c
@@ -1,10 +1,6 @@
-/* $OpenBSD: ns32k.c,v 1.4 2006/03/25 19:06:36 espie Exp $ */
+/* $OpenBSD: ns32k.c,v 1.5 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: ns32k.c,v 1.3 1995/04/19 07:16:13 cgd Exp $ */
-#ifndef lint
-static char rcsid[] = "$OpenBSD: ns32k.c,v 1.4 2006/03/25 19:06:36 espie Exp $";
-#endif /* not lint */
-
#include "gprof.h"
/*
diff --git a/usr.bin/gprof/pmax.c b/usr.bin/gprof/pmax.c
index 6b64094270d..7fcea1b94b0 100644
--- a/usr.bin/gprof/pmax.c
+++ b/usr.bin/gprof/pmax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmax.c,v 1.6 2006/03/25 19:06:36 espie Exp $ */
+/* $OpenBSD: pmax.c,v 1.7 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: pmax.c,v 1.3 1995/04/19 07:16:18 cgd Exp $ */
/*
@@ -36,14 +36,6 @@
* From: sparc.c 5.1 (Berkeley) 7/7/92
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mips.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: pmax.c,v 1.6 2006/03/25 19:06:36 espie Exp $";
-#endif
-#endif /* not lint */
-
#include "gprof.h"
/*
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 35cfa7abe9e..8a0f820639c 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printgprof.c,v 1.11 2006/03/25 19:06:36 espie Exp $ */
+/* $OpenBSD: printgprof.c,v 1.12 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: printgprof.c,v 1.5 1995/04/19 07:16:21 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)printgprof.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: printgprof.c,v 1.11 2006/03/25 19:06:36 espie Exp $";
-#endif
-#endif /* not lint */
-
#include <string.h>
#include "gprof.h"
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index c4d408e4afa..534200809c3 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printlist.c,v 1.6 2006/03/25 19:06:36 espie Exp $ */
+/* $OpenBSD: printlist.c,v 1.7 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: printlist.c,v 1.5 1995/04/19 07:16:23 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)printlist.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: printlist.c,v 1.6 2006/03/25 19:06:36 espie Exp $";
-#endif
-#endif /* not lint */
-
#include <string.h>
#include "gprof.h"
diff --git a/usr.bin/gprof/sh.c b/usr.bin/gprof/sh.c
index 99564829916..85beb8c19af 100644
--- a/usr.bin/gprof/sh.c
+++ b/usr.bin/gprof/sh.c
@@ -1,8 +1,4 @@
-/* $OpenBSD: sh.c,v 1.1 2006/10/11 13:34:18 drahn Exp $ */
-
-#ifndef lint
-static char rcsid[] = "$OpenBSD: sh.c,v 1.1 2006/10/11 13:34:18 drahn Exp $";
-#endif /* not lint */
+/* $OpenBSD: sh.c,v 1.2 2009/10/27 23:59:38 deraadt Exp $ */
#include "gprof.h"
diff --git a/usr.bin/gprof/sparc.c b/usr.bin/gprof/sparc.c
index 43f555a2235..e6caafe8db2 100644
--- a/usr.bin/gprof/sparc.c
+++ b/usr.bin/gprof/sparc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sparc.c,v 1.6 2006/03/25 19:06:36 espie Exp $ */
+/* $OpenBSD: sparc.c,v 1.7 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: sparc.c,v 1.4 1995/04/19 07:16:24 cgd Exp $ */
/*
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)sparc.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: sparc.c,v 1.6 2006/03/25 19:06:36 espie Exp $";
-#endif
-#endif /* not lint */
-
#include "gprof.h"
/*
diff --git a/usr.bin/gprof/tahoe.c b/usr.bin/gprof/tahoe.c
index f34994b70aa..69f3b7fdd91 100644
--- a/usr.bin/gprof/tahoe.c
+++ b/usr.bin/gprof/tahoe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tahoe.c,v 1.6 2006/03/25 19:06:36 espie Exp $ */
+/* $OpenBSD: tahoe.c,v 1.7 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: tahoe.c,v 1.5 1995/04/19 07:16:27 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tahoe.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: tahoe.c,v 1.6 2006/03/25 19:06:36 espie Exp $";
-#endif
-#endif /* not lint */
-
#include "gprof.h"
/*
diff --git a/usr.bin/gprof/vax.c b/usr.bin/gprof/vax.c
index 21e232ac61d..2aff0f836d4 100644
--- a/usr.bin/gprof/vax.c
+++ b/usr.bin/gprof/vax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vax.c,v 1.7 2006/03/25 19:06:36 espie Exp $ */
+/* $OpenBSD: vax.c,v 1.8 2009/10/27 23:59:38 deraadt Exp $ */
/* $NetBSD: vax.c,v 1.6 1996/04/20 14:56:37 ragge Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)vax.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: vax.c,v 1.7 2006/03/25 19:06:36 espie Exp $";
-#endif
-#endif /* not lint */
-
#include "gprof.h"
/*
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index 3a6ca123803..994c6902d60 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: head.c,v 1.14 2007/10/31 16:29:50 jmc Exp $ */
+/* $OpenBSD: head.c,v 1.15 2009/10/27 23:59:38 deraadt Exp $ */
/*
* Copyright (c) 1980, 1987 Regents of the University of California.
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1987 Regents of the University of California.\n\
- All rights reserved.\n";
-/*static char sccsid[] = "from: @(#)head.c 5.5 (Berkeley) 6/1/90";*/
-static const char rcsid[] = "$OpenBSD: head.c,v 1.14 2007/10/31 16:29:50 jmc Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
index 694fdbcc131..1d658cc9b8a 100644
--- a/usr.bin/hexdump/conv.c
+++ b/usr.bin/hexdump/conv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conv.c,v 1.7 2003/06/12 20:58:09 deraadt Exp $ */
+/* $OpenBSD: conv.c,v 1.8 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: conv.c,v 1.7 2001/12/07 15:14:29 bjh21 Exp $ */
/*
@@ -30,11 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)conv.c 5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: conv.c,v 1.7 2003/06/12 20:58:09 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index 02e98fe59a1..75136f1185c 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: display.c,v 1.17 2007/01/28 16:36:17 miod Exp $ */
+/* $OpenBSD: display.c,v 1.18 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: display.c,v 1.12 2001/12/07 15:14:29 bjh21 Exp $ */
/*
@@ -30,11 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)display.c 5.11 (Berkeley) 3/9/91";*/
-static char rcsid[] = "$OpenBSD: display.c,v 1.17 2007/01/28 16:36:17 miod Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index 18cc3f7e507..5a50100f987 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hexdump.c,v 1.12 2007/01/28 16:37:09 miod Exp $ */
+/* $OpenBSD: hexdump.c,v 1.13 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: hexdump.c,v 1.7 1997/10/19 02:34:06 lukem Exp $ */
/*
@@ -30,17 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)hexdump.c 5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: hexdump.c,v 1.12 2007/01/28 16:37:09 miod Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index fd92be118f6..71ac1f77618 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hexsyntax.c,v 1.10 2007/02/06 20:22:19 jmc Exp $ */
+/* $OpenBSD: hexsyntax.c,v 1.11 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: hexsyntax.c,v 1.8 1998/04/08 23:48:57 jeremy Exp $ */
/*-
@@ -30,11 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)hexsyntax.c 5.2 (Berkeley) 5/8/90";*/
-static char rcsid[] = "$OpenBSD: hexsyntax.c,v 1.10 2007/02/06 20:22:19 jmc Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 21b5354cbed..0424b5aaa33 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: odsyntax.c,v 1.16 2007/02/06 20:55:13 jmc Exp $ */
+/* $OpenBSD: odsyntax.c,v 1.17 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: odsyntax.c,v 1.15 2001/12/07 15:14:29 bjh21 Exp $ */
/*-
@@ -30,11 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)odsyntax.c 5.4 (Berkeley) 3/8/91";*/
-static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.16 2007/02/06 20:55:13 jmc Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index e64c78cd56f..9256a42ac62 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.c,v 1.16 2007/03/20 03:50:39 tedu Exp $ */
+/* $OpenBSD: parse.c,v 1.17 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: parse.c,v 1.12 2001/12/07 13:37:39 bjh21 Exp $ */
/*
@@ -30,11 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)parse.c 5.6 (Berkeley) 3/9/91";*/
-static char rcsid[] = "$OpenBSD: parse.c,v 1.16 2007/03/20 03:50:39 tedu Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/file.h>
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index ec692799970..690a1e0f0a6 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: id.c,v 1.18 2009/10/12 17:39:26 sobrado Exp $ */
+/* $OpenBSD: id.c,v 1.19 2009/10/27 23:59:39 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "@(#)id.c 8.3 (Berkeley) 4/28/95";*/
-static char rcsid[] = "$OpenBSD: id.c,v 1.18 2009/10/12 17:39:26 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <errno.h>
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 292c3c9bf12..845a22fad07 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: args.c,v 1.14 2004/07/20 03:50:26 deraadt Exp $ */
+/* $OpenBSD: args.c,v 1.15 2009/10/27 23:59:39 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)args.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: args.c,v 1.14 2004/07/20 03:50:26 deraadt Exp $";
-#endif /* not lint */
-
/*
* Argument scanning and profile reading code. Default parameters are set
* here as well.
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index de972197758..2839a2c00dd 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: indent.c,v 1.19 2009/05/29 09:07:29 sobrado Exp $ */
+/* $OpenBSD: indent.c,v 1.20 2009/10/27 23:59:39 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -32,20 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1985 Sun Microsystems, Inc.\n\
- @(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California.\n\
- @(#) Copyright (c) 1976 Board of Trustees of the University of Illinois.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "@(#)indent.c 5.17 (Berkeley) 6/7/93";*/
-static char rcsid[] = "$OpenBSD: indent.c,v 1.19 2009/05/29 09:07:29 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index cea03237ccb..ec283086703 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.10 2005/05/15 03:27:04 millert Exp $ */
+/* $OpenBSD: io.c,v 1.11 2009/10/27 23:59:39 deraadt Exp $ */
/*
* Copyright (c) 1985 Sun Microsystems, Inc.
@@ -31,11 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: io.c,v 1.10 2005/05/15 03:27:04 millert Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c
index 4f05963acd9..19422d17cf9 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lexi.c,v 1.14 2007/11/27 16:22:14 martynas Exp $ */
+/* $OpenBSD: lexi.c,v 1.15 2009/10/27 23:59:39 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)lexi.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: lexi.c,v 1.14 2007/11/27 16:22:14 martynas Exp $";
-#endif /* not lint */
-
/*
* Here we have the token scanner for indent. It scans off one token and puts
* it in the global variable "token". It returns a code, indicating the type
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index 3121f7f8519..a55dcf791dc 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.c,v 1.8 2004/07/20 03:50:26 deraadt Exp $ */
+/* $OpenBSD: parse.c,v 1.9 2009/10/27 23:59:39 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: parse.c,v 1.8 2004/07/20 03:50:26 deraadt Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include "indent_globs.h"
#include "indent_codes.h"
diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c
index d4964d1f0ad..233d410f4c3 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pr_comment.c,v 1.6 2004/07/20 03:50:26 deraadt Exp $ */
+/* $OpenBSD: pr_comment.c,v 1.7 2009/10/27 23:59:39 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)pr_comment.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: pr_comment.c,v 1.6 2004/07/20 03:50:26 deraadt Exp $";
-#endif /* not lint */
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 9c10b733007..d4b5ed89e4d 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: join.c,v 1.20 2007/05/29 18:29:26 jmc Exp $ */
+/* $OpenBSD: join.c,v 1.21 2009/10/27 23:59:39 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -33,17 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "@(#)join.c 8.6 (Berkeley) 5/4/95"; */
-static const char rcsid[] = "$OpenBSD: join.c,v 1.20 2007/05/29 18:29:26 jmc Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 81125aed2b5..cbff0f96830 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: jot.c,v 1.19 2007/05/01 01:26:30 jdixon Exp $ */
+/* $OpenBSD: jot.c,v 1.20 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: jot.c,v 1.3 1994/12/02 20:29:43 pk Exp $ */
/*-
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)jot.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: jot.c,v 1.19 2007/05/01 01:26:30 jdixon Exp $";
-#endif /* not lint */
-
/*
* jot - print sequential or random data
*
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 95618efaca2..1ee604eb278 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kdump.c,v 1.40 2009/10/21 15:08:23 sobrado Exp $ */
+/* $OpenBSD: kdump.c,v 1.41 2009/10/27 23:59:39 deraadt Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -29,19 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
-#endif
-static const char rcsid[] = "$OpenBSD: kdump.c,v 1.40 2009/10/21 15:08:23 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/uio.h>
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 8585240b597..4ec34c6ff2e 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ktrace.c,v 1.21 2009/02/23 01:41:14 tedu Exp $ */
+/* $OpenBSD: ktrace.c,v 1.22 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: ktrace.c,v 1.4 1995/08/31 23:01:44 jtc Exp $ */
/*-
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ktrace.c 8.2 (Berkeley) 4/28/95";
-#endif
-static char *rcsid = "$OpenBSD: ktrace.c,v 1.21 2009/02/23 01:41:14 tedu Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index fba8d95a312..2702c4ccd76 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr.c,v 1.5 2003/06/03 02:56:09 millert Exp $ */
+/* $OpenBSD: subr.c,v 1.6 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: subr.c,v 1.6 1995/08/31 23:01:45 jtc Exp $ */
/*-
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)subr.c 8.2 (Berkeley) 4/28/95";
-#endif
-static char *rcsid = "$OpenBSD: subr.c,v 1.5 2003/06/03 02:56:09 millert Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/user.h>
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 7b59ed8604c..3e5c8df75c0 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lam.c,v 1.13 2007/06/26 05:14:52 ray Exp $ */
+/* $OpenBSD: lam.c,v 1.14 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: lam.c,v 1.2 1994/11/14 20:27:42 jtc Exp $ */
/*-
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)lam.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: lam.c,v 1.13 2007/06/26 05:14:52 ray Exp $";
-#endif /* not lint */
-
/*
* lam - laminate files
* Author: John Kunze, UCB
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index d8aff1877ac..46e27f642dc 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: last.c,v 1.35 2009/05/01 10:38:17 chl Exp $ */
+/* $OpenBSD: last.c,v 1.36 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: last.c,v 1.6 1994/12/24 16:49:02 cgd Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)last.c 8.2 (Berkeley) 4/2/94";
-#endif
-static char rcsid[] = "$OpenBSD: last.c,v 1.35 2009/05/01 10:38:17 chl Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 210b0395346..0b46389a6cb 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lastcomm.c,v 1.16 2007/07/16 18:43:05 jmc Exp $ */
+/* $OpenBSD: lastcomm.c,v 1.17 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: lastcomm.c,v 1.9 1995/10/22 01:43:42 ghudson Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lastcomm.c 8.2 (Berkeley) 4/29/95";
-#endif
-static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.16 2007/07/16 18:43:05 jmc Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/acct.h>
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index 4a7e5213178..133d43e81e3 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: leave.c,v 1.11 2004/02/02 09:36:12 otto Exp $ */
+/* $OpenBSD: leave.c,v 1.12 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: leave.c,v 1.4 1995/07/03 16:50:13 phil Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)leave.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: leave.c,v 1.11 2004/02/02 09:36:12 otto Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <ctype.h>
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index 111ba6963c3..747c25845be 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.10 2004/02/03 21:20:17 espie Exp $ */
+/* $OpenBSD: main.c,v 1.11 2009/10/27 23:59:39 deraadt Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -33,13 +33,7 @@
* PURPOSE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/main.c,v 1.10 2004/02/03 21:20:17 espie Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/main.c,v 1.11 2009/10/27 23:59:39 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 8d5a62696fc..48d5db2836c 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -1,5 +1,5 @@
/*
- * $OpenBSD: locate.bigram.c,v 1.11 2007/03/18 20:13:49 otto Exp $
+ * $OpenBSD: locate.bigram.c,v 1.12 2009/10/27 23:59:39 deraadt Exp $
*
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
@@ -32,23 +32,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: locate.bigram.c,v 1.11 2007/03/18 20:13:49 otto Exp $
+ * $Id: locate.bigram.c,v 1.12 2009/10/27 23:59:39 deraadt Exp $
*/
-#ifndef lint
-#if 0
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#else
-static char rcsid[] = "$OpenBSD: locate.bigram.c,v 1.11 2007/03/18 20:13:49 otto Exp $";
-#endif
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)locate.bigram.c 8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
/*
* bigram < sorted_file_names | sort -nr |
* awk 'NR <= 128 { printf $2 }' > bigrams
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index fe6d980d0d8..b2f59ef4f95 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -1,5 +1,5 @@
/*
- * $OpenBSD: locate.code.c,v 1.15 2007/03/18 20:13:49 otto Exp $
+ * $OpenBSD: locate.code.c,v 1.16 2009/10/27 23:59:39 deraadt Exp $
*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,23 +31,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: locate.code.c,v 1.15 2007/03/18 20:13:49 otto Exp $
+ * $Id: locate.code.c,v 1.16 2009/10/27 23:59:39 deraadt Exp $
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)locate.code.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: locate.code.c,v 1.15 2007/03/18 20:13:49 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* PURPOSE: sorted list compressor (works with a modified 'find'
* to encode/decode a filename database)
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index e5e214ef002..fade0a4c842 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -1,5 +1,5 @@
/*
- * $OpenBSD: locate.c,v 1.23 2009/06/04 07:19:45 espie Exp $
+ * $OpenBSD: locate.c,v 1.24 2009/10/27 23:59:39 deraadt Exp $
*
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
@@ -32,24 +32,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: locate.c,v 1.23 2009/06/04 07:19:45 espie Exp $
+ * $Id: locate.c,v 1.24 2009/10/27 23:59:39 deraadt Exp $
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1995-1996 Wolfram Schneider, Berlin.\n\
-@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)locate.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: locate.c,v 1.23 2009/06/04 07:19:45 espie Exp $";
-#endif
-#endif /* not lint */
-
/*
* Ref: Usenix ;login:, Vol 8, No 1, February/March, 1983, p. 8.
*
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index b9225520748..0de41b0a3c7 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock.c,v 1.24 2009/09/18 20:58:35 martynas Exp $ */
+/* $OpenBSD: lock.c,v 1.25 2009/10/27 23:59:39 deraadt Exp $ */
/* $NetBSD: lock.c,v 1.8 1996/05/07 18:32:31 jtc Exp $ */
/*
@@ -33,19 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lock.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: lock.c,v 1.24 2009/09/18 20:58:35 martynas Exp $";
-#endif /* not lint */
-
/*
* Lock a terminal up until the given key is entered, until the root
* password is entered, or the given interval times out.
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index a04036ca560..c26b588393c 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: logger.c,v 1.10 2007/04/09 13:54:12 jmc Exp $ */
+/* $OpenBSD: logger.c,v 1.11 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: logger.c,v 1.4 1994/12/22 06:27:00 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)logger.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: logger.c,v 1.10 2007/04/09 13:54:12 jmc Exp $";
-#endif /* not lint */
-
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/usr.bin/login/failedlogin.c b/usr.bin/login/failedlogin.c
index 9795fd855af..bfd9a328d2f 100644
--- a/usr.bin/login/failedlogin.c
+++ b/usr.bin/login/failedlogin.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: failedlogin.c,v 1.14 2003/06/17 21:56:25 millert Exp $ */
+/* $OpenBSD: failedlogin.c,v 1.15 2009/10/27 23:59:40 deraadt Exp $ */
/*
* Copyright (c) 1996 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: failedlogin.c,v 1.14 2003/06/17 21:56:25 millert Exp $";
-#endif /* not lint */
-
/*
* failedlogin.c
* Log to failedlogin file and read from it, reporting the number of
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 06b1051641b..fe58fd82c97 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login.c,v 1.60 2009/09/05 14:04:38 tobias Exp $ */
+/* $OpenBSD: login.c,v 1.61 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $ */
/*-
@@ -63,19 +63,6 @@
* BSDI $From: login.c,v 2.28 1999/09/08 22:35:36 prb Exp $
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94";
-#endif
-static const char rcsid[] = "$OpenBSD: login.c,v 1.60 2009/09/05 14:04:38 tobias Exp $";
-#endif /* not lint */
-
/*
* login [ name ]
* login -h hostname (for telnetd, etc.)
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index 6f3052e34f7..3c87132c523 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: logname.c,v 1.6 2003/06/10 22:20:47 deraadt Exp $ */
+/* $OpenBSD: logname.c,v 1.7 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: logname.c,v 1.6 1994/12/22 06:39:32 jtc Exp $ */
/*-
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)logname.c 8.2 (Berkeley) 4/3/94";
-#endif
-static char rcsid[] = "$OpenBSD: logname.c,v 1.6 2003/06/10 22:20:47 deraadt Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <locale.h>
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index 9b5cf999576..cfce46f8e59 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: look.c,v 1.12 2009/06/17 10:42:08 sobrado Exp $ */
+/* $OpenBSD: look.c,v 1.13 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: look.c,v 1.7 1995/08/31 22:41:02 jtc Exp $ */
/*-
@@ -33,19 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)look.c 8.2 (Berkeley) 5/4/95";
-#endif
-static char rcsid[] = "$OpenBSD: look.c,v 1.12 2009/06/17 10:42:08 sobrado Exp $";
-#endif /* not lint */
-
/*
* look -- find lines in a sorted list.
*
diff --git a/usr.bin/mail/aux.c b/usr.bin/mail/aux.c
index 15dbb297c79..c401defd4c5 100644
--- a/usr.bin/mail/aux.c
+++ b/usr.bin/mail/aux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aux.c,v 1.24 2008/07/16 14:53:41 martynas Exp $ */
+/* $OpenBSD: aux.c,v 1.25 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: aux.c,v 1.5 1997/05/13 06:15:52 mikel Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)aux.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: aux.c,v 1.24 2008/07/16 14:53:41 martynas Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 87a633e0075..c9a411330b1 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd1.c,v 1.27 2008/07/15 19:13:25 martynas Exp $ */
+/* $OpenBSD: cmd1.c,v 1.28 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: cmd1.c,v 1.9 1997/07/09 05:29:48 mikel Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)cmd1.c 8.2 (Berkeley) 4/20/95";
-#else
-static const char rcsid[] = "$OpenBSD: cmd1.c,v 1.27 2008/07/15 19:13:25 martynas Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index 1637ea475ae..eb2c921440a 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd2.c,v 1.16 2009/07/28 16:05:04 martynas Exp $ */
+/* $OpenBSD: cmd2.c,v 1.17 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: cmd2.c,v 1.7 1997/05/17 19:55:10 pk Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: cmd2.c,v 1.16 2009/07/28 16:05:04 martynas Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include <sys/wait.h>
#include "extern.h"
diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c
index b758f082f04..bce23b10939 100644
--- a/usr.bin/mail/cmd3.c
+++ b/usr.bin/mail/cmd3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd3.c,v 1.23 2009/09/05 10:49:45 tobias Exp $ */
+/* $OpenBSD: cmd3.c,v 1.24 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: cmd3.c,v 1.8 1997/07/09 05:29:49 mikel Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)cmd3.c 8.2 (Berkeley) 4/20/95";
-#else
-static const char rcsid[] = "$OpenBSD: cmd3.c,v 1.23 2009/09/05 10:49:45 tobias Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index 9f2b8f13838..83e2b9ec23a 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmdtab.c,v 1.12 2009/07/28 16:05:04 martynas Exp $ */
+/* $OpenBSD: cmdtab.c,v 1.13 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: cmdtab.c,v 1.7 1996/12/28 07:10:59 tls Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)cmdtab.c 8.2 (Berkeley) 4/20/95";
-#else
-static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.12 2009/07/28 16:05:04 martynas Exp $";
-#endif
-#endif /* not lint */
-
#include "def.h"
#include "extern.h"
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index 04be18e3a53..63672bce745 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: collect.c,v 1.31 2009/07/28 16:05:04 martynas Exp $ */
+/* $OpenBSD: collect.c,v 1.32 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: collect.c,v 1.9 1997/07/09 05:25:45 mikel Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94";
-#else
-static const char rcsid[] = "$OpenBSD: collect.c,v 1.31 2009/07/28 16:05:04 martynas Exp $";
-#endif
-#endif /* not lint */
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index 5988db07729..cf14a37e81e 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: edit.c,v 1.18 2008/07/16 14:49:09 martynas Exp $ */
+/* $OpenBSD: edit.c,v 1.19 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: edit.c,v 1.5 1996/06/08 19:48:20 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)edit.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: edit.c,v 1.18 2008/07/16 14:49:09 martynas Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index 524766e9085..2de727cb0d3 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fio.c,v 1.31 2008/07/16 14:49:09 martynas Exp $ */
+/* $OpenBSD: fio.c,v 1.32 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: fio.c,v 1.8 1997/07/07 22:57:55 phil Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)fio.c 8.2 (Berkeley) 4/20/95";
-#else
-static const char rcsid[] = "$OpenBSD: fio.c,v 1.31 2008/07/16 14:49:09 martynas Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include <sys/file.h>
#include <sys/wait.h>
diff --git a/usr.bin/mail/getname.c b/usr.bin/mail/getname.c
index 6289c4a0c2e..61045d9dc44 100644
--- a/usr.bin/mail/getname.c
+++ b/usr.bin/mail/getname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getname.c,v 1.7 2003/06/03 02:56:11 millert Exp $ */
+/* $OpenBSD: getname.c,v 1.8 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: getname.c,v 1.4 1996/06/08 19:48:23 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)getname.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: getname.c,v 1.7 2003/06/03 02:56:11 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include <pwd.h>
#include "extern.h"
diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c
index 0bd9b48d475..97fefc23f04 100644
--- a/usr.bin/mail/head.c
+++ b/usr.bin/mail/head.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: head.c,v 1.10 2008/07/16 14:53:41 martynas Exp $ */
+/* $OpenBSD: head.c,v 1.11 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: head.c,v 1.6 1996/12/28 07:11:03 tls Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)head.c 8.2 (Berkeley) 4/20/95";
-#else
-static const char rcsid[] = "$OpenBSD: head.c,v 1.10 2008/07/16 14:53:41 martynas Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index 9062840857c..712d79df5b5 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lex.c,v 1.32 2004/05/10 15:25:51 deraadt Exp $ */
+/* $OpenBSD: lex.c,v 1.33 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: lex.c,v 1.10 1997/05/17 19:55:13 pk Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95";
-#else
-static const char rcsid[] = "$OpenBSD: lex.c,v 1.32 2004/05/10 15:25:51 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index d04bcef54d2..cfdb17e4dfa 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: list.c,v 1.17 2008/07/15 19:23:26 martynas Exp $ */
+/* $OpenBSD: list.c,v 1.18 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: list.c,v 1.7 1997/07/09 05:23:36 mikel Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)list.c 8.4 (Berkeley) 5/1/95";
-#else
-static const char rcsid[] = "$OpenBSD: list.c,v 1.17 2008/07/15 19:23:26 martynas Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include <ctype.h>
#include "extern.h"
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index 1fb59709d0d..16e0c8090f1 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.22 2008/10/09 06:48:11 jmc Exp $ */
+/* $OpenBSD: main.c,v 1.23 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: main.c,v 1.7 1997/05/13 06:15:57 mikel Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/20/95";
-#else
-static const char rcsid[] = "$OpenBSD: main.c,v 1.22 2008/10/09 06:48:11 jmc Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include <fcntl.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c
index 7b66a7ea705..e4f9caeafe2 100644
--- a/usr.bin/mail/names.c
+++ b/usr.bin/mail/names.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: names.c,v 1.17 2003/06/03 02:56:11 millert Exp $ */
+/* $OpenBSD: names.c,v 1.18 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: names.c,v 1.5 1996/06/08 19:48:32 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)names.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: names.c,v 1.17 2003/06/03 02:56:11 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index ed6bda6cb54..ce4fb118e11 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: popen.c,v 1.34 2004/09/15 22:21:11 deraadt Exp $ */
+/* $OpenBSD: popen.c,v 1.35 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: popen.c,v 1.6 1997/05/13 06:48:42 mikel Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)popen.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: popen.c,v 1.34 2004/09/15 22:21:11 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include <sys/wait.h>
#include <fcntl.h>
diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c
index 061223e993a..7320df9d372 100644
--- a/usr.bin/mail/quit.c
+++ b/usr.bin/mail/quit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: quit.c,v 1.19 2007/09/10 14:29:53 tobias Exp $ */
+/* $OpenBSD: quit.c,v 1.20 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: quit.c,v 1.6 1996/12/28 07:11:07 tls Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)quit.c 8.2 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: quit.c,v 1.19 2007/09/10 14:29:53 tobias Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include <fcntl.h>
#include "extern.h"
diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c
index 0b345b86aa2..6f0dc51d76b 100644
--- a/usr.bin/mail/send.c
+++ b/usr.bin/mail/send.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: send.c,v 1.21 2008/07/16 15:14:33 martynas Exp $ */
+/* $OpenBSD: send.c,v 1.22 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: send.c,v 1.6 1996/06/08 19:48:39 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)send.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: send.c,v 1.21 2008/07/16 15:14:33 martynas Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c
index 6cbdb70f3a7..090e34c6188 100644
--- a/usr.bin/mail/strings.c
+++ b/usr.bin/mail/strings.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strings.c,v 1.8 2003/06/03 02:56:11 millert Exp $ */
+/* $OpenBSD: strings.c,v 1.9 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: strings.c,v 1.5 1996/06/08 19:48:40 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)strings.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: strings.c,v 1.8 2003/06/03 02:56:11 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 57ca0f9ff2e..2b9d224a862 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: temp.c,v 1.14 2003/06/03 02:56:11 millert Exp $ */
+/* $OpenBSD: temp.c,v 1.15 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: temp.c,v 1.5 1996/06/08 19:48:42 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)temp.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: temp.c,v 1.14 2003/06/03 02:56:11 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index a4eb1c1c9b8..8adc37a55fc 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.18 2005/07/11 14:08:23 millert Exp $ */
+/* $OpenBSD: tty.c,v 1.19 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: tty.c,v 1.7 1997/07/09 05:25:46 mikel Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)tty.c 8.2 (Berkeley) 4/20/95";
-#else
-static const char rcsid[] = "$OpenBSD: tty.c,v 1.18 2005/07/11 14:08:23 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c
index d863f07d3a2..dd10018ff53 100644
--- a/usr.bin/mail/v7.local.c
+++ b/usr.bin/mail/v7.local.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v7.local.c,v 1.14 2003/06/03 02:56:11 millert Exp $ */
+/* $OpenBSD: v7.local.c,v 1.15 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: v7.local.c,v 1.8 1997/05/13 06:15:58 mikel Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)v7.local.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: v7.local.c,v 1.14 2003/06/03 02:56:11 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* Mail -- a mail program
*
diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c
index 7687d9913bb..7f2fe5dda19 100644
--- a/usr.bin/mail/vars.c
+++ b/usr.bin/mail/vars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vars.c,v 1.11 2007/06/19 05:47:41 ray Exp $ */
+/* $OpenBSD: vars.c,v 1.12 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: vars.c,v 1.4 1996/06/08 19:48:45 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: vars.c,v 1.11 2007/06/19 05:47:41 ray Exp $";
-#endif
-#endif /* not lint */
-
#include "rcv.h"
#include "extern.h"
diff --git a/usr.bin/mail/version.c b/usr.bin/mail/version.c
index e837be7ed2f..82bc8f5e361 100644
--- a/usr.bin/mail/version.c
+++ b/usr.bin/mail/version.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.c,v 1.6 2003/06/03 02:56:11 millert Exp $ */
+/* $OpenBSD: version.c,v 1.7 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: version.c,v 1.4 1996/06/08 19:48:46 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)version.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: version.c,v 1.6 2003/06/03 02:56:11 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* Just keep track of the date/sid of this version of Mail.
* Load this file first to get a "total" Mail version.
diff --git a/usr.bin/man/config.c b/usr.bin/man/config.c
index 00846df6c12..eae81f42a0d 100644
--- a/usr.bin/man/config.c
+++ b/usr.bin/man/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.8 2007/03/20 03:50:39 tedu Exp $ */
+/* $OpenBSD: config.c,v 1.9 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: config.c,v 1.7 1995/09/28 06:05:21 tls Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)config.c 8.8 (Berkeley) 1/31/95";
-#else
-static char rcsid[] = "$OpenBSD: config.c,v 1.8 2007/03/20 03:50:39 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/man/man.c b/usr.bin/man/man.c
index 2192cf8134e..6d63cc5683e 100644
--- a/usr.bin/man/man.c
+++ b/usr.bin/man/man.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: man.c,v 1.37 2008/12/30 13:14:41 jmc Exp $ */
+/* $OpenBSD: man.c,v 1.38 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: man.c,v 1.7 1995/09/28 06:05:34 tls Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95";
-#else
-static char rcsid[] = "$OpenBSD: man.c,v 1.37 2008/12/30 13:14:41 jmc Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 163615b349f..fd1483eca62 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mesg.c,v 1.7 2007/03/15 22:59:02 jmc Exp $ */
+/* $OpenBSD: mesg.c,v 1.8 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: mesg.c,v 1.4 1994/12/23 07:16:32 jtc Exp $ */
/*
@@ -35,19 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mesg.c 8.2 (Berkeley) 1/21/94";
-#endif
-static char rcsid[] = "$OpenBSD: mesg.c,v 1.7 2007/03/15 22:59:02 jmc Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index de9b916d21e..70c33e47dab 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkstr.c,v 1.10 2007/09/10 14:29:53 tobias Exp $ */
+/* $OpenBSD: mkstr.c,v 1.11 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: mkstr.c,v 1.4 1995/09/28 06:22:20 tls Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)mkstr.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: mkstr.c,v 1.10 2007/09/10 14:29:53 tobias Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index 0a89f33c51f..414a0960e73 100644
--- a/usr.bin/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mktemp.c,v 1.14 2008/05/26 09:22:30 sobrado Exp $ */
+/* $OpenBSD: mktemp.c,v 1.15 2009/10/27 23:59:40 deraadt Exp $ */
/*
* Copyright (c) 1996, 1997, 2001 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: mktemp.c,v 1.14 2008/05/26 09:22:30 sobrado Exp $";
-#endif /* not lint */
-
#include <paths.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index c644b98e150..c1f525c08ad 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msgs.c,v 1.33 2007/09/11 18:22:42 cloder Exp $ */
+/* $OpenBSD: msgs.c,v 1.34 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: msgs.c,v 1.7 1995/09/28 06:57:40 tls Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)msgs.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: msgs.c,v 1.33 2007/09/11 18:22:42 cloder Exp $";
-#endif
-#endif /* not lint */
-
/*
* msgs - a user bulletin board program
*
diff --git a/usr.bin/newsyslog/newsyslog.c b/usr.bin/newsyslog/newsyslog.c
index cc8f9089ce9..84b65c74536 100644
--- a/usr.bin/newsyslog/newsyslog.c
+++ b/usr.bin/newsyslog/newsyslog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: newsyslog.c,v 1.85 2009/09/10 13:03:35 millert Exp $ */
+/* $OpenBSD: newsyslog.c,v 1.86 2009/10/27 23:59:40 deraadt Exp $ */
/*
* Copyright (c) 1999, 2002, 2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -71,10 +71,6 @@
*
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: newsyslog.c,v 1.85 2009/09/10 13:03:35 millert Exp $";
-#endif /* not lint */
-
#ifndef CONF
#define CONF "/etc/newsyslog.conf" /* Configuration file */
#endif
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index b9e399ea343..e0c44250f2f 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfsstat.c,v 1.32 2009/06/05 19:32:26 jasper Exp $ */
+/* $OpenBSD: nfsstat.c,v 1.33 2009/10/27 23:59:40 deraadt Exp $ */
/* $NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $ */
/*
@@ -33,21 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "from: @(#)nfsstat.c 8.1 (Berkeley) 6/6/93";
-static char *rcsid = "$NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $";
-#else
-static char *rcsid = "$OpenBSD: nfsstat.c,v 1.32 2009/06/05 19:32:26 jasper Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index 68e6eb27ebd..dcb922efe5e 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nice.c,v 1.10 2009/06/17 09:51:51 sobrado Exp $ */
+/* $OpenBSD: nice.c,v 1.11 2009/10/27 23:59:41 deraadt Exp $ */
/* $NetBSD: nice.c,v 1.9 1995/08/31 23:30:58 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)nice.c 5.4 (Berkeley) 6/1/90";
-#endif
-static char rcsid[] = "$OpenBSD: nice.c,v 1.10 2009/06/17 09:51:51 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/time.h>
#include <sys/resource.h>
#include <stdio.h>
diff --git a/usr.bin/nm/elf.c b/usr.bin/nm/elf.c
index 8903b7a351b..ebe939247e8 100644
--- a/usr.bin/nm/elf.c
+++ b/usr.bin/nm/elf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: elf.c,v 1.18 2007/09/02 15:19:33 deraadt Exp $ */
+/* $OpenBSD: elf.c,v 1.19 2009/10/27 23:59:41 deraadt Exp $ */
/*
* Copyright (c) 2003 Michael Shalayeff
@@ -26,10 +26,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: elf.c,v 1.18 2007/09/02 15:19:33 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mman.h>
#include <unistd.h>
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 4406f0698a2..bb4f9d389ee 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nohup.c,v 1.13 2007/10/16 20:19:27 sobrado Exp $ */
+/* $OpenBSD: nohup.c,v 1.14 2009/10/27 23:59:41 deraadt Exp $ */
/* $NetBSD: nohup.c,v 1.6 1995/08/31 23:35:25 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)nohup.c 5.4 (Berkeley) 6/1/90";
-#endif
-static char rcsid[] = "$OpenBSD: nohup.c,v 1.13 2007/10/16 20:19:27 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/usr.bin/oldrdist/docmd.c b/usr.bin/oldrdist/docmd.c
index b12bd955aa9..a07126c3be5 100644
--- a/usr.bin/oldrdist/docmd.c
+++ b/usr.bin/oldrdist/docmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: docmd.c,v 1.21 2007/09/27 17:08:58 sobrado Exp $ */
+/* $OpenBSD: docmd.c,v 1.22 2009/10/27 23:59:41 deraadt Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)docmd.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: docmd.c,v 1.21 2007/09/27 17:08:58 sobrado Exp $";
-#endif /* not lint */
-
#include "defs.h"
#include <setjmp.h>
#include <netdb.h>
diff --git a/usr.bin/oldrdist/expand.c b/usr.bin/oldrdist/expand.c
index c853acf7580..7b0cf800d65 100644
--- a/usr.bin/oldrdist/expand.c
+++ b/usr.bin/oldrdist/expand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expand.c,v 1.11 2003/06/03 02:56:14 millert Exp $ */
+/* $OpenBSD: expand.c,v 1.12 2009/10/27 23:59:41 deraadt Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: expand.c,v 1.11 2003/06/03 02:56:14 millert Exp $";
-#endif /* not lint */
-
#include "defs.h"
#define GAVSIZ NCARGS / 6
diff --git a/usr.bin/oldrdist/gram.y b/usr.bin/oldrdist/gram.y
index fddac6ec6d6..3b1f83adbdb 100644
--- a/usr.bin/oldrdist/gram.y
+++ b/usr.bin/oldrdist/gram.y
@@ -28,11 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)gram.y 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$Id: gram.y,v 1.5 2003/06/03 02:56:14 millert Exp $";
-#endif /* not lint */
-
#include "defs.h"
struct cmd *cmds = NULL;
diff --git a/usr.bin/oldrdist/lookup.c b/usr.bin/oldrdist/lookup.c
index 55db4f0000d..82ae7379cc9 100644
--- a/usr.bin/oldrdist/lookup.c
+++ b/usr.bin/oldrdist/lookup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lookup.c,v 1.9 2004/01/15 19:12:31 otto Exp $ */
+/* $OpenBSD: lookup.c,v 1.10 2009/10/27 23:59:41 deraadt Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)lookup.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: lookup.c,v 1.9 2004/01/15 19:12:31 otto Exp $";
-#endif /* not lint */
-
#include "defs.h"
/* symbol types */
diff --git a/usr.bin/oldrdist/main.c b/usr.bin/oldrdist/main.c
index dd505f25237..be3b2bb5fe5 100644
--- a/usr.bin/oldrdist/main.c
+++ b/usr.bin/oldrdist/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.20 2007/09/27 17:08:58 sobrado Exp $ */
+/* $OpenBSD: main.c,v 1.21 2009/10/27 23:59:41 deraadt Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/* from: static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: main.c,v 1.20 2007/09/27 17:08:58 sobrado Exp $";
-#endif /* not lint */
-
#include <stdarg.h>
#include <libgen.h>
#include "defs.h"
diff --git a/usr.bin/oldrdist/server.c b/usr.bin/oldrdist/server.c
index f5156827341..a291e97841b 100644
--- a/usr.bin/oldrdist/server.c
+++ b/usr.bin/oldrdist/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.31 2007/10/17 20:10:44 chl Exp $ */
+/* $OpenBSD: server.c,v 1.32 2009/10/27 23:59:41 deraadt Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)server.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: server.c,v 1.31 2007/10/17 20:10:44 chl Exp $";
-#endif /* not lint */
-
#include <sys/wait.h>
#include <stdarg.h>
diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c
index dfafea856ab..cdac5fed743 100644
--- a/usr.bin/passwd/local_passwd.c
+++ b/usr.bin/passwd/local_passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: local_passwd.c,v 1.39 2008/11/06 05:35:56 djm Exp $ */
+/* $OpenBSD: local_passwd.c,v 1.40 2009/10/27 23:59:41 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static const char sccsid[] = "from: @(#)local_passwd.c 5.5 (Berkeley) 5/6/91";*/
-static const char rcsid[] = "$OpenBSD: local_passwd.c,v 1.39 2008/11/06 05:35:56 djm Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/uio.h>
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 85fa5cb0314..d125171631b 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: passwd.c,v 1.24 2007/09/08 18:42:36 cloder Exp $ */
+/* $OpenBSD: passwd.c,v 1.25 2009/10/27 23:59:41 deraadt Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static const char sccsid[] = "from: @(#)passwd.c 5.5 (Berkeley) 7/6/91";*/
-static const char rcsid[] = "$OpenBSD: passwd.c,v 1.24 2007/09/08 18:42:36 cloder Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/passwd/yp_passwd.c b/usr.bin/passwd/yp_passwd.c
index ca5aceb486c..e94380240cc 100644
--- a/usr.bin/passwd/yp_passwd.c
+++ b/usr.bin/passwd/yp_passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yp_passwd.c,v 1.31 2008/11/06 05:35:56 djm Exp $ */
+/* $OpenBSD: yp_passwd.c,v 1.32 2009/10/27 23:59:41 deraadt Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -28,10 +28,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static const char sccsid[] = "from: @(#)yp_passwd.c 1.0 2/2/93";*/
-static const char rcsid[] = "$OpenBSD: yp_passwd.c,v 1.31 2008/11/06 05:35:56 djm Exp $";
-#endif /* not lint */
#ifdef YP
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index bd8ba2fd84f..a94506f30b6 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: paste.c,v 1.16 2007/08/06 19:16:06 sobrado Exp $ */
+/* $OpenBSD: paste.c,v 1.17 2009/10/27 23:59:41 deraadt Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -32,17 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)paste.c 5.7 (Berkeley) 10/30/90";*/
-static char rcsid[] = "$OpenBSD: paste.c,v 1.16 2007/08/06 19:16:06 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/queue.h>
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/patch/backupfile.c b/usr.bin/patch/backupfile.c
index eb25313f00f..2d4037b6638 100644
--- a/usr.bin/patch/backupfile.c
+++ b/usr.bin/patch/backupfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: backupfile.c,v 1.19 2006/03/11 19:41:30 otto Exp $ */
+/* $OpenBSD: backupfile.c,v 1.20 2009/10/27 23:59:41 deraadt Exp $ */
/*
* backupfile.c -- make Emacs style backup file names Copyright (C) 1990 Free
@@ -16,10 +16,6 @@
* David MacKenzie <djm@ai.mit.edu>. Some algorithms adapted from GNU Emacs.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: backupfile.c,v 1.19 2006/03/11 19:41:30 otto Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <dirent.h>
#include <libgen.h>
diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c
index eaf5f527a20..6657d198390 100644
--- a/usr.bin/patch/inp.c
+++ b/usr.bin/patch/inp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inp.c,v 1.34 2006/03/11 19:41:30 otto Exp $ */
+/* $OpenBSD: inp.c,v 1.35 2009/10/27 23:59:41 deraadt Exp $ */
/*
* patch - a program to apply diffs to original files
@@ -26,10 +26,6 @@
* behaviour
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: inp.c,v 1.34 2006/03/11 19:41:30 otto Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c
index 33f1441fbbe..d95f5c05007 100644
--- a/usr.bin/patch/patch.c
+++ b/usr.bin/patch/patch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: patch.c,v 1.47 2009/04/05 13:36:00 stsp Exp $ */
+/* $OpenBSD: patch.c,v 1.48 2009/10/27 23:59:41 deraadt Exp $ */
/*
* patch - a program to apply diffs to original files
@@ -26,10 +26,6 @@
* behaviour
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: patch.c,v 1.47 2009/04/05 13:36:00 stsp Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c
index c2d1eeab021..a689e2e71a2 100644
--- a/usr.bin/patch/pch.c
+++ b/usr.bin/patch/pch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pch.c,v 1.37 2007/09/02 15:19:33 deraadt Exp $ */
+/* $OpenBSD: pch.c,v 1.38 2009/10/27 23:59:41 deraadt Exp $ */
/*
* patch - a program to apply diffs to original files
@@ -26,10 +26,6 @@
* behaviour
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: pch.c,v 1.37 2007/09/02 15:19:33 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/patch/util.c b/usr.bin/patch/util.c
index 5523450c95e..8c3f888ae66 100644
--- a/usr.bin/patch/util.c
+++ b/usr.bin/patch/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.32 2006/03/11 19:41:30 otto Exp $ */
+/* $OpenBSD: util.c,v 1.33 2009/10/27 23:59:41 deraadt Exp $ */
/*
* patch - a program to apply diffs to original files
@@ -26,10 +26,6 @@
* behaviour
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: util.c,v 1.32 2006/03/11 19:41:30 otto Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/pkill/pkill.c b/usr.bin/pkill/pkill.c
index b6e8b62cda7..60161a9aa4c 100644
--- a/usr.bin/pkill/pkill.c
+++ b/usr.bin/pkill/pkill.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkill.c,v 1.17 2008/06/26 05:42:21 ray Exp $ */
+/* $OpenBSD: pkill.c,v 1.18 2009/10/27 23:59:41 deraadt Exp $ */
/* $NetBSD: pkill.c,v 1.5 2002/10/27 11:49:34 kleink Exp $ */
/*-
@@ -30,10 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: pkill.c,v 1.17 2008/06/26 05:42:21 ray Exp $";
-#endif /* !lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index ce831fac12a..8d60f76a929 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: egetopt.c,v 1.7 2003/11/09 20:13:57 otto Exp $ */
+/* $OpenBSD: egetopt.c,v 1.8 2009/10/27 23:59:41 deraadt Exp $ */
/*-
* Copyright (c) 1991 Keith Muller.
@@ -33,11 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)egetopt.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: egetopt.c,v 1.7 2003/11/09 20:13:57 otto Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index d8f373b7441..93e09ae8f0a 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pr.c,v 1.27 2009/02/07 17:51:22 chl Exp $ */
+/* $OpenBSD: pr.c,v 1.28 2009/10/27 23:59:41 deraadt Exp $ */
/*-
* Copyright (c) 1991 Keith Muller.
@@ -33,17 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/* from: static char sccsid[] = "@(#)pr.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: pr.c,v 1.27 2009/02/07 17:51:22 chl Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 044e5506445..d63ce075602 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printenv.c,v 1.5 2003/06/10 22:20:49 deraadt Exp $ */
+/* $OpenBSD: printenv.c,v 1.6 2009/10/27 23:59:41 deraadt Exp $ */
/*
* Copyright (c) 1987 Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1987 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)printenv.c 5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: printenv.c,v 1.5 2003/06/10 22:20:49 deraadt Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index d6bbcd66fd5..311eaf8f906 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printf.c,v 1.16 2009/07/19 15:47:57 martynas Exp $ */
+/* $OpenBSD: printf.c,v 1.17 2009/10/27 23:59:41 deraadt Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)printf.c 5.9 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: printf.c,v 1.16 2009/07/19 15:47:57 martynas Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 707d9394f8e..9434aafb8a3 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: quota.c,v 1.28 2007/12/30 13:32:19 sobrado Exp $ */
+/* $OpenBSD: quota.c,v 1.29 2009/10/27 23:59:41 deraadt Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -32,18 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)quota.c 8.1 (Berkeley) 6/6/93";*/
-static const char rcsid[] =
-"$OpenBSD: quota.c,v 1.28 2007/12/30 13:32:19 sobrado Exp $";
-#endif /* not lint */
-
/*
* Disk quota reporting program.
*/
diff --git a/usr.bin/ranlib/build.c b/usr.bin/ranlib/build.c
index 99f8c01f08a..7572ac26dee 100644
--- a/usr.bin/ranlib/build.c
+++ b/usr.bin/ranlib/build.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: build.c,v 1.12 2004/10/09 20:36:05 mickey Exp $ */
+/* $OpenBSD: build.c,v 1.13 2009/10/27 23:59:42 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)build.c 5.3 (Berkeley) 3/12/91";*/
-static char rcsid[] = "$OpenBSD: build.c,v 1.12 2004/10/09 20:36:05 mickey Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/usr.bin/ranlib/misc.c b/usr.bin/ranlib/misc.c
index e6dbdb33ba8..b5189923ae6 100644
--- a/usr.bin/ranlib/misc.c
+++ b/usr.bin/ranlib/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.10 2008/01/04 16:44:10 miod Exp $ */
+/* $OpenBSD: misc.c,v 1.11 2009/10/27 23:59:42 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)misc.c 5.2 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$OpenBSD: misc.c,v 1.10 2008/01/04 16:44:10 miod Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <signal.h>
#include <errno.h>
diff --git a/usr.bin/ranlib/ranlib.c b/usr.bin/ranlib/ranlib.c
index 9ee20b64d15..3bf23e76671 100644
--- a/usr.bin/ranlib/ranlib.c
+++ b/usr.bin/ranlib/ranlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ranlib.c,v 1.7 2007/08/06 19:16:06 sobrado Exp $ */
+/* $OpenBSD: ranlib.c,v 1.8 2009/10/27 23:59:42 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,17 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)ranlib.c 5.6 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$OpenBSD: ranlib.c,v 1.7 2007/08/06 19:16:06 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <dirent.h>
#include <stdio.h>
diff --git a/usr.bin/ranlib/touch.c b/usr.bin/ranlib/touch.c
index cd623770529..be658c708f0 100644
--- a/usr.bin/ranlib/touch.c
+++ b/usr.bin/ranlib/touch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: touch.c,v 1.6 2003/06/12 20:58:10 deraadt Exp $ */
+/* $OpenBSD: touch.c,v 1.7 2009/10/27 23:59:42 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)touch.c 5.3 (Berkeley) 3/12/91";*/
-static char rcsid[] = "$OpenBSD: touch.c,v 1.6 2003/06/12 20:58:10 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <fcntl.h>
#include <dirent.h>
diff --git a/usr.bin/rcs/diff3.c b/usr.bin/rcs/diff3.c
index ffbc73c3dc4..4d0ab1549aa 100644
--- a/usr.bin/rcs/diff3.c
+++ b/usr.bin/rcs/diff3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff3.c,v 1.27 2009/02/25 23:16:20 ray Exp $ */
+/* $OpenBSD: diff3.c,v 1.28 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
@@ -64,17 +64,6 @@
* @(#)diff3.c 8.1 (Berkeley) 6/6/93
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: diff3.c,v 1.27 2009/02/25 23:16:20 ray Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.bin/rdist/child.c b/usr.bin/rdist/child.c
index 30303e1c365..331d92b9eae 100644
--- a/usr.bin/rdist/child.c
+++ b/usr.bin/rdist/child.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: child.c,v 1.13 2003/06/03 02:56:14 millert Exp $ */
+/* $OpenBSD: child.c,v 1.14 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -31,23 +31,6 @@
#include "defs.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: child.c,v 1.3 1999/11/01 00:20:55 christos Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: child.c,v 1.13 2003/06/03 02:56:14 millert Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)docmd.c 5.1 (Berkeley) 6/6/85";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
/*
* Functions for rdist related to children
*/
diff --git a/usr.bin/rdist/client.c b/usr.bin/rdist/client.c
index f43b0fafd97..930bb6a0508 100644
--- a/usr.bin/rdist/client.c
+++ b/usr.bin/rdist/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.21 2009/02/15 22:20:54 deraadt Exp $ */
+/* $OpenBSD: client.c,v 1.22 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -32,23 +32,6 @@
#include "defs.h"
#include "y.tab.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: client.c,v 1.13 1999/11/01 00:22:14 christos Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: client.c,v 1.21 2009/02/15 22:20:54 deraadt Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)client.c";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
/*
* Routines used in client mode to communicate with remove server.
*/
diff --git a/usr.bin/rdist/common.c b/usr.bin/rdist/common.c
index 564d8d9a7e6..6c8e9d69155 100644
--- a/usr.bin/rdist/common.c
+++ b/usr.bin/rdist/common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: common.c,v 1.22 2008/01/02 17:44:11 chl Exp $ */
+/* $OpenBSD: common.c,v 1.23 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -30,22 +30,6 @@
*/
#include "defs.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: common.c,v 1.8 2001/03/12 18:16:36 kim Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: common.c,v 1.22 2008/01/02 17:44:11 chl Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)common.c";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* !lint */
/*
* Things common to both the client and server.
diff --git a/usr.bin/rdist/distopt.c b/usr.bin/rdist/distopt.c
index d53f765de65..adf341f1513 100644
--- a/usr.bin/rdist/distopt.c
+++ b/usr.bin/rdist/distopt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: distopt.c,v 1.10 2007/02/26 20:57:18 jmc Exp $ */
+/* $OpenBSD: distopt.c,v 1.11 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -30,22 +30,6 @@
*/
#include "defs.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: distopt.c,v 1.5 1999/08/04 15:57:33 christos Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: distopt.c,v 1.10 2007/02/26 20:57:18 jmc Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)distopt.c";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* !lint */
/*
* Dist Option functions
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index c2149515e5e..3db7e91604b 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: docmd.c,v 1.20 2008/08/10 13:39:09 sobrado Exp $ */
+/* $OpenBSD: docmd.c,v 1.21 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -31,22 +31,6 @@
#include "defs.h"
#include "y.tab.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: docmd.c,v 1.8 2001/03/12 18:42:23 kim Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: docmd.c,v 1.20 2008/08/10 13:39:09 sobrado Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)docmd.c 5.1 (Berkeley) 6/6/85";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
/*
* Functions for rdist that do command (cmd) related activities.
diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c
index 6b5617c0a6d..4e47670778d 100644
--- a/usr.bin/rdist/expand.c
+++ b/usr.bin/rdist/expand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expand.c,v 1.11 2003/06/03 02:56:14 millert Exp $ */
+/* $OpenBSD: expand.c,v 1.12 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -30,23 +30,6 @@
*/
#include "defs.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: expand.c,v 1.4 1999/08/04 15:57:33 christos Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: expand.c,v 1.11 2003/06/03 02:56:14 millert Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)expand.c 5.2 (Berkeley) 3/28/86";
-
-char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
#define MAXEARGS 2048
#define LC '{'
diff --git a/usr.bin/rdist/gram.y b/usr.bin/rdist/gram.y
index 3edeeab9f5c..097583d2d8c 100644
--- a/usr.bin/rdist/gram.y
+++ b/usr.bin/rdist/gram.y
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: gram.y,v 1.8 2003/06/03 02:56:14 millert Exp $ */
+/* $OpenBSD: gram.y,v 1.9 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1993 Michael A. Cooper
@@ -33,24 +33,6 @@
#include "defs.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: gram.y,v 1.3 1999/08/04 15:57:33 christos Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: gram.y,v 1.8 2003/06/03 02:56:14 millert Exp $";
-#endif
-
-static char *sccsid __attribute__((__unused__)) =
-"@(#)gram.y 5.2 (Berkeley) 85/06/21";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-
static struct namelist *addnl __P((struct namelist *, struct namelist *));
static struct namelist *subnl __P((struct namelist *, struct namelist *));
static struct namelist *andnl __P((struct namelist *, struct namelist *));
diff --git a/usr.bin/rdist/isexec.c b/usr.bin/rdist/isexec.c
index 8eaf2bb327b..96ab2ee41ed 100644
--- a/usr.bin/rdist/isexec.c
+++ b/usr.bin/rdist/isexec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isexec.c,v 1.7 2003/06/03 02:56:14 millert Exp $ */
+/* $OpenBSD: isexec.c,v 1.8 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -31,23 +31,6 @@
#include "defs.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: isexec.c,v 1.2 1999/08/04 15:57:33 christos Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: isexec.c,v 1.7 2003/06/03 02:56:14 millert Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)client.c";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
static int _isexec(int);
#if EXE_TYPE == EXE_AOUT
diff --git a/usr.bin/rdist/lookup.c b/usr.bin/rdist/lookup.c
index 90d6e25d6ce..868130c9d8e 100644
--- a/usr.bin/rdist/lookup.c
+++ b/usr.bin/rdist/lookup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lookup.c,v 1.12 2003/06/03 02:56:14 millert Exp $ */
+/* $OpenBSD: lookup.c,v 1.13 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -31,23 +31,6 @@
#include "defs.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: lookup.c,v 1.4 1999/08/04 15:57:33 christos Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: lookup.c,v 1.12 2003/06/03 02:56:14 millert Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)lookup.c 5.1 (Berkeley) 6/6/85";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
/* symbol types */
#define VAR 1
#define CONST 2
diff --git a/usr.bin/rdist/message.c b/usr.bin/rdist/message.c
index 2b870f57dca..a622f99b89d 100644
--- a/usr.bin/rdist/message.c
+++ b/usr.bin/rdist/message.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: message.c,v 1.17 2007/09/14 14:29:20 chl Exp $ */
+/* $OpenBSD: message.c,v 1.18 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -31,23 +31,6 @@
#include "defs.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: message.c,v 1.5 1999/11/01 00:21:39 christos Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: message.c,v 1.17 2007/09/14 14:29:20 chl Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)common.c";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* !lint */
-
/*
* Message handling functions for both rdist and rdistd.
*/
diff --git a/usr.bin/rdist/rdist.c b/usr.bin/rdist/rdist.c
index a11b89fdda5..d29b47a7209 100644
--- a/usr.bin/rdist/rdist.c
+++ b/usr.bin/rdist/rdist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rdist.c,v 1.18 2007/02/26 15:38:04 jmc Exp $ */
+/* $OpenBSD: rdist.c,v 1.19 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -32,24 +32,6 @@
#include "defs.h"
#include "y.tab.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: rdist.c,v 1.6 2001/03/12 18:16:36 kim Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: rdist.c,v 1.18 2007/02/26 15:38:04 jmc Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)main.c 5.1 (Berkeley) 6/6/85";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-
#include <netdb.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/rdistd/filesys-os.c b/usr.bin/rdistd/filesys-os.c
index e278f1681f3..33e2092ca4b 100644
--- a/usr.bin/rdistd/filesys-os.c
+++ b/usr.bin/rdistd/filesys-os.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: filesys-os.c,v 1.9 2003/06/03 02:56:15 millert Exp $ */
+/* $OpenBSD: filesys-os.c,v 1.10 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -30,22 +30,6 @@
*/
#include "defs.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: filesys-os.c,v 1.5 1999/08/04 15:57:33 christos Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: filesys-os.c,v 1.9 2003/06/03 02:56:15 millert Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)filesys-os.c";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
/*
* OS specific file system routines
diff --git a/usr.bin/rdistd/filesys.c b/usr.bin/rdistd/filesys.c
index a76448486a5..8c37fbd22c8 100644
--- a/usr.bin/rdistd/filesys.c
+++ b/usr.bin/rdistd/filesys.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: filesys.c,v 1.10 2003/06/03 02:56:15 millert Exp $ */
+/* $OpenBSD: filesys.c,v 1.11 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -31,23 +31,6 @@
#include "defs.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: filesys.c,v 1.2 1999/08/04 15:57:33 christos Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: filesys.c,v 1.10 2003/06/03 02:56:15 millert Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)filesys.c";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
/*
* This file contains functions dealing with getting info
* about mounted filesystems.
diff --git a/usr.bin/rdistd/rdistd.c b/usr.bin/rdistd/rdistd.c
index 5d3067c3ee4..16774aabcf9 100644
--- a/usr.bin/rdistd/rdistd.c
+++ b/usr.bin/rdistd/rdistd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rdistd.c,v 1.7 2007/02/26 15:44:57 jmc Exp $ */
+/* $OpenBSD: rdistd.c,v 1.8 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -31,23 +31,6 @@
#include "defs.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: rdistd.c,v 1.2 1999/08/04 15:57:33 christos Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: rdistd.c,v 1.7 2007/02/26 15:44:57 jmc Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)rdistd.c";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
int main(int, char **, char **);
static void usage(void);
diff --git a/usr.bin/rdistd/server.c b/usr.bin/rdistd/server.c
index dd15e834084..06c95f2734d 100644
--- a/usr.bin/rdistd/server.c
+++ b/usr.bin/rdistd/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.20 2009/03/28 15:18:29 deraadt Exp $ */
+/* $OpenBSD: server.c,v 1.21 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -30,23 +30,6 @@
*/
#include "defs.h"
-#ifndef lint
-#if 0
-static char RCSid[] __attribute__((__unused__)) =
-"$From: server.c,v 1.10 1999/08/04 15:57:33 christos Exp $";
-#else
-static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: server.c,v 1.20 2009/03/28 15:18:29 deraadt Exp $";
-#endif
-
-static char sccsid[] __attribute__((__unused__)) =
-"@(#)server.c 5.3 (Berkeley) 6/7/86";
-
-static char copyright[] __attribute__((__unused__)) =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
/*
* Server routines
*/
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 14eab9e1aac..a4a304d9f2a 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: renice.c,v 1.14 2009/04/20 13:58:20 millert Exp $ */
+/* $OpenBSD: renice.c,v 1.15 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: renice.c,v 1.14 2009/04/20 13:58:20 millert Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index 3797777fb83..3d160da0716 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rev.c,v 1.9 2007/03/16 17:16:28 jasper Exp $ */
+/* $OpenBSD: rev.c,v 1.10 2009/10/27 23:59:42 deraadt Exp $ */
/* $NetBSD: rev.c,v 1.5 1995/09/28 08:49:40 tls Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)rev.c 8.3 (Berkeley) 5/4/95";
-#else
-static char rcsid[] = "$OpenBSD: rev.c,v 1.9 2007/03/16 17:16:28 jasper Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index ed5d320026a..74b5442aae1 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_clntout.c,v 1.13 2007/10/03 14:35:48 weingart Exp $ */
+/* $OpenBSD: rpc_clntout.c,v 1.14 2009/10/27 23:59:42 deraadt Exp $ */
/* $NetBSD: rpc_clntout.c,v 1.4 1995/06/11 21:49:52 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,10 +30,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-static const char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
-#endif
-
/*
* rpc_clntout.c, Client-stub outputter for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsytsems, Inc.
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index cb2acb6c786..aa752c87561 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_cout.c,v 1.19 2007/10/03 14:35:48 weingart Exp $ */
+/* $OpenBSD: rpc_cout.c,v 1.20 2009/10/27 23:59:42 deraadt Exp $ */
/* $NetBSD: rpc_cout.c,v 1.6 1996/10/01 04:13:53 cgd Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,10 +30,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-static const char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
-#endif
-
/*
* rpc_cout.c, XDR routine outputter for the RPC protocol compiler
*/
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index b73efe665a4..41b92346d66 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_hout.c,v 1.17 2007/10/03 14:35:48 weingart Exp $ */
+/* $OpenBSD: rpc_hout.c,v 1.18 2009/10/27 23:59:42 deraadt Exp $ */
/* $NetBSD: rpc_hout.c,v 1.4 1995/06/11 21:49:55 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,10 +30,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-static const char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
-#endif
-
/*
* rpc_hout.c, Header file outputter for the RPC protocol compiler
*/
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index c199b728135..20cae4fb609 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_main.c,v 1.23 2007/10/03 14:52:31 weingart Exp $ */
+/* $OpenBSD: rpc_main.c,v 1.24 2009/10/27 23:59:42 deraadt Exp $ */
/* $NetBSD: rpc_main.c,v 1.9 1996/02/19 11:12:43 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,12 +30,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-static const char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
-static const char cvsid[] =
- "$OpenBSD: rpc_main.c,v 1.23 2007/10/03 14:52:31 weingart Exp $";
-#endif
-
/*
* rpc_main.c, Top level of the RPC protocol compiler.
*/
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index a74f1e4e40f..f0930bc19a0 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_parse.c,v 1.16 2007/10/03 14:35:48 weingart Exp $ */
+/* $OpenBSD: rpc_parse.c,v 1.17 2009/10/27 23:59:42 deraadt Exp $ */
/* $NetBSD: rpc_parse.c,v 1.5 1995/08/29 23:05:55 cgd Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,10 +30,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-static const char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
-#endif
-
/*
* rpc_parse.c, Parser for the RPC protocol compiler
* Copyright (C) 1987 Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c
index bfcc4cbd8b4..e4449a543f7 100644
--- a/usr.bin/rpcgen/rpc_sample.c
+++ b/usr.bin/rpcgen/rpc_sample.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_sample.c,v 1.15 2007/10/03 14:35:48 weingart Exp $ */
+/* $OpenBSD: rpc_sample.c,v 1.16 2009/10/27 23:59:42 deraadt Exp $ */
/* $NetBSD: rpc_sample.c,v 1.2 1995/06/11 21:50:01 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,10 +30,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-static const char sccsid[] = "@(#)rpc_sample.c 1.1 90/08/30 (C) 1987 SMI";
-#endif
-
/*
* rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler
*/
diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c
index fab222e7252..50a3466f6fb 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_scan.c,v 1.13 2007/10/03 14:35:48 weingart Exp $ */
+/* $OpenBSD: rpc_scan.c,v 1.14 2009/10/27 23:59:42 deraadt Exp $ */
/* $NetBSD: rpc_scan.c,v 1.4 1995/06/11 21:50:02 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,10 +30,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-static const char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI";
-#endif
-
/*
* rpc_scan.c, Scanner for the RPC protocol compiler
* Copyright (C) 1987, Sun Microsystems, Inc.
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index 016b09befd4..d525c264733 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_svcout.c,v 1.24 2007/10/03 15:12:13 weingart Exp $ */
+/* $OpenBSD: rpc_svcout.c,v 1.25 2009/10/27 23:59:42 deraadt Exp $ */
/* $NetBSD: rpc_svcout.c,v 1.7 1995/06/24 14:59:59 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,10 +30,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-static const char sccsid[] = "@(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI";
-#endif
-
/*
* rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler
*/
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 190b174b61d..22448746340 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_tblout.c,v 1.11 2007/10/03 14:35:48 weingart Exp $ */
+/* $OpenBSD: rpc_tblout.c,v 1.12 2009/10/27 23:59:42 deraadt Exp $ */
/* $NetBSD: rpc_tblout.c,v 1.3 1995/06/24 15:00:15 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,10 +30,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-static const char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
-#endif
-
/*
* rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler
*/
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 0c8b922e4ae..e30c1bb67e7 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_util.c,v 1.13 2007/10/03 14:35:48 weingart Exp $ */
+/* $OpenBSD: rpc_util.c,v 1.14 2009/10/27 23:59:42 deraadt Exp $ */
/* $NetBSD: rpc_util.c,v 1.6 1995/08/29 23:05:57 cgd Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,10 +30,6 @@
* Mountain View, California 94043
*/
-#ifndef lint
-static const char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
-#endif
-
/*
* rpc_util.c, Utility routines for the RPC protocol compiler
*/
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index baafbe36fec..c42e8eaa13d 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -1,10 +1,4 @@
-/* $OpenBSD: rpcinfo.c,v 1.12 2007/03/26 14:20:03 jmc Exp $ */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)rpcinfo.c 1.22 87/08/12 SMI";*/
-/*static char sccsid[] = "from: @(#)rpcinfo.c 2.2 88/08/11 4.0 RPCSRC";*/
-static char rcsid[] = "$OpenBSD: rpcinfo.c,v 1.12 2007/03/26 14:20:03 jmc Exp $";
-#endif
+/* $OpenBSD: rpcinfo.c,v 1.13 2009/10/27 23:59:42 deraadt Exp $ */
/*
* Copyright (C) 1986, Sun Microsystems, Inc.
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index b9270ca9790..a496da41328 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rs.c,v 1.19 2009/10/14 20:51:47 sobrado Exp $ */
+/* $OpenBSD: rs.c,v 1.20 2009/10/27 23:59:42 deraadt Exp $ */
/*-
* Copyright (c) 1993
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)rs.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: rs.c,v 1.19 2009/10/14 20:51:47 sobrado Exp $";
-#endif
-#endif /* not lint */
-
/*
* rs - reshape a data array
* Author: John Kunze, Office of Comp. Affairs, UCB
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index 911e6b9d318..52e95c6de85 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsh.c,v 1.39 2007/03/20 15:48:10 jmc Exp $ */
+/* $OpenBSD: rsh.c,v 1.40 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1983, 1990 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1990 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static const char sccsid[] = "from: @(#)rsh.c 5.24 (Berkeley) 7/1/91";*/
-static const char rcsid[] = "$OpenBSD: rsh.c,v 1.39 2007/03/20 15:48:10 jmc Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 9230d50816f..f2ddb26ba67 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rup.c,v 1.23 2008/07/09 19:41:56 sobrado Exp $ */
+/* $OpenBSD: rup.c,v 1.24 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1993, John Brezak
@@ -28,10 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: rup.c,v 1.23 2008/07/09 19:41:56 sobrado Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 69520c9b195..852247496b3 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ruptime.c,v 1.15 2009/10/15 08:20:43 sobrado Exp $ */
+/* $OpenBSD: ruptime.c,v 1.16 2009/10/27 23:59:43 deraadt Exp $ */
/*
* Copyright (c) 1983 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-const char copyright[] =
-"@(#) Copyright (c) 1983 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static const char sccsid[] = "from: @(#)ruptime.c 5.8 (Berkeley) 7/21/90";*/
-static const char rcsid[] = "$OpenBSD: ruptime.c,v 1.15 2009/10/15 08:20:43 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/file.h>
#include <dirent.h>
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 60e4609977f..f9dc5f5cddb 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rusers.c,v 1.29 2007/09/02 15:19:34 deraadt Exp $ */
+/* $OpenBSD: rusers.c,v 1.30 2009/10/27 23:59:43 deraadt Exp $ */
/*
* Copyright (c) 2001, 2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -46,10 +46,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: rusers.c,v 1.29 2007/09/02 15:19:34 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 43132959554..7c0abdabf04 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rwall.c,v 1.11 2008/07/09 19:41:56 sobrado Exp $ */
+/* $OpenBSD: rwall.c,v 1.12 2009/10/27 23:59:43 deraadt Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
@@ -30,17 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)wall.c 5.14 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$OpenBSD: rwall.c,v 1.11 2008/07/09 19:41:56 sobrado Exp $";
-#endif /* not lint */
-
/*
* This program is not related to David Wall, whose Stanford Ph.D. thesis
* is entitled "Mechanisms for Broadcast and Selective Broadcast".
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index ba6b3a22599..63370265b35 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rwho.c,v 1.15 2003/06/03 02:56:15 millert Exp $ */
+/* $OpenBSD: rwho.c,v 1.16 2009/10/27 23:59:43 deraadt Exp $ */
/*
* Copyright (c) 1983 The Regents of the University of California.
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "from: @(#)rwho.c 5.5 (Berkeley) 6/1/90";
-#else
-static const char rcsid[] = "$OpenBSD: rwho.c,v 1.15 2003/06/03 02:56:15 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/file.h>
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 885c3a48d54..056242afc76 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: script.c,v 1.24 2005/12/12 20:10:53 deraadt Exp $ */
+/* $OpenBSD: script.c,v 1.25 2009/10/27 23:59:43 deraadt Exp $ */
/* $NetBSD: script.c,v 1.3 1994/12/21 08:55:43 jtc Exp $ */
/*
@@ -55,19 +55,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: script.c,v 1.24 2005/12/12 20:10:53 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index 58f8b2823db..f8f8a05be10 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compile.c,v 1.30 2009/10/23 15:24:41 reyk Exp $ */
+/* $OpenBSD: compile.c,v 1.31 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -33,11 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)compile.c 8.2 (Berkeley) 4/28/95"; */
-static const char rcsid[] = "$OpenBSD: compile.c,v 1.30 2009/10/23 15:24:41 reyk Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index ac151a90262..f50cb7e479f 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.16 2009/08/07 03:30:56 djm Exp $ */
+/* $OpenBSD: main.c,v 1.17 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-/* from: static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/3/94"; */
-static const char rcsid[] = "$OpenBSD: main.c,v 1.16 2009/08/07 03:30:56 djm Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index c3dbafdf8d7..2f5921be97c 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.8 2008/10/08 17:26:47 millert Exp $ */
+/* $OpenBSD: misc.c,v 1.9 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -33,11 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93"; */
-static const char rcsid[] = "$OpenBSD: misc.c,v 1.8 2008/10/08 17:26:47 millert Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <errno.h>
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index 8c898647e45..e1e63090027 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: process.c,v 1.14 2008/10/07 21:51:37 millert Exp $ */
+/* $OpenBSD: process.c,v 1.15 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -33,11 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)process.c 8.1 (Berkeley) 6/6/93"; */
-static const char rcsid[] = "$OpenBSD: process.c,v 1.14 2008/10/07 21:51:37 millert Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index eb1f09e0603..0ed5200ad4f 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: showmount.c,v 1.16 2007/03/29 11:27:33 jmc Exp $ */
+/* $OpenBSD: showmount.c,v 1.17 2009/10/27 23:59:43 deraadt Exp $ */
/* $NetBSD: showmount.c,v 1.7 1996/05/01 18:14:10 cgd Exp $ */
/*
@@ -33,19 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993, 1995\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)showmount.c 8.3 (Berkeley) 3/29/95";
-#endif
-static char rcsid[] = "$OpenBSD: showmount.c,v 1.16 2007/03/29 11:27:33 jmc Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/file.h>
#include <sys/socket.h>
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index 0320c93df87..ab8a682df0f 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: soelim.c,v 1.7 2003/06/10 22:20:51 deraadt Exp $ */
+/* $OpenBSD: soelim.c,v 1.8 2009/10/27 23:59:43 deraadt Exp $ */
/* $NetBSD: soelim.c,v 1.3 1994/12/21 08:11:26 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)soelim.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: soelim.c,v 1.7 2003/06/10 22:20:51 deraadt Exp $";
-#endif /* not lint */
-
#include <stdio.h>
/*
* soelim - a filter to process n/troff input eliminating .so's
diff --git a/usr.bin/sort/append.c b/usr.bin/sort/append.c
index 38797679f1d..c6249060deb 100644
--- a/usr.bin/sort/append.c
+++ b/usr.bin/sort/append.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: append.c,v 1.9 2004/07/20 03:50:27 deraadt Exp $ */
+/* $OpenBSD: append.c,v 1.10 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1993
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)append.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: append.c,v 1.9 2004/07/20 03:50:27 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "sort.h"
#include <stdlib.h>
diff --git a/usr.bin/sort/fields.c b/usr.bin/sort/fields.c
index d02275e9d6d..4217904bcde 100644
--- a/usr.bin/sort/fields.c
+++ b/usr.bin/sort/fields.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fields.c,v 1.13 2008/02/22 01:24:58 millert Exp $ */
+/* $OpenBSD: fields.c,v 1.14 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1993
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)fields.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: fields.c,v 1.13 2008/02/22 01:24:58 millert Exp $";
-#endif
-#endif /* not lint */
-
/* Subroutines to generate sort keys. */
#include "sort.h"
diff --git a/usr.bin/sort/files.c b/usr.bin/sort/files.c
index fb8973518b6..e62409ccaec 100644
--- a/usr.bin/sort/files.c
+++ b/usr.bin/sort/files.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: files.c,v 1.12 2005/08/18 14:56:25 jaredy Exp $ */
+/* $OpenBSD: files.c,v 1.13 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1993
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)files.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: files.c,v 1.12 2005/08/18 14:56:25 jaredy Exp $";
-#endif
-#endif /* not lint */
-
#include "sort.h"
#include "fsort.h"
diff --git a/usr.bin/sort/fsort.c b/usr.bin/sort/fsort.c
index b46974b57b0..cab2b3b824f 100644
--- a/usr.bin/sort/fsort.c
+++ b/usr.bin/sort/fsort.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsort.c,v 1.20 2008/11/20 12:14:16 otto Exp $ */
+/* $OpenBSD: fsort.c,v 1.21 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1993
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)fsort.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: fsort.c,v 1.20 2008/11/20 12:14:16 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* Read in the next bin. If it fits in one segment sort it;
* otherwise refine it by segment deeper by one character,
diff --git a/usr.bin/sort/init.c b/usr.bin/sort/init.c
index 700b8406979..34ef4149e10 100644
--- a/usr.bin/sort/init.c
+++ b/usr.bin/sort/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.11 2007/09/01 18:13:58 kili Exp $ */
+/* $OpenBSD: init.c,v 1.12 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1993
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.11 2007/09/01 18:13:58 kili Exp $";
-#endif
-#endif /* not lint */
-
#include "sort.h"
#include <ctype.h>
diff --git a/usr.bin/sort/msort.c b/usr.bin/sort/msort.c
index 342f8e37aea..7b208107342 100644
--- a/usr.bin/sort/msort.c
+++ b/usr.bin/sort/msort.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msort.c,v 1.21 2007/08/21 20:29:25 millert Exp $ */
+/* $OpenBSD: msort.c,v 1.22 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1993
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)msort.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: msort.c,v 1.21 2007/08/21 20:29:25 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "sort.h"
#include "fsort.h"
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index b31a7111dcd..f8d94064533 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sort.c,v 1.36 2007/08/22 06:56:40 jmc Exp $ */
+/* $OpenBSD: sort.c,v 1.37 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1993
@@ -32,20 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)sort.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: sort.c,v 1.36 2007/08/22 06:56:40 jmc Exp $";
-#endif
-#endif /* not lint */
-
/*
* Sort sorts a file using an optional user-defined key.
* Sort uses radix sort for internal sorting, and allows
diff --git a/usr.bin/sort/tmp.c b/usr.bin/sort/tmp.c
index c2d628e7736..b772580b1a8 100644
--- a/usr.bin/sort/tmp.c
+++ b/usr.bin/sort/tmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmp.c,v 1.8 2008/03/19 19:25:49 kili Exp $ */
+/* $OpenBSD: tmp.c,v 1.9 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1993
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tmp.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: tmp.c,v 1.8 2008/03/19 19:25:49 kili Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/spell/look.c b/usr.bin/spell/look.c
index 8c9678bde34..b9e0b254efc 100644
--- a/usr.bin/spell/look.c
+++ b/usr.bin/spell/look.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: look.c,v 1.3 2003/06/03 02:56:16 millert Exp $ */
+/* $OpenBSD: look.c,v 1.4 2009/10/27 23:59:43 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -32,13 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)look.c 8.2 (Berkeley) 5/4/95";
-#endif
-static const char rcsid[] = "$OpenBSD: look.c,v 1.3 2003/06/03 02:56:16 millert Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
#include <stdio.h>
diff --git a/usr.bin/spell/spellprog.c b/usr.bin/spell/spellprog.c
index 5528cce8cdf..d8ecb377633 100644
--- a/usr.bin/spell/spellprog.c
+++ b/usr.bin/spell/spellprog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spellprog.c,v 1.5 2007/09/02 15:19:34 deraadt Exp $ */
+/* $OpenBSD: spellprog.c,v 1.6 2009/10/27 23:59:43 deraadt Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -64,20 +64,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)spell.c 8.1 (Berkeley) 6/6/93";
-#else
-#endif
-static const char rcsid[] = "$OpenBSD: spellprog.c,v 1.5 2007/09/02 15:19:34 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/stat.h>
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index 48956318f95..6231e8ffa1a 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: split.c,v 1.16 2007/10/20 18:08:57 sobrado Exp $ */
+/* $OpenBSD: split.c,v 1.17 2009/10/27 23:59:43 deraadt Exp $ */
/* $NetBSD: split.c,v 1.5 1995/08/31 22:22:05 jtc Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)split.c 8.3 (Berkeley) 4/25/94";
-#else
-static char rcsid[] = "$OpenBSD: split.c,v 1.16 2007/10/20 18:08:57 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.bin/strings/strings.c b/usr.bin/strings/strings.c
index d76b5835b37..8b5b82026ab 100644
--- a/usr.bin/strings/strings.c
+++ b/usr.bin/strings/strings.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strings.c,v 1.14 2008/06/01 21:42:30 sobrado Exp $ */
+/* $OpenBSD: strings.c,v 1.15 2009/10/27 23:59:43 deraadt Exp $ */
/* $NetBSD: strings.c,v 1.7 1995/02/15 15:49:19 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)strings.c 8.2 (Berkeley) 1/28/94";
-#endif
-static char rcsid[] = "$OpenBSD: strings.c,v 1.14 2008/06/01 21:42:30 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <a.out.h>
diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c
index f190031c58f..efaab6ef55c 100644
--- a/usr.bin/strip/strip.c
+++ b/usr.bin/strip/strip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strip.c,v 1.25 2009/06/19 09:40:43 sobrado Exp $ */
+/* $OpenBSD: strip.c,v 1.26 2009/10/27 23:59:44 deraadt Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)strip.c 5.8 (Berkeley) 11/6/91";*/
-static char rcsid[] = "$OpenBSD: strip.c,v 1.25 2009/06/19 09:40:43 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index bb9b7909b0a..2275dac41a3 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: su.c,v 1.57 2007/10/19 21:03:51 deraadt Exp $ */
+/* $OpenBSD: su.c,v 1.58 2009/10/27 23:59:44 deraadt Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "from: @(#)su.c 5.26 (Berkeley) 7/6/91";
-#else
-static const char rcsid[] = "$OpenBSD: su.c,v 1.57 2007/10/19 21:03:51 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index f26fb05bcde..47ed8641f75 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmstat.c,v 1.71 2009/08/14 14:41:55 deraadt Exp $ */
+/* $OpenBSD: vmstat.c,v 1.72 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $ */
/*-
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94";
-#endif
-static char rcsid[] = "$OpenBSD: vmstat.c,v 1.71 2009/08/14 14:41:55 deraadt Exp $";
-#endif /* not lint */
-
/*
* Cursed vmstat -- from Robert Elz.
*/
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index 47cba10d3a3..a601f3ef063 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: forward.c,v 1.25 2008/11/13 18:33:03 landry Exp $ */
+/* $OpenBSD: forward.c,v 1.26 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: forward.c,v 1.7 1996/02/13 16:49:10 ghudson Exp $ */
/*-
@@ -33,13 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)forward.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: forward.c,v 1.25 2008/11/13 18:33:03 landry Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/event.h>
diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c
index b275746dc02..97650b4f85b 100644
--- a/usr.bin/tail/misc.c
+++ b/usr.bin/tail/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.7 2007/09/29 12:31:28 otto Exp $ */
+/* $OpenBSD: misc.c,v 1.8 2009/10/27 23:59:44 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.7 2007/09/29 12:31:28 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index efe53e2a035..c2a6d0047ab 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: read.c,v 1.13 2008/06/02 06:01:15 otto Exp $ */
+/* $OpenBSD: read.c,v 1.14 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: read.c,v 1.4 1994/11/23 07:42:07 jtc Exp $ */
/*-
@@ -33,13 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: read.c,v 1.13 2008/06/02 06:01:15 otto Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/limits.h>
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 17cc88a9a11..23a558d8db8 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: reverse.c,v 1.18 2007/09/29 12:31:28 otto Exp $ */
+/* $OpenBSD: reverse.c,v 1.19 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: reverse.c,v 1.6 1994/11/23 07:42:10 jtc Exp $ */
/*-
@@ -33,13 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)reverse.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: reverse.c,v 1.18 2007/09/29 12:31:28 otto Exp $";
-#endif /* not lint */
-
#include <sys/stat.h>
#include <err.h>
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index c0aa35c725b..5a1727b35af 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tail.c,v 1.16 2008/11/13 18:33:03 landry Exp $ */
+/* $OpenBSD: tail.c,v 1.17 2009/10/27 23:59:44 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -32,19 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tail.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: tail.c,v 1.16 2008/11/13 18:33:03 landry Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index ea1d5ee8548..9dd04d1382f 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctl.c,v 1.10 2009/05/09 11:05:00 chl Exp $ */
+/* $OpenBSD: ctl.c,v 1.11 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: ctl.c,v 1.3 1994/12/09 02:14:10 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ctl.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: ctl.c,v 1.10 2009/05/09 11:05:00 chl Exp $";
-#endif /* not lint */
-
/*
* This file handles haggling with the various talk daemons to
* get a socket to talk to. sockt is opened and connected in
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index 6892b59b603..46d2b4cd85c 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctl_transact.c,v 1.10 2004/03/02 21:04:42 tedu Exp $ */
+/* $OpenBSD: ctl_transact.c,v 1.11 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: ctl_transact.c,v 1.3 1994/12/09 02:14:12 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ctl_transact.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: ctl_transact.c,v 1.10 2004/03/02 21:04:42 tedu Exp $";
-#endif /* not lint */
-
#include "talk.h"
#include <sys/time.h>
#include <errno.h>
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index a82778f7b26..e6bc89e21a0 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: display.c,v 1.14 2004/03/02 21:04:42 tedu Exp $ */
+/* $OpenBSD: display.c,v 1.15 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: display.c,v 1.3 1994/12/09 02:14:13 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: display.c,v 1.14 2004/03/02 21:04:42 tedu Exp $";
-#endif /* not lint */
-
/*
* The window 'manager', initializes curses and handles the actual
* displaying of text
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index 4ed87786d12..adbe5ea62de 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: get_addrs.c,v 1.7 2004/03/16 01:11:09 tedu Exp $ */
+/* $OpenBSD: get_addrs.c,v 1.8 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: get_addrs.c,v 1.3 1994/12/09 02:14:14 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)get_addrs.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: get_addrs.c,v 1.7 2004/03/16 01:11:09 tedu Exp $";
-#endif /* not lint */
-
#include "talk.h"
#include <netdb.h>
#include <stdio.h>
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 3dd5a79f420..65c2a289c36 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: get_names.c,v 1.17 2008/05/31 21:10:36 sobrado Exp $ */
+/* $OpenBSD: get_names.c,v 1.18 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: get_names.c,v 1.4 1994/12/09 02:14:16 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)get_names.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: get_names.c,v 1.17 2008/05/31 21:10:36 sobrado Exp $";
-#endif /* not lint */
-
#include "talk.h"
#include <sys/param.h>
#include <pwd.h>
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index c72872fd1c0..fdaf7147dd4 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_disp.c,v 1.19 2004/03/02 21:04:42 tedu Exp $ */
+/* $OpenBSD: init_disp.c,v 1.20 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: init_disp.c,v 1.6 1994/12/09 02:14:17 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)init_disp.c 8.2 (Berkeley) 2/16/94";
-#endif
-static const char rcsid[] = "$OpenBSD: init_disp.c,v 1.19 2004/03/02 21:04:42 tedu Exp $";
-#endif /* not lint */
-
/*
* Initialization code for the display package,
* as well as the signal handling routines.
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index 4576d55340b..6a63d4d258e 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: invite.c,v 1.13 2007/05/25 21:27:16 krw Exp $ */
+/* $OpenBSD: invite.c,v 1.14 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: invite.c,v 1.3 1994/12/09 02:14:18 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)invite.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: invite.c,v 1.13 2007/05/25 21:27:16 krw Exp $";
-#endif /* not lint */
-
#include "talk.h"
#include <arpa/inet.h>
#include <sys/time.h>
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index eb58b8f6eab..5ef273aecc6 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.16 2005/04/13 02:33:08 deraadt Exp $ */
+/* $OpenBSD: io.c,v 1.17 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: io.c,v 1.4 1994/12/09 02:14:20 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: io.c,v 1.16 2005/04/13 02:33:08 deraadt Exp $";
-#endif /* not lint */
-
/*
* This file contains the I/O handling and the exchange of
* edit characters. This connection itself is established in
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index 472fc3813c2..7b8943815ad 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: look_up.c,v 1.10 2004/03/02 21:04:42 tedu Exp $ */
+/* $OpenBSD: look_up.c,v 1.11 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: look_up.c,v 1.3 1994/12/09 02:14:21 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)look_up.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: look_up.c,v 1.10 2004/03/02 21:04:42 tedu Exp $";
-#endif /* not lint */
-
#include "talk.h"
#include <errno.h>
#include <unistd.h>
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index 8fdd47ea840..f8e36a76c77 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msgs.c,v 1.8 2004/03/02 21:04:42 tedu Exp $ */
+/* $OpenBSD: msgs.c,v 1.9 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: msgs.c,v 1.3 1994/12/09 02:14:22 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)msgs.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: msgs.c,v 1.8 2004/03/02 21:04:42 tedu Exp $";
-#endif /* not lint */
-
/*
* A package to display what is happening every MSG_INTERVAL seconds
* if we are slow connecting.
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index afa415926a1..a85c9cb13e1 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: talk.c,v 1.8 2004/03/02 21:04:42 tedu Exp $ */
+/* $OpenBSD: talk.c,v 1.9 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: talk.c,v 1.3 1994/12/09 02:14:25 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)talk.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: talk.c,v 1.8 2004/03/02 21:04:42 tedu Exp $";
-#endif /* not lint */
-
#include "talk.h"
/*
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index eb67f51cfd7..1780c960814 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcopy.c,v 1.10 2007/06/25 16:59:54 deraadt Exp $ */
+/* $OpenBSD: tcopy.c,v 1.11 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: tcopy.c,v 1.5 1997/04/15 07:23:08 lukem Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1985, 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tcopy.c 8.3 (Berkeley) 1/23/95";
-#endif
-static char rcsid[] = "$OpenBSD: tcopy.c,v 1.10 2007/06/25 16:59:54 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index 18e47e5aca8..08ace9d6bc9 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tee.c,v 1.6 2003/06/10 22:20:53 deraadt Exp $ */
+/* $OpenBSD: tee.c,v 1.7 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: tee.c,v 1.5 1994/12/09 01:43:39 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tee.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: tee.c,v 1.6 2003/06/10 22:20:53 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/stat.h>
#include <signal.h>
diff --git a/usr.bin/telnet/auth.c b/usr.bin/telnet/auth.c
index 801771e0eb7..3d787b1f34f 100644
--- a/usr.bin/telnet/auth.c
+++ b/usr.bin/telnet/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.1 2005/05/24 03:43:56 deraadt Exp $ */
+/* $OpenBSD: auth.c,v 1.2 2009/10/27 23:59:44 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95" */
-/* from: static char *rcsid = "$NetBSD: auth.c,v 1.5 1996/02/24 01:15:17 jtk Exp $"; */
-#endif /* not lint */
-
/*
* This source code is no longer held under any constraint of USA
* `cryptographic laws' since it was exported legally. The cryptographic
diff --git a/usr.bin/telnet/genget.c b/usr.bin/telnet/genget.c
index 5f7a8ce4351..6a04d249a8b 100644
--- a/usr.bin/telnet/genget.c
+++ b/usr.bin/telnet/genget.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: genget.c,v 1.1 2005/05/24 03:43:56 deraadt Exp $ */
+/* $OpenBSD: genget.c,v 1.2 2009/10/27 23:59:44 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -29,12 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)genget.c 8.2 (Berkeley) 5/30/95"; */
-/* from: static char *rcsid = "$NetBSD: genget.c,v 1.5 1996/02/24 01:15:21 jtk Exp $"; */
-static char *rcsid = "$OpenBSD: genget.c,v 1.1 2005/05/24 03:43:56 deraadt Exp $";
-#endif /* not lint */
-
/* $KTH: genget.c,v 1.6 1997/05/04 09:01:34 assar Exp $ */
#include <ctype.h>
diff --git a/usr.bin/telnet/getent.c b/usr.bin/telnet/getent.c
index d853b22a37d..60ed439a3ac 100644
--- a/usr.bin/telnet/getent.c
+++ b/usr.bin/telnet/getent.c
@@ -27,12 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)getent.c 8.2 (Berkeley) 12/15/93"; */
-/* from: static char *rcsid = "$NetBSD: getent.c,v 1.5 1996/02/24 01:15:22 jtk Exp $"; */
-static char *rcsid = "$OpenBSD: getent.c,v 1.2 2003/06/03 02:56:18 millert Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include "misc-proto.h"
diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c
index 1be8ae748a8..7c78d6f8c76 100644
--- a/usr.bin/telnet/main.c
+++ b/usr.bin/telnet/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.18 2009/08/06 22:51:52 sobrado Exp $ */
+/* $OpenBSD: main.c,v 1.19 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $ */
/*
@@ -30,12 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include "telnet_locl.h"
/* These values need to be the same as defined in libtelnet/kerberos5.c */
diff --git a/usr.bin/telnet/misc.c b/usr.bin/telnet/misc.c
index 291f8e532f2..215ccc8c911 100644
--- a/usr.bin/telnet/misc.c
+++ b/usr.bin/telnet/misc.c
@@ -27,12 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/* from: static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/4/93"; */
-/* from: static char rcsid[] = "$NetBSD: misc.c,v 1.5 1996/02/24 01:15:25 jtk Exp $"; */
-static char rcsid[] = "$OpenBSD: misc.c,v 1.1 2005/05/24 03:43:56 deraadt Exp $";
-#endif /* not lint */
-
/* $KTH: misc.c,v 1.15 2000/01/25 23:24:58 assar Exp $ */
#include <stdio.h>
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 3a5936df045..fca97b45f15 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.29 2007/05/11 01:47:48 ray Exp $ */
+/* $OpenBSD: main.c,v 1.30 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
- "$OpenBSD: main.c,v 1.29 2007/05/11 01:47:48 ray Exp $";
-#endif /* not lint */
-
/*
* TFTP User Program -- Command Interface
*
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index e13af0c0a49..d28e9435ab0 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tftp.c,v 1.21 2007/05/11 01:47:48 ray Exp $ */
+/* $OpenBSD: tftp.c,v 1.22 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: tftp.c,v 1.5 1995/04/29 05:55:25 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tftp.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
- "$OpenBSD: tftp.c,v 1.21 2007/05/11 01:47:48 ray Exp $";
-#endif /* not lint */
-
/*
* TFTP User Program -- Protocol Machines
*
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index a01e3488ffa..9cc615efdcb 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tftpsubs.c,v 1.13 2007/09/10 14:29:53 tobias Exp $ */
+/* $OpenBSD: tftpsubs.c,v 1.14 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tftpsubs.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
- "$OpenBSD: tftpsubs.c,v 1.13 2007/09/10 14:29:53 tobias Exp $";
-#endif /* not lint */
-
/*
* Simple minded read-ahead/write-behind subroutines for tftp user and
* server. Written originally with multiple buffers in mind, but current
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 353fbd319ce..1624a6509d4 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: time.c,v 1.17 2009/07/14 17:24:08 sobrado Exp $ */
+/* $OpenBSD: time.c,v 1.18 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: time.c,v 1.7 1995/06/27 00:34:00 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: time.c,v 1.17 2009/07/14 17:24:08 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/tip/acu.c b/usr.bin/tip/acu.c
index 896bde2b54c..1a136728c75 100644
--- a/usr.bin/tip/acu.c
+++ b/usr.bin/tip/acu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acu.c,v 1.16 2008/11/09 12:34:47 tobias Exp $ */
+/* $OpenBSD: acu.c,v 1.17 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: acu.c,v 1.4 1996/12/29 10:34:03 cgd Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)acu.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: acu.c,v 1.16 2008/11/09 12:34:47 tobias Exp $";
-#endif /* not lint */
-
#include "tip.h"
static acu_t *acu = NULL;
diff --git a/usr.bin/tip/aculib/biz22.c b/usr.bin/tip/aculib/biz22.c
index 920b42a5c41..a0144e1d7a9 100644
--- a/usr.bin/tip/aculib/biz22.c
+++ b/usr.bin/tip/aculib/biz22.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: biz22.c,v 1.13 2006/03/17 19:17:13 moritz Exp $ */
+/* $OpenBSD: biz22.c,v 1.14 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: biz22.c,v 1.6 1997/02/11 09:24:11 mrg Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)biz22.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: biz22.c,v 1.13 2006/03/17 19:17:13 moritz Exp $";
-#endif /* not lint */
-
#include "tip.h"
#define DISCONNECT_CMD "\20\04" /* disconnection string */
diff --git a/usr.bin/tip/aculib/biz31.c b/usr.bin/tip/aculib/biz31.c
index 41518112db4..d77ffae3a3e 100644
--- a/usr.bin/tip/aculib/biz31.c
+++ b/usr.bin/tip/aculib/biz31.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: biz31.c,v 1.10 2006/03/17 19:17:13 moritz Exp $ */
+/* $OpenBSD: biz31.c,v 1.11 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: biz31.c,v 1.5 1997/02/11 09:24:14 mrg Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)biz31.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: biz31.c,v 1.10 2006/03/17 19:17:13 moritz Exp $";
-#endif /* not lint */
-
#include "tip.h"
#define MAXRETRY 3 /* sync up retry count */
diff --git a/usr.bin/tip/aculib/courier.c b/usr.bin/tip/aculib/courier.c
index cd642b6df0a..2a9f9f4d9aa 100644
--- a/usr.bin/tip/aculib/courier.c
+++ b/usr.bin/tip/aculib/courier.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: courier.c,v 1.15 2006/03/17 19:17:13 moritz Exp $ */
+/* $OpenBSD: courier.c,v 1.16 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: courier.c,v 1.7 1997/02/11 09:24:16 mrg Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)courier.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: courier.c,v 1.15 2006/03/17 19:17:13 moritz Exp $";
-#endif /* not lint */
-
/*
* Routines for calling up on a Courier modem.
* Derived from Hayes driver.
diff --git a/usr.bin/tip/aculib/df.c b/usr.bin/tip/aculib/df.c
index f858d46fc05..39b09901d29 100644
--- a/usr.bin/tip/aculib/df.c
+++ b/usr.bin/tip/aculib/df.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: df.c,v 1.9 2006/03/17 19:17:13 moritz Exp $ */
+/* $OpenBSD: df.c,v 1.10 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: df.c,v 1.4 1995/10/29 00:49:51 pk Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)df.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: df.c,v 1.9 2006/03/17 19:17:13 moritz Exp $";
-#endif /* not lint */
-
/*
* Dial the DF02-AC or DF03-AC
*/
diff --git a/usr.bin/tip/aculib/dn11.c b/usr.bin/tip/aculib/dn11.c
index 01805ca7691..57144e3d244 100644
--- a/usr.bin/tip/aculib/dn11.c
+++ b/usr.bin/tip/aculib/dn11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dn11.c,v 1.9 2006/03/17 19:17:13 moritz Exp $ */
+/* $OpenBSD: dn11.c,v 1.10 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: dn11.c,v 1.4 1995/10/29 00:49:53 pk Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dn11.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: dn11.c,v 1.9 2006/03/17 19:17:13 moritz Exp $";
-#endif /* not lint */
-
/*
* Routines for dialing up on DN-11
*/
diff --git a/usr.bin/tip/aculib/hayes.c b/usr.bin/tip/aculib/hayes.c
index 32bf2a0b9d2..c52004c0194 100644
--- a/usr.bin/tip/aculib/hayes.c
+++ b/usr.bin/tip/aculib/hayes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hayes.c,v 1.14 2007/05/16 03:14:41 ray Exp $ */
+/* $OpenBSD: hayes.c,v 1.15 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: hayes.c,v 1.6 1997/02/11 09:24:17 mrg Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)hayes.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: hayes.c,v 1.14 2007/05/16 03:14:41 ray Exp $";
-#endif /* not lint */
-
/*
* Routines for calling up on a Hayes Modem
* (based on the old VenTel driver).
diff --git a/usr.bin/tip/aculib/t3000.c b/usr.bin/tip/aculib/t3000.c
index 1bb81c5d375..728cd37a582 100644
--- a/usr.bin/tip/aculib/t3000.c
+++ b/usr.bin/tip/aculib/t3000.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t3000.c,v 1.14 2006/03/17 19:17:13 moritz Exp $ */
+/* $OpenBSD: t3000.c,v 1.15 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: t3000.c,v 1.5 1997/02/11 09:24:18 mrg Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)t3000.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: t3000.c,v 1.14 2006/03/17 19:17:13 moritz Exp $";
-#endif /* not lint */
-
/*
* Routines for calling up on a Telebit T3000 modem.
* Derived from Courier driver.
diff --git a/usr.bin/tip/aculib/v3451.c b/usr.bin/tip/aculib/v3451.c
index 96624409f27..64621d2e835 100644
--- a/usr.bin/tip/aculib/v3451.c
+++ b/usr.bin/tip/aculib/v3451.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3451.c,v 1.9 2006/03/17 19:17:13 moritz Exp $ */
+/* $OpenBSD: v3451.c,v 1.10 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: v3451.c,v 1.6 1997/02/11 09:24:20 mrg Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)v3451.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: v3451.c,v 1.9 2006/03/17 19:17:13 moritz Exp $";
-#endif /* not lint */
-
/*
* Routines for calling up on a Vadic 3451 Modem
*/
diff --git a/usr.bin/tip/aculib/v831.c b/usr.bin/tip/aculib/v831.c
index 383a540f1f6..ff70eda8a9e 100644
--- a/usr.bin/tip/aculib/v831.c
+++ b/usr.bin/tip/aculib/v831.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v831.c,v 1.11 2006/03/17 19:17:13 moritz Exp $ */
+/* $OpenBSD: v831.c,v 1.12 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: v831.c,v 1.5 1996/12/29 10:42:01 cgd Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)v831.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: v831.c,v 1.11 2006/03/17 19:17:13 moritz Exp $";
-#endif /* not lint */
-
/*
* Routines for dialing up on Vadic 831
*/
diff --git a/usr.bin/tip/aculib/ventel.c b/usr.bin/tip/aculib/ventel.c
index 04ca30e6199..a0f9a9e94f1 100644
--- a/usr.bin/tip/aculib/ventel.c
+++ b/usr.bin/tip/aculib/ventel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ventel.c,v 1.12 2006/03/17 19:17:13 moritz Exp $ */
+/* $OpenBSD: ventel.c,v 1.13 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: ventel.c,v 1.6 1997/02/11 09:24:21 mrg Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ventel.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: ventel.c,v 1.12 2006/03/17 19:17:13 moritz Exp $";
-#endif /* not lint */
-
/*
* Routines for calling up on a Ventel Modem
* The Ventel is expected to be strapped for local echo (just like uucp)
diff --git a/usr.bin/tip/acutab.c b/usr.bin/tip/acutab.c
index 85101f317e2..77f23771ffe 100644
--- a/usr.bin/tip/acutab.c
+++ b/usr.bin/tip/acutab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acutab.c,v 1.5 2006/03/17 19:17:13 moritz Exp $ */
+/* $OpenBSD: acutab.c,v 1.6 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: acutab.c,v 1.3 1994/12/08 09:30:41 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)acutab.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: acutab.c,v 1.5 2006/03/17 19:17:13 moritz Exp $";
-#endif /* not lint */
-
#include "tip.h"
acu_t acutable[] = {
diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c
index 73e46a5a6b1..c057286fec0 100644
--- a/usr.bin/tip/cmds.c
+++ b/usr.bin/tip/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.27 2007/05/15 19:42:05 moritz Exp $ */
+/* $OpenBSD: cmds.c,v 1.28 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: cmds.c,v 1.7 1997/02/11 09:24:03 mrg Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: cmds.c,v 1.27 2007/05/15 19:42:05 moritz Exp $";
-#endif /* not lint */
-
#include "tip.h"
#include "pathnames.h"
diff --git a/usr.bin/tip/cmdtab.c b/usr.bin/tip/cmdtab.c
index 99b563d7ad7..d33f48e5868 100644
--- a/usr.bin/tip/cmdtab.c
+++ b/usr.bin/tip/cmdtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmdtab.c,v 1.7 2006/03/17 14:43:06 moritz Exp $ */
+/* $OpenBSD: cmdtab.c,v 1.8 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: cmdtab.c,v 1.3 1994/12/08 09:30:46 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.7 2006/03/17 14:43:06 moritz Exp $";
-#endif /* not lint */
-
#include "tip.h"
esctable_t etable[] = {
diff --git a/usr.bin/tip/cu.c b/usr.bin/tip/cu.c
index a1d41045b83..5c3fb1cc752 100644
--- a/usr.bin/tip/cu.c
+++ b/usr.bin/tip/cu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cu.c,v 1.23 2007/11/26 09:28:34 martynas Exp $ */
+/* $OpenBSD: cu.c,v 1.24 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: cu.c,v 1.5 1997/02/11 09:24:05 mrg Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cu.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: cu.c,v 1.23 2007/11/26 09:28:34 martynas Exp $";
-#endif /* not lint */
-
#include <err.h>
#include <paths.h>
diff --git a/usr.bin/tip/hunt.c b/usr.bin/tip/hunt.c
index a6cf72ec6c5..f4a4c4c6c05 100644
--- a/usr.bin/tip/hunt.c
+++ b/usr.bin/tip/hunt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hunt.c,v 1.13 2006/03/17 19:39:46 deraadt Exp $ */
+/* $OpenBSD: hunt.c,v 1.14 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: hunt.c,v 1.6 1997/04/20 00:02:10 mellon Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)hunt.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: hunt.c,v 1.13 2006/03/17 19:39:46 deraadt Exp $";
-#endif /* not lint */
-
#include "tip.h"
static jmp_buf deadline;
diff --git a/usr.bin/tip/log.c b/usr.bin/tip/log.c
index 2b485d59941..71d43c0da3b 100644
--- a/usr.bin/tip/log.c
+++ b/usr.bin/tip/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.9 2007/05/15 19:42:05 moritz Exp $ */
+/* $OpenBSD: log.c,v 1.10 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: log.c,v 1.4 1994/12/24 17:56:28 cgd Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: log.c,v 1.9 2007/05/15 19:42:05 moritz Exp $";
-#endif /* not lint */
-
#include "tip.h"
#ifdef ACULOG
diff --git a/usr.bin/tip/partab.c b/usr.bin/tip/partab.c
index 0b8df9c65a4..c25c12f704f 100644
--- a/usr.bin/tip/partab.c
+++ b/usr.bin/tip/partab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: partab.c,v 1.5 2003/06/03 02:56:18 millert Exp $ */
+/* $OpenBSD: partab.c,v 1.6 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: partab.c,v 1.4 1996/12/29 10:38:21 cgd Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)partab.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: partab.c,v 1.5 2003/06/03 02:56:18 millert Exp $";
-#endif /* not lint */
-
/*
* Even parity table for 0-0177
*/
diff --git a/usr.bin/tip/remote.c b/usr.bin/tip/remote.c
index 2312a05388c..2592221b525 100644
--- a/usr.bin/tip/remote.c
+++ b/usr.bin/tip/remote.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: remote.c,v 1.17 2007/05/15 19:42:05 moritz Exp $ */
+/* $OpenBSD: remote.c,v 1.18 2009/10/27 23:59:44 deraadt Exp $ */
/* $NetBSD: remote.c,v 1.5 1997/04/20 00:02:45 mellon Exp $ */
/*
@@ -31,19 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)remote.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: remote.c,v 1.17 2007/05/15 19:42:05 moritz Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c
index 879264ceadd..7636a9c35e8 100644
--- a/usr.bin/tip/tip.c
+++ b/usr.bin/tip/tip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tip.c,v 1.34 2008/06/01 18:38:29 sobrado Exp $ */
+/* $OpenBSD: tip.c,v 1.35 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: tip.c,v 1.13 1997/04/20 00:03:05 mellon Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tip.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: tip.c,v 1.34 2008/06/01 18:38:29 sobrado Exp $";
-#endif /* not lint */
-
/*
* tip - UNIX link to other systems
* tip [-v] [-speed] system-name
diff --git a/usr.bin/tip/tipout.c b/usr.bin/tip/tipout.c
index 0ebe017276e..0a01765a873 100644
--- a/usr.bin/tip/tipout.c
+++ b/usr.bin/tip/tipout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tipout.c,v 1.18 2006/05/31 07:03:08 jason Exp $ */
+/* $OpenBSD: tipout.c,v 1.19 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: tipout.c,v 1.5 1996/12/29 10:34:12 cgd Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tipout.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: tipout.c,v 1.18 2006/05/31 07:03:08 jason Exp $";
-#endif /* not lint */
-
#include "tip.h"
/*
diff --git a/usr.bin/tip/uucplock.c b/usr.bin/tip/uucplock.c
index d1581b9c545..7ea9c6c53a1 100644
--- a/usr.bin/tip/uucplock.c
+++ b/usr.bin/tip/uucplock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uucplock.c,v 1.11 2006/03/16 19:32:46 deraadt Exp $ */
+/* $OpenBSD: uucplock.c,v 1.12 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: uucplock.c,v 1.7 1997/02/11 09:24:08 mrg Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)uucplock.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: uucplock.c,v 1.11 2006/03/16 19:32:46 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/file.h>
#include <sys/dir.h>
diff --git a/usr.bin/tip/value.c b/usr.bin/tip/value.c
index 325485b5bf0..646116ca127 100644
--- a/usr.bin/tip/value.c
+++ b/usr.bin/tip/value.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: value.c,v 1.17 2007/05/15 19:42:05 moritz Exp $ */
+/* $OpenBSD: value.c,v 1.18 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: value.c,v 1.6 1997/02/11 09:24:09 mrg Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)value.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: value.c,v 1.17 2007/05/15 19:42:05 moritz Exp $";
-#endif /* not lint */
-
#include "tip.h"
#define MIDDLE 35
diff --git a/usr.bin/tip/vars.c b/usr.bin/tip/vars.c
index 8c973684bf2..a75fd3f9ae7 100644
--- a/usr.bin/tip/vars.c
+++ b/usr.bin/tip/vars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vars.c,v 1.9 2007/05/15 19:42:05 moritz Exp $ */
+/* $OpenBSD: vars.c,v 1.10 2009/10/27 23:59:45 deraadt Exp $ */
/* $NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: vars.c,v 1.9 2007/05/15 19:42:05 moritz Exp $";
-#endif /* not lint */
-
#include "tip.h"
#include "pathnames.h"
diff --git a/usr.bin/tn3270/api/api_bsd.c b/usr.bin/tn3270/api/api_bsd.c
index 190c5d234d5..87addf10cc0 100644
--- a/usr.bin/tn3270/api/api_bsd.c
+++ b/usr.bin/tn3270/api/api_bsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: api_bsd.c,v 1.5 2003/11/15 00:26:36 tedu Exp $ */
+/* $OpenBSD: api_bsd.c,v 1.6 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)api_bsd.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: api_bsd.c,v 1.5 2003/11/15 00:26:36 tedu Exp $";
-#endif /* not lint */
-
#if defined(unix)
#include <sys/types.h>
diff --git a/usr.bin/tn3270/api/api_exch.c b/usr.bin/tn3270/api/api_exch.c
index f5fbc611b26..dea15bdff75 100644
--- a/usr.bin/tn3270/api/api_exch.c
+++ b/usr.bin/tn3270/api/api_exch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: api_exch.c,v 1.6 2003/07/18 23:11:43 david Exp $ */
+/* $OpenBSD: api_exch.c,v 1.7 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)api_exch.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: api_exch.c,v 1.6 2003/07/18 23:11:43 david Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.bin/tn3270/api/apilib.c b/usr.bin/tn3270/api/apilib.c
index 1080d1dcfa3..8c55d349187 100644
--- a/usr.bin/tn3270/api/apilib.c
+++ b/usr.bin/tn3270/api/apilib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apilib.c,v 1.3 2003/06/03 02:56:18 millert Exp $ */
+/* $OpenBSD: apilib.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)apilib.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: apilib.c,v 1.3 2003/06/03 02:56:18 millert Exp $";
-#endif /* not lint */
-
#include "../ctlr/api.h"
#include "apilib.h"
diff --git a/usr.bin/tn3270/api/asc_ebc.c b/usr.bin/tn3270/api/asc_ebc.c
index 804e8a9eb31..2daedde4f7d 100644
--- a/usr.bin/tn3270/api/asc_ebc.c
+++ b/usr.bin/tn3270/api/asc_ebc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asc_ebc.c,v 1.3 2003/06/03 02:56:18 millert Exp $ */
+/* $OpenBSD: asc_ebc.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)asc_ebc.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: asc_ebc.c,v 1.3 2003/06/03 02:56:18 millert Exp $";
-#endif /* not lint */
-
/*
* Ascii<->Ebcdic translation tables.
*/
diff --git a/usr.bin/tn3270/api/astosc.c b/usr.bin/tn3270/api/astosc.c
index 1019af5948f..fe3bfdac43a 100644
--- a/usr.bin/tn3270/api/astosc.c
+++ b/usr.bin/tn3270/api/astosc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: astosc.c,v 1.4 2003/06/03 02:56:18 millert Exp $ */
+/* $OpenBSD: astosc.c,v 1.5 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)astosc.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: astosc.c,v 1.4 2003/06/03 02:56:18 millert Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include "../general/general.h"
diff --git a/usr.bin/tn3270/api/dctype.c b/usr.bin/tn3270/api/dctype.c
index 13887f41f52..26e088cc0cc 100644
--- a/usr.bin/tn3270/api/dctype.c
+++ b/usr.bin/tn3270/api/dctype.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dctype.c,v 1.3 2003/06/03 02:56:18 millert Exp $ */
+/* $OpenBSD: dctype.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)dctype.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: dctype.c,v 1.3 2003/06/03 02:56:18 millert Exp $";
-#endif /* not lint */
-
#include "dctype.h"
unsigned char dctype[192] = {
diff --git a/usr.bin/tn3270/api/disp_asc.c b/usr.bin/tn3270/api/disp_asc.c
index 4e486320506..96b361ac1f2 100644
--- a/usr.bin/tn3270/api/disp_asc.c
+++ b/usr.bin/tn3270/api/disp_asc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disp_asc.c,v 1.3 2003/06/03 02:56:18 millert Exp $ */
+/* $OpenBSD: disp_asc.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)disp_asc.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: disp_asc.c,v 1.3 2003/06/03 02:56:18 millert Exp $";
-#endif /* not lint */
-
/*
* There isn't much excuse for this file, but here it is.
*/
diff --git a/usr.bin/tn3270/api/ebc_disp.c b/usr.bin/tn3270/api/ebc_disp.c
index f3626877df1..e2c3273bbd3 100644
--- a/usr.bin/tn3270/api/ebc_disp.c
+++ b/usr.bin/tn3270/api/ebc_disp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ebc_disp.c,v 1.3 2003/06/03 02:56:18 millert Exp $ */
+/* $OpenBSD: ebc_disp.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)ebc_disp.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: ebc_disp.c,v 1.3 2003/06/03 02:56:18 millert Exp $";
-#endif /* not lint */
-
/*
* Translate table to map EBCDIC into 3270 display codes.
*/
diff --git a/usr.bin/tn3270/ascii/map3270.c b/usr.bin/tn3270/ascii/map3270.c
index 3c48afacffd..6dbf8edd00d 100644
--- a/usr.bin/tn3270/ascii/map3270.c
+++ b/usr.bin/tn3270/ascii/map3270.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: map3270.c,v 1.9 2003/11/08 19:17:29 jmc Exp $ */
+/* $OpenBSD: map3270.c,v 1.10 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)map3270.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: map3270.c,v 1.9 2003/11/08 19:17:29 jmc Exp $";
-#endif /* not lint */
-
/* This program reads a description file, somewhat like /etc/termcap,
that describes the mapping between the current terminal's keyboard and
a 3270 keyboard.
diff --git a/usr.bin/tn3270/ascii/mset.c b/usr.bin/tn3270/ascii/mset.c
index 723a32150db..75729b63dc4 100644
--- a/usr.bin/tn3270/ascii/mset.c
+++ b/usr.bin/tn3270/ascii/mset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mset.c,v 1.6 2003/07/10 00:06:51 david Exp $ */
+/* $OpenBSD: mset.c,v 1.7 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)mset.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mset.c,v 1.6 2003/07/10 00:06:51 david Exp $";
-#endif /* not lint */
-
/*
* this program outputs the user's 3270 mapping table in a form suitable
* for inclusion in the environment. Typically, this might be used
diff --git a/usr.bin/tn3270/ascii/termin.c b/usr.bin/tn3270/ascii/termin.c
index 0b71bed9008..3b5d86b6a0d 100644
--- a/usr.bin/tn3270/ascii/termin.c
+++ b/usr.bin/tn3270/ascii/termin.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: termin.c,v 1.4 2003/06/03 02:56:19 millert Exp $ */
+/* $OpenBSD: termin.c,v 1.5 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)termin.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: termin.c,v 1.4 2003/06/03 02:56:19 millert Exp $";
-#endif /* not lint */
-
/* this takes characters from the keyboard, and produces 3270 keystroke
codes
*/
diff --git a/usr.bin/tn3270/ctlr/api.c b/usr.bin/tn3270/ctlr/api.c
index 10553b0dbd7..958ef647312 100644
--- a/usr.bin/tn3270/ctlr/api.c
+++ b/usr.bin/tn3270/ctlr/api.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: api.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
+/* $OpenBSD: api.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)api.c 4.5 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: api.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
-#endif /* not lint */
-
/*
* This file implements the API used in the PC version.
*/
diff --git a/usr.bin/tn3270/ctlr/function.c b/usr.bin/tn3270/ctlr/function.c
index 7164170136c..b8a5c5ca1b0 100644
--- a/usr.bin/tn3270/ctlr/function.c
+++ b/usr.bin/tn3270/ctlr/function.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: function.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
+/* $OpenBSD: function.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)function.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: function.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
-#endif /* not lint */
-
/*
* This file, which never produces a function.o, is used solely to
* be run through the preprocessor.
diff --git a/usr.bin/tn3270/ctlr/inbound.c b/usr.bin/tn3270/ctlr/inbound.c
index 512a2f9baa5..94538cccdfd 100644
--- a/usr.bin/tn3270/ctlr/inbound.c
+++ b/usr.bin/tn3270/ctlr/inbound.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inbound.c,v 1.6 2003/06/03 02:56:19 millert Exp $ */
+/* $OpenBSD: inbound.c,v 1.7 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)inbound.c 4.3 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: inbound.c,v 1.6 2003/06/03 02:56:19 millert Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include "../general/general.h"
diff --git a/usr.bin/tn3270/ctlr/oia.c b/usr.bin/tn3270/ctlr/oia.c
index 00835bb6422..100ebd7aab2 100644
--- a/usr.bin/tn3270/ctlr/oia.c
+++ b/usr.bin/tn3270/ctlr/oia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: oia.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
+/* $OpenBSD: oia.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)oia.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: oia.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
-#endif /* not lint */
-
/*
* Routines to maintain the Operator Information Area.
*/
diff --git a/usr.bin/tn3270/ctlr/options.c b/usr.bin/tn3270/ctlr/options.c
index 1c36bb1eb31..8f733de70b6 100644
--- a/usr.bin/tn3270/ctlr/options.c
+++ b/usr.bin/tn3270/ctlr/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.4 2003/06/03 02:56:19 millert Exp $ */
+/* $OpenBSD: options.c,v 1.5 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)options.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: options.c,v 1.4 2003/06/03 02:56:19 millert Exp $";
-#endif /* not lint */
-
/*
* this file contains the definitions, initialization, and processing of
* commands to handle the various local options (APL ON, etc.)
diff --git a/usr.bin/tn3270/ctlr/outbound.c b/usr.bin/tn3270/ctlr/outbound.c
index 6740c19e174..41284d5f2a3 100644
--- a/usr.bin/tn3270/ctlr/outbound.c
+++ b/usr.bin/tn3270/ctlr/outbound.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: outbound.c,v 1.5 2003/06/03 02:56:19 millert Exp $ */
+/* $OpenBSD: outbound.c,v 1.6 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)outbound.c 4.3 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: outbound.c,v 1.5 2003/06/03 02:56:19 millert Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include "../general/general.h"
diff --git a/usr.bin/tn3270/general/genbsubs.c b/usr.bin/tn3270/general/genbsubs.c
index ec00f9e33f3..0e6bb6ae977 100644
--- a/usr.bin/tn3270/general/genbsubs.c
+++ b/usr.bin/tn3270/general/genbsubs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: genbsubs.c,v 1.4 2003/06/03 02:56:19 millert Exp $ */
+/* $OpenBSD: genbsubs.c,v 1.5 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)genbsubs.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: genbsubs.c,v 1.4 2003/06/03 02:56:19 millert Exp $";
-#endif /* not lint */
-
/* The output of bunequal is the offset of the byte which didn't match;
* if all the bytes match, then we return n.
* bunequal(s1, s2, n) */
diff --git a/usr.bin/tn3270/general/globals.c b/usr.bin/tn3270/general/globals.c
index 5c1e63e502b..d77b18f1cce 100644
--- a/usr.bin/tn3270/general/globals.c
+++ b/usr.bin/tn3270/general/globals.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: globals.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
+/* $OpenBSD: globals.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)globals.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: globals.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
-#endif /* not lint */
-
/*
* Do the defining instances for the globals of tn3270.
*/
diff --git a/usr.bin/tn3270/sys_curses/system.c b/usr.bin/tn3270/sys_curses/system.c
index a2e33606d1b..312ffaeab11 100644
--- a/usr.bin/tn3270/sys_curses/system.c
+++ b/usr.bin/tn3270/sys_curses/system.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: system.c,v 1.17 2004/03/20 04:28:51 aaron Exp $ */
+/* $OpenBSD: system.c,v 1.18 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)system.c 4.5 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: system.c,v 1.17 2004/03/20 04:28:51 aaron Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#if defined(pyr)
diff --git a/usr.bin/tn3270/sys_curses/termout.c b/usr.bin/tn3270/sys_curses/termout.c
index 674234128b1..ec3e4d12276 100644
--- a/usr.bin/tn3270/sys_curses/termout.c
+++ b/usr.bin/tn3270/sys_curses/termout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: termout.c,v 1.12 2003/07/18 23:11:43 david Exp $ */
+/* $OpenBSD: termout.c,v 1.13 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)termout.c 4.3 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: termout.c,v 1.12 2003/07/18 23:11:43 david Exp $";
-#endif /* not lint */
-
#if defined(unix)
#include <signal.h>
#include <termios.h>
diff --git a/usr.bin/tn3270/tools/mkastods/mkastods.c b/usr.bin/tn3270/tools/mkastods/mkastods.c
index 53bca9e0432..fa3e4eaedc9 100644
--- a/usr.bin/tn3270/tools/mkastods/mkastods.c
+++ b/usr.bin/tn3270/tools/mkastods/mkastods.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkastods.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
+/* $OpenBSD: mkastods.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)mkastods.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkastods.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#if defined(unix)
#include <strings.h>
diff --git a/usr.bin/tn3270/tools/mkastosc/mkastosc.c b/usr.bin/tn3270/tools/mkastosc/mkastosc.c
index 13f05d42c29..56f0411d158 100644
--- a/usr.bin/tn3270/tools/mkastosc/mkastosc.c
+++ b/usr.bin/tn3270/tools/mkastosc/mkastosc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkastosc.c,v 1.4 2007/10/17 20:10:44 chl Exp $ */
+/* $OpenBSD: mkastosc.c,v 1.5 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)mkastosc.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkastosc.c,v 1.4 2007/10/17 20:10:44 chl Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#if defined(unix)
#include <strings.h>
diff --git a/usr.bin/tn3270/tools/mkdctype/ectype.c b/usr.bin/tn3270/tools/mkdctype/ectype.c
index 0dc02d6cda5..475bd4eb378 100644
--- a/usr.bin/tn3270/tools/mkdctype/ectype.c
+++ b/usr.bin/tn3270/tools/mkdctype/ectype.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ectype.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
+/* $OpenBSD: ectype.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)ectype.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: ectype.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
-#endif /* not lint */
-
#include "ectype.h"
char ectype[] = {
diff --git a/usr.bin/tn3270/tools/mkdctype/mkdctype.c b/usr.bin/tn3270/tools/mkdctype/mkdctype.c
index ff798765524..b5dd770cf49 100644
--- a/usr.bin/tn3270/tools/mkdctype/mkdctype.c
+++ b/usr.bin/tn3270/tools/mkdctype/mkdctype.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkdctype.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
+/* $OpenBSD: mkdctype.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)mkdctype.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkdctype.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
-#endif /* not lint */
-
#include "../api/ebc_disp.h"
#include "ectype.h"
diff --git a/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c b/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
index 2a3009679c6..1a66fdcd2ff 100644
--- a/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
+++ b/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkdstoas.c,v 1.3 2003/06/03 02:56:20 millert Exp $ */
+/* $OpenBSD: mkdstoas.c,v 1.4 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)mkdstoas.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkdstoas.c,v 1.3 2003/06/03 02:56:20 millert Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#if defined(unix)
#include <strings.h>
diff --git a/usr.bin/tn3270/tools/mkhits/dohits.c b/usr.bin/tn3270/tools/mkhits/dohits.c
index 72c1dcbe829..5c0de1d221a 100644
--- a/usr.bin/tn3270/tools/mkhits/dohits.c
+++ b/usr.bin/tn3270/tools/mkhits/dohits.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dohits.c,v 1.10 2007/10/17 20:10:44 chl Exp $ */
+/* $OpenBSD: dohits.c,v 1.11 2009/10/27 23:59:46 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)dohits.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: dohits.c,v 1.10 2007/10/17 20:10:44 chl Exp $";
-#endif /* not lint */
/*
* This program scans a file which describes a keyboard. The output
diff --git a/usr.bin/tn3270/tools/mkhits/mkhits.c b/usr.bin/tn3270/tools/mkhits/mkhits.c
index 69b22be6679..9d9d6f7d837 100644
--- a/usr.bin/tn3270/tools/mkhits/mkhits.c
+++ b/usr.bin/tn3270/tools/mkhits/mkhits.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkhits.c,v 1.3 2003/06/03 02:56:20 millert Exp $ */
+/* $OpenBSD: mkhits.c,v 1.4 2009/10/27 23:59:46 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)mkhits.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkhits.c,v 1.3 2003/06/03 02:56:20 millert Exp $";
-#endif /* not lint */
-
/*
* This program scans a file which describes a keyboard. The output
* of the program is a series of 'C' declarations which describe a
diff --git a/usr.bin/tn3270/tools/mkmake.y b/usr.bin/tn3270/tools/mkmake.y
index 4bd94884a78..642a926f5d2 100644
--- a/usr.bin/tn3270/tools/mkmake.y
+++ b/usr.bin/tn3270/tools/mkmake.y
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)mkmake.y 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: mkmake.y,v 1.5 2003/11/08 19:17:29 jmc Exp $";
-#endif /* not lint */
-
typedef struct string {
int
hashval,
diff --git a/usr.bin/tn3270/tools/prt3270.c b/usr.bin/tn3270/tools/prt3270.c
index cde0f12b4d5..85544e9f2d0 100644
--- a/usr.bin/tn3270/tools/prt3270.c
+++ b/usr.bin/tn3270/tools/prt3270.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prt3270.c,v 1.6 2003/12/09 11:58:42 mickey Exp $ */
+/* $OpenBSD: prt3270.c,v 1.7 2009/10/27 23:59:45 deraadt Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)prt3270.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: prt3270.c,v 1.6 2003/12/09 11:58:42 mickey Exp $";
-#endif /* not lint */
-
#if defined(unix)
#endif
#include <stdio.h>
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index d90d9df7f9e..c6041e3d92e 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tput.c,v 1.16 2004/10/05 14:46:11 jaredy Exp $ */
+/* $OpenBSD: tput.c,v 1.17 2009/10/27 23:59:46 deraadt Exp $ */
/*
* Copyright (c) 1999 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -44,19 +44,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tput.c 8.3 (Berkeley) 4/28/95";
-#endif
-static char rcsid[] = "$OpenBSD: tput.c,v 1.16 2004/10/05 14:46:11 jaredy Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <ctype.h>
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index 1b36e39bf2d..2cee34548ef 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: str.c,v 1.10 2006/04/03 01:31:11 djm Exp $ */
+/* $OpenBSD: str.c,v 1.11 2009/10/27 23:59:46 deraadt Exp $ */
/* $NetBSD: str.c,v 1.7 1995/08/31 22:13:47 jtc Exp $ */
/*-
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)str.c 8.2 (Berkeley) 4/28/95";
-#endif
-static char rcsid[] = "$OpenBSD: str.c,v 1.10 2006/04/03 01:31:11 djm Exp $";
-#endif /* not lint */
-
#include <sys/cdefs.h>
#include <sys/types.h>
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index 8d9141fbd91..62e1e9f27fd 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tr.c,v 1.14 2008/07/09 19:41:56 sobrado Exp $ */
+/* $OpenBSD: tr.c,v 1.15 2009/10/27 23:59:46 deraadt Exp $ */
/* $NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tr.c 8.2 (Berkeley) 5/4/95";
-#endif
-static char rcsid[] = "$OpenBSD: tr.c,v 1.14 2008/07/09 19:41:56 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.bin/tset/termcap.c b/usr.bin/tset/termcap.c
index 3c78cdd369a..6ab914792a9 100644
--- a/usr.bin/tset/termcap.c
+++ b/usr.bin/tset/termcap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: termcap.c,v 1.6 2007/03/20 03:56:13 tedu Exp $ */
+/* $OpenBSD: termcap.c,v 1.7 2009/10/27 23:59:46 deraadt Exp $ */
/* $NetBSD: termcap.c,v 1.7 1995/06/05 19:45:52 pk Exp $ */
/*
@@ -30,10 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: termcap.c,v 1.6 2007/03/20 03:56:13 tedu Exp $";
-#endif /* not lint */
-
#define PVECSIZ 32 /* max number of names in path */
#define _PATH_DEF ".termcap /usr/share/misc/termcap"
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index aa90ea9186b..a377d94e435 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.5 2003/06/10 22:20:53 deraadt Exp $ */
+/* $OpenBSD: tty.c,v 1.6 2009/10/27 23:59:46 deraadt Exp $ */
/* $NetBSD: tty.c,v 1.4 1994/12/07 00:46:57 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: tty.c,v 1.5 2003/06/10 22:20:53 deraadt Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index aacb5fc1373..a03ca2f60fc 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ul.c,v 1.14 2007/10/16 20:19:27 sobrado Exp $ */
+/* $OpenBSD: ul.c,v 1.15 2009/10/27 23:59:46 deraadt Exp $ */
/* $NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ul.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: ul.c,v 1.14 2007/10/16 20:19:27 sobrado Exp $";
-#endif /* not lint */
-
#include <curses.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index c0cfd0d9cb3..e100cefd47c 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uname.c,v 1.10 2008/06/19 20:07:04 deraadt Exp $ */
+/* $OpenBSD: uname.c,v 1.11 2009/10/27 23:59:46 deraadt Exp $ */
/*
* Copyright (c) 1994 Winning Strategies, Inc.
@@ -31,10 +31,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: uname.c,v 1.10 2008/06/19 20:07:04 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index a24be37ae81..89e4f23f3fa 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unexpand.c,v 1.9 2003/07/10 00:06:51 david Exp $ */
+/* $OpenBSD: unexpand.c,v 1.10 2009/10/27 23:59:46 deraadt Exp $ */
/* $NetBSD: unexpand.c,v 1.5 1994/12/24 17:08:05 cgd Exp $ */
/*-
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)unexpand.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: unexpand.c,v 1.9 2003/07/10 00:06:51 david Exp $";
-#endif /* not lint */
-
/*
* unexpand - put tabs into a file replacing blanks
*/
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 6481bc54de8..1e48be01954 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unifdef.c,v 1.13 2007/06/25 15:57:28 jmc Exp $ */
+/* $OpenBSD: unifdef.c,v 1.14 2009/10/27 23:59:46 deraadt Exp $ */
/*
* Copyright (c) 2002, 2003 Tony Finch <dot@dotat.at>
* Copyright (c) 1985, 1993
@@ -32,17 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1985, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-
-#if 0
-static char sccsid[] = "@(#)unifdef.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: unifdef.c,v 1.13 2007/06/25 15:57:28 jmc Exp $";
-#endif
-
/*
* unifdef - remove ifdef'ed lines
*
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index 50a0f600bc2..8bcff412f20 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uniq.c,v 1.17 2007/11/11 17:50:29 kili Exp $ */
+/* $OpenBSD: uniq.c,v 1.18 2009/10/27 23:59:46 deraadt Exp $ */
/* $NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $ */
/*
@@ -33,19 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)uniq.c 8.3 (Berkeley) 5/4/95";
-#endif
-static char rcsid[] = "$OpenBSD: uniq.c,v 1.17 2007/11/11 17:50:29 kili Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index cb124edb44d..0898c07a0fb 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unvis.c,v 1.8 2008/07/06 13:49:35 sobrado Exp $ */
+/* $OpenBSD: unvis.c,v 1.9 2009/10/27 23:59:46 deraadt Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -29,19 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: unvis.c,v 1.8 2008/07/06 13:49:35 sobrado Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <err.h>
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index 2a68ef2451d..ce2acddfd0f 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: users.c,v 1.8 2003/10/16 16:57:37 tedu Exp $ */
+/* $OpenBSD: users.c,v 1.9 2009/10/27 23:59:46 deraadt Exp $ */
/* $NetBSD: users.c,v 1.5 1994/12/20 15:58:19 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)users.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: users.c,v 1.8 2003/10/16 16:57:37 tedu Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <utmp.h>
#include <stdio.h>
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index afb717769d9..c5f1b73a398 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uudecode.c,v 1.16 2008/07/29 18:25:28 sobrado Exp $ */
+/* $OpenBSD: uudecode.c,v 1.17 2009/10/27 23:59:46 deraadt Exp $ */
/* $FreeBSD: uudecode.c,v 1.49 2003/05/03 19:44:46 obrien Exp $ */
/*-
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)uudecode.c 8.2 (Berkeley) 4/2/94";
-#endif
-static const char rcsid[] = "$OpenBSD: uudecode.c,v 1.16 2008/07/29 18:25:28 sobrado Exp $";
-#endif /* not lint */
-
/*
* Create the specified file, decoding as you go.
* Used with uuencode.
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index 2898558e6d9..ccce77bf7a5 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uuencode.c,v 1.9 2008/07/29 18:25:28 sobrado Exp $ */
+/* $OpenBSD: uuencode.c,v 1.10 2009/10/27 23:59:46 deraadt Exp $ */
/* $FreeBSD: uuencode.c,v 1.18 2004/01/22 07:23:35 grehan Exp $ */
/*-
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)uuencode.c 8.2 (Berkeley) 4/2/94";
-#endif
-static const char rcsid[] = "$OpenBSD: uuencode.c,v 1.9 2008/07/29 18:25:28 sobrado Exp $";
-#endif /* not lint */
-
/*
* Encode a file so it can be mailed to a remote system.
*/
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index 46f1beb4580..23a36de5505 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vacation.c,v 1.31 2009/10/11 15:50:34 sobrado Exp $ */
+/* $OpenBSD: vacation.c,v 1.32 2009/10/27 23:59:46 deraadt Exp $ */
/* $NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)vacation.c 8.2 (Berkeley) 1/26/94";
-#endif
-static char rcsid[] = "$OpenBSD: vacation.c,v 1.31 2009/10/11 15:50:34 sobrado Exp $";
-#endif /* not lint */
-
/*
** Vacation
** Copyright (c) 1983 Eric P. Allman
diff --git a/usr.bin/vgrind/RETEST/retest.c b/usr.bin/vgrind/RETEST/retest.c
index dc3aea46a11..7033f08a547 100644
--- a/usr.bin/vgrind/RETEST/retest.c
+++ b/usr.bin/vgrind/RETEST/retest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: retest.c,v 1.5 2003/06/03 02:56:21 millert Exp $ */
+/* $OpenBSD: retest.c,v 1.6 2009/10/27 23:59:47 deraadt Exp $ */
/* $NetBSD: retest.c,v 1.2 1994/11/17 08:28:18 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)retest.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: retest.c,v 1.5 2003/06/03 02:56:21 millert Exp $";
-#endif /* not lint */
-
#include <ctype.h>
int l_onecase = 0;
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index efe0d43497b..4c0fd96e1be 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: regexp.c,v 1.7 2003/06/03 02:56:21 millert Exp $ */
+/* $OpenBSD: regexp.c,v 1.8 2009/10/27 23:59:46 deraadt Exp $ */
/* $NetBSD: regexp.c,v 1.3 1994/11/17 08:28:02 jtc Exp $ */
/*
@@ -31,19 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)regexp.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: regexp.c,v 1.7 2003/06/03 02:56:21 millert Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index fb8ff10a531..74858406580 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfontedpr.c,v 1.11 2006/03/23 02:17:38 ray Exp $ */
+/* $OpenBSD: vfontedpr.c,v 1.12 2009/10/27 23:59:46 deraadt Exp $ */
/* $NetBSD: vfontedpr.c,v 1.7 1998/12/19 23:41:53 christos Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)vfontedpr.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: vfontedpr.c,v 1.11 2006/03/23 02:17:38 ray Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/limits.h>
diff --git a/usr.bin/vgrind/vgrindefs.c b/usr.bin/vgrind/vgrindefs.c
index c28b85ae68d..0b805f3c959 100644
--- a/usr.bin/vgrind/vgrindefs.c
+++ b/usr.bin/vgrind/vgrindefs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vgrindefs.c,v 1.9 2005/04/13 02:05:18 deraadt Exp $ */
+/* $OpenBSD: vgrindefs.c,v 1.10 2009/10/27 23:59:47 deraadt Exp $ */
/* $NetBSD: vgrindefs.c,v 1.5 1994/12/20 12:05:29 cgd Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)vgrindefs.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: vgrindefs.c,v 1.9 2005/04/13 02:05:18 deraadt Exp $";
-#endif /* not lint */
-
#define BUFSIZ 1024
#define MAXHOP 32 /* max number of tc= indirections */
diff --git a/usr.bin/vi/catalog/dump.c b/usr.bin/vi/catalog/dump.c
index 56e99826dc8..6897dbec609 100644
--- a/usr.bin/vi/catalog/dump.c
+++ b/usr.bin/vi/catalog/dump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dump.c,v 1.5 2008/03/28 17:58:20 jasper Exp $ */
+/* $OpenBSD: dump.c,v 1.6 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)dump.c 8.1 (Berkeley) 8/31/94";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdio.h>
diff --git a/usr.bin/vi/cl/cl_bsd.c b/usr.bin/vi/cl/cl_bsd.c
index da525ae939a..768e49815e4 100644
--- a/usr.bin/vi/cl/cl_bsd.c
+++ b/usr.bin/vi/cl/cl_bsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_bsd.c,v 1.9 2006/03/11 06:58:00 ray Exp $ */
+/* $OpenBSD: cl_bsd.c,v 1.10 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1995, 1996
@@ -9,10 +9,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)cl_bsd.c 8.29 (Berkeley) 7/1/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/cl/cl_funcs.c b/usr.bin/vi/cl/cl_funcs.c
index 92985444ce0..ba9bf5918ed 100644
--- a/usr.bin/vi/cl/cl_funcs.c
+++ b/usr.bin/vi/cl/cl_funcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_funcs.c,v 1.13 2009/01/28 13:02:22 sobrado Exp $ */
+/* $OpenBSD: cl_funcs.c,v 1.14 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)cl_funcs.c 10.50 (Berkeley) 9/24/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/cl/cl_main.c b/usr.bin/vi/cl/cl_main.c
index 405a10b6988..fa5422c6a19 100644
--- a/usr.bin/vi/cl/cl_main.c
+++ b/usr.bin/vi/cl/cl_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_main.c,v 1.19 2008/03/28 17:58:20 jasper Exp $ */
+/* $OpenBSD: cl_main.c,v 1.20 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)cl_main.c 10.36 (Berkeley) 10/14/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/cl/cl_read.c b/usr.bin/vi/cl/cl_read.c
index 6edc55197ea..dfd27de60d0 100644
--- a/usr.bin/vi/cl/cl_read.c
+++ b/usr.bin/vi/cl/cl_read.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_read.c,v 1.17 2009/06/10 14:03:18 millert Exp $ */
+/* $OpenBSD: cl_read.c,v 1.18 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)cl_read.c 10.15 (Berkeley) 9/24/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/cl/cl_screen.c b/usr.bin/vi/cl/cl_screen.c
index 78013b9eb73..610f5bef919 100644
--- a/usr.bin/vi/cl/cl_screen.c
+++ b/usr.bin/vi/cl/cl_screen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_screen.c,v 1.18 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: cl_screen.c,v 1.19 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)cl_screen.c 10.49 (Berkeley) 9/24/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/cl/cl_term.c b/usr.bin/vi/cl/cl_term.c
index 6d1163a4bdd..69d1cfc6c9b 100644
--- a/usr.bin/vi/cl/cl_term.c
+++ b/usr.bin/vi/cl/cl_term.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_term.c,v 1.15 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: cl_term.c,v 1.16 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)cl_term.c 10.22 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/common/api.c b/usr.bin/vi/common/api.c
index 23ed2ec0ac7..0e6799a6b51 100644
--- a/usr.bin/vi/common/api.c
+++ b/usr.bin/vi/common/api.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: api.c,v 1.13 2007/05/14 12:32:29 pyr Exp $ */
+/* $OpenBSD: api.c,v 1.14 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -13,10 +13,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)api.c 8.26 (Berkeley) 10/14/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/common/cut.c b/usr.bin/vi/common/cut.c
index f263a3c0b19..5c59fb713ae 100644
--- a/usr.bin/vi/common/cut.c
+++ b/usr.bin/vi/common/cut.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cut.c,v 1.10 2006/01/08 21:09:13 miod Exp $ */
+/* $OpenBSD: cut.c,v 1.11 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)cut.c 10.10 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/common/delete.c b/usr.bin/vi/common/delete.c
index c3dde6c9b66..b580e93d4e7 100644
--- a/usr.bin/vi/common/delete.c
+++ b/usr.bin/vi/common/delete.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: delete.c,v 1.7 2002/02/16 21:27:56 millert Exp $ */
+/* $OpenBSD: delete.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)delete.c 10.12 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/common/exf.c b/usr.bin/vi/common/exf.c
index 4444e59cbe6..9eba430c3f9 100644
--- a/usr.bin/vi/common/exf.c
+++ b/usr.bin/vi/common/exf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exf.c,v 1.24 2007/11/24 12:59:28 jmc Exp $ */
+/* $OpenBSD: exf.c,v 1.25 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)exf.c 10.49 (Berkeley) 10/10/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h> /* XXX: param.h may not have included types.h */
#include <sys/queue.h>
diff --git a/usr.bin/vi/common/key.c b/usr.bin/vi/common/key.c
index 11384a2b5e3..5a93f7fa856 100644
--- a/usr.bin/vi/common/key.c
+++ b/usr.bin/vi/common/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.9 2006/01/08 21:08:27 miod Exp $ */
+/* $OpenBSD: key.c,v 1.10 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)key.c 10.33 (Berkeley) 9/24/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/common/line.c b/usr.bin/vi/common/line.c
index 4ef445b268d..b536c829c7e 100644
--- a/usr.bin/vi/common/line.c
+++ b/usr.bin/vi/common/line.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: line.c,v 1.8 2007/05/14 12:32:29 pyr Exp $ */
+/* $OpenBSD: line.c,v 1.9 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)line.c 10.21 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/common/log.c b/usr.bin/vi/common/log.c
index 8a9be397fe6..830d7d87a29 100644
--- a/usr.bin/vi/common/log.c
+++ b/usr.bin/vi/common/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: log.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)log.c 10.8 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/common/main.c b/usr.bin/vi/common/main.c
index e50581972d2..73957ef3e11 100644
--- a/usr.bin/vi/common/main.c
+++ b/usr.bin/vi/common/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.18 2009/02/01 21:57:21 miod Exp $ */
+/* $OpenBSD: main.c,v 1.19 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,18 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n\
-@(#) Copyright (c) 1992, 1993, 1994, 1995, 1996\n\
- Keith Bostic. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static const char sccsid[] = "@(#)main.c 10.48 (Berkeley) 10/11/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/common/mark.c b/usr.bin/vi/common/mark.c
index 18709253911..ee0203c7715 100644
--- a/usr.bin/vi/common/mark.c
+++ b/usr.bin/vi/common/mark.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mark.c,v 1.7 2006/01/08 21:05:39 miod Exp $ */
+/* $OpenBSD: mark.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)mark.c 10.13 (Berkeley) 7/19/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/common/msg.c b/usr.bin/vi/common/msg.c
index 61d5efefa62..d11c9b98235 100644
--- a/usr.bin/vi/common/msg.c
+++ b/usr.bin/vi/common/msg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msg.c,v 1.17 2007/03/20 03:56:13 tedu Exp $ */
+/* $OpenBSD: msg.c,v 1.18 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)msg.c 10.48 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h> /* XXX: param.h may not have included types.h */
#include <sys/queue.h>
diff --git a/usr.bin/vi/common/options.c b/usr.bin/vi/common/options.c
index dd820aa1b0c..538b6bfcd09 100644
--- a/usr.bin/vi/common/options.c
+++ b/usr.bin/vi/common/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.13 2006/03/11 07:04:53 ray Exp $ */
+/* $OpenBSD: options.c,v 1.14 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)options.c 10.51 (Berkeley) 10/14/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/common/options_f.c b/usr.bin/vi/common/options_f.c
index c290fb3e3ed..2adfefa574f 100644
--- a/usr.bin/vi/common/options_f.c
+++ b/usr.bin/vi/common/options_f.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options_f.c,v 1.6 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: options_f.c,v 1.7 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)options_f.c 10.25 (Berkeley) 7/12/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/common/put.c b/usr.bin/vi/common/put.c
index fcf15c2c06e..4aa8a7fae92 100644
--- a/usr.bin/vi/common/put.c
+++ b/usr.bin/vi/common/put.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: put.c,v 1.9 2007/05/14 12:32:29 pyr Exp $ */
+/* $OpenBSD: put.c,v 1.10 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)put.c 10.11 (Berkeley) 9/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/common/recover.c b/usr.bin/vi/common/recover.c
index 46373aea904..8adb35d384a 100644
--- a/usr.bin/vi/common/recover.c
+++ b/usr.bin/vi/common/recover.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: recover.c,v 1.14 2008/09/25 11:37:03 sobrado Exp $ */
+/* $OpenBSD: recover.c,v 1.15 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)recover.c 10.21 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h> /* XXX: param.h may not have included types.h */
#include <sys/queue.h>
diff --git a/usr.bin/vi/common/screen.c b/usr.bin/vi/common/screen.c
index d82fb005c5c..d248e39b5e5 100644
--- a/usr.bin/vi/common/screen.c
+++ b/usr.bin/vi/common/screen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen.c,v 1.7 2005/10/17 19:12:16 otto Exp $ */
+/* $OpenBSD: screen.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)screen.c 10.15 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/common/search.c b/usr.bin/vi/common/search.c
index d39737acf87..a41ac2102b3 100644
--- a/usr.bin/vi/common/search.c
+++ b/usr.bin/vi/common/search.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: search.c,v 1.8 2006/01/08 21:05:39 miod Exp $ */
+/* $OpenBSD: search.c,v 1.9 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)search.c 10.25 (Berkeley) 6/30/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/common/seq.c b/usr.bin/vi/common/seq.c
index 268c46c5b3d..b16c7bf2f1c 100644
--- a/usr.bin/vi/common/seq.c
+++ b/usr.bin/vi/common/seq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: seq.c,v 1.7 2005/10/17 19:12:16 otto Exp $ */
+/* $OpenBSD: seq.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)seq.c 10.10 (Berkeley) 3/30/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/common/util.c b/usr.bin/vi/common/util.c
index c4d177b2337..3d5f298d88d 100644
--- a/usr.bin/vi/common/util.c
+++ b/usr.bin/vi/common/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.7 2002/02/19 19:39:39 millert Exp $ */
+/* $OpenBSD: util.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)util.c 10.11 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex.c b/usr.bin/vi/ex/ex.c
index 5c892e487f3..6c352e3b7c7 100644
--- a/usr.bin/vi/ex/ex.c
+++ b/usr.bin/vi/ex/ex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex.c,v 1.15 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex.c,v 1.16 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex.c 10.57 (Berkeley) 10/10/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/ex/ex_abbrev.c b/usr.bin/vi/ex/ex_abbrev.c
index a5a9d6c2e71..706a9548a93 100644
--- a/usr.bin/vi/ex/ex_abbrev.c
+++ b/usr.bin/vi/ex/ex_abbrev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_abbrev.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_abbrev.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_abbrev.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_append.c b/usr.bin/vi/ex/ex_append.c
index 1016d319c5d..686ed84b370 100644
--- a/usr.bin/vi/ex/ex_append.c
+++ b/usr.bin/vi/ex/ex_append.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_append.c,v 1.7 2005/10/17 19:12:16 otto Exp $ */
+/* $OpenBSD: ex_append.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_append.c 10.30 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_args.c b/usr.bin/vi/ex/ex_args.c
index 213dae2671f..277dfac70cc 100644
--- a/usr.bin/vi/ex/ex_args.c
+++ b/usr.bin/vi/ex/ex_args.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_args.c,v 1.6 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex_args.c,v 1.7 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_args.c 10.16 (Berkeley) 7/13/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_argv.c b/usr.bin/vi/ex/ex_argv.c
index a7f441a9675..871662b78de 100644
--- a/usr.bin/vi/ex/ex_argv.c
+++ b/usr.bin/vi/ex/ex_argv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_argv.c,v 1.12 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex_argv.c,v 1.13 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_argv.c 10.26 (Berkeley) 9/20/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_at.c b/usr.bin/vi/ex/ex_at.c
index 71ce279f696..e3fd1832146 100644
--- a/usr.bin/vi/ex/ex_at.c
+++ b/usr.bin/vi/ex/ex_at.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_at.c,v 1.7 2005/10/17 19:12:16 otto Exp $ */
+/* $OpenBSD: ex_at.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_at.c 10.12 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_bang.c b/usr.bin/vi/ex/ex_bang.c
index 2532b7be7ed..267e02631b1 100644
--- a/usr.bin/vi/ex/ex_bang.c
+++ b/usr.bin/vi/ex/ex_bang.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_bang.c,v 1.6 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: ex_bang.c,v 1.7 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_bang.c 10.33 (Berkeley) 9/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_cd.c b/usr.bin/vi/ex/ex_cd.c
index d2782413331..699c510309b 100644
--- a/usr.bin/vi/ex/ex_cd.c
+++ b/usr.bin/vi/ex/ex_cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_cd.c,v 1.8 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: ex_cd.c,v 1.9 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_cd.c 10.10 (Berkeley) 8/12/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_cmd.c b/usr.bin/vi/ex/ex_cmd.c
index 3a5d42d1395..d4a9b491a48 100644
--- a/usr.bin/vi/ex/ex_cmd.c
+++ b/usr.bin/vi/ex/ex_cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_cmd.c,v 1.5 2001/01/29 01:58:42 niklas Exp $ */
+/* $OpenBSD: ex_cmd.c,v 1.6 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_cmd.c 10.20 (Berkeley) 10/10/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_cscope.c b/usr.bin/vi/ex/ex_cscope.c
index 56093878711..78819f3dda4 100644
--- a/usr.bin/vi/ex/ex_cscope.c
+++ b/usr.bin/vi/ex/ex_cscope.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_cscope.c,v 1.15 2008/08/29 13:07:13 oga Exp $ */
+/* $OpenBSD: ex_cscope.c,v 1.16 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1994, 1996
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_cscope.c 10.13 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h> /* XXX: param.h may not have included types.h */
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_delete.c b/usr.bin/vi/ex/ex_delete.c
index f57b8d3bbb1..d8fc7868c23 100644
--- a/usr.bin/vi/ex/ex_delete.c
+++ b/usr.bin/vi/ex/ex_delete.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_delete.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_delete.c,v 1.6 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_delete.c 10.9 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_display.c b/usr.bin/vi/ex/ex_display.c
index 720dbeea8ff..ce5c0ed4520 100644
--- a/usr.bin/vi/ex/ex_display.c
+++ b/usr.bin/vi/ex/ex_display.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_display.c,v 1.6 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex_display.c,v 1.7 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_display.c 10.12 (Berkeley) 4/10/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_edit.c b/usr.bin/vi/ex/ex_edit.c
index 1ff292994a8..384457de3fb 100644
--- a/usr.bin/vi/ex/ex_edit.c
+++ b/usr.bin/vi/ex/ex_edit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_edit.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_edit.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_edit.c 10.10 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_equal.c b/usr.bin/vi/ex/ex_equal.c
index 6a1be656e4f..9878260a34e 100644
--- a/usr.bin/vi/ex/ex_equal.c
+++ b/usr.bin/vi/ex/ex_equal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_equal.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_equal.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_equal.c 10.10 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_file.c b/usr.bin/vi/ex/ex_file.c
index ae5b79e5d5e..86199cf0b22 100644
--- a/usr.bin/vi/ex/ex_file.c
+++ b/usr.bin/vi/ex/ex_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_file.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_file.c,v 1.6 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_file.c 10.12 (Berkeley) 7/12/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_filter.c b/usr.bin/vi/ex/ex_filter.c
index 8e0ede942b7..b4951a95f53 100644
--- a/usr.bin/vi/ex/ex_filter.c
+++ b/usr.bin/vi/ex/ex_filter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_filter.c,v 1.9 2006/12/21 21:38:17 otto Exp $ */
+/* $OpenBSD: ex_filter.c,v 1.10 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_filter.c 10.34 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/usr.bin/vi/ex/ex_global.c b/usr.bin/vi/ex/ex_global.c
index 0fb2c6fe617..842012112e6 100644
--- a/usr.bin/vi/ex/ex_global.c
+++ b/usr.bin/vi/ex/ex_global.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_global.c,v 1.10 2007/05/14 12:32:29 pyr Exp $ */
+/* $OpenBSD: ex_global.c,v 1.11 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_global.c 10.22 (Berkeley) 10/10/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_init.c b/usr.bin/vi/ex/ex_init.c
index b6b5fd7c8f1..2d18324244f 100644
--- a/usr.bin/vi/ex/ex_init.c
+++ b/usr.bin/vi/ex/ex_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_init.c,v 1.8 2002/12/15 13:30:17 henning Exp $ */
+/* $OpenBSD: ex_init.c,v 1.9 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_init.c 10.26 (Berkeley) 8/12/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h> /* XXX: param.h may not have included types.h */
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_join.c b/usr.bin/vi/ex/ex_join.c
index 2629f967db7..0ab30889290 100644
--- a/usr.bin/vi/ex/ex_join.c
+++ b/usr.bin/vi/ex/ex_join.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_join.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_join.c,v 1.6 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_join.c 10.10 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_map.c b/usr.bin/vi/ex/ex_map.c
index 5389374a917..f9b1aba4db7 100644
--- a/usr.bin/vi/ex/ex_map.c
+++ b/usr.bin/vi/ex/ex_map.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_map.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_map.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_map.c 10.9 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_mark.c b/usr.bin/vi/ex/ex_mark.c
index 0bc0795afbf..1dc75085e58 100644
--- a/usr.bin/vi/ex/ex_mark.c
+++ b/usr.bin/vi/ex/ex_mark.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_mark.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_mark.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_mark.c 10.8 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_mkexrc.c b/usr.bin/vi/ex/ex_mkexrc.c
index 35347750e0f..66db029d0a5 100644
--- a/usr.bin/vi/ex/ex_mkexrc.c
+++ b/usr.bin/vi/ex/ex_mkexrc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_mkexrc.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_mkexrc.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_mkexrc.c 10.11 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/ex/ex_move.c b/usr.bin/vi/ex/ex_move.c
index 5155f4889db..95e8261e529 100644
--- a/usr.bin/vi/ex/ex_move.c
+++ b/usr.bin/vi/ex/ex_move.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_move.c,v 1.7 2005/10/17 19:12:16 otto Exp $ */
+/* $OpenBSD: ex_move.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_move.c 10.10 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_open.c b/usr.bin/vi/ex/ex_open.c
index b21e3899c54..ed155cbf693 100644
--- a/usr.bin/vi/ex/ex_open.c
+++ b/usr.bin/vi/ex/ex_open.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_open.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_open.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_open.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_perl.c b/usr.bin/vi/ex/ex_perl.c
index b47341abb50..53571a6f732 100644
--- a/usr.bin/vi/ex/ex_perl.c
+++ b/usr.bin/vi/ex/ex_perl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_perl.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_perl.c,v 1.6 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -15,10 +15,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_perl.c 8.10 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_preserve.c b/usr.bin/vi/ex/ex_preserve.c
index 129e93d728d..d70352b60c5 100644
--- a/usr.bin/vi/ex/ex_preserve.c
+++ b/usr.bin/vi/ex/ex_preserve.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_preserve.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_preserve.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_preserve.c 10.12 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_print.c b/usr.bin/vi/ex/ex_print.c
index 7f3f1166da5..8cac5cf4115 100644
--- a/usr.bin/vi/ex/ex_print.c
+++ b/usr.bin/vi/ex/ex_print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_print.c,v 1.8 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex_print.c,v 1.9 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_print.c 10.18 (Berkeley) 5/12/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_put.c b/usr.bin/vi/ex/ex_put.c
index 6af96f2ec38..3a5707638e8 100644
--- a/usr.bin/vi/ex/ex_put.c
+++ b/usr.bin/vi/ex/ex_put.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_put.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_put.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_put.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_quit.c b/usr.bin/vi/ex/ex_quit.c
index 5a2006a74d9..3d62d5574b4 100644
--- a/usr.bin/vi/ex/ex_quit.c
+++ b/usr.bin/vi/ex/ex_quit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_quit.c,v 1.3 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_quit.c,v 1.4 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_quit.c 10.7 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_read.c b/usr.bin/vi/ex/ex_read.c
index 4cbb356060c..c0f2530bff0 100644
--- a/usr.bin/vi/ex/ex_read.c
+++ b/usr.bin/vi/ex/ex_read.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_read.c,v 1.8 2006/03/11 06:58:00 ray Exp $ */
+/* $OpenBSD: ex_read.c,v 1.9 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_read.c 10.38 (Berkeley) 8/12/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/ex/ex_screen.c b/usr.bin/vi/ex/ex_screen.c
index 1684fef2b5f..301ee4bfc1b 100644
--- a/usr.bin/vi/ex/ex_screen.c
+++ b/usr.bin/vi/ex/ex_screen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_screen.c,v 1.6 2005/10/17 19:12:16 otto Exp $ */
+/* $OpenBSD: ex_screen.c,v 1.7 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_screen.c 10.11 (Berkeley) 6/29/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_script.c b/usr.bin/vi/ex/ex_script.c
index ec0eaa943a4..b551fab3ae2 100644
--- a/usr.bin/vi/ex/ex_script.c
+++ b/usr.bin/vi/ex/ex_script.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_script.c,v 1.15 2009/06/10 14:03:18 millert Exp $ */
+/* $OpenBSD: ex_script.c,v 1.16 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -14,10 +14,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_script.c 10.30 (Berkeley) 9/24/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_set.c b/usr.bin/vi/ex/ex_set.c
index 7902db985d1..fb60a7d698f 100644
--- a/usr.bin/vi/ex/ex_set.c
+++ b/usr.bin/vi/ex/ex_set.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_set.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_set.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_set.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_shell.c b/usr.bin/vi/ex/ex_shell.c
index a8ff35b4bc4..d9f57da852d 100644
--- a/usr.bin/vi/ex/ex_shell.c
+++ b/usr.bin/vi/ex/ex_shell.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_shell.c,v 1.10 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: ex_shell.c,v 1.11 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_shell.c 10.38 (Berkeley) 8/19/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/wait.h>
diff --git a/usr.bin/vi/ex/ex_shift.c b/usr.bin/vi/ex/ex_shift.c
index 523fa875d6f..4bcf384984f 100644
--- a/usr.bin/vi/ex/ex_shift.c
+++ b/usr.bin/vi/ex/ex_shift.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_shift.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_shift.c,v 1.6 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,11 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_shift.c 10.11 (Berkeley) 9/15/96";
-#endif /* not lint */
-
-#include <sys/types.h>
#include <sys/queue.h>
#include <bitstring.h>
diff --git a/usr.bin/vi/ex/ex_source.c b/usr.bin/vi/ex/ex_source.c
index c046a33bb6e..8bd88bb24ac 100644
--- a/usr.bin/vi/ex/ex_source.c
+++ b/usr.bin/vi/ex/ex_source.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_source.c,v 1.6 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_source.c,v 1.7 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_source.c 10.12 (Berkeley) 8/10/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/ex/ex_stop.c b/usr.bin/vi/ex/ex_stop.c
index 8f62be4aa22..4be5da4c4e2 100644
--- a/usr.bin/vi/ex/ex_stop.c
+++ b/usr.bin/vi/ex/ex_stop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_stop.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_stop.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_stop.c 10.10 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_subst.c b/usr.bin/vi/ex/ex_subst.c
index a41efe298ac..3b2053bac3a 100644
--- a/usr.bin/vi/ex/ex_subst.c
+++ b/usr.bin/vi/ex/ex_subst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_subst.c,v 1.16 2007/03/27 18:24:06 otto Exp $ */
+/* $OpenBSD: ex_subst.c,v 1.17 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_subst.c 10.37 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_tag.c b/usr.bin/vi/ex/ex_tag.c
index b5d5043b180..734bf30459d 100644
--- a/usr.bin/vi/ex/ex_tag.c
+++ b/usr.bin/vi/ex/ex_tag.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_tag.c,v 1.13 2006/03/11 06:58:00 ray Exp $ */
+/* $OpenBSD: ex_tag.c,v 1.14 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -14,10 +14,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_tag.c 10.36 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h> /* XXX: param.h may not have included types.h */
diff --git a/usr.bin/vi/ex/ex_tcl.c b/usr.bin/vi/ex/ex_tcl.c
index 6538638da48..f78504acb5d 100644
--- a/usr.bin/vi/ex/ex_tcl.c
+++ b/usr.bin/vi/ex/ex_tcl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_tcl.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_tcl.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -13,10 +13,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_tcl.c 8.10 (Berkeley) 9/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_txt.c b/usr.bin/vi/ex/ex_txt.c
index c89cf1a4d72..5d6e7b5c776 100644
--- a/usr.bin/vi/ex/ex_txt.c
+++ b/usr.bin/vi/ex/ex_txt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_txt.c,v 1.9 2006/01/08 21:06:38 miod Exp $ */
+/* $OpenBSD: ex_txt.c,v 1.10 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_txt.c 10.17 (Berkeley) 10/10/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_undo.c b/usr.bin/vi/ex/ex_undo.c
index d7a5cd3bf43..08579f4dc39 100644
--- a/usr.bin/vi/ex/ex_undo.c
+++ b/usr.bin/vi/ex/ex_undo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_undo.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_undo.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_undo.c 10.6 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_usage.c b/usr.bin/vi/ex/ex_usage.c
index 951bf7e0ee6..bd87fe14e5b 100644
--- a/usr.bin/vi/ex/ex_usage.c
+++ b/usr.bin/vi/ex/ex_usage.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_usage.c,v 1.6 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex_usage.c,v 1.7 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_usage.c 10.13 (Berkeley) 5/3/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_util.c b/usr.bin/vi/ex/ex_util.c
index 5e330e049d1..0e1e055b4b0 100644
--- a/usr.bin/vi/ex/ex_util.c
+++ b/usr.bin/vi/ex/ex_util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_util.c,v 1.6 2002/02/17 19:42:34 millert Exp $ */
+/* $OpenBSD: ex_util.c,v 1.7 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_util.c 10.23 (Berkeley) 6/19/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/ex/ex_version.c b/usr.bin/vi/ex/ex_version.c
index 3f503eba13f..e1e2128623a 100644
--- a/usr.bin/vi/ex/ex_version.c
+++ b/usr.bin/vi/ex/ex_version.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_version.c,v 1.8 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_version.c,v 1.9 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_version.c 10.31 (Berkeley) 8/22/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_visual.c b/usr.bin/vi/ex/ex_visual.c
index 74bc5f8846e..5a945474d54 100644
--- a/usr.bin/vi/ex/ex_visual.c
+++ b/usr.bin/vi/ex/ex_visual.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_visual.c,v 1.7 2006/03/11 06:58:00 ray Exp $ */
+/* $OpenBSD: ex_visual.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_visual.c 10.13 (Berkeley) 6/28/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/ex/ex_write.c b/usr.bin/vi/ex/ex_write.c
index 894583284ac..0f21d3132a9 100644
--- a/usr.bin/vi/ex/ex_write.c
+++ b/usr.bin/vi/ex/ex_write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_write.c,v 1.10 2007/03/20 03:56:13 tedu Exp $ */
+/* $OpenBSD: ex_write.c,v 1.11 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_write.c 10.30 (Berkeley) 7/12/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/ex/ex_yank.c b/usr.bin/vi/ex/ex_yank.c
index 408d9e9ca41..1716d7e1fd2 100644
--- a/usr.bin/vi/ex/ex_yank.c
+++ b/usr.bin/vi/ex/ex_yank.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_yank.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_yank.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_yank.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/ex/ex_z.c b/usr.bin/vi/ex/ex_z.c
index 00c46196864..1f128216c28 100644
--- a/usr.bin/vi/ex/ex_z.c
+++ b/usr.bin/vi/ex/ex_z.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_z.c,v 1.5 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: ex_z.c,v 1.6 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)ex_z.c 10.10 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
diff --git a/usr.bin/vi/perl_api/perl.xs b/usr.bin/vi/perl_api/perl.xs
index 2c41b1f5563..aacc5e6dd61 100644
--- a/usr.bin/vi/perl_api/perl.xs
+++ b/usr.bin/vi/perl_api/perl.xs
@@ -1,4 +1,4 @@
-/* $OpenBSD: perl.xs,v 1.3 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: perl.xs,v 1.4 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -15,10 +15,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)perl.xs 8.27 (Berkeley) 10/16/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/perl_api/perlsfio.c b/usr.bin/vi/perl_api/perlsfio.c
index 94abbd3814c..05a0ee9b4d4 100644
--- a/usr.bin/vi/perl_api/perlsfio.c
+++ b/usr.bin/vi/perl_api/perlsfio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: perlsfio.c,v 1.3 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: perlsfio.c,v 1.4 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1996
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)perlsfio.c 8.1 (Berkeley) 9/24/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/getc.c b/usr.bin/vi/vi/getc.c
index e82abd772d1..dc29213ae59 100644
--- a/usr.bin/vi/vi/getc.c
+++ b/usr.bin/vi/vi/getc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getc.c,v 1.7 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: getc.c,v 1.8 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)getc.c 10.10 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_at.c b/usr.bin/vi/vi/v_at.c
index fc05017ac0a..233f9a73189 100644
--- a/usr.bin/vi/vi/v_at.c
+++ b/usr.bin/vi/vi/v_at.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_at.c,v 1.6 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_at.c,v 1.7 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_at.c 10.8 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_ch.c b/usr.bin/vi/vi/v_ch.c
index 8329aa58e96..f9ca98a6fb6 100644
--- a/usr.bin/vi/vi/v_ch.c
+++ b/usr.bin/vi/vi/v_ch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_ch.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_ch.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_ch.c 10.8 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_cmd.c b/usr.bin/vi/vi/v_cmd.c
index 7aff9988cde..ea141a732aa 100644
--- a/usr.bin/vi/vi/v_cmd.c
+++ b/usr.bin/vi/vi/v_cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_cmd.c,v 1.3 2004/11/29 21:51:08 jmc Exp $ */
+/* $OpenBSD: v_cmd.c,v 1.4 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_cmd.c 10.9 (Berkeley) 3/28/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_delete.c b/usr.bin/vi/vi/v_delete.c
index b446d0f9bd6..c07eeb9e384 100644
--- a/usr.bin/vi/vi/v_delete.c
+++ b/usr.bin/vi/vi/v_delete.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_delete.c,v 1.6 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_delete.c,v 1.7 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_delete.c 10.9 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_ex.c b/usr.bin/vi/vi/v_ex.c
index 5043d5c4c7b..fce8125b350 100644
--- a/usr.bin/vi/vi/v_ex.c
+++ b/usr.bin/vi/vi/v_ex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_ex.c,v 1.8 2006/03/20 01:00:36 pvalchev Exp $ */
+/* $OpenBSD: v_ex.c,v 1.9 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_ex.c 10.42 (Berkeley) 6/28/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_increment.c b/usr.bin/vi/vi/v_increment.c
index f1848225422..95f5ed5a7b4 100644
--- a/usr.bin/vi/vi/v_increment.c
+++ b/usr.bin/vi/vi/v_increment.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_increment.c,v 1.6 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_increment.c,v 1.7 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_increment.c 10.12 (Berkeley) 3/19/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_init.c b/usr.bin/vi/vi/v_init.c
index a212785bf91..6f201483ec2 100644
--- a/usr.bin/vi/vi/v_init.c
+++ b/usr.bin/vi/vi/v_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_init.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_init.c,v 1.5 2009/10/27 23:59:47 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_init.c 10.8 (Berkeley) 3/30/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_itxt.c b/usr.bin/vi/vi/v_itxt.c
index 40ac66673da..748f42da389 100644
--- a/usr.bin/vi/vi/v_itxt.c
+++ b/usr.bin/vi/vi/v_itxt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_itxt.c,v 1.6 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_itxt.c,v 1.7 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_itxt.c 10.16 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_left.c b/usr.bin/vi/vi/v_left.c
index 70ccb8b2df9..196d7d47388 100644
--- a/usr.bin/vi/vi/v_left.c
+++ b/usr.bin/vi/vi/v_left.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_left.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_left.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_left.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_mark.c b/usr.bin/vi/vi/v_mark.c
index f69c4e04e36..8fa292ca8e0 100644
--- a/usr.bin/vi/vi/v_mark.c
+++ b/usr.bin/vi/vi/v_mark.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_mark.c,v 1.7 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: v_mark.c,v 1.8 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_mark.c 10.8 (Berkeley) 9/20/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_match.c b/usr.bin/vi/vi/v_match.c
index 274c6636af9..b9eccd5f2a8 100644
--- a/usr.bin/vi/vi/v_match.c
+++ b/usr.bin/vi/vi/v_match.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_match.c,v 1.5 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_match.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_match.c 10.8 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_paragraph.c b/usr.bin/vi/vi/v_paragraph.c
index 157ea5eef49..56449327f59 100644
--- a/usr.bin/vi/vi/v_paragraph.c
+++ b/usr.bin/vi/vi/v_paragraph.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_paragraph.c,v 1.5 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_paragraph.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_paragraph.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_put.c b/usr.bin/vi/vi/v_put.c
index 8845852c371..e7a78c21ed2 100644
--- a/usr.bin/vi/vi/v_put.c
+++ b/usr.bin/vi/vi/v_put.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_put.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_put.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_put.c 10.5 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_redraw.c b/usr.bin/vi/vi/v_redraw.c
index 8c224722afd..eeea87d8c65 100644
--- a/usr.bin/vi/vi/v_redraw.c
+++ b/usr.bin/vi/vi/v_redraw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_redraw.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_redraw.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_redraw.c 10.6 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_replace.c b/usr.bin/vi/vi/v_replace.c
index 01910b2ccb4..47dcb292282 100644
--- a/usr.bin/vi/vi/v_replace.c
+++ b/usr.bin/vi/vi/v_replace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_replace.c,v 1.6 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_replace.c,v 1.7 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_replace.c 10.17 (Berkeley) 6/30/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_right.c b/usr.bin/vi/vi/v_right.c
index 0fbf2362fc0..9633a099d56 100644
--- a/usr.bin/vi/vi/v_right.c
+++ b/usr.bin/vi/vi/v_right.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_right.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_right.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_right.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_screen.c b/usr.bin/vi/vi/v_screen.c
index b28cb7d1f5c..015e99f158e 100644
--- a/usr.bin/vi/vi/v_screen.c
+++ b/usr.bin/vi/vi/v_screen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_screen.c,v 1.5 2005/10/17 19:12:16 otto Exp $ */
+/* $OpenBSD: v_screen.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_screen.c 10.10 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_scroll.c b/usr.bin/vi/vi/v_scroll.c
index 5ca270fbccd..baa49f286ff 100644
--- a/usr.bin/vi/vi/v_scroll.c
+++ b/usr.bin/vi/vi/v_scroll.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_scroll.c,v 1.7 2006/03/04 16:18:06 miod Exp $ */
+/* $OpenBSD: v_scroll.c,v 1.8 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_scroll.c 10.9 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_search.c b/usr.bin/vi/vi/v_search.c
index 8cb428f12dd..4c3599ae064 100644
--- a/usr.bin/vi/vi/v_search.c
+++ b/usr.bin/vi/vi/v_search.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_search.c,v 1.10 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: v_search.c,v 1.11 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_search.c 10.18 (Berkeley) 9/19/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_section.c b/usr.bin/vi/vi/v_section.c
index 6040bc1198d..503eff98c98 100644
--- a/usr.bin/vi/vi/v_section.c
+++ b/usr.bin/vi/vi/v_section.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_section.c,v 1.5 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_section.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_section.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_sentence.c b/usr.bin/vi/vi/v_sentence.c
index 54107f3fb03..caf02196331 100644
--- a/usr.bin/vi/vi/v_sentence.c
+++ b/usr.bin/vi/vi/v_sentence.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_sentence.c,v 1.5 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_sentence.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_sentence.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_status.c b/usr.bin/vi/vi/v_status.c
index d8e90393086..cba61738844 100644
--- a/usr.bin/vi/vi/v_status.c
+++ b/usr.bin/vi/vi/v_status.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_status.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_status.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_status.c 10.9 (Berkeley) 5/15/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/vi/v_txt.c b/usr.bin/vi/vi/v_txt.c
index 065996e14f9..d7c80ec8192 100644
--- a/usr.bin/vi/vi/v_txt.c
+++ b/usr.bin/vi/vi/v_txt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_txt.c,v 1.21 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: v_txt.c,v 1.22 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_txt.c 10.87 (Berkeley) 10/13/96";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/vi/vi/v_ulcase.c b/usr.bin/vi/vi/v_ulcase.c
index 94735d87b43..653710d71f8 100644
--- a/usr.bin/vi/vi/v_ulcase.c
+++ b/usr.bin/vi/vi/v_ulcase.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_ulcase.c,v 1.6 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_ulcase.c,v 1.7 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_ulcase.c 10.7 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_undo.c b/usr.bin/vi/vi/v_undo.c
index ba9600e9154..dd90df19919 100644
--- a/usr.bin/vi/vi/v_undo.c
+++ b/usr.bin/vi/vi/v_undo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_undo.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_undo.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_undo.c 10.5 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_util.c b/usr.bin/vi/vi/v_util.c
index 39fd1217c2b..e31fbea8ae8 100644
--- a/usr.bin/vi/vi/v_util.c
+++ b/usr.bin/vi/vi/v_util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_util.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_util.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_util.c 10.11 (Berkeley) 6/30/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_word.c b/usr.bin/vi/vi/v_word.c
index 9cb613419b7..61ac531ea23 100644
--- a/usr.bin/vi/vi/v_word.c
+++ b/usr.bin/vi/vi/v_word.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_word.c,v 1.5 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: v_word.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_word.c 10.5 (Berkeley) 3/6/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_xchar.c b/usr.bin/vi/vi/v_xchar.c
index d3f43a384bc..48d501bd409 100644
--- a/usr.bin/vi/vi/v_xchar.c
+++ b/usr.bin/vi/vi/v_xchar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_xchar.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_xchar.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_xchar.c 10.9 (Berkeley) 10/23/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_yank.c b/usr.bin/vi/vi/v_yank.c
index 43ba898ffd4..9346981ebdf 100644
--- a/usr.bin/vi/vi/v_yank.c
+++ b/usr.bin/vi/vi/v_yank.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_yank.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_yank.c,v 1.6 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_yank.c 10.9 (Berkeley) 5/19/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_z.c b/usr.bin/vi/vi/v_z.c
index 58d85b2f8ae..406224e0827 100644
--- a/usr.bin/vi/vi/v_z.c
+++ b/usr.bin/vi/vi/v_z.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_z.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_z.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_z.c 10.10 (Berkeley) 5/16/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/v_zexit.c b/usr.bin/vi/vi/v_zexit.c
index 061017edf89..f33501f464b 100644
--- a/usr.bin/vi/vi/v_zexit.c
+++ b/usr.bin/vi/vi/v_zexit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v_zexit.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: v_zexit.c,v 1.5 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)v_zexit.c 10.6 (Berkeley) 4/27/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vi.c b/usr.bin/vi/vi/vi.c
index 19357ff7168..8caf156bd80 100644
--- a/usr.bin/vi/vi/vi.c
+++ b/usr.bin/vi/vi/vi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vi.c,v 1.12 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: vi.c,v 1.13 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vi.c 10.57 (Berkeley) 10/13/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vs_line.c b/usr.bin/vi/vi/vs_line.c
index 827814bf777..8dda32926f9 100644
--- a/usr.bin/vi/vi/vs_line.c
+++ b/usr.bin/vi/vi/vs_line.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs_line.c,v 1.12 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: vs_line.c,v 1.13 2009/10/27 23:59:48 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vs_line.c 10.19 (Berkeley) 9/26/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vs_msg.c b/usr.bin/vi/vi/vs_msg.c
index 9f526877557..6ffbbb393dc 100644
--- a/usr.bin/vi/vi/vs_msg.c
+++ b/usr.bin/vi/vi/vs_msg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs_msg.c,v 1.10 2006/04/22 03:09:15 ray Exp $ */
+/* $OpenBSD: vs_msg.c,v 1.11 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vs_msg.c 10.77 (Berkeley) 10/13/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vs_refresh.c b/usr.bin/vi/vi/vs_refresh.c
index 55fa2428b61..1d377580b85 100644
--- a/usr.bin/vi/vi/vs_refresh.c
+++ b/usr.bin/vi/vi/vs_refresh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs_refresh.c,v 1.15 2008/03/08 18:11:42 otto Exp $ */
+/* $OpenBSD: vs_refresh.c,v 1.16 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vs_refresh.c 10.44 (Berkeley) 10/13/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vs_relative.c b/usr.bin/vi/vi/vs_relative.c
index ed99ebc2263..32a3568f506 100644
--- a/usr.bin/vi/vi/vs_relative.c
+++ b/usr.bin/vi/vi/vs_relative.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs_relative.c,v 1.7 2008/03/08 12:34:09 otto Exp $ */
+/* $OpenBSD: vs_relative.c,v 1.8 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vs_relative.c 10.11 (Berkeley) 5/13/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vs_smap.c b/usr.bin/vi/vi/vs_smap.c
index b81f3d27199..7135c702ec6 100644
--- a/usr.bin/vi/vi/vs_smap.c
+++ b/usr.bin/vi/vi/vs_smap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs_smap.c,v 1.6 2006/01/08 21:05:40 miod Exp $ */
+/* $OpenBSD: vs_smap.c,v 1.7 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vs_smap.c 10.25 (Berkeley) 7/12/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vi/vi/vs_split.c b/usr.bin/vi/vi/vs_split.c
index daf761302e3..fb4074adc26 100644
--- a/usr.bin/vi/vi/vs_split.c
+++ b/usr.bin/vi/vi/vs_split.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs_split.c,v 1.9 2006/03/11 06:58:00 ray Exp $ */
+/* $OpenBSD: vs_split.c,v 1.10 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -11,10 +11,6 @@
#include "config.h"
-#ifndef lint
-static const char sccsid[] = "@(#)vs_split.c 10.31 (Berkeley) 10/13/96";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/time.h>
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index c9a9f2e8fe0..e8c66d443cd 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: foldit.c,v 1.4 2003/06/03 02:56:22 millert Exp $ */
+/* $OpenBSD: foldit.c,v 1.5 2009/10/27 23:59:49 deraadt Exp $ */
/* $NetBSD: foldit.c,v 1.4 1994/12/20 16:13:02 jtc Exp $ */
/*-
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)foldit.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: foldit.c,v 1.4 2003/06/03 02:56:22 millert Exp $";
-#endif /* not lint */
-
#include <stdio.h>
int
diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index 0f3873f2599..e6ad55f64a4 100644
--- a/usr.bin/vis/vis.c
+++ b/usr.bin/vis/vis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vis.c,v 1.11 2007/03/15 23:17:20 jmc Exp $ */
+/* $OpenBSD: vis.c,v 1.12 2009/10/27 23:59:49 deraadt Exp $ */
/* $NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $ */
/*-
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] = "$OpenBSD: vis.c,v 1.11 2007/03/15 23:17:20 jmc Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index d412eb4a5c2..d7b5fdedf5d 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,5 +1,5 @@
/* $NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $ */
-/* $OpenBSD: vmstat.c,v 1.112 2009/09/30 19:39:34 naddy Exp $ */
+/* $OpenBSD: vmstat.c,v 1.113 2009/10/27 23:59:49 deraadt Exp $ */
/*
* Copyright (c) 1980, 1986, 1991, 1993
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1986, 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)vmstat.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: vmstat.c,v 1.112 2009/09/30 19:39:34 naddy Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/proc.h>
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 274a9df531b..526a81507da 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pr_time.c,v 1.13 2005/04/11 07:04:47 deraadt Exp $ */
+/* $OpenBSD: pr_time.c,v 1.14 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pr_time.c 8.2 (Berkeley) 4/4/94";
-#else
-static char *rcsid = "$OpenBSD: pr_time.c,v 1.13 2005/04/11 07:04:47 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index a52bc8cdb02..727b881a071 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc_compare.c,v 1.10 2005/04/11 07:04:47 deraadt Exp $ */
+/* $OpenBSD: proc_compare.c,v 1.11 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)proc_compare.c 8.2 (Berkeley) 9/23/93";
-#else
-static char *rcsid = "$OpenBSD: proc_compare.c,v 1.10 2005/04/11 07:04:47 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index dbe9f106b4e..e625a640764 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: w.c,v 1.46 2008/09/30 21:29:58 millert Exp $ */
+/* $OpenBSD: w.c,v 1.47 2009/10/27 23:59:49 deraadt Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)w.c 8.4 (Berkeley) 4/16/94";
-#else
-static char *rcsid = "$OpenBSD: w.c,v 1.46 2008/09/30 21:29:58 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* w - print system status (who and what)
*
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 3059f9b1b9e..a09dc3084bf 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttymsg.c,v 1.15 2004/09/14 23:01:31 deraadt Exp $ */
+/* $OpenBSD: ttymsg.c,v 1.16 2009/10/27 23:59:49 deraadt Exp $ */
/* $NetBSD: ttymsg.c,v 1.3 1994/11/17 07:17:55 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)ttymsg.c 8.2 (Berkeley) 11/16/93";
-#endif
-static const char rcsid[] = "$OpenBSD: ttymsg.c,v 1.15 2004/09/14 23:01:31 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/uio.h>
#include <signal.h>
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 4f34d7dde63..cdb65aa979a 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wall.c,v 1.24 2009/08/03 20:30:03 bluhm Exp $ */
+/* $OpenBSD: wall.c,v 1.25 2009/10/27 23:59:49 deraadt Exp $ */
/* $NetBSD: wall.c,v 1.6 1994/11/17 07:17:58 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93";
-#endif
-static const char rcsid[] = "$OpenBSD: wall.c,v 1.24 2009/08/03 20:30:03 bluhm Exp $";
-#endif /* not lint */
-
/*
* This program is not related to David Wall, whose Stanford Ph.D. thesis
* is entitled "Mechanisms for Broadcast and Selective Broadcast".
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index e2b3e5b2346..52689c9e6da 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wc.c,v 1.12 2008/06/19 18:29:06 otto Exp $ */
+/* $OpenBSD: wc.c,v 1.13 2009/10/27 23:59:49 deraadt Exp $ */
/*
* Copyright (c) 1980, 1987, 1991, 1993
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1987, 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wc.c 8.2 (Berkeley) 5/2/95";
-#else
-static char rcsid[] = "$OpenBSD: wc.c,v 1.12 2008/06/19 18:29:06 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index a429cbe6ccc..7a89b1d4642 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: what.c,v 1.11 2003/07/10 00:06:52 david Exp $ */
+/* $OpenBSD: what.c,v 1.12 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: what.c,v 1.4 1994/12/20 16:01:03 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)what.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: what.c,v 1.11 2003/07/10 00:06:52 david Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/utsname.h>
#include <stdio.h>
diff --git a/usr.bin/whatis/whatis.c b/usr.bin/whatis/whatis.c
index f9809c6be70..0cbca42fe24 100644
--- a/usr.bin/whatis/whatis.c
+++ b/usr.bin/whatis/whatis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: whatis.c,v 1.12 2007/03/20 03:56:13 tedu Exp $ */
+/* $OpenBSD: whatis.c,v 1.13 2009/10/27 23:59:50 deraadt Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)whatis.c 8.5 (Berkeley) 11/26/93";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c
index d799d6d5c58..b0ed1d30842 100644
--- a/usr.bin/which/which.c
+++ b/usr.bin/which/which.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: which.c,v 1.14 2007/08/14 17:41:10 sobrado Exp $ */
+/* $OpenBSD: which.c,v 1.15 2009/10/27 23:59:50 deraadt Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: which.c,v 1.14 2007/08/14 17:41:10 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 6363158d0ec..cfdb7dd69f7 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: who.c,v 1.17 2004/08/18 21:24:27 jmc Exp $ */
+/* $OpenBSD: who.c,v 1.18 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: who.c,v 1.4 1994/12/07 04:28:49 jtc Exp $ */
/*
@@ -33,19 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)who.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: who.c,v 1.17 2004/08/18 21:24:27 jmc Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <paths.h>
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 19a1a2f021e..02207705ad4 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: write.c,v 1.25 2008/07/06 13:42:35 sobrado Exp $ */
+/* $OpenBSD: write.c,v 1.26 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: write.c,v 1.5 1995/08/31 21:48:32 jtc Exp $ */
/*
@@ -33,19 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)write.c 8.2 (Berkeley) 4/27/95";
-#endif
-static char *rcsid = "$OpenBSD: write.c,v 1.25 2008/07/06 13:42:35 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <ctype.h>
diff --git a/usr.bin/xargs/strnsubst.c b/usr.bin/xargs/strnsubst.c
index 7d283fd4f04..feaf068b8f7 100644
--- a/usr.bin/xargs/strnsubst.c
+++ b/usr.bin/xargs/strnsubst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strnsubst.c,v 1.4 2005/12/01 05:52:20 cloder Exp $ */
+/* $OpenBSD: strnsubst.c,v 1.5 2009/10/27 23:59:50 deraadt Exp $ */
/* $FreeBSD: strnsubst.c,v 1.6 2002/06/22 12:58:42 jmallett Exp $ */
/*
@@ -9,10 +9,6 @@
* For the man who taught me vi, and who got too old, too young.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: strnsubst.c,v 1.4 2005/12/01 05:52:20 cloder Exp $";
-#endif /* not lint */
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index b63733afc98..bba5d2589c5 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xargs.c,v 1.25 2007/09/02 15:19:36 deraadt Exp $ */
+/* $OpenBSD: xargs.c,v 1.26 2009/10/27 23:59:50 deraadt Exp $ */
/* $FreeBSD: xargs.c,v 1.51 2003/05/03 19:09:11 obrien Exp $ */
/*-
@@ -35,20 +35,6 @@
* $xMach: xargs.c,v 1.6 2002/02/23 05:27:47 tim Exp $
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: xargs.c,v 1.25 2007/09/02 15:19:36 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/wait.h>
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 7386ecdd0ab..00676cc9a93 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xinstall.c,v 1.48 2009/03/27 07:31:27 phessler Exp $ */
+/* $OpenBSD: xinstall.c,v 1.49 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
-#endif
-static char rcsid[] = "$OpenBSD: xinstall.c,v 1.48 2009/03/27 07:31:27 phessler Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/wait.h>
#include <sys/mman.h>
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index a3be3d83ad8..758f633055e 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xstr.c,v 1.15 2009/10/22 20:03:04 sobrado Exp $ */
+/* $OpenBSD: xstr.c,v 1.16 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: xstr.c,v 1.5 1994/12/24 16:57:59 cgd Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)xstr.c 8.1 (Berkeley) 6/9/93";
-#endif
-static char rcsid[] = "$OpenBSD: xstr.c,v 1.15 2009/10/22 20:03:04 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <signal.h>
#include <errno.h>
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index fcd887afc27..723746e8f6e 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: closure.c,v 1.8 2005/06/10 16:40:45 pvalchev Exp $ */
+/* $OpenBSD: closure.c,v 1.9 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: closure.c,v 1.4 1996/03/19 03:21:29 jtc Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)closure.c 5.3 (Berkeley) 5/24/93";
-#else
-static char rcsid[] = "$OpenBSD: closure.c,v 1.8 2005/06/10 16:40:45 pvalchev Exp $";
-#endif
-#endif /* not lint */
-
#include "defs.h"
short *itemset;
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 333017334a3..d76548ab309 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: error.c,v 1.10 2005/06/08 03:18:59 pvalchev Exp $ */
+/* $OpenBSD: error.c,v 1.11 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: error.c,v 1.4 1996/03/19 03:21:32 jtc Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)error.c 5.3 (Berkeley) 6/1/90";
-#else
-static char rcsid[] = "$OpenBSD: error.c,v 1.10 2005/06/08 03:18:59 pvalchev Exp $";
-#endif
-#endif /* not lint */
-
/* routines for printing error messages */
#include "defs.h"
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index 3cdf3ae1079..4e9a391c392 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lalr.c,v 1.8 2003/06/19 16:34:53 pvalchev Exp $ */
+/* $OpenBSD: lalr.c,v 1.9 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: lalr.c,v 1.4 1996/03/19 03:21:33 jtc Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lalr.c 5.3 (Berkeley) 6/1/90";
-#else
-static char rcsid[] = "$OpenBSD: lalr.c,v 1.8 2003/06/19 16:34:53 pvalchev Exp $";
-#endif
-#endif /* not lint */
-
#include "defs.h"
typedef
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 666e28b8351..7333a5d15e9 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lr0.c,v 1.8 2003/06/19 16:34:53 pvalchev Exp $ */
+/* $OpenBSD: lr0.c,v 1.9 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: lr0.c,v 1.4 1996/03/19 03:21:35 jtc Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lr0.c 5.3 (Berkeley) 1/20/91";
-#else
-static char rcsid[] = "$OpenBSD: lr0.c,v 1.8 2003/06/19 16:34:53 pvalchev Exp $";
-#endif
-#endif /* not lint */
-
#include "defs.h"
extern short *itemset;
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index df4338ba88f..9918276eb02 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.22 2009/05/01 10:41:05 chl Exp $ */
+/* $OpenBSD: main.c,v 1.23 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: main.c,v 1.5 1996/03/19 03:21:38 jtc Exp $ */
/*
@@ -33,20 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)main.c 5.5 (Berkeley) 5/24/93";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.22 2009/05/01 10:41:05 chl Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <fcntl.h>
#include <paths.h>
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index f9d1112518b..b2facdce856 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkpar.c,v 1.13 2005/06/10 16:40:45 pvalchev Exp $ */
+/* $OpenBSD: mkpar.c,v 1.14 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: mkpar.c,v 1.4 1996/03/19 03:21:39 jtc Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mkpar.c 5.3 (Berkeley) 1/20/91";
-#else
-static char rcsid[] = "$NetBSD: mkpar.c,v 1.4 1996/03/19 03:21:39 jtc Exp $";
-#endif
-#endif /* not lint */
-
#include "defs.h"
action **parser;
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index e47a51d232e..380072bb76d 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: output.c,v 1.14 2005/06/10 16:40:45 pvalchev Exp $ */
+/* $OpenBSD: output.c,v 1.15 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: output.c,v 1.4 1996/03/19 03:21:41 jtc Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)output.c 5.7 (Berkeley) 5/24/93";
-#else
-static char rcsid[] = "$OpenBSD: output.c,v 1.14 2005/06/10 16:40:45 pvalchev Exp $";
-#endif
-#endif /* not lint */
-
#include "defs.h"
static int nvectors;
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 3f5a63634cc..3a20067dd04 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: reader.c,v 1.20 2006/04/21 07:38:16 deraadt Exp $ */
+/* $OpenBSD: reader.c,v 1.21 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: reader.c,v 1.5 1996/03/19 03:21:43 jtc Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)reader.c 5.7 (Berkeley) 1/20/91";
-#else
-static char rcsid[] = "$NetBSD: reader.c,v 1.5 1996/03/19 03:21:43 jtc Exp $";
-#endif
-#endif /* not lint */
-
#include "defs.h"
/* The line size must be a positive integer. One hundred was chosen */
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index 082ae29d39d..60a05d7a17f 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: skeleton.c,v 1.29 2008/07/08 15:06:50 otto Exp $ */
+/* $OpenBSD: skeleton.c,v 1.30 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: skeleton.c,v 1.10 1996/03/25 00:36:18 mrg Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)skeleton.c 5.8 (Berkeley) 4/29/95";
-#else
-static char rcsid[] = "$NetBSD: skeleton.c,v 1.10 1996/03/25 00:36:18 mrg Exp $";
-#endif
-#endif /* not lint */
-
#include "defs.h"
/* The definition of yysccsid in the banner should be replaced with */
@@ -57,14 +49,6 @@ static char rcsid[] = "$NetBSD: skeleton.c,v 1.10 1996/03/25 00:36:18 mrg Exp $"
char *banner[] =
{
- "#ifndef lint",
- "/*static char yysccsid[] = \"from: @(#)yaccpar 1.9 (Berkeley) 02/21/93\";*/",
- "static char yyrcsid[]",
- "#if __GNUC__ >= 2",
- " __attribute__ ((unused))",
- "#endif /* __GNUC__ >= 2 */",
- " = \"$OpenBSD: skeleton.c,v 1.29 2008/07/08 15:06:50 otto Exp $\";",
- "#endif",
"#include <stdlib.h>",
"#include <string.h>",
"#define YYBYACC 1",
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index a0004bd8584..8afa7d11d9c 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: symtab.c,v 1.12 2005/06/10 16:40:45 pvalchev Exp $ */
+/* $OpenBSD: symtab.c,v 1.13 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: symtab.c,v 1.4 1996/03/19 03:21:48 jtc Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)symtab.c 5.3 (Berkeley) 6/1/90";
-#else
-static char rcsid[] = "$OpenBSD: symtab.c,v 1.12 2005/06/10 16:40:45 pvalchev Exp $";
-#endif
-#endif /* not lint */
-
#include "defs.h"
/* TABLE_SIZE is the number of entries in the symbol table. */
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 7b2bd325c1d..4f39564ba64 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: verbose.c,v 1.9 2005/06/10 16:40:45 pvalchev Exp $ */
+/* $OpenBSD: verbose.c,v 1.10 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: verbose.c,v 1.4 1996/03/19 03:21:50 jtc Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)verbose.c 5.3 (Berkeley) 1/20/91";
-#else
-static char rcsid[] = "$OpenBSD: verbose.c,v 1.9 2005/06/10 16:40:45 pvalchev Exp $";
-#endif
-#endif /* not lint */
-
#include "defs.h"
static short *null_rules;
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 73fc72e1e4a..3580b854d57 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: warshall.c,v 1.8 2003/06/19 16:34:53 pvalchev Exp $ */
+/* $OpenBSD: warshall.c,v 1.9 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: warshall.c,v 1.4 1996/03/19 03:21:51 jtc Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)warshall.c 5.4 (Berkeley) 5/24/93";
-#else
-static char rcsid[] = "$OpenBSD: warshall.c,v 1.8 2003/06/19 16:34:53 pvalchev Exp $";
-#endif
-#endif /* not lint */
-
#include "defs.h"
void transitive_closure(unsigned int *, int);
diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c
index 8bc858d88f3..b7bf70e0ee5 100644
--- a/usr.bin/yes/yes.c
+++ b/usr.bin/yes/yes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yes.c,v 1.7 2003/06/15 21:21:56 tedu Exp $ */
+/* $OpenBSD: yes.c,v 1.8 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: yes.c,v 1.3 1994/11/14 04:56:15 jtc Exp $ */
/*
@@ -30,19 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)yes.c 8.1 (Berkeley) 6/6/93";
-#endif
-static char rcsid[] = "$OpenBSD: yes.c,v 1.7 2003/06/15 21:21:56 tedu Exp $";
-#endif /* not lint */
-
#include <stdio.h>
int
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index 3ff084e04e8..1355cf1a606 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypcat.c,v 1.13 2008/05/29 07:42:08 sobrado Exp $ */
+/* $OpenBSD: ypcat.c,v 1.14 2009/10/27 23:59:50 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: ypcat.c,v 1.13 2008/05/29 07:42:08 sobrado Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index d8baa8bdf34..1503633eb7e 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypmatch.c,v 1.13 2008/06/01 21:45:08 sobrado Exp $ */
+/* $OpenBSD: ypmatch.c,v 1.14 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: ypmatch.c,v 1.8 1996/05/07 01:24:52 jtc Exp $ */
/*
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: ypmatch.c,v 1.13 2008/06/01 21:45:08 sobrado Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 683b2bc5435..7a9560c4ca6 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypwhich.c,v 1.19 2007/04/02 15:34:39 jmc Exp $ */
+/* $OpenBSD: ypwhich.c,v 1.20 2009/10/27 23:59:50 deraadt Exp $ */
/* $NetBSD: ypwhich.c,v 1.6 1996/05/13 02:43:48 thorpej Exp $ */
/*
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$Id: ypwhich.c,v 1.19 2007/04/02 15:34:39 jmc Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>