summaryrefslogtreecommitdiff
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
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
-rw-r--r--bin/cat/cat.c16
-rw-r--r--bin/chmod/chmod.c16
-rw-r--r--bin/cp/utils.c10
-rw-r--r--bin/csh/alloc.c10
-rw-r--r--bin/csh/char.c10
-rw-r--r--bin/csh/const.c10
-rw-r--r--bin/csh/csh.c16
-rw-r--r--bin/csh/dir.c10
-rw-r--r--bin/csh/dol.c10
-rw-r--r--bin/csh/error.c10
-rw-r--r--bin/csh/exec.c10
-rw-r--r--bin/csh/exp.c10
-rw-r--r--bin/csh/file.c10
-rw-r--r--bin/csh/func.c10
-rw-r--r--bin/csh/glob.c10
-rw-r--r--bin/csh/hist.c10
-rw-r--r--bin/csh/init.c10
-rw-r--r--bin/csh/lex.c10
-rw-r--r--bin/csh/misc.c10
-rw-r--r--bin/csh/parse.c10
-rw-r--r--bin/csh/proc.c10
-rw-r--r--bin/csh/sem.c10
-rw-r--r--bin/csh/set.c17
-rw-r--r--bin/csh/str.c10
-rw-r--r--bin/csh/time.c10
-rw-r--r--bin/date/date.c16
-rw-r--r--bin/date/netdate.c10
-rw-r--r--bin/dd/args.c10
-rw-r--r--bin/dd/conv.c10
-rw-r--r--bin/dd/conv_tab.c10
-rw-r--r--bin/dd/dd.c16
-rw-r--r--bin/dd/misc.c10
-rw-r--r--bin/dd/position.c10
-rw-r--r--bin/df/df.c16
-rw-r--r--bin/df/ffs_df.c8
-rw-r--r--bin/domainname/domainname.c16
-rw-r--r--bin/echo/echo.c16
-rw-r--r--bin/ed/buf.c10
-rw-r--r--bin/ed/cbc.c10
-rw-r--r--bin/ed/glbl.c10
-rw-r--r--bin/ed/io.c10
-rw-r--r--bin/ed/main.c16
-rw-r--r--bin/ed/re.c10
-rw-r--r--bin/ed/sub.c10
-rw-r--r--bin/ed/undo.c10
-rw-r--r--bin/hostname/hostname.c16
-rw-r--r--bin/kill/kill.c16
-rw-r--r--bin/ksh/mknod.c16
-rw-r--r--bin/ln/ln.c16
-rw-r--r--bin/ls/cmp.c10
-rw-r--r--bin/ls/ls.c16
-rw-r--r--bin/ls/print.c10
-rw-r--r--bin/ls/util.c10
-rw-r--r--bin/md5/crc.c6
-rw-r--r--bin/mkdir/mkdir.c16
-rw-r--r--bin/mt/mt.c16
-rw-r--r--bin/mt/mtrmt.c9
-rw-r--r--bin/mv/mv.c16
-rw-r--r--bin/pax/ar_io.c10
-rw-r--r--bin/pax/ar_subs.c10
-rw-r--r--bin/pax/buf_subs.c10
-rw-r--r--bin/pax/cache.c10
-rw-r--r--bin/pax/cpio.c10
-rw-r--r--bin/pax/file_subs.c10
-rw-r--r--bin/pax/ftree.c10
-rw-r--r--bin/pax/gen_subs.c10
-rw-r--r--bin/pax/getoldopt.c6
-rw-r--r--bin/pax/options.c10
-rw-r--r--bin/pax/pat_rep.c10
-rw-r--r--bin/pax/pax.c16
-rw-r--r--bin/pax/sel_subs.c10
-rw-r--r--bin/pax/tables.c10
-rw-r--r--bin/pax/tar.c10
-rw-r--r--bin/pax/tty_subs.c10
-rw-r--r--bin/ps/keyword.c10
-rw-r--r--bin/ps/nlist.c10
-rw-r--r--bin/ps/print.c10
-rw-r--r--bin/ps/ps.c16
-rw-r--r--bin/pwd/pwd.c16
-rw-r--r--bin/rcp/rcp.c16
-rw-r--r--bin/rcp/util.c10
-rw-r--r--bin/rm/rm.c16
-rw-r--r--bin/rmail/rmail.c16
-rw-r--r--bin/rmdir/rmdir.c16
-rw-r--r--bin/sleep/sleep.c16
-rw-r--r--bin/stty/cchar.c10
-rw-r--r--bin/stty/gfmt.c10
-rw-r--r--bin/stty/key.c10
-rw-r--r--bin/stty/modes.c10
-rw-r--r--bin/stty/print.c10
-rw-r--r--bin/stty/stty.c16
-rw-r--r--bin/sync/sync.c16
-rw-r--r--bin/test/test.c6
-rw-r--r--distrib/special/more/more.c16
-rw-r--r--games/adventure/crc.c11
-rw-r--r--games/adventure/done.c10
-rw-r--r--games/adventure/init.c10
-rw-r--r--games/adventure/io.c10
-rw-r--r--games/adventure/main.c16
-rw-r--r--games/adventure/save.c10
-rw-r--r--games/adventure/setup.c16
-rw-r--r--games/adventure/subr.c10
-rw-r--r--games/adventure/vocab.c10
-rw-r--r--games/adventure/wizard.c10
-rw-r--r--games/arithmetic/arithmetic.c16
-rw-r--r--games/atc/extern.c10
-rw-r--r--games/atc/grammar.y10
-rw-r--r--games/atc/graphics.c10
-rw-r--r--games/atc/input.c10
-rw-r--r--games/atc/lex.l10
-rw-r--r--games/atc/list.c10
-rw-r--r--games/atc/log.c10
-rw-r--r--games/atc/main.c16
-rw-r--r--games/atc/update.c10
-rw-r--r--games/backgammon/backgammon/extra.c10
-rw-r--r--games/backgammon/backgammon/main.c16
-rw-r--r--games/backgammon/backgammon/move.c10
-rw-r--r--games/backgammon/backgammon/text.c10
-rw-r--r--games/backgammon/common_source/allow.c10
-rw-r--r--games/backgammon/common_source/board.c10
-rw-r--r--games/backgammon/common_source/check.c10
-rw-r--r--games/backgammon/common_source/fancy.c10
-rw-r--r--games/backgammon/common_source/init.c10
-rw-r--r--games/backgammon/common_source/odds.c10
-rw-r--r--games/backgammon/common_source/one.c10
-rw-r--r--games/backgammon/common_source/save.c10
-rw-r--r--games/backgammon/common_source/subs.c10
-rw-r--r--games/backgammon/common_source/table.c10
-rw-r--r--games/backgammon/teachgammon/data.c10
-rw-r--r--games/backgammon/teachgammon/teach.c16
-rw-r--r--games/backgammon/teachgammon/ttext1.c10
-rw-r--r--games/backgammon/teachgammon/ttext2.c10
-rw-r--r--games/backgammon/teachgammon/tutor.c10
-rw-r--r--games/banner/banner.c16
-rw-r--r--games/battlestar/battlestar.c16
-rw-r--r--games/battlestar/com1.c10
-rw-r--r--games/battlestar/com2.c10
-rw-r--r--games/battlestar/com3.c10
-rw-r--r--games/battlestar/com4.c10
-rw-r--r--games/battlestar/com5.c10
-rw-r--r--games/battlestar/com6.c10
-rw-r--r--games/battlestar/com7.c10
-rw-r--r--games/battlestar/cypher.c10
-rw-r--r--games/battlestar/dayfile.c10
-rw-r--r--games/battlestar/dayobjs.c10
-rw-r--r--games/battlestar/fly.c10
-rw-r--r--games/battlestar/getcom.c10
-rw-r--r--games/battlestar/globals.c10
-rw-r--r--games/battlestar/init.c10
-rw-r--r--games/battlestar/misc.c10
-rw-r--r--games/battlestar/nightfile.c10
-rw-r--r--games/battlestar/nightobjs.c10
-rw-r--r--games/battlestar/parse.c10
-rw-r--r--games/battlestar/room.c10
-rw-r--r--games/battlestar/save.c10
-rw-r--r--games/battlestar/words.c10
-rw-r--r--games/bcd/bcd.c16
-rw-r--r--games/boggle/boggle/bog.c16
-rw-r--r--games/boggle/boggle/help.c10
-rw-r--r--games/boggle/boggle/mach.c10
-rw-r--r--games/boggle/boggle/timer.c10
-rw-r--r--games/boggle/boggle/word.c10
-rw-r--r--games/boggle/mkdict/mkdict.c16
-rw-r--r--games/boggle/mkindex/mkindex.c16
-rw-r--r--games/bs/bs.c6
-rw-r--r--games/caesar/caesar.c16
-rw-r--r--games/canfield/canfield/canfield.c16
-rw-r--r--games/canfield/cfscores/cfscores.c16
-rw-r--r--games/cribbage/cards.c10
-rw-r--r--games/cribbage/crib.c16
-rw-r--r--games/cribbage/extern.c10
-rw-r--r--games/cribbage/instr.c10
-rw-r--r--games/cribbage/io.c10
-rw-r--r--games/cribbage/score.c10
-rw-r--r--games/cribbage/support.c10
-rw-r--r--games/factor/factor.c16
-rw-r--r--games/fish/fish.c16
-rw-r--r--games/fortune/fortune/fortune.c16
-rw-r--r--games/fortune/strfile/strfile.c16
-rw-r--r--games/fortune/unstr/unstr.c12
-rw-r--r--games/gomoku/bdinit.c10
-rw-r--r--games/gomoku/bdisp.c10
-rw-r--r--games/gomoku/main.c16
-rw-r--r--games/gomoku/makemove.c10
-rw-r--r--games/gomoku/pickmove.c10
-rw-r--r--games/gomoku/stoc.c10
-rw-r--r--games/hack/alloc.c6
-rw-r--r--games/hack/hack.Decl.c6
-rw-r--r--games/hack/hack.apply.c6
-rw-r--r--games/hack/hack.bones.c6
-rw-r--r--games/hack/hack.c6
-rw-r--r--games/hack/hack.cmd.c6
-rw-r--r--games/hack/hack.do.c6
-rw-r--r--games/hack/hack.do_name.c6
-rw-r--r--games/hack/hack.do_wear.c6
-rw-r--r--games/hack/hack.dog.c6
-rw-r--r--games/hack/hack.eat.c6
-rw-r--r--games/hack/hack.end.c6
-rw-r--r--games/hack/hack.engrave.c6
-rw-r--r--games/hack/hack.fight.c6
-rw-r--r--games/hack/hack.invent.c6
-rw-r--r--games/hack/hack.ioctl.c6
-rw-r--r--games/hack/hack.lev.c6
-rw-r--r--games/hack/hack.main.c6
-rw-r--r--games/hack/hack.makemon.c6
-rw-r--r--games/hack/hack.mhitu.c6
-rw-r--r--games/hack/hack.mklev.c6
-rw-r--r--games/hack/hack.mkmaze.c6
-rw-r--r--games/hack/hack.mkobj.c6
-rw-r--r--games/hack/hack.mkshop.c6
-rw-r--r--games/hack/hack.mon.c6
-rw-r--r--games/hack/hack.monst.c6
-rw-r--r--games/hack/hack.o_init.c6
-rw-r--r--games/hack/hack.objnam.c6
-rw-r--r--games/hack/hack.options.c6
-rw-r--r--games/hack/hack.pager.c6
-rw-r--r--games/hack/hack.potion.c6
-rw-r--r--games/hack/hack.pri.c6
-rw-r--r--games/hack/hack.read.c6
-rw-r--r--games/hack/hack.rip.c6
-rw-r--r--games/hack/hack.rumors.c6
-rw-r--r--games/hack/hack.save.c6
-rw-r--r--games/hack/hack.search.c6
-rw-r--r--games/hack/hack.shk.c6
-rw-r--r--games/hack/hack.shknam.c6
-rw-r--r--games/hack/hack.steal.c6
-rw-r--r--games/hack/hack.termcap.c6
-rw-r--r--games/hack/hack.timeout.c6
-rw-r--r--games/hack/hack.topl.c6
-rw-r--r--games/hack/hack.track.c6
-rw-r--r--games/hack/hack.trap.c6
-rw-r--r--games/hack/hack.tty.c10
-rw-r--r--games/hack/hack.u_init.c6
-rw-r--r--games/hack/hack.unix.c6
-rw-r--r--games/hack/hack.vault.c6
-rw-r--r--games/hack/hack.version.c6
-rw-r--r--games/hack/hack.wield.c6
-rw-r--r--games/hack/hack.wizard.c6
-rw-r--r--games/hack/hack.worm.c6
-rw-r--r--games/hack/hack.worn.c6
-rw-r--r--games/hack/hack.zap.c6
-rw-r--r--games/hack/makedefs.c6
-rw-r--r--games/hack/rnd.c6
-rw-r--r--games/hangman/endgame.c10
-rw-r--r--games/hangman/extern.c10
-rw-r--r--games/hangman/getguess.c10
-rw-r--r--games/hangman/getword.c10
-rw-r--r--games/hangman/main.c16
-rw-r--r--games/hangman/playgame.c10
-rw-r--r--games/hangman/prdata.c10
-rw-r--r--games/hangman/prman.c10
-rw-r--r--games/hangman/prword.c10
-rw-r--r--games/hangman/setup.c10
-rw-r--r--games/mille/comp.c10
-rw-r--r--games/mille/end.c10
-rw-r--r--games/mille/extern.c10
-rw-r--r--games/mille/init.c10
-rw-r--r--games/mille/mille.c16
-rw-r--r--games/mille/misc.c10
-rw-r--r--games/mille/move.c10
-rw-r--r--games/mille/print.c10
-rw-r--r--games/mille/roll.c10
-rw-r--r--games/mille/save.c10
-rw-r--r--games/mille/types.c10
-rw-r--r--games/mille/varpush.c10
-rw-r--r--games/monop/cards.c10
-rw-r--r--games/monop/execute.c10
-rw-r--r--games/monop/getinp.c10
-rw-r--r--games/monop/houses.c10
-rw-r--r--games/monop/initdeck.c16
-rw-r--r--games/monop/jail.c10
-rw-r--r--games/monop/misc.c10
-rw-r--r--games/monop/monop.c16
-rw-r--r--games/monop/morg.c10
-rw-r--r--games/monop/print.c10
-rw-r--r--games/monop/prop.c10
-rw-r--r--games/monop/rent.c10
-rw-r--r--games/monop/roll.c10
-rw-r--r--games/monop/spec.c10
-rw-r--r--games/monop/trade.c10
-rw-r--r--games/morse/morse.c16
-rw-r--r--games/number/number.c16
-rw-r--r--games/pig/pig.c16
-rw-r--r--games/pom/pom.c16
-rw-r--r--games/ppt/ppt.c16
-rw-r--r--games/primes/pattern.c10
-rw-r--r--games/primes/pr_tbl.c10
-rw-r--r--games/primes/primes.c16
-rw-r--r--games/quiz/quiz.c16
-rw-r--r--games/quiz/rxp.c10
-rw-r--r--games/rain/rain.c16
-rw-r--r--games/random/random.c16
-rw-r--r--games/robots/extern.c10
-rw-r--r--games/robots/init_field.c10
-rw-r--r--games/robots/main.c16
-rw-r--r--games/robots/make_level.c10
-rw-r--r--games/robots/move.c10
-rw-r--r--games/robots/move_robs.c10
-rw-r--r--games/robots/play_level.c10
-rw-r--r--games/robots/query.c10
-rw-r--r--games/robots/rnd_pos.c10
-rw-r--r--games/robots/score.c10
-rw-r--r--games/rogue/hit.c10
-rw-r--r--games/rogue/init.c10
-rw-r--r--games/rogue/inventory.c10
-rw-r--r--games/rogue/level.c10
-rw-r--r--games/rogue/machdep.c10
-rw-r--r--games/rogue/main.c16
-rw-r--r--games/rogue/message.c10
-rw-r--r--games/rogue/monster.c10
-rw-r--r--games/rogue/move.c10
-rw-r--r--games/rogue/object.c10
-rw-r--r--games/rogue/pack.c10
-rw-r--r--games/rogue/play.c10
-rw-r--r--games/rogue/random.c10
-rw-r--r--games/rogue/ring.c10
-rw-r--r--games/rogue/room.c10
-rw-r--r--games/rogue/save.c10
-rw-r--r--games/rogue/score.c10
-rw-r--r--games/rogue/spec_hit.c10
-rw-r--r--games/rogue/throw.c10
-rw-r--r--games/rogue/trap.c10
-rw-r--r--games/rogue/use.c10
-rw-r--r--games/rogue/zap.c10
-rw-r--r--games/sail/assorted.c10
-rw-r--r--games/sail/dr_1.c10
-rw-r--r--games/sail/dr_2.c10
-rw-r--r--games/sail/dr_3.c10
-rw-r--r--games/sail/dr_4.c10
-rw-r--r--games/sail/dr_5.c10
-rw-r--r--games/sail/dr_main.c10
-rw-r--r--games/sail/game.c10
-rw-r--r--games/sail/globals.c10
-rw-r--r--games/sail/lo_main.c10
-rw-r--r--games/sail/main.c16
-rw-r--r--games/sail/misc.c10
-rw-r--r--games/sail/parties.c10
-rw-r--r--games/sail/pl_1.c10
-rw-r--r--games/sail/pl_2.c10
-rw-r--r--games/sail/pl_3.c10
-rw-r--r--games/sail/pl_4.c10
-rw-r--r--games/sail/pl_5.c10
-rw-r--r--games/sail/pl_6.c10
-rw-r--r--games/sail/pl_7.c10
-rw-r--r--games/sail/pl_main.c10
-rw-r--r--games/sail/sync.c11
-rw-r--r--games/sail/version.c10
-rw-r--r--games/snake/snake.c16
-rw-r--r--games/snake/snscore.c16
-rw-r--r--games/trek/abandon.c10
-rw-r--r--games/trek/attack.c10
-rw-r--r--games/trek/autover.c10
-rw-r--r--games/trek/capture.c10
-rw-r--r--games/trek/check_out.c10
-rw-r--r--games/trek/checkcond.c10
-rw-r--r--games/trek/compkl.c10
-rw-r--r--games/trek/computer.c10
-rw-r--r--games/trek/damage.c10
-rw-r--r--games/trek/damaged.c10
-rw-r--r--games/trek/dcrept.c10
-rw-r--r--games/trek/destruct.c10
-rw-r--r--games/trek/dock.c10
-rw-r--r--games/trek/dumpgame.c10
-rw-r--r--games/trek/dumpme.c10
-rw-r--r--games/trek/dumpssradio.c10
-rw-r--r--games/trek/events.c10
-rw-r--r--games/trek/externs.c10
-rw-r--r--games/trek/getcodi.c10
-rw-r--r--games/trek/getpar.c10
-rw-r--r--games/trek/help.c10
-rw-r--r--games/trek/impulse.c10
-rw-r--r--games/trek/initquad.c10
-rw-r--r--games/trek/kill.c10
-rw-r--r--games/trek/klmove.c10
-rw-r--r--games/trek/lose.c10
-rw-r--r--games/trek/lrscan.c10
-rw-r--r--games/trek/main.c16
-rw-r--r--games/trek/move.c10
-rw-r--r--games/trek/nova.c10
-rw-r--r--games/trek/out.c10
-rw-r--r--games/trek/phaser.c10
-rw-r--r--games/trek/play.c10
-rw-r--r--games/trek/ram.c10
-rw-r--r--games/trek/ranf.c10
-rw-r--r--games/trek/rest.c10
-rw-r--r--games/trek/schedule.c10
-rw-r--r--games/trek/score.c10
-rw-r--r--games/trek/setup.c10
-rw-r--r--games/trek/setwarp.c10
-rw-r--r--games/trek/shield.c10
-rw-r--r--games/trek/snova.c10
-rw-r--r--games/trek/srscan.c10
-rw-r--r--games/trek/systemname.c10
-rw-r--r--games/trek/torped.c10
-rw-r--r--games/trek/visual.c10
-rw-r--r--games/trek/warp.c10
-rw-r--r--games/trek/win.c10
-rw-r--r--games/worm/worm.c16
-rw-r--r--games/worms/worms.c16
-rw-r--r--games/wump/wump.c16
-rw-r--r--lib/csu/alpha/Makefile4
-rw-r--r--lib/csu/amd64/Makefile4
-rw-r--r--lib/csu/arm/Makefile3
-rw-r--r--lib/csu/hppa/Makefile3
-rw-r--r--lib/csu/hppa64/Makefile3
-rw-r--r--lib/csu/i386/Makefile4
-rw-r--r--lib/csu/m68k/Makefile4
-rw-r--r--lib/csu/m88k/Makefile4
-rw-r--r--lib/csu/mips64/Makefile6
-rw-r--r--lib/csu/powerpc/Makefile3
-rw-r--r--lib/csu/sh/Makefile3
-rw-r--r--lib/csu/sparc/Makefile3
-rw-r--r--lib/csu/sparc64/Makefile4
-rw-r--r--lib/csu/vax/Makefile4
-rw-r--r--lib/libc/Makefile8
-rw-r--r--lib/libc/Makefile.inc4
-rw-r--r--lib/libc/stdlib/lsearch.c6
-rw-r--r--lib/libc/time/strftime.c10
-rw-r--r--lib/libcompat/4.1/ftime.c6
-rw-r--r--lib/libcompat/4.1/gtty.c6
-rw-r--r--lib/libcompat/4.1/stty.c6
-rw-r--r--lib/libcompat/4.3/regex.c7
-rw-r--r--lib/libcompat/4.3/rexec.c4
-rw-r--r--lib/libcompat/4.3/setrgid.c4
-rw-r--r--lib/libcompat/4.3/setruid.c4
-rw-r--r--lib/libcompat/4.4/cuserid.c4
-rw-r--r--lib/libcompat/regexp/regerror.c6
-rw-r--r--lib/libcompat/regexp/regexp.c6
-rw-r--r--lib/libcompat/regexp/regsub.c6
-rw-r--r--lib/libcurses/tinfo/read_termcap.c4
-rw-r--r--lib/libedit/TEST/test.c14
-rw-r--r--lib/libedit/chared.c9
-rw-r--r--lib/libedit/common.c9
-rw-r--r--lib/libedit/el.c9
-rw-r--r--lib/libedit/emacs.c9
-rw-r--r--lib/libedit/hist.c9
-rw-r--r--lib/libedit/history.c9
-rw-r--r--lib/libedit/key.c9
-rw-r--r--lib/libedit/map.c9
-rw-r--r--lib/libedit/parse.c9
-rw-r--r--lib/libedit/prompt.c9
-rw-r--r--lib/libedit/read.c9
-rw-r--r--lib/libedit/readline.c5
-rw-r--r--lib/libedit/refresh.c9
-rw-r--r--lib/libedit/search.c9
-rw-r--r--lib/libedit/sig.c9
-rw-r--r--lib/libedit/term.c9
-rw-r--r--lib/libedit/tokenizer.c10
-rw-r--r--lib/libedit/tty.c9
-rw-r--r--lib/libedit/vi.c10
-rw-r--r--lib/libkvm/kvm.c10
-rw-r--r--lib/libkvm/kvm_cd9660.c6
-rw-r--r--lib/libkvm/kvm_file.c10
-rw-r--r--lib/libkvm/kvm_file2.c6
-rw-r--r--lib/libkvm/kvm_getloadavg.c10
-rw-r--r--lib/libkvm/kvm_i386.c10
-rw-r--r--lib/libkvm/kvm_m68k.c10
-rw-r--r--lib/libkvm/kvm_mips64.c10
-rw-r--r--lib/libkvm/kvm_ntfs.c6
-rw-r--r--lib/libkvm/kvm_proc.c10
-rw-r--r--lib/libkvm/kvm_sparc.c10
-rw-r--r--lib/libkvm/kvm_udf.c6
-rw-r--r--lib/libm/arch/hppa/e_remainder.c4
-rw-r--r--lib/libm/arch/hppa/e_remainderf.c4
-rw-r--r--lib/libm/arch/hppa/e_sqrt.c4
-rw-r--r--lib/libm/arch/hppa/e_sqrtf.c4
-rw-r--r--lib/libm/arch/hppa/s_ceil.c4
-rw-r--r--lib/libm/arch/hppa/s_ceilf.c4
-rw-r--r--lib/libm/arch/hppa/s_floor.c4
-rw-r--r--lib/libm/arch/hppa/s_floorf.c4
-rw-r--r--lib/libm/arch/hppa/s_rint.c4
-rw-r--r--lib/libm/arch/hppa/s_rintf.c4
-rw-r--r--lib/libm/arch/hppa/s_round.c4
-rw-r--r--lib/libm/arch/hppa/s_roundf.c4
-rw-r--r--lib/libm/arch/hppa/s_trunc.c4
-rw-r--r--lib/libm/arch/hppa/s_truncf.c4
-rw-r--r--lib/libm/noieee_src/n_acosh.c6
-rw-r--r--lib/libm/noieee_src/n_asincos.c6
-rw-r--r--lib/libm/noieee_src/n_asinh.c6
-rw-r--r--lib/libm/noieee_src/n_atan.c6
-rw-r--r--lib/libm/noieee_src/n_atan2.c6
-rw-r--r--lib/libm/noieee_src/n_atanh.c6
-rw-r--r--lib/libm/noieee_src/n_cbrt.c6
-rw-r--r--lib/libm/noieee_src/n_cosh.c6
-rw-r--r--lib/libm/noieee_src/n_erf.c6
-rw-r--r--lib/libm/noieee_src/n_exp.c6
-rw-r--r--lib/libm/noieee_src/n_exp__E.c6
-rw-r--r--lib/libm/noieee_src/n_expm1.c6
-rw-r--r--lib/libm/noieee_src/n_floor.c6
-rw-r--r--lib/libm/noieee_src/n_fmod.c6
-rw-r--r--lib/libm/noieee_src/n_hypot.c6
-rw-r--r--lib/libm/noieee_src/n_j0.c6
-rw-r--r--lib/libm/noieee_src/n_j1.c6
-rw-r--r--lib/libm/noieee_src/n_jn.c6
-rw-r--r--lib/libm/noieee_src/n_lgamma.c6
-rw-r--r--lib/libm/noieee_src/n_log.c6
-rw-r--r--lib/libm/noieee_src/n_log10.c6
-rw-r--r--lib/libm/noieee_src/n_log1p.c6
-rw-r--r--lib/libm/noieee_src/n_log__L.c6
-rw-r--r--lib/libm/noieee_src/n_pow.c6
-rw-r--r--lib/libm/noieee_src/n_sincos.c6
-rw-r--r--lib/libm/noieee_src/n_sinh.c6
-rw-r--r--lib/libm/noieee_src/n_support.c6
-rw-r--r--lib/libm/noieee_src/n_tan.c6
-rw-r--r--lib/libm/noieee_src/n_tanh.c6
-rw-r--r--lib/libm/noieee_src/n_tgamma.c6
-rw-r--r--lib/libm/src/b_exp__D.c6
-rw-r--r--lib/libm/src/b_log__D.c6
-rw-r--r--lib/libm/src/b_tgamma.c6
-rw-r--r--lib/libm/src/e_acos.c4
-rw-r--r--lib/libm/src/e_acosf.c4
-rw-r--r--lib/libm/src/e_acosh.c4
-rw-r--r--lib/libm/src/e_acoshf.c4
-rw-r--r--lib/libm/src/e_asin.c4
-rw-r--r--lib/libm/src/e_asinf.c4
-rw-r--r--lib/libm/src/e_atan2.c4
-rw-r--r--lib/libm/src/e_atan2f.c4
-rw-r--r--lib/libm/src/e_atanh.c4
-rw-r--r--lib/libm/src/e_atanhf.c4
-rw-r--r--lib/libm/src/e_cosh.c4
-rw-r--r--lib/libm/src/e_coshf.c4
-rw-r--r--lib/libm/src/e_exp.c4
-rw-r--r--lib/libm/src/e_expf.c4
-rw-r--r--lib/libm/src/e_fmod.c4
-rw-r--r--lib/libm/src/e_fmodf.c4
-rw-r--r--lib/libm/src/e_hypot.c4
-rw-r--r--lib/libm/src/e_hypotf.c4
-rw-r--r--lib/libm/src/e_j0.c4
-rw-r--r--lib/libm/src/e_j0f.c4
-rw-r--r--lib/libm/src/e_j1.c4
-rw-r--r--lib/libm/src/e_j1f.c4
-rw-r--r--lib/libm/src/e_jn.c4
-rw-r--r--lib/libm/src/e_jnf.c4
-rw-r--r--lib/libm/src/e_lgamma_r.c4
-rw-r--r--lib/libm/src/e_lgammaf_r.c4
-rw-r--r--lib/libm/src/e_log.c4
-rw-r--r--lib/libm/src/e_log10.c4
-rw-r--r--lib/libm/src/e_log10f.c4
-rw-r--r--lib/libm/src/e_logf.c4
-rw-r--r--lib/libm/src/e_pow.c4
-rw-r--r--lib/libm/src/e_powf.c4
-rw-r--r--lib/libm/src/e_rem_pio2.c4
-rw-r--r--lib/libm/src/e_rem_pio2f.c4
-rw-r--r--lib/libm/src/e_remainder.c4
-rw-r--r--lib/libm/src/e_remainderf.c4
-rw-r--r--lib/libm/src/e_scalb.c4
-rw-r--r--lib/libm/src/e_scalbf.c4
-rw-r--r--lib/libm/src/e_sinh.c4
-rw-r--r--lib/libm/src/e_sinhf.c4
-rw-r--r--lib/libm/src/e_sqrt.c4
-rw-r--r--lib/libm/src/e_sqrtf.c4
-rw-r--r--lib/libm/src/k_cos.c4
-rw-r--r--lib/libm/src/k_cosf.c4
-rw-r--r--lib/libm/src/k_rem_pio2.c4
-rw-r--r--lib/libm/src/k_rem_pio2f.c4
-rw-r--r--lib/libm/src/k_sin.c4
-rw-r--r--lib/libm/src/k_sinf.c4
-rw-r--r--lib/libm/src/k_tan.c4
-rw-r--r--lib/libm/src/k_tanf.c4
-rw-r--r--lib/libm/src/s_asinh.c4
-rw-r--r--lib/libm/src/s_asinhf.c4
-rw-r--r--lib/libm/src/s_atan.c4
-rw-r--r--lib/libm/src/s_atanf.c4
-rw-r--r--lib/libm/src/s_cbrt.c4
-rw-r--r--lib/libm/src/s_cbrtf.c4
-rw-r--r--lib/libm/src/s_ceil.c4
-rw-r--r--lib/libm/src/s_ceilf.c4
-rw-r--r--lib/libm/src/s_copysign.c4
-rw-r--r--lib/libm/src/s_copysignf.c4
-rw-r--r--lib/libm/src/s_cos.c4
-rw-r--r--lib/libm/src/s_cosf.c4
-rw-r--r--lib/libm/src/s_erf.c4
-rw-r--r--lib/libm/src/s_erff.c4
-rw-r--r--lib/libm/src/s_expm1.c4
-rw-r--r--lib/libm/src/s_expm1f.c4
-rw-r--r--lib/libm/src/s_fabs.c4
-rw-r--r--lib/libm/src/s_fabsf.c4
-rw-r--r--lib/libm/src/s_floor.c4
-rw-r--r--lib/libm/src/s_floorf.c4
-rw-r--r--lib/libm/src/s_frexp.c4
-rw-r--r--lib/libm/src/s_frexpf.c4
-rw-r--r--lib/libm/src/s_ilogb.c4
-rw-r--r--lib/libm/src/s_ilogbf.c4
-rw-r--r--lib/libm/src/s_log1p.c4
-rw-r--r--lib/libm/src/s_log1pf.c4
-rw-r--r--lib/libm/src/s_logb.c4
-rw-r--r--lib/libm/src/s_logbf.c4
-rw-r--r--lib/libm/src/s_modf.c4
-rw-r--r--lib/libm/src/s_modff.c4
-rw-r--r--lib/libm/src/s_nextafter.c4
-rw-r--r--lib/libm/src/s_nextafterf.c4
-rw-r--r--lib/libm/src/s_rint.c4
-rw-r--r--lib/libm/src/s_rintf.c4
-rw-r--r--lib/libm/src/s_scalbn.c4
-rw-r--r--lib/libm/src/s_scalbnf.c4
-rw-r--r--lib/libm/src/s_significand.c4
-rw-r--r--lib/libm/src/s_significandf.c4
-rw-r--r--lib/libm/src/s_sin.c4
-rw-r--r--lib/libm/src/s_sinf.c4
-rw-r--r--lib/libm/src/s_tan.c4
-rw-r--r--lib/libm/src/s_tanf.c4
-rw-r--r--lib/libm/src/s_tanh.c4
-rw-r--r--lib/libm/src/s_tanhf.c4
-rw-r--r--lib/libm/src/w_gamma.c4
-rw-r--r--lib/libm/src/w_gamma_r.c4
-rw-r--r--lib/libm/src/w_gammaf.c4
-rw-r--r--lib/libm/src/w_gammaf_r.c4
-rw-r--r--lib/libm/src/w_lgamma.c4
-rw-r--r--lib/libm/src/w_lgammaf.c4
-rw-r--r--lib/libocurses/EXAMPLES/ex1.c9
-rw-r--r--lib/libocurses/TEST/tc1.c10
-rw-r--r--lib/libocurses/TEST/tc2.c10
-rw-r--r--lib/libocurses/TEST/tc3.c10
-rw-r--r--lib/libpcap/grammar.y6
-rw-r--r--lib/libpcap/scanner.l7
-rw-r--r--lib/librpcsvc/bootparam_prot.x8
-rw-r--r--lib/librpcsvc/klm_prot.x7
-rw-r--r--lib/librpcsvc/mount.x7
-rw-r--r--lib/librpcsvc/nfs_prot.x7
-rw-r--r--lib/librpcsvc/rex.x7
-rw-r--r--lib/librpcsvc/rnusers.x7
-rw-r--r--lib/librpcsvc/rquota.x7
-rw-r--r--lib/librpcsvc/rstat.x8
-rw-r--r--lib/librpcsvc/rusers.x7
-rw-r--r--lib/librpcsvc/rwall.x5
-rw-r--r--lib/librpcsvc/sm_inter.x7
-rw-r--r--lib/librpcsvc/spray.x7
-rw-r--r--lib/librpcsvc/yp.x6
-rw-r--r--lib/librpcsvc/yppasswd.x7
-rw-r--r--lib/libutil/uucplock.c6
-rw-r--r--lib/libwrap/clean_exit.c10
-rw-r--r--lib/libwrap/diag.c10
-rw-r--r--lib/libwrap/eval.c10
-rw-r--r--lib/libwrap/fix_options.c10
-rw-r--r--lib/libwrap/hosts_access.c10
-rw-r--r--lib/libwrap/hosts_ctl.c10
-rw-r--r--lib/libwrap/misc.c10
-rw-r--r--lib/libwrap/options.c10
-rw-r--r--lib/libwrap/percent_m.c10
-rw-r--r--lib/libwrap/percent_x.c10
-rw-r--r--lib/libwrap/refuse.c10
-rw-r--r--lib/libwrap/rfc931.c6
-rw-r--r--lib/libwrap/shell_cmd.c10
-rw-r--r--lib/libwrap/socket.c8
-rw-r--r--lib/libwrap/update.c10
-rw-r--r--lib/liby/main.c7
-rw-r--r--lib/liby/yyerror.c7
-rw-r--r--lib/libz/deflate.c4
-rw-r--r--lib/libz/inftrees.c4
-rw-r--r--libexec/comsat/comsat.c13
-rw-r--r--libexec/fingerd/fingerd.c16
-rw-r--r--libexec/ftpd/ftpcmd.y11
-rw-r--r--libexec/ftpd/ftpd.c17
-rw-r--r--libexec/ftpd/logwtmp.c11
-rw-r--r--libexec/ftpd/popen.c11
-rw-r--r--libexec/getNAME/getNAME.c16
-rw-r--r--libexec/getty/init.c7
-rw-r--r--libexec/getty/main.c13
-rw-r--r--libexec/getty/subr.c7
-rw-r--r--libexec/ld.so/dir.c12
-rw-r--r--libexec/lockspool/lockspool.c6
-rw-r--r--libexec/mail.local/locking.c6
-rw-r--r--libexec/mail.local/mail.local.c16
-rw-r--r--libexec/rpc.rstatd/rstat_proc.c7
-rw-r--r--libexec/rpc.rstatd/rstatd.c6
-rw-r--r--libexec/rpc.rusersd/rusers_proc.c6
-rw-r--r--libexec/rpc.rusersd/rusersd.c6
-rw-r--r--libexec/rpc.rwalld/rwalld.c6
-rw-r--r--libexec/rpc.sprayd/sprayd.c6
-rw-r--r--libexec/rpc.yppasswdd/rpc.yppasswdd.c6
-rw-r--r--libexec/rpc.yppasswdd/yppasswdd_mkpw.c6
-rw-r--r--libexec/rpc.yppasswdd/yppasswdd_proc.c6
-rw-r--r--libexec/rshd/rshd.c13
-rw-r--r--libexec/talkd/announce.c7
-rw-r--r--libexec/talkd/print.c7
-rw-r--r--libexec/talkd/process.c7
-rw-r--r--libexec/talkd/table.c7
-rw-r--r--libexec/talkd/talkd.c13
-rw-r--r--libexec/tcpd/safe_finger/safe_finger.c10
-rw-r--r--libexec/tcpd/tcpd/tcpd.c10
-rw-r--r--libexec/tcpd/tcpdchk/inetcf.c10
-rw-r--r--libexec/tcpd/tcpdchk/scaffold.c10
-rw-r--r--libexec/tcpd/tcpdchk/tcpdchk.c10
-rw-r--r--libexec/tcpd/tcpdmatch/tcpdmatch.c10
-rw-r--r--libexec/tftpd/tftpd.c13
-rw-r--r--libexec/uucpd/uucpd.c13
-rw-r--r--regress/lib/libc/db/dbtest.c16
-rw-r--r--regress/lib/libc/hsearch/hsearchtest.c11
-rw-r--r--sbin/badsect/badsect.c16
-rw-r--r--sbin/clri/clri.c14
-rw-r--r--sbin/disklabel/disklabel.c12
-rw-r--r--sbin/disklabel/dkcksum.c10
-rw-r--r--sbin/disklabel/editor.c6
-rw-r--r--sbin/dump/dumprmt.c10
-rw-r--r--sbin/dump/itime.c10
-rw-r--r--sbin/dump/main.c16
-rw-r--r--sbin/dump/optr.c10
-rw-r--r--sbin/dump/tape.c10
-rw-r--r--sbin/dump/traverse.c10
-rw-r--r--sbin/dumpfs/dumpfs.c16
-rw-r--r--sbin/fsck/fsck.c4
-rw-r--r--sbin/fsck/fsutil.c5
-rw-r--r--sbin/fsck/preen.c10
-rw-r--r--sbin/fsck_ext2fs/main.c20
-rw-r--r--sbin/fsck_ffs/dir.c10
-rw-r--r--sbin/fsck_ffs/inode.c10
-rw-r--r--sbin/fsck_ffs/main.c16
-rw-r--r--sbin/fsck_ffs/pass1.c10
-rw-r--r--sbin/fsck_ffs/pass1b.c10
-rw-r--r--sbin/fsck_ffs/pass2.c10
-rw-r--r--sbin/fsck_ffs/pass3.c10
-rw-r--r--sbin/fsck_ffs/pass4.c10
-rw-r--r--sbin/fsck_ffs/pass5.c10
-rw-r--r--sbin/fsck_ffs/setup.c10
-rw-r--r--sbin/fsck_ffs/utilities.c10
-rw-r--r--sbin/fsck_msdos/boot.c7
-rw-r--r--sbin/fsck_msdos/check.c7
-rw-r--r--sbin/fsck_msdos/dir.c7
-rw-r--r--sbin/fsck_msdos/fat.c7
-rw-r--r--sbin/fsck_msdos/main.c6
-rw-r--r--sbin/fsdb/fsdb.c6
-rw-r--r--sbin/fsdb/fsdbutil.c6
-rw-r--r--sbin/growfs/debug.c7
-rw-r--r--sbin/growfs/growfs.c9
-rw-r--r--sbin/init/init.c16
-rw-r--r--sbin/mknod/mknod.c16
-rw-r--r--sbin/mount/getmntopts.c10
-rw-r--r--sbin/mount/mount.c16
-rw-r--r--sbin/mount_cd9660/mount_cd9660.c16
-rw-r--r--sbin/mount_ext2fs/mount_ext2fs.c16
-rw-r--r--sbin/mount_ffs/mount_ffs.c16
-rw-r--r--sbin/mount_msdos/mount_msdos.c6
-rw-r--r--sbin/mount_nfs/mount_nfs.c16
-rw-r--r--sbin/mount_portal/mount_portal.c16
-rw-r--r--sbin/mount_procfs/mount_procfs.c16
-rw-r--r--sbin/mountd/mountd.c16
-rw-r--r--sbin/ncheck_ffs/ncheck_ffs.c6
-rw-r--r--sbin/newfs_msdos/newfs_msdos.c7
-rw-r--r--sbin/nfsd/nfsd.c16
-rw-r--r--sbin/ping/ping.c16
-rw-r--r--sbin/ping6/ping6.c12
-rw-r--r--sbin/quotacheck/quotacheck.c16
-rw-r--r--sbin/reboot/reboot.c16
-rw-r--r--sbin/restore/dirs.c10
-rw-r--r--sbin/restore/interactive.c10
-rw-r--r--sbin/restore/main.c16
-rw-r--r--sbin/restore/restore.c10
-rw-r--r--sbin/restore/symtab.c10
-rw-r--r--sbin/restore/tape.c10
-rw-r--r--sbin/restore/utilities.c10
-rw-r--r--sbin/savecore/savecore.c16
-rw-r--r--sbin/shutdown/shutdown.c16
-rw-r--r--sbin/slattach/slattach.c16
-rw-r--r--sbin/sysctl/pathconf.c16
-rw-r--r--sbin/sysctl/sysctl.c16
-rw-r--r--sbin/ttyflags/ttyflags.c12
-rw-r--r--sbin/tunefs/tunefs.c16
-rw-r--r--sbin/umount/umount.c16
-rw-r--r--sys/arch/amd64/stand/installboot/nlist.c4
-rw-r--r--sys/arch/hp300/stand/mkboot/mkboot.c16
-rw-r--r--sys/arch/hppa/stand/mkboot/mkboot.c14
-rw-r--r--sys/arch/hppa64/stand/mkboot/mkboot.c14
-rw-r--r--sys/dev/ic/if_wi.c7
-rw-r--r--sys/lib/libkern/adddi3.c4
-rw-r--r--sys/lib/libkern/anddi3.c4
-rw-r--r--sys/lib/libkern/ashldi3.c4
-rw-r--r--sys/lib/libkern/ashrdi3.c4
-rw-r--r--sys/lib/libkern/bcmp.c6
-rw-r--r--sys/lib/libkern/bzero.c6
-rw-r--r--sys/lib/libkern/cmpdi2.c4
-rw-r--r--sys/lib/libkern/divdi3.c4
-rw-r--r--sys/lib/libkern/ffs.c6
-rw-r--r--sys/lib/libkern/htonl.c4
-rw-r--r--sys/lib/libkern/htons.c4
-rw-r--r--sys/lib/libkern/iordi3.c4
-rw-r--r--sys/lib/libkern/lshldi3.c4
-rw-r--r--sys/lib/libkern/lshrdi3.c4
-rw-r--r--sys/lib/libkern/mcount.c10
-rw-r--r--sys/lib/libkern/memchr.c7
-rw-r--r--sys/lib/libkern/memcmp.c6
-rw-r--r--sys/lib/libkern/memset.c11
-rw-r--r--sys/lib/libkern/moddi3.c4
-rw-r--r--sys/lib/libkern/muldi3.c4
-rw-r--r--sys/lib/libkern/negdi2.c4
-rw-r--r--sys/lib/libkern/notdi2.c4
-rw-r--r--sys/lib/libkern/qdivrem.c4
-rw-r--r--sys/lib/libkern/softfloat.c5
-rw-r--r--sys/lib/libkern/strcmp.c6
-rw-r--r--sys/lib/libkern/strlcat.c6
-rw-r--r--sys/lib/libkern/strlcpy.c6
-rw-r--r--sys/lib/libkern/strlen.c6
-rw-r--r--sys/lib/libkern/strncasecmp.c6
-rw-r--r--sys/lib/libkern/strncmp.c6
-rw-r--r--sys/lib/libkern/strncpy.c6
-rw-r--r--sys/lib/libkern/subdi3.c4
-rw-r--r--sys/lib/libkern/ucmpdi2.c4
-rw-r--r--sys/lib/libkern/udivdi3.c4
-rw-r--r--sys/lib/libkern/umoddi3.c4
-rw-r--r--sys/lib/libkern/xordi3.c4
-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
-rw-r--r--usr.sbin/ac/ac.c4
-rw-r--r--usr.sbin/accton/accton.c11
-rw-r--r--usr.sbin/amd/amd/amd.c8
-rw-r--r--usr.sbin/amd/amd/map.c7
-rw-r--r--usr.sbin/amd/amd/mapc.c7
-rw-r--r--usr.sbin/amd/amd/mntfs.c6
-rw-r--r--usr.sbin/amd/amd/nfs_ops.c7
-rw-r--r--usr.sbin/amd/amd/opts.c5
-rw-r--r--usr.sbin/amd/amd/restart.c5
-rw-r--r--usr.sbin/amd/amq/amq.c15
-rw-r--r--usr.sbin/amd/fsinfo/fsinfo.c8
-rw-r--r--usr.sbin/amd/include/am.h3
-rw-r--r--usr.sbin/amd/mk-amd-map/mk-amd-map.c15
-rw-r--r--usr.sbin/chroot/chroot.c16
-rw-r--r--usr.sbin/config/cmd.c6
-rw-r--r--usr.sbin/config/exec.c6
-rw-r--r--usr.sbin/config/exec_aout.c6
-rw-r--r--usr.sbin/config/exec_ecoff.c6
-rw-r--r--usr.sbin/config/exec_elf.c6
-rw-r--r--usr.sbin/config/main.c8
-rw-r--r--usr.sbin/config/misc.c6
-rw-r--r--usr.sbin/config/ukc.c6
-rw-r--r--usr.sbin/config/ukcutil.c6
-rw-r--r--usr.sbin/cron/atrun.c6
-rw-r--r--usr.sbin/cron/cron.c6
-rw-r--r--usr.sbin/cron/database.c6
-rw-r--r--usr.sbin/cron/do_command.c6
-rw-r--r--usr.sbin/cron/entry.c6
-rw-r--r--usr.sbin/cron/env.c6
-rw-r--r--usr.sbin/cron/job.c6
-rw-r--r--usr.sbin/cron/misc.c6
-rw-r--r--usr.sbin/cron/popen.c10
-rw-r--r--usr.sbin/cron/user.c6
-rw-r--r--usr.sbin/dev_mkdb/dev_mkdb.c13
-rw-r--r--usr.sbin/edquota/edquota.c11
-rw-r--r--usr.sbin/inetd/inetd.c13
-rw-r--r--usr.sbin/iostat/iostat.c17
-rw-r--r--usr.sbin/kgmon/kgmon.c13
-rw-r--r--usr.sbin/kvm_mkdb/kvm_mkdb.c16
-rw-r--r--usr.sbin/kvm_mkdb/nlist.c10
-rw-r--r--usr.sbin/kvm_mkdb/testdb.c10
-rw-r--r--usr.sbin/lpr/common_source/common.c10
-rw-r--r--usr.sbin/lpr/common_source/common_vars.c6
-rw-r--r--usr.sbin/lpr/common_source/displayq.c10
-rw-r--r--usr.sbin/lpr/common_source/rmjob.c10
-rw-r--r--usr.sbin/lpr/common_source/startdaemon.c10
-rw-r--r--usr.sbin/lpr/filters/lpf.c16
-rw-r--r--usr.sbin/lpr/lpc/cmds.c16
-rw-r--r--usr.sbin/lpr/lpc/cmdtab.c10
-rw-r--r--usr.sbin/lpr/lpc/lpc.c16
-rw-r--r--usr.sbin/lpr/lpd/key.c10
-rw-r--r--usr.sbin/lpr/lpd/lpd.c16
-rw-r--r--usr.sbin/lpr/lpd/lpdchar.c10
-rw-r--r--usr.sbin/lpr/lpd/modes.c10
-rw-r--r--usr.sbin/lpr/lpd/printjob.c13
-rw-r--r--usr.sbin/lpr/lpd/recvjob.c16
-rw-r--r--usr.sbin/lpr/lpd/ttcompat.c6
-rw-r--r--usr.sbin/lpr/lpq/lpq.c16
-rw-r--r--usr.sbin/lpr/lpr/lpr.c16
-rw-r--r--usr.sbin/lpr/lprm/lprm.c16
-rw-r--r--usr.sbin/lpr/lptest/lptest.c16
-rw-r--r--usr.sbin/lpr/pac/pac.c16
-rw-r--r--usr.sbin/mopd/common/cmp.c7
-rw-r--r--usr.sbin/mopd/common/device.c7
-rw-r--r--usr.sbin/mopd/common/dl.c7
-rw-r--r--usr.sbin/mopd/common/file.c7
-rw-r--r--usr.sbin/mopd/common/get.c7
-rw-r--r--usr.sbin/mopd/common/loop-bsd.c7
-rw-r--r--usr.sbin/mopd/common/mopdef.c7
-rw-r--r--usr.sbin/mopd/common/nma.c7
-rw-r--r--usr.sbin/mopd/common/pf.c7
-rw-r--r--usr.sbin/mopd/common/print.c7
-rw-r--r--usr.sbin/mopd/common/put.c7
-rw-r--r--usr.sbin/mopd/common/rc.c7
-rw-r--r--usr.sbin/mopd/mopa.out/mopa.out.c6
-rw-r--r--usr.sbin/mopd/mopchk/mopchk.c6
-rw-r--r--usr.sbin/mopd/mopd/mopd.c7
-rw-r--r--usr.sbin/mopd/mopd/process.c7
-rw-r--r--usr.sbin/mopd/mopprobe/mopprobe.c6
-rw-r--r--usr.sbin/mopd/moptrace/moptrace.c6
-rw-r--r--usr.sbin/mopd/otherOS/loop-linux2.c4
-rw-r--r--usr.sbin/mopd/otherOS/loop.c6
-rw-r--r--usr.sbin/mopd/otherOS/pf-snit.c6
-rw-r--r--usr.sbin/mrinfo/mrinfo.c8
-rw-r--r--usr.sbin/mrouted/main.c5
-rw-r--r--usr.sbin/mtrace/mtrace.c7
-rw-r--r--usr.sbin/mtree/compare.c10
-rw-r--r--usr.sbin/mtree/crc.c11
-rw-r--r--usr.sbin/mtree/create.c10
-rw-r--r--usr.sbin/mtree/mtree.c16
-rw-r--r--usr.sbin/mtree/spec.c10
-rw-r--r--usr.sbin/mtree/verify.c10
-rw-r--r--usr.sbin/netgroup_mkdb/netgroup_mkdb.c5
-rw-r--r--usr.sbin/netgroup_mkdb/str.c4
-rw-r--r--usr.sbin/netgroup_mkdb/util.c4
-rw-r--r--usr.sbin/portmap/portmap.c21
-rw-r--r--usr.sbin/pppd/auth.c10
-rw-r--r--usr.sbin/pppd/cbcp.c10
-rw-r--r--usr.sbin/pppd/ccp.c10
-rw-r--r--usr.sbin/pppd/chap.c10
-rw-r--r--usr.sbin/pppd/chap_ms.c10
-rw-r--r--usr.sbin/pppd/chat/chat.c10
-rw-r--r--usr.sbin/pppd/demand.c10
-rw-r--r--usr.sbin/pppd/fsm.c10
-rw-r--r--usr.sbin/pppd/ipcp.c10
-rw-r--r--usr.sbin/pppd/lcp.c10
-rw-r--r--usr.sbin/pppd/magic.c10
-rw-r--r--usr.sbin/pppd/main.c10
-rw-r--r--usr.sbin/pppd/options.c10
-rw-r--r--usr.sbin/pppd/pppstats/pppstats.c10
-rw-r--r--usr.sbin/pppd/sys-bsd.c10
-rw-r--r--usr.sbin/pppd/upap.c10
-rw-r--r--usr.sbin/pstat/pstat.c16
-rw-r--r--usr.sbin/pwd_mkdb/pwd_mkdb.c16
-rw-r--r--usr.sbin/quot/quot.c6
-rw-r--r--usr.sbin/quotaon/quotaon.c11
-rw-r--r--usr.sbin/rarpd/arptab.c10
-rw-r--r--usr.sbin/rarpd/rarpd.c12
-rw-r--r--usr.sbin/rbootd/bpf.c7
-rw-r--r--usr.sbin/rbootd/conf.c7
-rw-r--r--usr.sbin/rbootd/parseconf.c7
-rw-r--r--usr.sbin/rbootd/rbootd.c13
-rw-r--r--usr.sbin/rbootd/rmpproto.c7
-rw-r--r--usr.sbin/rbootd/utils.c7
-rw-r--r--usr.sbin/rdate/rdate.c9
-rw-r--r--usr.sbin/rdate/rfc868time.c10
-rw-r--r--usr.sbin/repquota/repquota.c11
-rw-r--r--usr.sbin/rmt/rmt.c13
-rw-r--r--usr.sbin/route6d/route6d.c6
-rw-r--r--usr.sbin/rpc.lockd/test.c7
-rw-r--r--usr.sbin/rwhod/rwhod.c11
-rw-r--r--usr.sbin/sa/main.c10
-rw-r--r--usr.sbin/sa/pdb.c6
-rw-r--r--usr.sbin/sa/usrdb.c6
-rw-r--r--usr.sbin/sliplogin/sliplogin.c11
-rw-r--r--usr.sbin/slstats/slstats.c6
-rw-r--r--usr.sbin/syslogd/syslogd.c16
-rw-r--r--usr.sbin/syslogd/ttymsg.c9
-rw-r--r--usr.sbin/tcpdump/addrtoname.c6
-rw-r--r--usr.sbin/tcpdump/bpf_dump.c6
-rw-r--r--usr.sbin/tcpdump/gmt2local.c7
-rw-r--r--usr.sbin/tcpdump/machdep.c7
-rw-r--r--usr.sbin/tcpdump/parsenfsfh.c7
-rw-r--r--usr.sbin/tcpdump/print-arp.c7
-rw-r--r--usr.sbin/tcpdump/print-atalk.c7
-rw-r--r--usr.sbin/tcpdump/print-atm.c6
-rw-r--r--usr.sbin/tcpdump/print-bgp.c7
-rw-r--r--usr.sbin/tcpdump/print-bootp.c7
-rw-r--r--usr.sbin/tcpdump/print-carp.c7
-rw-r--r--usr.sbin/tcpdump/print-cdp.c7
-rw-r--r--usr.sbin/tcpdump/print-decnet.c7
-rw-r--r--usr.sbin/tcpdump/print-dhcp6.c7
-rw-r--r--usr.sbin/tcpdump/print-domain.c7
-rw-r--r--usr.sbin/tcpdump/print-dvmrp.c7
-rw-r--r--usr.sbin/tcpdump/print-enc.c7
-rw-r--r--usr.sbin/tcpdump/print-ether.c6
-rw-r--r--usr.sbin/tcpdump/print-etherip.c7
-rw-r--r--usr.sbin/tcpdump/print-fddi.c7
-rw-r--r--usr.sbin/tcpdump/print-frag6.c7
-rw-r--r--usr.sbin/tcpdump/print-hsrp.c7
-rw-r--r--usr.sbin/tcpdump/print-icmp.c7
-rw-r--r--usr.sbin/tcpdump/print-icmp6.c7
-rw-r--r--usr.sbin/tcpdump/print-igrp.c7
-rw-r--r--usr.sbin/tcpdump/print-ike.c7
-rw-r--r--usr.sbin/tcpdump/print-ip.c7
-rw-r--r--usr.sbin/tcpdump/print-ip6.c7
-rw-r--r--usr.sbin/tcpdump/print-ipsec.c7
-rw-r--r--usr.sbin/tcpdump/print-ipx.c7
-rw-r--r--usr.sbin/tcpdump/print-isoclns.c7
-rw-r--r--usr.sbin/tcpdump/print-krb.c7
-rw-r--r--usr.sbin/tcpdump/print-l2tp.c7
-rw-r--r--usr.sbin/tcpdump/print-llc.c7
-rw-r--r--usr.sbin/tcpdump/print-lwres.c5
-rw-r--r--usr.sbin/tcpdump/print-netbios.c7
-rw-r--r--usr.sbin/tcpdump/print-nfs.c7
-rw-r--r--usr.sbin/tcpdump/print-ntp.c7
-rw-r--r--usr.sbin/tcpdump/print-null.c7
-rw-r--r--usr.sbin/tcpdump/print-ospf.c7
-rw-r--r--usr.sbin/tcpdump/print-ospf6.c7
-rw-r--r--usr.sbin/tcpdump/print-pflog.c7
-rw-r--r--usr.sbin/tcpdump/print-pfsync.c7
-rw-r--r--usr.sbin/tcpdump/print-pim.c7
-rw-r--r--usr.sbin/tcpdump/print-ppp.c7
-rw-r--r--usr.sbin/tcpdump/print-raw.c7
-rw-r--r--usr.sbin/tcpdump/print-rip.c7
-rw-r--r--usr.sbin/tcpdump/print-ripng.c7
-rw-r--r--usr.sbin/tcpdump/print-rt6.c7
-rw-r--r--usr.sbin/tcpdump/print-sl.c7
-rw-r--r--usr.sbin/tcpdump/print-smb.c7
-rw-r--r--usr.sbin/tcpdump/print-snmp.c7
-rw-r--r--usr.sbin/tcpdump/print-sunrpc.c7
-rw-r--r--usr.sbin/tcpdump/print-tcp.c7
-rw-r--r--usr.sbin/tcpdump/print-tftp.c7
-rw-r--r--usr.sbin/tcpdump/print-timed.c7
-rw-r--r--usr.sbin/tcpdump/print-udp.c7
-rw-r--r--usr.sbin/tcpdump/print-udpencap.c7
-rw-r--r--usr.sbin/tcpdump/print-vrrp.c7
-rw-r--r--usr.sbin/tcpdump/print-wb.c7
-rw-r--r--usr.sbin/tcpdump/savestr.c7
-rw-r--r--usr.sbin/tcpdump/setsignal.c7
-rw-r--r--usr.sbin/tcpdump/smbutil.c7
-rw-r--r--usr.sbin/tcpdump/tcpdump.c10
-rw-r--r--usr.sbin/tcpdump/util.c7
-rw-r--r--usr.sbin/timed/timed/acksend.c6
-rw-r--r--usr.sbin/timed/timed/byteorder.c6
-rw-r--r--usr.sbin/timed/timed/candidate.c6
-rw-r--r--usr.sbin/timed/timed/cksum.c6
-rw-r--r--usr.sbin/timed/timed/correct.c6
-rw-r--r--usr.sbin/timed/timed/master.c6
-rw-r--r--usr.sbin/timed/timed/measure.c6
-rw-r--r--usr.sbin/timed/timed/networkdelta.c6
-rw-r--r--usr.sbin/timed/timed/readmsg.c6
-rw-r--r--usr.sbin/timed/timed/slave.c6
-rw-r--r--usr.sbin/timed/timed/timed.c12
-rw-r--r--usr.sbin/timed/timedc/cmds.c8
-rw-r--r--usr.sbin/timed/timedc/cmdtab.c6
-rw-r--r--usr.sbin/timed/timedc/timedc.c12
-rw-r--r--usr.sbin/traceroute/traceroute.c16
-rw-r--r--usr.sbin/traceroute6/traceroute6.c12
-rw-r--r--usr.sbin/trpt/trpt.c12
-rw-r--r--usr.sbin/vipw/vipw.c12
-rw-r--r--usr.sbin/ypbind/ypbind.c6
-rw-r--r--usr.sbin/yppoll/yppoll.c6
-rw-r--r--usr.sbin/ypserv/common/yplib_host.c6
-rw-r--r--usr.sbin/ypserv/makedbm/db.c6
-rw-r--r--usr.sbin/ypserv/makedbm/makedbm.c6
-rw-r--r--usr.sbin/ypserv/mkalias/mkalias.c6
-rw-r--r--usr.sbin/ypserv/mknetid/mknetid.c6
-rw-r--r--usr.sbin/ypserv/revnetgroup/hash.c6
-rw-r--r--usr.sbin/ypserv/revnetgroup/parse_netgroup.c6
-rw-r--r--usr.sbin/ypserv/revnetgroup/revnetgroup.c6
-rw-r--r--usr.sbin/ypserv/stdethers/stdethers.c6
-rw-r--r--usr.sbin/ypserv/stdhosts/stdhosts.c6
-rw-r--r--usr.sbin/ypserv/yppush/yppush.c6
-rw-r--r--usr.sbin/ypserv/yppush/yppush_err.c6
-rw-r--r--usr.sbin/ypserv/yppush/yppush_proc.c6
-rw-r--r--usr.sbin/ypserv/yppush/yppush_svc.c6
-rw-r--r--usr.sbin/ypserv/ypserv/acl.c6
-rw-r--r--usr.sbin/ypserv/ypserv/ypserv.c6
-rw-r--r--usr.sbin/ypserv/ypserv/ypserv_db.c6
-rw-r--r--usr.sbin/ypserv/ypserv/ypserv_proc.c6
-rw-r--r--usr.sbin/ypserv/yptest/yptest.c6
-rw-r--r--usr.sbin/ypserv/ypxfr/ypxfr.c6
-rw-r--r--usr.sbin/ypset/ypset.c6
1563 files changed, 1412 insertions, 12640 deletions
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index dabf2a4356b..399db63d71a 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cat.c,v 1.19 2007/07/17 07:10:22 jmc Exp $ */
+/* $OpenBSD: cat.c,v 1.20 2009/10/27 23:59:19 deraadt Exp $ */
/* $NetBSD: cat.c,v 1.11 1995/09/07 06:12:54 jtc Exp $ */
/*
@@ -33,20 +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[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95";
-#else
-static char rcsid[] = "$OpenBSD: cat.c,v 1.19 2007/07/17 07:10:22 jmc Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index 9fe51a1c3df..4e568381c81 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chmod.c,v 1.24 2009/01/21 16:05:39 sobrado Exp $ */
+/* $OpenBSD: chmod.c,v 1.25 2009/10/27 23:59:20 deraadt Exp $ */
/* $NetBSD: chmod.c,v 1.12 1995/03/21 09:02:09 cgd Exp $ */
/*
@@ -30,20 +30,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[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94";
-#else
-static const char rcsid[] = "$OpenBSD: chmod.c,v 1.24 2009/01/21 16:05:39 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 1fa8a358282..4a28cd50b2e 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utils.c,v 1.29 2007/09/22 21:10:49 sobrado Exp $ */
+/* $OpenBSD: utils.c,v 1.30 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: utils.c,v 1.6 1997/02/26 14:40:51 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94";
-#else
-static char rcsid[] = "$OpenBSD: utils.c,v 1.29 2007/09/22 21:10:49 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/mman.h>
diff --git a/bin/csh/alloc.c b/bin/csh/alloc.c
index 0c46215593e..92f65780408 100644
--- a/bin/csh/alloc.c
+++ b/bin/csh/alloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: alloc.c,v 1.9 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: alloc.c,v 1.10 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: alloc.c,v 1.6 1995/03/21 09:02:23 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)alloc.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: alloc.c,v 1.9 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/bin/csh/char.c b/bin/csh/char.c
index 8cf8bfa0435..a97fa35737f 100644
--- a/bin/csh/char.c
+++ b/bin/csh/char.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: char.c,v 1.3 2003/06/02 23:32:06 millert Exp $ */
+/* $OpenBSD: char.c,v 1.4 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: char.c,v 1.6 1995/03/21 09:02:26 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)char.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: char.c,v 1.3 2003/06/02 23:32:06 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "char.h"
unsigned short _cmap[256] = {
diff --git a/bin/csh/const.c b/bin/csh/const.c
index b5bb162f99e..f3a7b93f260 100644
--- a/bin/csh/const.c
+++ b/bin/csh/const.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: const.c,v 1.5 2003/06/02 23:32:06 millert Exp $ */
+/* $OpenBSD: const.c,v 1.6 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: const.c,v 1.6 1995/03/21 09:02:31 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)const.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: const.c,v 1.5 2003/06/02 23:32:06 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* tc.const.c: String constants for csh.
*/
diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index 6a693cfca3f..9c9d7dac2be 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: csh.c,v 1.24 2006/10/18 21:20:39 deraadt Exp $ */
+/* $OpenBSD: csh.c,v 1.25 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93";
-#else
-static char rcsid[] = "$OpenBSD: csh.c,v 1.24 2006/10/18 21:20:39 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
diff --git a/bin/csh/dir.c b/bin/csh/dir.c
index 5b658c45552..499f6df7818 100644
--- a/bin/csh/dir.c
+++ b/bin/csh/dir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dir.c,v 1.13 2003/09/25 15:29:06 millert Exp $ */
+/* $OpenBSD: dir.c,v 1.14 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: dir.c,v 1.9 1995/03/21 09:02:42 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: dir.c,v 1.13 2003/09/25 15:29:06 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/bin/csh/dol.c b/bin/csh/dol.c
index aca71c79bf7..fcb4819c997 100644
--- a/bin/csh/dol.c
+++ b/bin/csh/dol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dol.c,v 1.15 2005/02/25 16:07:10 deraadt Exp $ */
+/* $OpenBSD: dol.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: dol.c,v 1.15 2005/02/25 16:07:10 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <fcntl.h>
#include <errno.h>
diff --git a/bin/csh/error.c b/bin/csh/error.c
index 7fb5739ccee..3c6239257e5 100644
--- a/bin/csh/error.c
+++ b/bin/csh/error.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: error.c,v 1.8 2008/05/17 23:31:52 sobrado Exp $ */
+/* $OpenBSD: error.c,v 1.9 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: err.c,v 1.6 1995/03/21 09:02:47 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: error.c,v 1.8 2008/05/17 23:31:52 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index b517813b140..fb5061e93ea 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.c,v 1.14 2005/02/25 16:07:10 deraadt Exp $ */
+/* $OpenBSD: exec.c,v 1.15 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95";
-#else
-static char rcsid[] = "$OpenBSD: exec.c,v 1.14 2005/02/25 16:07:10 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <dirent.h>
diff --git a/bin/csh/exp.c b/bin/csh/exp.c
index 0f4145af032..d66ee283c35 100644
--- a/bin/csh/exp.c
+++ b/bin/csh/exp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exp.c,v 1.7 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: exp.c,v 1.8 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: exp.c,v 1.6 1995/03/21 09:02:51 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: exp.c,v 1.7 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
diff --git a/bin/csh/file.c b/bin/csh/file.c
index 2c06bdf344f..c8fa07395ac 100644
--- a/bin/csh/file.c
+++ b/bin/csh/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.15 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: file.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: file.c,v 1.11 1996/11/08 19:34:37 christos Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)file.c 8.2 (Berkeley) 3/19/94";
-#else
-static char rcsid[] = "$OpenBSD: file.c,v 1.15 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#ifdef FILEC
#include <sys/param.h>
diff --git a/bin/csh/func.c b/bin/csh/func.c
index 7c5834f4986..786fd778d5e 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: func.c,v 1.24 2004/08/08 12:55:28 millert Exp $ */
+/* $OpenBSD: func.c,v 1.25 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: func.c,v 1.24 2004/08/08 12:55:28 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <signal.h>
diff --git a/bin/csh/glob.c b/bin/csh/glob.c
index c886c699994..ecdff678306 100644
--- a/bin/csh/glob.c
+++ b/bin/csh/glob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: glob.c,v 1.12 2003/06/25 21:12:39 deraadt Exp $ */
+/* $OpenBSD: glob.c,v 1.13 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: glob.c,v 1.10 1995/03/21 09:03:01 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)glob.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: glob.c,v 1.12 2003/06/25 21:12:39 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <glob.h>
#include <errno.h>
diff --git a/bin/csh/hist.c b/bin/csh/hist.c
index ba251d91e40..bdfcaf5511c 100644
--- a/bin/csh/hist.c
+++ b/bin/csh/hist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hist.c,v 1.7 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: hist.c,v 1.8 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: hist.c,v 1.7 1995/03/21 18:35:44 mycroft Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: hist.c,v 1.7 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdlib.h>
#include <stdarg.h>
diff --git a/bin/csh/init.c b/bin/csh/init.c
index 1384c6fee78..ddc447a37c0 100644
--- a/bin/csh/init.c
+++ b/bin/csh/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.6 2003/06/23 16:42:15 deraadt Exp $ */
+/* $OpenBSD: init.c,v 1.7 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: init.c,v 1.6 1995/03/21 09:03:05 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.6 2003/06/23 16:42:15 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <stdarg.h>
#include "csh.h"
diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index 271bf35a867..2ea507e3ad7 100644
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lex.c,v 1.13 2005/02/25 16:07:10 deraadt Exp $ */
+/* $OpenBSD: lex.c,v 1.14 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: lex.c,v 1.9 1995/09/27 00:38:46 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: lex.c,v 1.13 2005/02/25 16:07:10 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <termios.h>
diff --git a/bin/csh/misc.c b/bin/csh/misc.c
index 9271908cac3..f75cbfa8051 100644
--- a/bin/csh/misc.c
+++ b/bin/csh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.10 2005/12/11 02:41:01 deraadt Exp $ */
+/* $OpenBSD: misc.c,v 1.11 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.6 1995/03/21 09:03:09 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.10 2005/12/11 02:41:01 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/bin/csh/parse.c b/bin/csh/parse.c
index a64c699cc6f..7b833c50871 100644
--- a/bin/csh/parse.c
+++ b/bin/csh/parse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.c,v 1.8 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: parse.c,v 1.9 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: parse.c,v 1.6 1995/03/21 09:03:10 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: parse.c,v 1.8 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
diff --git a/bin/csh/proc.c b/bin/csh/proc.c
index b3882a9f0de..5f55b7cf6c3 100644
--- a/bin/csh/proc.c
+++ b/bin/csh/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.20 2003/09/19 03:18:52 millert Exp $ */
+/* $OpenBSD: proc.c,v 1.21 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: proc.c,v 1.9 1995/04/29 23:21:33 mycroft Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: proc.c,v 1.20 2003/09/19 03:18:52 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/wait.h>
#include <errno.h>
diff --git a/bin/csh/sem.c b/bin/csh/sem.c
index 7a353334f42..c4d0255dadc 100644
--- a/bin/csh/sem.c
+++ b/bin/csh/sem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sem.c,v 1.15 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: sem.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: sem.c,v 1.9 1995/09/27 00:38:50 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: sem.c,v 1.15 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
diff --git a/bin/csh/set.c b/bin/csh/set.c
index a08a0a625ae..4476fa29381 100644
--- a/bin/csh/set.c
+++ b/bin/csh/set.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: set.c,v 1.10 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: set.c,v 1.11 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: set.c,v 1.8 1995/03/21 18:35:52 mycroft Exp $ */
/*-
@@ -30,21 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)set.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: set.c,v 1.10 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <stdlib.h>
-#ifndef SHORT_STRINGS
-#include <string.h>
-#endif /* SHORT_STRINGS */
-#include <stdarg.h>
-
#include "csh.h"
#include "extern.h"
diff --git a/bin/csh/str.c b/bin/csh/str.c
index e05674ef5f8..44b48064ea6 100644
--- a/bin/csh/str.c
+++ b/bin/csh/str.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: str.c,v 1.14 2008/10/03 19:45:34 deraadt Exp $ */
+/* $OpenBSD: str.c,v 1.15 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: str.c,v 1.6 1995/03/21 09:03:24 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)str.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: str.c,v 1.14 2008/10/03 19:45:34 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#define MALLOC_INCR 128
/*
diff --git a/bin/csh/time.c b/bin/csh/time.c
index 33a04a3ba8d..83bb020988e 100644
--- a/bin/csh/time.c
+++ b/bin/csh/time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: time.c,v 1.11 2005/02/25 16:07:10 deraadt Exp $ */
+/* $OpenBSD: time.c,v 1.12 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: time.c,v 1.7 1995/03/21 13:55:25 mycroft Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: time.c,v 1.11 2005/02/25 16:07:10 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdarg.h>
diff --git a/bin/date/date.c b/bin/date/date.c
index 5820adb2da8..e58029c6868 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: date.c,v 1.31 2007/12/28 19:17:28 chl Exp $ */
+/* $OpenBSD: date.c,v 1.32 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: date.c,v 1.11 1995/09/07 06:21:05 jtc Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1985, 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[] = "@(#)date.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: date.c,v 1.31 2007/12/28 19:17:28 chl Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
index b100d20a7a7..5e720decac3 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netdate.c,v 1.17 2008/10/01 08:46:58 otto Exp $ */
+/* $OpenBSD: netdate.c,v 1.18 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: netdate.c,v 1.10 1995/09/07 06:21:06 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)netdate.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: netdate.c,v 1.17 2008/10/01 08:46:58 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/bin/dd/args.c b/bin/dd/args.c
index 3aef61e8735..9e4d573c31a 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: args.c,v 1.17 2006/11/01 05:46:20 ray Exp $ */
+/* $OpenBSD: args.c,v 1.18 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: args.c,v 1.7 1996/03/01 01:18:58 jtc Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: args.c,v 1.17 2006/11/01 05:46:20 ray Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index ee5e1ecc9fc..ba005a3e155 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conv.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: conv.c,v 1.11 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: conv.c,v 1.6 1996/02/20 19:29:02 jtc Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)conv.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: conv.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index 05e5c0e7896..7c08885fe21 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conv_tab.c,v 1.4 2003/06/02 23:32:07 millert Exp $ */
+/* $OpenBSD: conv_tab.c,v 1.5 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: conv_tab.c,v 1.7 1996/02/20 19:29:03 jtc Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)conv_tab.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: conv_tab.c,v 1.4 2003/06/02 23:32:07 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
/*
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 7a8a371830e..64dd3f8c79e 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dd.c,v 1.15 2007/11/10 13:45:17 chl Exp $ */
+/* $OpenBSD: dd.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: dd.c,v 1.6 1996/02/20 19:29:06 jtc Exp $ */
/*-
@@ -34,20 +34,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[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: dd.c,v 1.15 2007/11/10 13:45:17 chl Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index e94168b2459..b87a67cfbf9 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.15 2006/03/22 18:08:04 dhill Exp $ */
+/* $OpenBSD: misc.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.4 1995/03/21 09:04:10 cgd Exp $ */
/*-
@@ -34,14 +34,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.15 2006/03/22 18:08:04 dhill Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/uio.h>
diff --git a/bin/dd/position.c b/bin/dd/position.c
index d0ea5598176..1f0a9382be9 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: position.c,v 1.9 2006/11/07 18:47:46 otto Exp $ */
+/* $OpenBSD: position.c,v 1.10 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: position.c,v 1.4 1995/03/21 09:04:12 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)position.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: position.c,v 1.9 2006/11/07 18:47:46 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/bin/df/df.c b/bin/df/df.c
index 27a4a1f552e..6ae73ca3f8c 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: df.c,v 1.49 2008/03/16 20:04:35 otto Exp $ */
+/* $OpenBSD: df.c,v 1.50 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $ */
/*
@@ -35,20 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 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[] = "@(#)df.c 8.7 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: df.c,v 1.49 2008/03/16 20:04:35 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/mount.h>
diff --git a/bin/df/ffs_df.c b/bin/df/ffs_df.c
index 358bd423723..718d8bd75fa 100644
--- a/bin/df/ffs_df.c
+++ b/bin/df/ffs_df.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_df.c,v 1.12 2007/04/30 18:40:24 otto Exp $ */
+/* $OpenBSD: ffs_df.c,v 1.13 2009/10/27 23:59:21 deraadt Exp $ */
/*
* Copyright (c) 1980, 1990, 1993, 1994
@@ -34,12 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <ufs/ufs/dinode.h>
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index e295bdeb2b1..a5a38929ddc 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: domainname.c,v 1.7 2003/06/02 23:32:07 millert Exp $ */
+/* $OpenBSD: domainname.c,v 1.8 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: domainname.c,v 1.7 1995/03/21 09:04:22 cgd Exp $ */
/*
@@ -30,20 +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[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: domainname.c,v 1.7 2003/06/02 23:32:07 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <err.h>
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index b1633198ba8..fbb326c0560 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: echo.c,v 1.6 2003/06/02 23:32:07 millert Exp $ */
+/* $OpenBSD: echo.c,v 1.7 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: echo.c,v 1.6 1995/03/21 09:04:27 cgd Exp $ */
/*
@@ -30,20 +30,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[] = "@(#)echo.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: echo.c,v 1.6 2003/06/02 23:32:07 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index 0fa9735b7e1..fc1ae7f4ffe 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf.c,v 1.18 2008/02/12 07:57:29 otto Exp $ */
+/* $OpenBSD: buf.c,v 1.19 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: buf.c,v 1.15 1995/04/23 10:07:28 cgd Exp $ */
/* buf.c: This file contains the scratch-file buffer routines for the
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: buf.c,v 1.18 2008/02/12 07:57:29 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index cf8c070592b..da1304799a8 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cbc.c,v 1.15 2008/06/08 13:58:10 tobias Exp $ */
+/* $OpenBSD: cbc.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: cbc.c,v 1.9 1995/03/21 09:04:36 cgd Exp $ */
/* cbc.c: This file contains the encryption routines for the ed line editor */
@@ -36,14 +36,6 @@
* from: @(#)bdes.c 5.5 (Berkeley) 6/27/91
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: cbc.c,v 1.15 2008/06/08 13:58:10 tobias Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
#include <errno.h>
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index d7862a31fd2..e2a4bca5045 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: glbl.c,v 1.11 2007/09/03 14:26:54 deraadt Exp $ */
+/* $OpenBSD: glbl.c,v 1.12 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: glbl.c,v 1.2 1995/03/21 09:04:41 cgd Exp $ */
/* glob.c: This file contains the global command routines for the ed line
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)glob.c,v 1.1 1994/02/01 00:34:40 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: glbl.c,v 1.11 2007/09/03 14:26:54 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/ioctl.h>
#include <sys/wait.h>
diff --git a/bin/ed/io.c b/bin/ed/io.c
index 25c43d37374..46dd83342b4 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.12 2007/11/06 10:22:29 chl Exp $ */
+/* $OpenBSD: io.c,v 1.13 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: io.c,v 1.2 1995/03/21 09:04:43 cgd Exp $ */
/* io.c: This file contains the i/o routines for the ed line editor */
@@ -28,14 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: io.c,v 1.12 2007/11/06 10:22:29 chl Exp $";
-#endif
-#endif /* not lint */
-
#include "ed.h"
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 6075a4a255d..a12f83aeaca 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.32 2009/01/28 22:17:30 sobrado Exp $ */
+/* $OpenBSD: main.c,v 1.33 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: main.c,v 1.3 1995/03/21 09:04:44 cgd Exp $ */
/* main.c: This file contains the main control and user-interface routines
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char *copyright =
-"@(#) Copyright (c) 1993 Andrew Moore, Talke Studio. \n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.32 2009/01/28 22:17:30 sobrado Exp $";
-#endif
-#endif /* not lint */
-
/*
* CREDITS
*
diff --git a/bin/ed/re.c b/bin/ed/re.c
index b1626192529..57d0b89dca4 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: re.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: re.c,v 1.11 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: re.c,v 1.14 1995/03/21 09:04:48 cgd Exp $ */
/* re.c: This file contains the regular expression interface routines for
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: re.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "ed.h"
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index 5aaca73d392..c9b91aa9966 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sub.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: sub.c,v 1.11 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: sub.c,v 1.4 1995/03/21 09:04:50 cgd Exp $ */
/* sub.c: This file contains the substitution routines for the ed
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)sub.c,v 1.1 1994/02/01 00:34:44 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: sub.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "ed.h"
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index c01dc191ee1..487df5156a8 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: undo.c,v 1.9 2007/09/02 15:19:07 deraadt Exp $ */
+/* $OpenBSD: undo.c,v 1.10 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: undo.c,v 1.2 1995/03/21 09:04:52 cgd Exp $ */
/* undo.c: This file contains the undo routines for the ed line editor */
@@ -28,14 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)undo.c,v 1.1 1994/02/01 00:34:44 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: undo.c,v 1.9 2007/09/02 15:19:07 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "ed.h"
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 4f1a2581d1a..6a63d7f08bf 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostname.c,v 1.7 2003/06/02 23:32:08 millert Exp $ */
+/* $OpenBSD: hostname.c,v 1.8 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: hostname.c,v 1.10 1995/09/07 06:28:40 jtc Exp $ */
/*
@@ -30,20 +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[] = "@(#)hostname.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: hostname.c,v 1.7 2003/06/02 23:32:08 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <err.h>
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index 1b8db40568f..4a356c31f7d 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kill.c,v 1.8 2003/07/29 00:24:15 deraadt Exp $ */
+/* $OpenBSD: kill.c,v 1.9 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: kill.c,v 1.11 1995/09/07 06:30:27 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[] = "@(#)kill.c 8.4 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: kill.c,v 1.8 2003/07/29 00:24:15 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/bin/ksh/mknod.c b/bin/ksh/mknod.c
index a336a867047..2e336a7ad13 100644
--- a/bin/ksh/mknod.c
+++ b/bin/ksh/mknod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mknod.c,v 1.1 2005/10/06 06:39:36 otto Exp $ */
+/* $OpenBSD: mknod.c,v 1.2 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: mknod.c,v 1.8 1995/08/11 00:08:18 jtc Exp $ */
/*
@@ -33,20 +33,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 char sccsid[] = "@(#)mknod.c 8.1 (Berkeley) 6/5/93";
-#else
-static const char rcsid[] = "$OpenBSD: mknod.c,v 1.1 2005/10/06 06:39:36 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index ac8e7ce9040..0b0be08f7a4 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ln.c,v 1.17 2008/05/28 19:31:38 millert Exp $ */
+/* $OpenBSD: ln.c,v 1.18 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: ln.c,v 1.10 1995/03/21 09:06:10 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const 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 const char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94";
-#else
-static const char rcsid[] = "$OpenBSD: ln.c,v 1.17 2008/05/28 19:31:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index 1b8ba0f70a0..fa4f11aeda6 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmp.c,v 1.5 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: cmp.c,v 1.6 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: cmp.c,v 1.10 1996/07/08 10:32:01 mycroft Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmp.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: cmp.c,v 1.5 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index eb3a1d0e430..5b8d56a68f4 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ls.c,v 1.34 2009/05/06 18:47:32 todd Exp $ */
+/* $OpenBSD: ls.c,v 1.35 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $ */
/*
@@ -33,20 +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[] = "@(#)ls.c 8.7 (Berkeley) 8/5/94";
-#else
-static char rcsid[] = "$OpenBSD: ls.c,v 1.34 2009/05/06 18:47:32 todd Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/bin/ls/print.c b/bin/ls/print.c
index e5fac1b56b2..74178319c7d 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.25 2007/05/07 18:39:28 millert Exp $ */
+/* $OpenBSD: print.c,v 1.26 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)print.c 8.5 (Berkeley) 7/28/94";
-#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.25 2007/05/07 18:39:28 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 2fc6ee6c7ac..22f97ccb5e6 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.13 2007/04/25 08:16:10 sobrado Exp $ */
+/* $OpenBSD: util.c,v 1.14 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: util.c,v 1.12 1995/09/07 06:43:02 jtc Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)util.c 8.5 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: util.c,v 1.13 2007/04/25 08:16:10 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/md5/crc.c b/bin/md5/crc.c
index d322f342e93..bb949b95c6e 100644
--- a/bin/md5/crc.c
+++ b/bin/md5/crc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crc.c,v 1.2 2004/05/10 19:48:07 deraadt Exp $ */
+/* $OpenBSD: crc.c,v 1.3 2009/10/27 23:59:22 deraadt Exp $ */
/*
* Copyright (c) 2004 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: crc.c,v 1.2 2004/05/10 19:48:07 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <errno.h>
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index 719f0207b14..7e65b332706 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkdir.c,v 1.23 2008/09/30 23:25:31 millert Exp $ */
+/* $OpenBSD: mkdir.c,v 1.24 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: mkdir.c,v 1.14 1995/06/25 21:59:21 mycroft Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94";
-#else
-static char rcsid[] = "$OpenBSD: mkdir.c,v 1.23 2008/09/30 23:25:31 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/mt/mt.c b/bin/mt/mt.c
index b1d271e2321..df1d454f4f5 100644
--- a/bin/mt/mt.c
+++ b/bin/mt/mt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mt.c,v 1.29 2006/06/14 02:14:25 krw Exp $ */
+/* $OpenBSD: mt.c,v 1.30 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: mt.c,v 1.14.2.1 1996/05/27 15:12:11 mrg 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[] = "@(#)mt.c 8.2 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: mt.c,v 1.29 2006/06/14 02:14:25 krw Exp $";
-#endif
-#endif /* not lint */
-
/*
* mt --
* magnetic tape manipulation program
diff --git a/bin/mt/mtrmt.c b/bin/mt/mtrmt.c
index 38f6026078c..f17620193dd 100644
--- a/bin/mt/mtrmt.c
+++ b/bin/mt/mtrmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mtrmt.c,v 1.17 2006/04/11 15:06:48 ray Exp $ */
+/* $OpenBSD: mtrmt.c,v 1.18 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: mtrmt.c,v 1.2 1996/03/06 06:22:07 scottr Exp $ */
/*-
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-/*
- * This was unceremoniously ripped out of usr.sbin/dump/dumprmt.c:
- *
- * static char sccsid[] = "@(#)dumprmt.c 8.1 (Berkeley) 6/5/93";
- *
- */
-
#include <sys/param.h>
#include <sys/mtio.h>
#include <sys/ioctl.h>
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 97cb60cfbdd..979797ddff0 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mv.c,v 1.34 2007/07/27 02:49:38 ray Exp $ */
+/* $OpenBSD: mv.c,v 1.35 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: mv.c,v 1.9 1995/03/21 09:06:52 cgd Exp $ */
/*
@@ -33,20 +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[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: mv.c,v 1.34 2007/07/27 02:49:38 ray Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/wait.h>
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 2a833bb2f65..f230a9c8940 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar_io.c,v 1.38 2008/06/11 00:49:08 pvalchev Exp $ */
+/* $OpenBSD: ar_io.c,v 1.39 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: ar_io.c,v 1.38 2008/06/11 00:49:08 pvalchev Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 73aefdabb48..5b5505a7e4e 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar_subs.c,v 1.32 2008/05/06 06:54:28 henning Exp $ */
+/* $OpenBSD: ar_subs.c,v 1.33 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: ar_subs.c,v 1.5 1995/03/21 09:07:06 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: ar_subs.c,v 1.32 2008/05/06 06:54:28 henning Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index aff311aa6f2..f64416cb146 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf_subs.c,v 1.21 2005/11/09 19:59:06 otto Exp $ */
+/* $OpenBSD: buf_subs.c,v 1.22 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: buf_subs.c,v 1.21 2005/11/09 19:59:06 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 44eda1f518a..c15d61a79d0 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cache.c,v 1.17 2004/03/16 03:28:34 tedu Exp $ */
+/* $OpenBSD: cache.c,v 1.18 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: cache.c,v 1.4 1995/03/21 09:07:10 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: cache.c,v 1.17 2004/03/16 03:28:34 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 4a9796028b8..1a46cb668a3 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpio.c,v 1.18 2008/01/01 16:22:44 tobias Exp $ */
+/* $OpenBSD: cpio.c,v 1.19 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: cpio.c,v 1.5 1995/03/21 09:07:13 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: cpio.c,v 1.18 2008/01/01 16:22:44 tobias Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 73db1af1129..4c809064649 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file_subs.c,v 1.30 2005/11/09 19:59:06 otto Exp $ */
+/* $OpenBSD: file_subs.c,v 1.31 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: file_subs.c,v 1.30 2005/11/09 19:59:06 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index 1ca2a7a1d63..415a4963452 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftree.c,v 1.28 2008/05/06 06:54:28 henning Exp $ */
+/* $OpenBSD: ftree.c,v 1.29 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: ftree.c,v 1.4 1995/03/21 09:07:21 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: ftree.c,v 1.28 2008/05/06 06:54:28 henning Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 7e66f62cd0a..1c6f73ee57e 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gen_subs.c,v 1.19 2007/04/04 21:55:10 millert Exp $ */
+/* $OpenBSD: gen_subs.c,v 1.20 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: gen_subs.c,v 1.5 1995/03/21 09:07:26 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: gen_subs.c,v 1.19 2007/04/04 21:55:10 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c
index 45fdbf29fbc..8ceb189eec2 100644
--- a/bin/pax/getoldopt.c
+++ b/bin/pax/getoldopt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getoldopt.c,v 1.8 2003/07/02 21:19:33 deraadt Exp $ */
+/* $OpenBSD: getoldopt.c,v 1.9 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $ */
/*
@@ -10,10 +10,6 @@
* in the Public Domain for your edification and enjoyment.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: getoldopt.c,v 1.8 2003/07/02 21:19:33 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index fa198891e54..7a5589ab6f3 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.70 2008/06/11 00:49:08 pvalchev Exp $ */
+/* $OpenBSD: options.c,v 1.71 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: options.c,v 1.70 2008/06/11 00:49:08 pvalchev Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index ff79582ce24..118c30b19ca 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pat_rep.c,v 1.30 2005/08/05 08:30:10 djm Exp $ */
+/* $OpenBSD: pat_rep.c,v 1.31 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: pat_rep.c,v 1.30 2005/08/05 08:30:10 djm Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 3c3d2b47197..f89ca349419 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pax.c,v 1.28 2005/08/04 10:02:44 mpf Exp $ */
+/* $OpenBSD: pax.c,v 1.29 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: pax.c,v 1.5 1996/03/26 23:54:20 mrg Exp $ */
/*-
@@ -34,20 +34,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 const char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: pax.c,v 1.28 2005/08/04 10:02:44 mpf Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <sys/types.h>
#include <sys/param.h>
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 55d3a0017c1..625547d506a 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sel_subs.c,v 1.18 2004/04/16 22:50:23 deraadt Exp $ */
+/* $OpenBSD: sel_subs.c,v 1.19 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: sel_subs.c,v 1.5 1995/03/21 09:07:42 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: sel_subs.c,v 1.18 2004/04/16 22:50:23 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index e428051c3da..50bd89b53ec 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tables.c,v 1.25 2007/09/02 15:19:08 deraadt Exp $ */
+/* $OpenBSD: tables.c,v 1.26 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: tables.c,v 1.25 2007/09/02 15:19:08 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index 6a0b3b32963..234c4368b70 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tar.c,v 1.41 2006/03/04 20:24:55 otto Exp $ */
+/* $OpenBSD: tar.c,v 1.42 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: tar.c,v 1.41 2006/03/04 20:24:55 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index 6b6e13423ee..e63a221cba4 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty_subs.c,v 1.13 2009/06/01 13:02:46 ray Exp $ */
+/* $OpenBSD: tty_subs.c,v 1.14 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: tty_subs.c,v 1.5 1995/03/21 09:07:52 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)tty_subs.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: tty_subs.c,v 1.13 2009/06/01 13:02:46 ray Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 6d320c5572e..e861e3a5d0d 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keyword.c,v 1.28 2008/03/08 19:20:12 millert Exp $ */
+/* $OpenBSD: keyword.c,v 1.29 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: keyword.c,v 1.28 2008/03/08 19:20:12 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index feb2cfe1a7e..ba89a6ada1d 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nlist.c,v 1.16 2008/02/10 16:56:13 kettenis Exp $ */
+/* $OpenBSD: nlist.c,v 1.17 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: nlist.c,v 1.11 1995/03/21 09:08:03 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)nlist.c 8.4 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: nlist.c,v 1.16 2008/02/10 16:56:13 kettenis Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/proc.h>
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 578461c87b4..b8ac1f03f19 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.44 2008/03/08 19:20:12 millert Exp $ */
+/* $OpenBSD: print.c,v 1.45 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
-#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.44 2008/03/08 19:20:12 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index bd10e34ac5e..7c60d4f6af8 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ps.c,v 1.46 2008/07/18 14:24:18 kevlo Exp $ */
+/* $OpenBSD: ps.c,v 1.47 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: ps.c,v 1.15 1995/05/18 20:33:25 mycroft Exp $ */
/*-
@@ -30,20 +30,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[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: ps.c,v 1.46 2008/07/18 14:24:18 kevlo Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/user.h>
#include <sys/time.h>
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index b02ea0a019f..fd6078408a1 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pwd.c,v 1.10 2006/04/01 18:08:48 deraadt Exp $ */
+/* $OpenBSD: pwd.c,v 1.11 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: pwd.c,v 1.7 1995/03/21 09:08:18 cgd Exp $ */
/*
@@ -30,20 +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[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94";
-#else
-static char rcsid[] = "$OpenBSD: pwd.c,v 1.10 2006/04/01 18:08:48 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 5a7dc5fd665..b62ca1fb18c 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcp.c,v 1.48 2009/03/01 13:47:02 sobrado Exp $ */
+/* $OpenBSD: rcp.c,v 1.49 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1990, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] = "$OpenBSD: rcp.c,v 1.48 2009/03/01 13:47:02 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index 465ffc42c37..c96eec5bc70 100644
--- a/bin/rcp/util.c
+++ b/bin/rcp/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.18 2007/11/29 07:39:09 chl Exp $ */
+/* $OpenBSD: util.c,v 1.19 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: util.c,v 1.2 1995/03/21 08:19:08 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)util.c 8.2 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] = "$OpenBSD: util.c,v 1.18 2007/11/29 07:39:09 chl Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index f4ed950aa1f..10a6404fb1e 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rm.c,v 1.22 2008/06/10 17:14:16 otto Exp $ */
+/* $OpenBSD: rm.c,v 1.23 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: rm.c,v 1.19 1995/09/07 06:48:50 jtc Exp $ */
/*-
@@ -30,20 +30,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[] = "@(#)rm.c 8.8 (Berkeley) 4/27/95";
-#else
-static char rcsid[] = "$OpenBSD: rm.c,v 1.22 2008/06/10 17:14:16 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/param.h>
diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c
index bce0429adab..841cceca45c 100644
--- a/bin/rmail/rmail.c
+++ b/bin/rmail/rmail.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmail.c,v 1.23 2008/05/28 16:01:42 sobrado Exp $ */
+/* $OpenBSD: rmail.c,v 1.24 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: rmail.c,v 1.8 1995/09/07 06:51:50 jtc Exp $ */
/*
@@ -30,20 +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[] = "@(#)rmail.c 8.3 (Berkeley) 5/15/95";
-#else
-static char rcsid[] = "$OpenBSD: rmail.c,v 1.23 2008/05/28 16:01:42 sobrado Exp $";
-#endif
-#endif /* not lint */
-
/*
* RMAIL -- UUCP mail server.
*
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index 2973461ec5a..f4d55d42f01 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmdir.c,v 1.8 2003/06/02 23:32:09 millert Exp $ */
+/* $OpenBSD: rmdir.c,v 1.9 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: rmdir.c,v 1.13 1995/03/21 09:08:31 cgd Exp $ */
/*-
@@ -30,20 +30,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
-#if 0
-static char sccsid[] = "@(#)rmdir.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: rmdir.c,v 1.8 2003/06/02 23:32:09 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include <errno.h>
#include <stdio.h>
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index c1c4a2bd764..337cc4d7d81 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sleep.c,v 1.18 2009/02/13 20:39:58 deraadt Exp $ */
+/* $OpenBSD: sleep.c,v 1.19 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: sleep.c,v 1.8 1995/03/21 09:11:11 cgd 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[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: sleep.c,v 1.18 2009/02/13 20:39:58 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include <errno.h>
#include <locale.h>
diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index 16e3eec6c78..f585a633ede 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cchar.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: cchar.c,v 1.11 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: cchar.c,v 1.10 1996/05/07 18:20:05 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cchar.c 8.5 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: cchar.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index aee5896e66b..995e1f60283 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gfmt.c,v 1.6 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: gfmt.c,v 1.7 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: gfmt.c,v 1.10 1996/05/07 18:20:08 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)gfmt.c 8.6 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: gfmt.c,v 1.6 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/bin/stty/key.c b/bin/stty/key.c
index 5d18a565aa1..22af3088caa 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.12 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: key.c,v 1.13 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: key.c,v 1.11 1995/09/07 06:57:11 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)key.c 8.4 (Berkeley) 2/20/95";
-#else
-static char rcsid[] = "$OpenBSD: key.c,v 1.12 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index 9c2f3161fab..fea27dc944f 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: modes.c,v 1.9 2004/09/16 09:55:09 deraadt Exp $ */
+/* $OpenBSD: modes.c,v 1.10 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: modes.c,v 1.9 1996/05/07 18:20:09 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)modes.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: modes.c,v 1.9 2004/09/16 09:55:09 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stddef.h>
#include <string.h>
diff --git a/bin/stty/print.c b/bin/stty/print.c
index 899301365bf..a765e714b9a 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.12 2006/06/04 01:35:05 deraadt Exp $ */
+/* $OpenBSD: print.c,v 1.13 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: print.c,v 1.11 1996/05/07 18:20:10 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
-#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.12 2006/06/04 01:35:05 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stddef.h>
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index 26ee132c41d..210a7368393 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stty.c,v 1.12 2008/05/17 23:31:52 sobrado Exp $ */
+/* $OpenBSD: stty.c,v 1.13 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: stty.c,v 1.11 1995/03/21 09:11:30 cgd Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 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[] = "@(#)stty.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: stty.c,v 1.12 2008/05/17 23:31:52 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index 69b5791ee6b..1c83ed9ae06 100644
--- a/bin/sync/sync.c
+++ b/bin/sync/sync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sync.c,v 1.6 2005/02/02 19:23:17 jolan Exp $ */
+/* $OpenBSD: sync.c,v 1.7 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: sync.c,v 1.7 1995/03/21 09:11:37 cgd Exp $ */
/*
@@ -30,20 +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[] = "@(#)sync.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: sync.c,v 1.6 2005/02/02 19:23:17 jolan Exp $";
-#endif
-#endif /* not lint */
-
#include <unistd.h>
int
diff --git a/bin/test/test.c b/bin/test/test.c
index 8bf5e93a7d1..23f9757eb28 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: test.c,v 1.10 2009/03/01 20:11:06 otto Exp $ */
+/* $OpenBSD: test.c,v 1.11 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: test.c,v 1.15 1995/03/21 07:04:06 cgd Exp $ */
/*
@@ -11,10 +11,6 @@
* This program is in the Public Domain.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: test.c,v 1.10 2009/03/01 20:11:06 otto Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/distrib/special/more/more.c b/distrib/special/more/more.c
index 6edcead0cf5..94a6758872c 100644
--- a/distrib/special/more/more.c
+++ b/distrib/special/more/more.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: more.c,v 1.27 2007/08/02 03:23:37 david Exp $ */
+/* $OpenBSD: more.c,v 1.28 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -48,20 +48,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)more.c 5.28 (Berkeley) 3/1/93";
-#else
-static const char rcsid[] = "$OpenBSD: more.c,v 1.27 2007/08/02 03:23:37 david Exp $";
-#endif
-#endif /* not lint */
-
/*
* more.c - General purpose tty output filter and file perusal program
*
diff --git a/games/adventure/crc.c b/games/adventure/crc.c
index 1e62d03a369..d98a8595b04 100644
--- a/games/adventure/crc.c
+++ b/games/adventure/crc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crc.c,v 1.6 2008/10/03 08:18:44 sthen Exp $ */
+/* $OpenBSD: crc.c,v 1.7 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: crc.c,v 1.2 1995/03/21 12:04:59 cgd Exp $ */
/*-
@@ -33,15 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 5/31/93";
-static char ORIGINAL_sccsid[] = "@(#)crc.c 5.2 (Berkeley) 4/4/91";
-#else
-static char rcsid[] = "$OpenBSD: crc.c,v 1.6 2008/10/03 08:18:44 sthen Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
unsigned long crctab[] = {
diff --git a/games/adventure/done.c b/games/adventure/done.c
index b13d3f99069..16968025d93 100644
--- a/games/adventure/done.c
+++ b/games/adventure/done.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: done.c,v 1.7 2004/07/09 15:59:26 deraadt Exp $ */
+/* $OpenBSD: done.c,v 1.8 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: done.c,v 1.2 1995/03/21 12:05:01 cgd Exp $ */
/*-
@@ -35,14 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)done.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: done.c,v 1.7 2004/07/09 15:59:26 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/* Re-coding of advent in C: termination routines */
#include <stdio.h>
diff --git a/games/adventure/init.c b/games/adventure/init.c
index 1dd1bd81053..9c60994258c 100644
--- a/games/adventure/init.c
+++ b/games/adventure/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.10 2006/03/27 00:10:14 tedu Exp $ */
+/* $OpenBSD: init.c,v 1.11 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: init.c,v 1.4 1996/05/21 21:53:05 mrg Exp $ */
/*-
@@ -35,14 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 6/2/93";
-#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.10 2006/03/27 00:10:14 tedu Exp $";
-#endif
-#endif /* not lint */
-
/* Re-coding of advent in C: data initialization */
#include <sys/types.h>
diff --git a/games/adventure/io.c b/games/adventure/io.c
index 7bdd2914757..0c4c699db08 100644
--- a/games/adventure/io.c
+++ b/games/adventure/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.16 2006/03/27 00:10:14 tedu Exp $ */
+/* $OpenBSD: io.c,v 1.17 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: io.c,v 1.3 1995/04/24 12:21:37 cgd Exp $ */
/*-
@@ -35,14 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: io.c,v 1.16 2006/03/27 00:10:14 tedu Exp $";
-#endif
-#endif /* not lint */
-
/* Re-coding of advent in C: file i/o and user i/o */
#include <err.h>
diff --git a/games/adventure/main.c b/games/adventure/main.c
index d6f05f20830..54f60eedebc 100644
--- a/games/adventure/main.c
+++ b/games/adventure/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.18 2004/07/09 15:59:26 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.19 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: main.c,v 1.5 1996/05/21 21:53:09 mrg Exp $ */
/*-
@@ -35,20 +35,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[] = "@(#)main.c 8.1 (Berkeley) 6/2/93";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.18 2004/07/09 15:59:26 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/* Re-coding of advent in C: main program */
#include <sys/file.h>
diff --git a/games/adventure/save.c b/games/adventure/save.c
index c2b9874a1e8..45885ac005d 100644
--- a/games/adventure/save.c
+++ b/games/adventure/save.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: save.c,v 1.7 2004/07/09 15:59:26 deraadt Exp $ */
+/* $OpenBSD: save.c,v 1.8 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: save.c,v 1.2 1995/03/21 12:05:08 cgd Exp $ */
/*-
@@ -35,14 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: save.c,v 1.7 2004/07/09 15:59:26 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include "hdr.h"
diff --git a/games/adventure/setup.c b/games/adventure/setup.c
index ee5a86aebd7..cab495bcd7a 100644
--- a/games/adventure/setup.c
+++ b/games/adventure/setup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setup.c,v 1.8 2004/07/09 15:59:26 deraadt Exp $ */
+/* $OpenBSD: setup.c,v 1.9 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: setup.c,v 1.2 1995/03/21 12:05:10 cgd Exp $ */
/*-
@@ -33,20 +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[] = "@(#)setup.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: setup.c,v 1.8 2004/07/09 15:59:26 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* Setup: keep the structure of the original Adventure port, but use an
* internal copy of the data file, serving as a sort of virtual disk. It's
diff --git a/games/adventure/subr.c b/games/adventure/subr.c
index e27c9505db5..6ca78d5a671 100644
--- a/games/adventure/subr.c
+++ b/games/adventure/subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr.c,v 1.9 2004/07/09 15:59:26 deraadt Exp $ */
+/* $OpenBSD: subr.c,v 1.10 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: subr.c,v 1.2 1995/03/21 12:05:11 cgd Exp $ */
/*-
@@ -35,14 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: subr.c,v 1.9 2004/07/09 15:59:26 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/* Re-coding of advent in C: subroutines from main */
#include <stdio.h>
diff --git a/games/adventure/vocab.c b/games/adventure/vocab.c
index 5b3ed32fbc6..5326c962fb4 100644
--- a/games/adventure/vocab.c
+++ b/games/adventure/vocab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vocab.c,v 1.12 2006/03/27 00:10:14 tedu Exp $ */
+/* $OpenBSD: vocab.c,v 1.13 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: vocab.c,v 1.2 1995/03/21 12:05:13 cgd Exp $ */
/*-
@@ -35,14 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)vocab.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: vocab.c,v 1.12 2006/03/27 00:10:14 tedu Exp $";
-#endif
-#endif /* not lint */
-
/* Re-coding of advent in C: data structure routines */
#include <err.h>
diff --git a/games/adventure/wizard.c b/games/adventure/wizard.c
index 2fa65cbeb02..b01c9112162 100644
--- a/games/adventure/wizard.c
+++ b/games/adventure/wizard.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wizard.c,v 1.13 2004/07/09 15:59:26 deraadt Exp $ */
+/* $OpenBSD: wizard.c,v 1.14 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: wizard.c,v 1.3 1995/04/24 12:21:41 cgd Exp $ */
/*-
@@ -35,14 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)wizard.c 8.1 (Berkeley) 6/2/93";
-#else
-static char rcsid[] = "$OpenBSD: wizard.c,v 1.13 2004/07/09 15:59:26 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/* Re-coding of advent in C: privileged operations */
#include <sys/param.h>
diff --git a/games/arithmetic/arithmetic.c b/games/arithmetic/arithmetic.c
index 90f03ce1b2e..17cffd4f590 100644
--- a/games/arithmetic/arithmetic.c
+++ b/games/arithmetic/arithmetic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arithmetic.c,v 1.16 2007/03/20 03:43:50 tedu Exp $ */
+/* $OpenBSD: arithmetic.c,v 1.17 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -32,20 +32,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[] = "@(#)arithmetic.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: arithmetic.c,v 1.16 2007/03/20 03:43:50 tedu Exp $";
-#endif
-#endif /* not lint */
-
/*
* By Eamonn McManus, Trinity College Dublin <emcmanus@cs.tcd.ie>.
*
diff --git a/games/atc/extern.c b/games/atc/extern.c
index 3283b0d02c3..313873f8c19 100644
--- a/games/atc/extern.c
+++ b/games/atc/extern.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.c,v 1.3 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: extern.c,v 1.4 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: extern.c,v 1.4 1995/04/27 21:22:19 mycroft Exp $ */
/*-
@@ -42,14 +42,6 @@
* For more info on this and all of my stuff, mail edjames@berkeley.edu.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: extern.c,v 1.3 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "include.h"
char GAMES[] = "Game_List";
diff --git a/games/atc/grammar.y b/games/atc/grammar.y
index adab173293a..e6dd0e02420 100644
--- a/games/atc/grammar.y
+++ b/games/atc/grammar.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: grammar.y,v 1.5 2007/09/04 22:39:31 hshoexer Exp $ */
+/* $OpenBSD: grammar.y,v 1.6 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: grammar.y,v 1.3 1995/03/21 15:03:59 cgd Exp $ */
/*-
@@ -60,14 +60,6 @@
%{
#include "include.h"
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)grammar.y 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: grammar.y,v 1.5 2007/09/04 22:39:31 hshoexer Exp $";
-#endif
-#endif /* not lint */
-
int errors = 0;
int line = 1;
%}
diff --git a/games/atc/graphics.c b/games/atc/graphics.c
index 9d6efb66e1d..6aad9d476eb 100644
--- a/games/atc/graphics.c
+++ b/games/atc/graphics.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: graphics.c,v 1.7 2004/11/29 08:52:28 jsg Exp $ */
+/* $OpenBSD: graphics.c,v 1.8 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: graphics.c,v 1.3 1995/03/21 15:04:04 cgd Exp $ */
/*-
@@ -42,14 +42,6 @@
* For more info on this and all of my stuff, mail edjames@berkeley.edu.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)graphics.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: graphics.c,v 1.7 2004/11/29 08:52:28 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include "include.h"
diff --git a/games/atc/input.c b/games/atc/input.c
index a188d17fc58..6528902b117 100644
--- a/games/atc/input.c
+++ b/games/atc/input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: input.c,v 1.11 2006/11/07 03:52:59 deraadt Exp $ */
+/* $OpenBSD: input.c,v 1.12 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: input.c,v 1.4 1995/04/27 21:22:24 mycroft Exp $ */
/*-
@@ -42,14 +42,6 @@
* For more info on this and all of my stuff, mail edjames@berkeley.edu.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: input.c,v 1.11 2006/11/07 03:52:59 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "include.h"
#include "pathnames.h"
diff --git a/games/atc/lex.l b/games/atc/lex.l
index f7f315db177..f1cc2f64e77 100644
--- a/games/atc/lex.l
+++ b/games/atc/lex.l
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: lex.l,v 1.3 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: lex.l,v 1.4 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: lex.l,v 1.3 1995/03/21 15:04:15 cgd Exp $ */
/*-
@@ -43,14 +43,6 @@
* For more info on this and all of my stuff, mail edjames@berkeley.edu.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lex.l 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: lex.l,v 1.3 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "y.tab.h"
extern int line;
diff --git a/games/atc/list.c b/games/atc/list.c
index c51c69a8a7c..0da162435e0 100644
--- a/games/atc/list.c
+++ b/games/atc/list.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: list.c,v 1.6 2004/11/29 08:52:28 jsg Exp $ */
+/* $OpenBSD: list.c,v 1.7 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: list.c,v 1.3 1995/03/21 15:04:18 cgd Exp $ */
/*-
@@ -42,14 +42,6 @@
* For more info on this and all of my stuff, mail edjames@berkeley.edu.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)list.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: list.c,v 1.6 2004/11/29 08:52:28 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include "include.h"
PLANE *
diff --git a/games/atc/log.c b/games/atc/log.c
index 352784411d5..6f134bec863 100644
--- a/games/atc/log.c
+++ b/games/atc/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.16 2007/11/06 10:22:29 chl Exp $ */
+/* $OpenBSD: log.c,v 1.17 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: log.c,v 1.3 1995/03/21 15:04:21 cgd Exp $ */
/*-
@@ -42,14 +42,6 @@
* For more info on this and all of my stuff, mail edjames@berkeley.edu.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: log.c,v 1.16 2007/11/06 10:22:29 chl Exp $";
-#endif
-#endif /* not lint */
-
#include "include.h"
#include "pathnames.h"
diff --git a/games/atc/main.c b/games/atc/main.c
index 456ec1f0750..5b189534bb6 100644
--- a/games/atc/main.c
+++ b/games/atc/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.20 2009/06/01 13:04:59 ray Exp $ */
+/* $OpenBSD: main.c,v 1.21 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: main.c,v 1.4 1995/04/27 21:22:25 mycroft Exp $ */
/*-
@@ -42,20 +42,6 @@
* For more info on this and all of my stuff, mail edjames@berkeley.edu.
*/
-#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[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.20 2009/06/01 13:04:59 ray Exp $";
-#endif
-#endif /* not lint */
-
#include "include.h"
#include "pathnames.h"
diff --git a/games/atc/update.c b/games/atc/update.c
index a97a854d0a4..98ce4d2d9d4 100644
--- a/games/atc/update.c
+++ b/games/atc/update.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: update.c,v 1.11 2006/03/31 10:32:30 otto Exp $ */
+/* $OpenBSD: update.c,v 1.12 2009/10/27 23:59:23 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,14 +41,6 @@
* For more info on this and all of my stuff, mail edjames@berkeley.edu.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)update.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: update.c,v 1.11 2006/03/31 10:32:30 otto Exp $";
-#endif
-#endif /* not lint */
-
#include "include.h"
void
diff --git a/games/backgammon/backgammon/extra.c b/games/backgammon/backgammon/extra.c
index f51776a68bb..5b91bb4b8a0 100644
--- a/games/backgammon/backgammon/extra.c
+++ b/games/backgammon/backgammon/extra.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: extra.c,v 1.5 2006/12/14 10:14:05 martin Exp $ */
+/* $OpenBSD: extra.c,v 1.6 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)extra.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: extra.c,v 1.5 2006/12/14 10:14:05 martin Exp $";
-#endif
-#endif /* not lint */
-
#include "back.h"
#include "backlocal.h"
diff --git a/games/backgammon/backgammon/main.c b/games/backgammon/backgammon/main.c
index 60635878a3d..8b08c1b16f7 100644
--- a/games/backgammon/backgammon/main.c
+++ b/games/backgammon/backgammon/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.15 2006/10/29 20:02:41 martin Exp $ */
+/* $OpenBSD: main.c,v 1.16 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,20 +29,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[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.15 2006/10/29 20:02:41 martin Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include <time.h>
#include "back.h"
diff --git a/games/backgammon/backgammon/move.c b/games/backgammon/backgammon/move.c
index 29ed30029c3..73634f4ed64 100644
--- a/games/backgammon/backgammon/move.c
+++ b/games/backgammon/backgammon/move.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: move.c,v 1.9 2006/12/14 10:14:05 martin Exp $ */
+/* $OpenBSD: move.c,v 1.10 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: move.c,v 1.9 2006/12/14 10:14:05 martin Exp $";
-#endif
-#endif /* not lint */
-
#include "back.h"
#include "backlocal.h"
diff --git a/games/backgammon/backgammon/text.c b/games/backgammon/backgammon/text.c
index b893f222fe5..c92d7f6bbf3 100644
--- a/games/backgammon/backgammon/text.c
+++ b/games/backgammon/backgammon/text.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: text.c,v 1.7 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: text.c,v 1.8 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)text.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: text.c,v 1.7 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "back.h"
const char *const instruct[] = {
diff --git a/games/backgammon/common_source/allow.c b/games/backgammon/common_source/allow.c
index 8e2839e4a99..da17fdd819e 100644
--- a/games/backgammon/common_source/allow.c
+++ b/games/backgammon/common_source/allow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: allow.c,v 1.4 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: allow.c,v 1.5 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)allow.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: allow.c,v 1.4 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "back.h"
int
diff --git a/games/backgammon/common_source/board.c b/games/backgammon/common_source/board.c
index ea636dbf7eb..a0802e1a3a4 100644
--- a/games/backgammon/common_source/board.c
+++ b/games/backgammon/common_source/board.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: board.c,v 1.7 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: board.c,v 1.8 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)board.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: board.c,v 1.7 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "back.h"
static int i, j, k;
diff --git a/games/backgammon/common_source/check.c b/games/backgammon/common_source/check.c
index 116fab66690..a8438570846 100644
--- a/games/backgammon/common_source/check.c
+++ b/games/backgammon/common_source/check.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: check.c,v 1.5 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: check.c,v 1.6 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)check.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: check.c,v 1.5 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "back.h"
void
diff --git a/games/backgammon/common_source/fancy.c b/games/backgammon/common_source/fancy.c
index cf93269a24c..1b286dc7aef 100644
--- a/games/backgammon/common_source/fancy.c
+++ b/games/backgammon/common_source/fancy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fancy.c,v 1.11 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: fancy.c,v 1.12 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)fancy.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: fancy.c,v 1.11 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include "back.h"
diff --git a/games/backgammon/common_source/init.c b/games/backgammon/common_source/init.c
index 85ae503e1f9..50ed7b357fe 100644
--- a/games/backgammon/common_source/init.c
+++ b/games/backgammon/common_source/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.9 2006/12/14 10:14:05 martin Exp $ */
+/* $OpenBSD: init.c,v 1.10 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.9 2006/12/14 10:14:05 martin Exp $";
-#endif
-#endif /* not lint */
-
/*
* variable initialization.
*/
diff --git a/games/backgammon/common_source/odds.c b/games/backgammon/common_source/odds.c
index 68cbb49fa75..438b40b134e 100644
--- a/games/backgammon/common_source/odds.c
+++ b/games/backgammon/common_source/odds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: odds.c,v 1.4 2006/03/27 00:10:14 tedu Exp $ */
+/* $OpenBSD: odds.c,v 1.5 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)odds.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: odds.c,v 1.4 2006/03/27 00:10:14 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include "back.h"
void
diff --git a/games/backgammon/common_source/one.c b/games/backgammon/common_source/one.c
index 89bf7e2f526..bc92c802b10 100644
--- a/games/backgammon/common_source/one.c
+++ b/games/backgammon/common_source/one.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: one.c,v 1.4 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: one.c,v 1.5 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)one.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: one.c,v 1.4 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "back.h"
int
diff --git a/games/backgammon/common_source/save.c b/games/backgammon/common_source/save.c
index bf05e16b4af..a56b22db6da 100644
--- a/games/backgammon/common_source/save.c
+++ b/games/backgammon/common_source/save.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: save.c,v 1.9 2006/03/27 00:10:14 tedu Exp $ */
+/* $OpenBSD: save.c,v 1.10 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: save.c,v 1.9 2006/03/27 00:10:14 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <ctype.h>
#include <errno.h>
diff --git a/games/backgammon/common_source/subs.c b/games/backgammon/common_source/subs.c
index c41a808bde7..eca168d258b 100644
--- a/games/backgammon/common_source/subs.c
+++ b/games/backgammon/common_source/subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subs.c,v 1.17 2008/03/17 09:17:56 sobrado Exp $ */
+/* $OpenBSD: subs.c,v 1.18 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)subs.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: subs.c,v 1.17 2008/03/17 09:17:56 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include "back.h"
__dead void usage(void);
diff --git a/games/backgammon/common_source/table.c b/games/backgammon/common_source/table.c
index 5ecdac6708e..6c69e260ac4 100644
--- a/games/backgammon/common_source/table.c
+++ b/games/backgammon/common_source/table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: table.c,v 1.7 2006/03/27 00:10:14 tedu Exp $ */
+/* $OpenBSD: table.c,v 1.8 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: table.c,v 1.7 2006/03/27 00:10:14 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include "back.h"
diff --git a/games/backgammon/teachgammon/data.c b/games/backgammon/teachgammon/data.c
index 4a39bbb75fb..1049f0f109b 100644
--- a/games/backgammon/teachgammon/data.c
+++ b/games/backgammon/teachgammon/data.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: data.c,v 1.5 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: data.c,v 1.6 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)data.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: data.c,v 1.5 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/cdefs.h>
#include "tutor.h"
diff --git a/games/backgammon/teachgammon/teach.c b/games/backgammon/teachgammon/teach.c
index c9e1092772e..3a27c909ca8 100644
--- a/games/backgammon/teachgammon/teach.c
+++ b/games/backgammon/teachgammon/teach.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: teach.c,v 1.13 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: teach.c,v 1.14 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,20 +29,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[] = "@(#)teach.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: teach.c,v 1.13 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include "back.h"
#include "tutor.h"
diff --git a/games/backgammon/teachgammon/ttext1.c b/games/backgammon/teachgammon/ttext1.c
index 6b17aa7c501..4a134aa1983 100644
--- a/games/backgammon/teachgammon/ttext1.c
+++ b/games/backgammon/teachgammon/ttext1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttext1.c,v 1.5 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: ttext1.c,v 1.6 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ttext1.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: ttext1.c,v 1.5 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "back.h"
#include "tutor.h"
diff --git a/games/backgammon/teachgammon/ttext2.c b/games/backgammon/teachgammon/ttext2.c
index b4f1d6179e9..241b513bc48 100644
--- a/games/backgammon/teachgammon/ttext2.c
+++ b/games/backgammon/teachgammon/ttext2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttext2.c,v 1.6 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: ttext2.c,v 1.7 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ttext2.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: ttext2.c,v 1.6 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "back.h"
#include "tutor.h"
diff --git a/games/backgammon/teachgammon/tutor.c b/games/backgammon/teachgammon/tutor.c
index f4979e6e58d..03838499b7a 100644
--- a/games/backgammon/teachgammon/tutor.c
+++ b/games/backgammon/teachgammon/tutor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tutor.c,v 1.5 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: tutor.c,v 1.6 2009/10/27 23:59:23 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tutor.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: tutor.c,v 1.5 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "back.h"
#include "tutor.h"
diff --git a/games/banner/banner.c b/games/banner/banner.c
index 0970faaa71c..14e959e7eae 100644
--- a/games/banner/banner.c
+++ b/games/banner/banner.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: banner.c,v 1.15 2009/10/17 21:37:36 sobrado Exp $ */
+/* $OpenBSD: banner.c,v 1.16 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: banner.c,v 1.4 1995/04/22 11:55:15 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)banner.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: banner.c,v 1.15 2009/10/17 21:37:36 sobrado Exp $";
-#endif
-#endif /* not lint */
-
/*
* banner - prints large signs
* banner [-w width] [-d] [-t] message ...
diff --git a/games/battlestar/battlestar.c b/games/battlestar/battlestar.c
index fcb961d6453..a7989e8b44e 100644
--- a/games/battlestar/battlestar.c
+++ b/games/battlestar/battlestar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: battlestar.c,v 1.15 2005/05/01 02:43:12 djm Exp $ */
+/* $OpenBSD: battlestar.c,v 1.16 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: battlestar.c,v 1.3 1995/03/21 15:06:47 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[] = "@(#)battlestar.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: battlestar.c,v 1.15 2005/05/01 02:43:12 djm Exp $";
-#endif
-#endif /* not lint */
-
/*
* Battlestar - a stellar-tropical adventure game
*
diff --git a/games/battlestar/com1.c b/games/battlestar/com1.c
index 85b1970462a..037a0e9f448 100644
--- a/games/battlestar/com1.c
+++ b/games/battlestar/com1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com1.c,v 1.13 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: com1.c,v 1.14 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: com1.c,v 1.3 1995/03/21 15:06:51 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)com1.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: com1.c,v 1.13 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
int
diff --git a/games/battlestar/com2.c b/games/battlestar/com2.c
index b869e25c26c..93685ca3f57 100644
--- a/games/battlestar/com2.c
+++ b/games/battlestar/com2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com2.c,v 1.15 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: com2.c,v 1.16 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: com2.c,v 1.3 1995/03/21 15:06:55 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)com2.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: com2.c,v 1.15 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
int
diff --git a/games/battlestar/com3.c b/games/battlestar/com3.c
index ea5e8c56141..f8089dcc7a8 100644
--- a/games/battlestar/com3.c
+++ b/games/battlestar/com3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com3.c,v 1.12 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: com3.c,v 1.13 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: com3.c,v 1.3 1995/03/21 15:07:00 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)com3.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: com3.c,v 1.12 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
void
diff --git a/games/battlestar/com4.c b/games/battlestar/com4.c
index 18d489f4341..e579377c8d3 100644
--- a/games/battlestar/com4.c
+++ b/games/battlestar/com4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com4.c,v 1.13 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: com4.c,v 1.14 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: com4.c,v 1.3 1995/03/21 15:07:04 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)com4.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: com4.c,v 1.13 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
int
diff --git a/games/battlestar/com5.c b/games/battlestar/com5.c
index d78cead9523..e9b7af885e3 100644
--- a/games/battlestar/com5.c
+++ b/games/battlestar/com5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com5.c,v 1.11 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: com5.c,v 1.12 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: com5.c,v 1.3 1995/03/21 15:07:07 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)com5.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: com5.c,v 1.11 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
void
diff --git a/games/battlestar/com6.c b/games/battlestar/com6.c
index 6e834acd488..076707ba4b8 100644
--- a/games/battlestar/com6.c
+++ b/games/battlestar/com6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com6.c,v 1.18 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: com6.c,v 1.19 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: com6.c,v 1.5 1995/04/27 21:30:23 mycroft Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)com6.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: com6.c,v 1.18 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
#include "pathnames.h"
diff --git a/games/battlestar/com7.c b/games/battlestar/com7.c
index fab9bcb5fbb..e4be849f77b 100644
--- a/games/battlestar/com7.c
+++ b/games/battlestar/com7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com7.c,v 1.11 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: com7.c,v 1.12 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: com7.c,v 1.3 1995/03/21 15:07:12 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)com7.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: com7.c,v 1.11 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
int
diff --git a/games/battlestar/cypher.c b/games/battlestar/cypher.c
index edb767559f7..8200b6666b2 100644
--- a/games/battlestar/cypher.c
+++ b/games/battlestar/cypher.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cypher.c,v 1.16 2007/09/09 17:10:02 ray Exp $ */
+/* $OpenBSD: cypher.c,v 1.17 2009/10/27 23:59:23 deraadt Exp $ */
/* $NetBSD: cypher.c,v 1.3 1995/03/21 15:07:15 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cypher.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: cypher.c,v 1.16 2007/09/09 17:10:02 ray Exp $";
-#endif
-#endif /* not lint */
-
#include <stdarg.h>
#include "extern.h"
diff --git a/games/battlestar/dayfile.c b/games/battlestar/dayfile.c
index 506f548cf9a..6cf6019341b 100644
--- a/games/battlestar/dayfile.c
+++ b/games/battlestar/dayfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dayfile.c,v 1.10 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: dayfile.c,v 1.11 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: dayfile.c,v 1.3 1995/03/21 15:07:18 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dayfile.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: dayfile.c,v 1.10 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
struct room dayfile[] = {
diff --git a/games/battlestar/dayobjs.c b/games/battlestar/dayobjs.c
index c4b22e45264..16de954dbeb 100644
--- a/games/battlestar/dayobjs.c
+++ b/games/battlestar/dayobjs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dayobjs.c,v 1.6 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: dayobjs.c,v 1.7 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: dayobjs.c,v 1.3 1995/03/21 15:07:22 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dayobjs.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: dayobjs.c,v 1.6 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
const struct objs dayobjs[] = {
diff --git a/games/battlestar/fly.c b/games/battlestar/fly.c
index 96d1e4aba51..3a4212d5f17 100644
--- a/games/battlestar/fly.c
+++ b/games/battlestar/fly.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fly.c,v 1.12 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: fly.c,v 1.13 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: fly.c,v 1.3 1995/03/21 15:07:28 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)fly.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: fly.c,v 1.12 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
#undef UP
#include <curses.h>
diff --git a/games/battlestar/getcom.c b/games/battlestar/getcom.c
index 77491d27571..957963fb238 100644
--- a/games/battlestar/getcom.c
+++ b/games/battlestar/getcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getcom.c,v 1.13 2006/10/10 21:38:16 cloder Exp $ */
+/* $OpenBSD: getcom.c,v 1.14 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: getcom.c,v 1.3 1995/03/21 15:07:30 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)getcom.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: getcom.c,v 1.13 2006/10/10 21:38:16 cloder Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
char *
diff --git a/games/battlestar/globals.c b/games/battlestar/globals.c
index 3cebe8252dd..cd8d62d17db 100644
--- a/games/battlestar/globals.c
+++ b/games/battlestar/globals.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: globals.c,v 1.12 2004/02/03 20:22:37 drahn Exp $ */
+/* $OpenBSD: globals.c,v 1.13 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: globals.c,v 1.3 1995/03/21 15:07:32 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)globals.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: globals.c,v 1.12 2004/02/03 20:22:37 drahn Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
int WEIGHT = MAXWEIGHT;
diff --git a/games/battlestar/init.c b/games/battlestar/init.c
index 9e8c073adcc..25e781566a3 100644
--- a/games/battlestar/init.c
+++ b/games/battlestar/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.12 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: init.c,v 1.13 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: init.c,v 1.4 1995/03/21 15:07:35 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)init.c 8.4 (Berkeley) 4/30/95";
-#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.12 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
static int checkout(const char *);
diff --git a/games/battlestar/misc.c b/games/battlestar/misc.c
index 2f9eb4a6f38..e92f6ed31d5 100644
--- a/games/battlestar/misc.c
+++ b/games/battlestar/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.7 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: misc.c,v 1.8 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.3 1995/03/21 15:07:37 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)misc.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.7 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
/* for beenthere, injuries */
diff --git a/games/battlestar/nightfile.c b/games/battlestar/nightfile.c
index a761d0ef240..ce6d42d0a79 100644
--- a/games/battlestar/nightfile.c
+++ b/games/battlestar/nightfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nightfile.c,v 1.10 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: nightfile.c,v 1.11 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: nightfile.c,v 1.3 1995/03/21 15:07:41 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)nightfile.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: nightfile.c,v 1.10 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
struct room nightfile[] = {
diff --git a/games/battlestar/nightobjs.c b/games/battlestar/nightobjs.c
index 68f1272c84f..d8d34d80c7c 100644
--- a/games/battlestar/nightobjs.c
+++ b/games/battlestar/nightobjs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nightobjs.c,v 1.6 2003/06/03 03:01:38 millert Exp $ */
+/* $OpenBSD: nightobjs.c,v 1.7 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: nightobjs.c,v 1.3 1995/03/21 15:07:46 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)nightobjs.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: nightobjs.c,v 1.6 2003/06/03 03:01:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
const struct objs nightobjs[] = {
diff --git a/games/battlestar/parse.c b/games/battlestar/parse.c
index 4f35155a05e..f80bbbbb8da 100644
--- a/games/battlestar/parse.c
+++ b/games/battlestar/parse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.c,v 1.14 2007/11/24 12:59:28 jmc Exp $ */
+/* $OpenBSD: parse.c,v 1.15 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: parse.c,v 1.3 1995/03/21 15:07:48 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)parse.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: parse.c,v 1.14 2007/11/24 12:59:28 jmc Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
#define HASHSIZE 256
diff --git a/games/battlestar/room.c b/games/battlestar/room.c
index 961a043f503..129f1c6b318 100644
--- a/games/battlestar/room.c
+++ b/games/battlestar/room.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: room.c,v 1.8 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: room.c,v 1.9 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: room.c,v 1.3 1995/03/21 15:07:54 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)room.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: room.c,v 1.8 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
void
diff --git a/games/battlestar/save.c b/games/battlestar/save.c
index e2f49ed413c..ea3266f221f 100644
--- a/games/battlestar/save.c
+++ b/games/battlestar/save.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: save.c,v 1.10 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: save.c,v 1.11 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: save.c,v 1.3 1995/03/21 15:07:57 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)save.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: save.c,v 1.10 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
void
diff --git a/games/battlestar/words.c b/games/battlestar/words.c
index 3ca1fe191dd..5afd4daddcc 100644
--- a/games/battlestar/words.c
+++ b/games/battlestar/words.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: words.c,v 1.9 2003/06/03 03:01:39 millert Exp $ */
+/* $OpenBSD: words.c,v 1.10 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: words.c,v 1.3 1995/03/21 15:08:00 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)words.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: words.c,v 1.9 2003/06/03 03:01:39 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
struct wlist wlist[] = {
diff --git a/games/bcd/bcd.c b/games/bcd/bcd.c
index f7e8cc3ec75..ba4a522718f 100644
--- a/games/bcd/bcd.c
+++ b/games/bcd/bcd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcd.c,v 1.12 2007/09/11 15:21:05 gilles Exp $ */
+/* $OpenBSD: bcd.c,v 1.13 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: bcd.c,v 1.6 1995/04/24 12:22:23 cgd Exp $ */
/*
@@ -33,20 +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[] = "@(#)bcd.c 8.2 (Berkeley) 3/20/94";
-#else
-static char rcsid[] = "$OpenBSD: bcd.c,v 1.12 2007/09/11 15:21:05 gilles Exp $";
-#endif
-#endif /* not lint */
-
/*
* bcd --
*
diff --git a/games/boggle/boggle/bog.c b/games/boggle/boggle/bog.c
index 35859d6056e..86170628925 100644
--- a/games/boggle/boggle/bog.c
+++ b/games/boggle/boggle/bog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bog.c,v 1.19 2008/08/12 06:32:14 mbalmer Exp $ */
+/* $OpenBSD: bog.c,v 1.20 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: bog.c,v 1.5 1995/04/24 12:22:32 cgd Exp $ */
/*-
@@ -33,20 +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
-#if 0
-static char sccsid[] = "@(#)bog.c 8.1 (Berkeley) 6/11/93";
-#else
-static char rcsid[] = "$OpenBSD: bog.c,v 1.19 2008/08/12 06:32:14 mbalmer Exp $";
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/games/boggle/boggle/help.c b/games/boggle/boggle/help.c
index 9b11fc0d502..b8729fb2c11 100644
--- a/games/boggle/boggle/help.c
+++ b/games/boggle/boggle/help.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: help.c,v 1.4 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: help.c,v 1.5 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: help.c,v 1.2 1995/03/21 12:14:38 cgd Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)help.c 8.1 (Berkeley) 6/11/93";
-#else
-static char rcsid[] = "$OpenBSD: help.c,v 1.4 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <curses.h>
#include <stdio.h>
diff --git a/games/boggle/boggle/mach.c b/games/boggle/boggle/mach.c
index be166c58d97..fb16b4b269c 100644
--- a/games/boggle/boggle/mach.c
+++ b/games/boggle/boggle/mach.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mach.c,v 1.11 2009/05/21 12:57:31 schwarze Exp $ */
+/* $OpenBSD: mach.c,v 1.12 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: mach.c,v 1.5 1995/04/28 22:28:48 mycroft Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mach.c 8.1 (Berkeley) 6/11/93";
-#else
-static char rcsid[] = "$OpenBSD: mach.c,v 1.11 2009/05/21 12:57:31 schwarze Exp $";
-#endif
-#endif /* not lint */
-
/*
* Terminal interface
*
diff --git a/games/boggle/boggle/timer.c b/games/boggle/boggle/timer.c
index aebb4f2b9c1..9265c5199bb 100644
--- a/games/boggle/boggle/timer.c
+++ b/games/boggle/boggle/timer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timer.c,v 1.9 2008/03/26 20:12:59 millert Exp $ */
+/* $OpenBSD: timer.c,v 1.10 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: timer.c,v 1.3 1995/04/24 12:22:45 cgd Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)timer.c 8.2 (Berkeley) 2/22/94";
-#else
-static char rcsid[] = "$OpenBSD: timer.c,v 1.9 2008/03/26 20:12:59 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/games/boggle/boggle/word.c b/games/boggle/boggle/word.c
index 89b8b425a3d..dc3acc59938 100644
--- a/games/boggle/boggle/word.c
+++ b/games/boggle/boggle/word.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: word.c,v 1.6 2006/03/27 00:10:14 tedu Exp $ */
+/* $OpenBSD: word.c,v 1.7 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: word.c,v 1.2 1995/03/21 12:14:45 cgd Exp $ */
/*-
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)word.c 8.1 (Berkeley) 6/11/93";
-#else
-static char rcsid[] = "$OpenBSD: word.c,v 1.6 2006/03/27 00:10:14 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/games/boggle/mkdict/mkdict.c b/games/boggle/mkdict/mkdict.c
index 58ab1ce36a6..6a4f7d4ebad 100644
--- a/games/boggle/mkdict/mkdict.c
+++ b/games/boggle/mkdict/mkdict.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkdict.c,v 1.10 2006/04/11 09:17:55 deraadt Exp $ */
+/* $OpenBSD: mkdict.c,v 1.11 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: mkdict.c,v 1.2 1995/03/21 12:14:49 cgd Exp $ */
/*-
@@ -33,20 +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
-#if 0
-static char sccsid[] = "@(#)mkdict.c 8.1 (Berkeley) 6/11/93";
-#else
-static char rcsid[] = "$OpenBSD: mkdict.c,v 1.10 2006/04/11 09:17:55 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* Filter out words that:
* 1) Are not completely made up of lower case letters
diff --git a/games/boggle/mkindex/mkindex.c b/games/boggle/mkindex/mkindex.c
index bc1c66819a6..82740d2149c 100644
--- a/games/boggle/mkindex/mkindex.c
+++ b/games/boggle/mkindex/mkindex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkindex.c,v 1.7 2004/07/10 07:26:22 deraadt Exp $ */
+/* $OpenBSD: mkindex.c,v 1.8 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: mkindex.c,v 1.2 1995/03/21 12:14:52 cgd Exp $ */
/*-
@@ -33,20 +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
-#if 0
-static char sccsid[] = "@(#)mkindex.c 8.1 (Berkeley) 6/11/93";
-#else
-static char rcsid[] = "$OpenBSD: mkindex.c,v 1.7 2004/07/10 07:26:22 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/bs/bs.c b/games/bs/bs.c
index b4440286ebe..abf2708c28d 100644
--- a/games/bs/bs.c
+++ b/games/bs/bs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bs.c,v 1.21 2009/10/17 21:45:50 sobrado Exp $ */
+/* $OpenBSD: bs.c,v 1.22 2009/10/27 23:59:24 deraadt Exp $ */
/*
* Copyright (c) 1986, Bruce Holloway
* All rights reserved.
@@ -39,10 +39,6 @@
* v2.2 with bugfixes and strategical improvements, March 1998.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: bs.c,v 1.21 2009/10/17 21:45:50 sobrado Exp $";
-#endif
-
/* #define _POSIX_SOURCE */ /* ( random() ) */
#include <sys/param.h>
diff --git a/games/caesar/caesar.c b/games/caesar/caesar.c
index 6854dc2a06a..a87b6e3273a 100644
--- a/games/caesar/caesar.c
+++ b/games/caesar/caesar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: caesar.c,v 1.13 2004/07/09 15:59:26 deraadt Exp $ */
+/* $OpenBSD: caesar.c,v 1.14 2009/10/27 23:59:24 deraadt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,20 +37,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[] = "@(#)caesar.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: caesar.c,v 1.13 2004/07/09 15:59:26 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/games/canfield/canfield/canfield.c b/games/canfield/canfield/canfield.c
index 77ccc925490..8b340cd461e 100644
--- a/games/canfield/canfield/canfield.c
+++ b/games/canfield/canfield/canfield.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: canfield.c,v 1.11 2005/05/01 02:43:12 djm Exp $ */
+/* $OpenBSD: canfield.c,v 1.12 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: canfield.c,v 1.7 1995/05/13 07:28:35 jtc 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[] = "@(#)canfield.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: canfield.c,v 1.11 2005/05/01 02:43:12 djm Exp $";
-#endif
-#endif /* not lint */
-
/*
* The canfield program
*
diff --git a/games/canfield/cfscores/cfscores.c b/games/canfield/cfscores/cfscores.c
index 3a62dea7853..717c24d38e1 100644
--- a/games/canfield/cfscores/cfscores.c
+++ b/games/canfield/cfscores/cfscores.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfscores.c,v 1.14 2009/06/09 14:56:19 sobrado Exp $ */
+/* $OpenBSD: cfscores.c,v 1.15 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: cfscores.c,v 1.3 1995/03/21 15:08:37 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[] = "@(#)cfscores.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: cfscores.c,v 1.14 2009/06/09 14:56:19 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
#include <fcntl.h>
diff --git a/games/cribbage/cards.c b/games/cribbage/cards.c
index ac59b222332..f27a4febdcd 100644
--- a/games/cribbage/cards.c
+++ b/games/cribbage/cards.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cards.c,v 1.4 2004/07/10 07:26:23 deraadt Exp $ */
+/* $OpenBSD: cards.c,v 1.5 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: cards.c,v 1.3 1995/03/21 15:08:41 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cards.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: cards.c,v 1.4 2004/07/10 07:26:23 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <curses.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/cribbage/crib.c b/games/cribbage/crib.c
index 5a41a47bc6b..b685d0e99ed 100644
--- a/games/cribbage/crib.c
+++ b/games/cribbage/crib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crib.c,v 1.13 2004/07/10 07:26:23 deraadt Exp $ */
+/* $OpenBSD: crib.c,v 1.14 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: crib.c,v 1.7 1997/07/10 06:47:29 mikel 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[] = "@(#)crib.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: crib.c,v 1.13 2004/07/10 07:26:23 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <curses.h>
#include <err.h>
diff --git a/games/cribbage/extern.c b/games/cribbage/extern.c
index bf820c62d0f..7ad135637d5 100644
--- a/games/cribbage/extern.c
+++ b/games/cribbage/extern.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.c,v 1.6 2004/01/16 00:13:18 espie Exp $ */
+/* $OpenBSD: extern.c,v 1.7 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: extern.c,v 1.3 1995/03/21 15:08:50 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$NetBSD: extern.c,v 1.3 1995/03/21 15:08:50 cgd Exp $";
-#endif
-#endif /* not lint */
-
#include <curses.h>
#include "deck.h"
diff --git a/games/cribbage/instr.c b/games/cribbage/instr.c
index b6e2bf0691f..70deb2bf7be 100644
--- a/games/cribbage/instr.c
+++ b/games/cribbage/instr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: instr.c,v 1.10 2004/07/10 07:26:23 deraadt Exp $ */
+/* $OpenBSD: instr.c,v 1.11 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: instr.c,v 1.5 1997/07/10 06:47:30 mikel Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)instr.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: instr.c,v 1.10 2004/07/10 07:26:23 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
diff --git a/games/cribbage/io.c b/games/cribbage/io.c
index bbeccae1a95..32d61613a2c 100644
--- a/games/cribbage/io.c
+++ b/games/cribbage/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.11 2008/12/03 15:43:17 sthen Exp $ */
+/* $OpenBSD: io.c,v 1.12 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: io.c,v 1.9 1997/07/09 06:25:47 phil Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$NetBSD: io.c,v 1.7 1995/03/21 15:08:53 cgd Exp $";
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include <curses.h>
#include <signal.h>
diff --git a/games/cribbage/score.c b/games/cribbage/score.c
index 91ca9b7292c..59889574b35 100644
--- a/games/cribbage/score.c
+++ b/games/cribbage/score.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: score.c,v 1.8 2004/07/10 07:26:23 deraadt Exp $ */
+/* $OpenBSD: score.c,v 1.9 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: score.c,v 1.3 1995/03/21 15:08:57 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: score.c,v 1.8 2004/07/10 07:26:23 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <curses.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/cribbage/support.c b/games/cribbage/support.c
index 2e29ccdc58d..93d02349853 100644
--- a/games/cribbage/support.c
+++ b/games/cribbage/support.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: support.c,v 1.10 2006/03/27 00:10:15 tedu Exp $ */
+/* $OpenBSD: support.c,v 1.11 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: support.c,v 1.3 1995/03/21 15:08:59 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)support.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: support.c,v 1.10 2006/03/27 00:10:15 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include <curses.h>
#include <string.h>
diff --git a/games/factor/factor.c b/games/factor/factor.c
index 0bf1dfbeb05..198479a0358 100644
--- a/games/factor/factor.c
+++ b/games/factor/factor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: factor.c,v 1.18 2008/03/17 09:17:56 sobrado Exp $ */
+/* $OpenBSD: factor.c,v 1.19 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: factor.c,v 1.5 1995/03/23 08:28:07 cgd Exp $ */
/*
@@ -33,20 +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[] = "@(#)factor.c 8.4 (Berkeley) 5/4/95";
-#else
-static char rcsid[] = "$OpenBSD: factor.c,v 1.18 2008/03/17 09:17:56 sobrado Exp $";
-#endif
-#endif /* not lint */
-
/*
* factor - factor a number into primes
*
diff --git a/games/fish/fish.c b/games/fish/fish.c
index 16dd7d25584..5fae3ff340e 100644
--- a/games/fish/fish.c
+++ b/games/fish/fish.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fish.c,v 1.14 2004/11/29 08:52:28 jsg Exp $ */
+/* $OpenBSD: fish.c,v 1.15 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: fish.c,v 1.3 1995/03/23 08:28:18 cgd Exp $ */
/*-
@@ -33,20 +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[] = "@(#)fish.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: fish.c,v 1.14 2004/11/29 08:52:28 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/wait.h>
#include <err.h>
diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index 798137ca547..1ad40c9f246 100644
--- a/games/fortune/fortune/fortune.c
+++ b/games/fortune/fortune/fortune.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fortune.c,v 1.27 2008/04/13 00:22:16 djm Exp $ */
+/* $OpenBSD: fortune.c,v 1.28 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: fortune.c,v 1.8 1995/03/23 08:28:40 cgd Exp $ */
/*-
@@ -33,20 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1986, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: fortune.c,v 1.27 2008/04/13 00:22:16 djm Exp $";
-#endif
-#endif /* not lint */
-
# include <sys/param.h>
# include <sys/stat.h>
diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c
index 3252cb87baf..c859053d26e 100644
--- a/games/fortune/strfile/strfile.c
+++ b/games/fortune/strfile/strfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strfile.c,v 1.16 2007/09/04 22:39:31 hshoexer Exp $ */
+/* $OpenBSD: strfile.c,v 1.17 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: strfile.c,v 1.4 1995/04/24 12:23:09 cgd Exp $ */
/*-
@@ -33,20 +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[] = "@(#)strfile.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: strfile.c,v 1.16 2007/09/04 22:39:31 hshoexer Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <ctype.h>
#include <err.h>
diff --git a/games/fortune/unstr/unstr.c b/games/fortune/unstr/unstr.c
index f230a7563bd..c081ceb6209 100644
--- a/games/fortune/unstr/unstr.c
+++ b/games/fortune/unstr/unstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unstr.c,v 1.9 2004/07/09 15:59:26 deraadt Exp $ */
+/* $OpenBSD: unstr.c,v 1.10 2009/10/27 23:59:24 deraadt Exp $ */
/* $NetBSD: unstr.c,v 1.3 1995/03/23 08:29:00 cgd Exp $ */
/*-
@@ -33,16 +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
-static char sccsid[] = "@(#)unstr.c 8.1 (Berkeley) 5/31/93";
-#endif /* not lint */
-
/*
* This program un-does what "strfile" makes, thereby obtaining the
* original file again. This can be invoked with the name of the output
diff --git a/games/gomoku/bdinit.c b/games/gomoku/bdinit.c
index ee35cb25815..7b9af0c08b8 100644
--- a/games/gomoku/bdinit.c
+++ b/games/gomoku/bdinit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bdinit.c,v 1.5 2003/06/03 03:01:39 millert Exp $ */
+/* $OpenBSD: bdinit.c,v 1.6 2009/10/27 23:59:24 deraadt Exp $ */
/*
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
@@ -31,14 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)bdinit.c 8.2 (Berkeley) 5/3/95";
-#else
-static char rcsid[] = "$OpenBSD: bdinit.c,v 1.5 2003/06/03 03:01:39 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "gomoku.h"
#include <string.h>
diff --git a/games/gomoku/bdisp.c b/games/gomoku/bdisp.c
index 9c3555a3e54..d6fb0c6aead 100644
--- a/games/gomoku/bdisp.c
+++ b/games/gomoku/bdisp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bdisp.c,v 1.9 2006/12/14 10:15:09 martin Exp $ */
+/* $OpenBSD: bdisp.c,v 1.10 2009/10/27 23:59:24 deraadt Exp $ */
/*
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
@@ -31,14 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)bdisp.c 8.2 (Berkeley) 5/3/95";
-#else
-static char rcsid[] = "$OpenBSD: bdisp.c,v 1.9 2006/12/14 10:15:09 martin Exp $";
-#endif
-#endif /* not lint */
-
#include "gomoku.h"
#include <curses.h>
#include <string.h>
diff --git a/games/gomoku/main.c b/games/gomoku/main.c
index 2e55041f1b1..aeb8f56b0f8 100644
--- a/games/gomoku/main.c
+++ b/games/gomoku/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.21 2008/03/17 09:17:56 sobrado Exp $ */
+/* $OpenBSD: main.c,v 1.22 2009/10/27 23:59:24 deraadt Exp $ */
/*
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
@@ -31,20 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1994\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.4 (Berkeley) 5/4/95";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.21 2008/03/17 09:17:56 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <curses.h>
#include <err.h>
diff --git a/games/gomoku/makemove.c b/games/gomoku/makemove.c
index 9d883a39179..f9cc487c513 100644
--- a/games/gomoku/makemove.c
+++ b/games/gomoku/makemove.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: makemove.c,v 1.6 2003/06/03 03:01:39 millert Exp $ */
+/* $OpenBSD: makemove.c,v 1.7 2009/10/27 23:59:24 deraadt Exp $ */
/*
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
@@ -31,14 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)makemove.c 8.2 (Berkeley) 5/3/95";
-#else
-static char rcsid[] = "$OpenBSD: makemove.c,v 1.6 2003/06/03 03:01:39 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "gomoku.h"
/* direction deltas */
diff --git a/games/gomoku/pickmove.c b/games/gomoku/pickmove.c
index 5ae93886f68..70063bbac8f 100644
--- a/games/gomoku/pickmove.c
+++ b/games/gomoku/pickmove.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pickmove.c,v 1.10 2006/12/14 10:15:09 martin Exp $ */
+/* $OpenBSD: pickmove.c,v 1.11 2009/10/27 23:59:24 deraadt Exp $ */
/*
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
@@ -31,14 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pickmove.c 8.2 (Berkeley) 5/3/95";
-#else
-static char rcsid[] = "$OpenBSD: pickmove.c,v 1.10 2006/12/14 10:15:09 martin Exp $";
-#endif
-#endif /* not lint */
-
#include "gomoku.h"
#include <stdlib.h>
#include <string.h>
diff --git a/games/gomoku/stoc.c b/games/gomoku/stoc.c
index 1fc1f968d0c..c679e6ed67a 100644
--- a/games/gomoku/stoc.c
+++ b/games/gomoku/stoc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stoc.c,v 1.7 2003/07/10 00:03:01 david Exp $ */
+/* $OpenBSD: stoc.c,v 1.8 2009/10/27 23:59:24 deraadt Exp $ */
/*
* Copyright (c) 1994
* The Regents of the University of California. All rights reserved.
@@ -31,14 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)stoc.c 8.1 (Berkeley) 7/24/94";
-#else
-static char rcsid[] = "$OpenBSD: stoc.c,v 1.7 2003/07/10 00:03:01 david Exp $";
-#endif
-#endif /* not lint */
-
#include "gomoku.h"
#include <stdlib.h>
#include <string.h>
diff --git a/games/hack/alloc.c b/games/hack/alloc.c
index 3b3b405f7a2..d6289bcb929 100644
--- a/games/hack/alloc.c
+++ b/games/hack/alloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: alloc.c,v 1.6 2006/03/14 22:06:10 deraadt Exp $ */
+/* $OpenBSD: alloc.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: alloc.c,v 1.6 2006/03/14 22:06:10 deraadt Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include "hack.h"
diff --git a/games/hack/hack.Decl.c b/games/hack/hack.Decl.c
index 0004cace322..449bb3f3d32 100644
--- a/games/hack/hack.Decl.c
+++ b/games/hack/hack.Decl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.Decl.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.Decl.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.Decl.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
char nul[40]; /* contains zeros */
char plname[PL_NSIZ]; /* player name */
diff --git a/games/hack/hack.apply.c b/games/hack/hack.apply.c
index 2a92efdbfd2..ff03e258ccc 100644
--- a/games/hack/hack.apply.c
+++ b/games/hack/hack.apply.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.apply.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.apply.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.apply.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
#include "def.edog.h"
extern int (*occupation)(void);
diff --git a/games/hack/hack.bones.c b/games/hack/hack.bones.c
index 00a8acbf0bf..6cd76829f1b 100644
--- a/games/hack/hack.bones.c
+++ b/games/hack/hack.bones.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.bones.c,v 1.7 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.bones.c,v 1.8 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.bones.c,v 1.7 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <unistd.h>
#include "hack.h"
extern char plname[PL_NSIZ];
diff --git a/games/hack/hack.c b/games/hack/hack.c
index 0ece7888d7b..881bca4b702 100644
--- a/games/hack/hack.c
+++ b/games/hack/hack.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.c,v 1.7 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.c,v 1.8 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.c,v 1.7 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
#include <stdio.h>
diff --git a/games/hack/hack.cmd.c b/games/hack/hack.cmd.c
index 1175250be7f..4d9fee363e1 100644
--- a/games/hack/hack.cmd.c
+++ b/games/hack/hack.cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.cmd.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.cmd.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.cmd.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
#include "def.func_tab.h"
#include <ctype.h>
diff --git a/games/hack/hack.do.c b/games/hack/hack.do.c
index b9af55da088..bade7dead09 100644
--- a/games/hack/hack.do.c
+++ b/games/hack/hack.do.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.do.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.do.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.do.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
/* Contains code for 'd', 'D' (drop), '>', '<' (up, down) and 't' (throw) */
#include <stdlib.h>
diff --git a/games/hack/hack.do_name.c b/games/hack/hack.do_name.c
index 143b068cfba..17decccd331 100644
--- a/games/hack/hack.do_name.c
+++ b/games/hack/hack.do_name.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.do_name.c,v 1.8 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.do_name.c,v 1.9 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.do_name.c,v 1.8 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/hack/hack.do_wear.c b/games/hack/hack.do_wear.c
index 8a904a8c0cd..d4f9f172550 100644
--- a/games/hack/hack.do_wear.c
+++ b/games/hack/hack.do_wear.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.do_wear.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.do_wear.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.do_wear.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include "hack.h"
diff --git a/games/hack/hack.dog.c b/games/hack/hack.dog.c
index b2411ef605d..104478e90e4 100644
--- a/games/hack/hack.dog.c
+++ b/games/hack/hack.dog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.dog.c,v 1.7 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.dog.c,v 1.8 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.dog.c,v 1.7 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
#include "hack.mfndpos.h"
extern struct monst *makemon();
diff --git a/games/hack/hack.eat.c b/games/hack/hack.eat.c
index 0a163602a8f..b39628b23a3 100644
--- a/games/hack/hack.eat.c
+++ b/games/hack/hack.eat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.eat.c,v 1.7 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.eat.c,v 1.8 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.eat.c,v 1.7 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include "hack.h"
char POISONOUS[] = "ADKSVabhks";
diff --git a/games/hack/hack.end.c b/games/hack/hack.end.c
index 542b9d5084f..9d87b4d6f14 100644
--- a/games/hack/hack.end.c
+++ b/games/hack/hack.end.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.end.c,v 1.9 2003/07/06 02:07:45 avsm Exp $ */
+/* $OpenBSD: hack.end.c,v 1.10 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.end.c,v 1.9 2003/07/06 02:07:45 avsm Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/hack/hack.engrave.c b/games/hack/hack.engrave.c
index c03ccf8b498..1692897e09c 100644
--- a/games/hack/hack.engrave.c
+++ b/games/hack/hack.engrave.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.engrave.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.engrave.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.engrave.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include "hack.h"
diff --git a/games/hack/hack.fight.c b/games/hack/hack.fight.c
index ad85644d20d..1fe6976dabd 100644
--- a/games/hack/hack.fight.c
+++ b/games/hack/hack.fight.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.fight.c,v 1.8 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.fight.c,v 1.9 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.fight.c,v 1.8 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include "hack.h"
extern struct permonst li_dog, dog, la_dog;
diff --git a/games/hack/hack.invent.c b/games/hack/hack.invent.c
index dbab8a1c9fb..5f0f9a09a5a 100644
--- a/games/hack/hack.invent.c
+++ b/games/hack/hack.invent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.invent.c,v 1.8 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.invent.c,v 1.9 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.invent.c,v 1.8 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/games/hack/hack.ioctl.c b/games/hack/hack.ioctl.c
index 86dfcb6bd8c..bf67a1d763b 100644
--- a/games/hack/hack.ioctl.c
+++ b/games/hack/hack.ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.ioctl.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.ioctl.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.ioctl.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
/* This cannot be part of hack.tty.c (as it was earlier) since on some
systems (e.g. MUNIX) the include files <termio.h> and <sgtty.h>
define the same constants, and the C preprocessor complains. */
diff --git a/games/hack/hack.lev.c b/games/hack/hack.lev.c
index 143f4dc32b7..2c09b520956 100644
--- a/games/hack/hack.lev.c
+++ b/games/hack/hack.lev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.lev.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.lev.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.lev.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/games/hack/hack.main.c b/games/hack/hack.main.c
index 5f69d9365c3..6c28c8738e5 100644
--- a/games/hack/hack.main.c
+++ b/games/hack/hack.main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.main.c,v 1.14 2005/05/01 02:43:12 djm Exp $ */
+/* $OpenBSD: hack.main.c,v 1.15 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.main.c,v 1.14 2005/05/01 02:43:12 djm Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
diff --git a/games/hack/hack.makemon.c b/games/hack/hack.makemon.c
index afb8d50580e..c97cf179eca 100644
--- a/games/hack/hack.makemon.c
+++ b/games/hack/hack.makemon.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.makemon.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.makemon.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.makemon.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
extern char fut_geno[];
extern struct obj *mkobj_at();
diff --git a/games/hack/hack.mhitu.c b/games/hack/hack.mhitu.c
index ac9fa5b4cb6..e4c4c744013 100644
--- a/games/hack/hack.mhitu.c
+++ b/games/hack/hack.mhitu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.mhitu.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.mhitu.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.mhitu.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
extern struct monst *makemon();
diff --git a/games/hack/hack.mklev.c b/games/hack/hack.mklev.c
index 366bc7e0037..8d673e0cb29 100644
--- a/games/hack/hack.mklev.c
+++ b/games/hack/hack.mklev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.mklev.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.mklev.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.mklev.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/games/hack/hack.mkmaze.c b/games/hack/hack.mkmaze.c
index 6d67455d58c..c2631c1bae5 100644
--- a/games/hack/hack.mkmaze.c
+++ b/games/hack/hack.mkmaze.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.mkmaze.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.mkmaze.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.mkmaze.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
extern struct permonst pm_wizard;
struct permonst hell_hound =
diff --git a/games/hack/hack.mkobj.c b/games/hack/hack.mkobj.c
index b0d083ffa6b..196ac3ad53a 100644
--- a/games/hack/hack.mkobj.c
+++ b/games/hack/hack.mkobj.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.mkobj.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.mkobj.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.mkobj.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
char mkobjstr[] = "))[[!!!!????%%%%/=**))[[!!!!????%%%%/=**(%";
diff --git a/games/hack/hack.mkshop.c b/games/hack/hack.mkshop.c
index 58760af88e8..165e32330b0 100644
--- a/games/hack/hack.mkshop.c
+++ b/games/hack/hack.mkshop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.mkshop.c,v 1.7 2003/05/19 06:36:30 pjanzen Exp $ */
+/* $OpenBSD: hack.mkshop.c,v 1.8 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.mkshop.c,v 1.7 2003/05/19 06:36:30 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#ifndef QUEST
#include "hack.h"
diff --git a/games/hack/hack.mon.c b/games/hack/hack.mon.c
index 0111df0d91e..07c2a7eb664 100644
--- a/games/hack/hack.mon.c
+++ b/games/hack/hack.mon.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.mon.c,v 1.7 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.mon.c,v 1.8 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.mon.c,v 1.7 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include "hack.h"
#include "hack.mfndpos.h"
diff --git a/games/hack/hack.monst.c b/games/hack/hack.monst.c
index 7964f9e44c0..d9dd0857607 100644
--- a/games/hack/hack.monst.c
+++ b/games/hack/hack.monst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.monst.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.monst.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.monst.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
#include "def.eshk.h"
extern char plname[PL_NSIZ];
diff --git a/games/hack/hack.o_init.c b/games/hack/hack.o_init.c
index 958bd68a914..ee4c0c27e04 100644
--- a/games/hack/hack.o_init.c
+++ b/games/hack/hack.o_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.o_init.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.o_init.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.o_init.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <string.h>
#include "config.h" /* for typedefs */
diff --git a/games/hack/hack.objnam.c b/games/hack/hack.objnam.c
index 98648edfa7e..db58dafb13b 100644
--- a/games/hack/hack.objnam.c
+++ b/games/hack/hack.objnam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.objnam.c,v 1.8 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.objnam.c,v 1.9 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.objnam.c,v 1.8 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/hack/hack.options.c b/games/hack/hack.options.c
index df669911f49..efae51c793c 100644
--- a/games/hack/hack.options.c
+++ b/games/hack/hack.options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.options.c,v 1.8 2003/07/06 02:07:45 avsm Exp $ */
+/* $OpenBSD: hack.options.c,v 1.9 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.options.c,v 1.8 2003/07/06 02:07:45 avsm Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/hack/hack.pager.c b/games/hack/hack.pager.c
index da62843d16b..3625f7c3f23 100644
--- a/games/hack/hack.pager.c
+++ b/games/hack/hack.pager.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.pager.c,v 1.17 2009/06/03 14:47:47 chl Exp $ */
+/* $OpenBSD: hack.pager.c,v 1.18 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.pager.c,v 1.17 2009/06/03 14:47:47 chl Exp $";
-#endif /* not lint */
-
/* This file contains the command routine dowhatis() and a pager. */
/* Also readmail() and doshell(), and generally the things that
contact the outside world. */
diff --git a/games/hack/hack.potion.c b/games/hack/hack.potion.c
index 61c73737835..b23962f2c40 100644
--- a/games/hack/hack.potion.c
+++ b/games/hack/hack.potion.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.potion.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.potion.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.potion.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
extern char *nomovemsg;
extern struct monst youmonst;
diff --git a/games/hack/hack.pri.c b/games/hack/hack.pri.c
index 483208aafb8..18336998c32 100644
--- a/games/hack/hack.pri.c
+++ b/games/hack/hack.pri.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.pri.c,v 1.9 2003/05/19 09:00:54 pjanzen Exp $ */
+/* $OpenBSD: hack.pri.c,v 1.10 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.pri.c,v 1.9 2003/05/19 09:00:54 pjanzen Exp $";
-#endif /* not lint */
-
#include <curses.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/hack/hack.read.c b/games/hack/hack.read.c
index 53709fc5e9d..a4ac8bc6cb6 100644
--- a/games/hack/hack.read.c
+++ b/games/hack/hack.read.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.read.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.read.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.read.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include "hack.h"
diff --git a/games/hack/hack.rip.c b/games/hack/hack.rip.c
index 386e0cbe725..c1db2a0a644 100644
--- a/games/hack/hack.rip.c
+++ b/games/hack/hack.rip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.rip.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.rip.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.rip.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include "hack.h"
diff --git a/games/hack/hack.rumors.c b/games/hack/hack.rumors.c
index 4ccfab757a2..446b9a76310 100644
--- a/games/hack/hack.rumors.c
+++ b/games/hack/hack.rumors.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.rumors.c,v 1.6 2007/09/11 15:21:05 gilles Exp $ */
+/* $OpenBSD: hack.rumors.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.rumors.c,v 1.6 2007/09/11 15:21:05 gilles Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include "hack.h" /* for RUMORFILE and BSD (index) */
#define CHARSZ 8 /* number of bits in a char */
diff --git a/games/hack/hack.save.c b/games/hack/hack.save.c
index ebc8bd75796..9daac9936bb 100644
--- a/games/hack/hack.save.c
+++ b/games/hack/hack.save.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.save.c,v 1.8 2006/10/11 20:56:59 deraadt Exp $ */
+/* $OpenBSD: hack.save.c,v 1.9 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.save.c,v 1.8 2006/10/11 20:56:59 deraadt Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
diff --git a/games/hack/hack.search.c b/games/hack/hack.search.c
index 0b9a5f4a74e..3a1d865d126 100644
--- a/games/hack/hack.search.c
+++ b/games/hack/hack.search.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.search.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.search.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.search.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
int
diff --git a/games/hack/hack.shk.c b/games/hack/hack.shk.c
index eb72e05571a..9d314e91923 100644
--- a/games/hack/hack.shk.c
+++ b/games/hack/hack.shk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.shk.c,v 1.10 2003/07/06 02:07:45 avsm Exp $ */
+/* $OpenBSD: hack.shk.c,v 1.11 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.shk.c,v 1.10 2003/07/06 02:07:45 avsm Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include "hack.h"
diff --git a/games/hack/hack.shknam.c b/games/hack/hack.shknam.c
index 4a7aa133e73..afbdaa121b3 100644
--- a/games/hack/hack.shknam.c
+++ b/games/hack/hack.shknam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.shknam.c,v 1.7 2003/07/06 02:07:45 avsm Exp $ */
+/* $OpenBSD: hack.shknam.c,v 1.8 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.shknam.c,v 1.7 2003/07/06 02:07:45 avsm Exp $";
-#endif /* not lint */
-
#include "hack.h"
char *shkliquors[] = {
diff --git a/games/hack/hack.steal.c b/games/hack/hack.steal.c
index bc342c09b74..7107f59a11e 100644
--- a/games/hack/hack.steal.c
+++ b/games/hack/hack.steal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.steal.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.steal.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.steal.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include "hack.h"
diff --git a/games/hack/hack.termcap.c b/games/hack/hack.termcap.c
index 826f483e595..2674be3e5fc 100644
--- a/games/hack/hack.termcap.c
+++ b/games/hack/hack.termcap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.termcap.c,v 1.7 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.termcap.c,v 1.8 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.termcap.c,v 1.7 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/games/hack/hack.timeout.c b/games/hack/hack.timeout.c
index bc85902f783..481a360442a 100644
--- a/games/hack/hack.timeout.c
+++ b/games/hack/hack.timeout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.timeout.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.timeout.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.timeout.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
static void stoned_dialogue(void);
diff --git a/games/hack/hack.topl.c b/games/hack/hack.topl.c
index 53a32eae47d..baabb08304c 100644
--- a/games/hack/hack.topl.c
+++ b/games/hack/hack.topl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.topl.c,v 1.8 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.topl.c,v 1.9 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.topl.c,v 1.8 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
diff --git a/games/hack/hack.track.c b/games/hack/hack.track.c
index fe864f2a481..57f9284a15a 100644
--- a/games/hack/hack.track.c
+++ b/games/hack/hack.track.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.track.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.track.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.track.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
#define UTSZ 50
diff --git a/games/hack/hack.trap.c b/games/hack/hack.trap.c
index 8e71d6bfd66..24188d916aa 100644
--- a/games/hack/hack.trap.c
+++ b/games/hack/hack.trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.trap.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.trap.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.trap.c,v 1.6 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdlib.h>
#include "hack.h"
diff --git a/games/hack/hack.tty.c b/games/hack/hack.tty.c
index 2f99a505c3e..6c8765057af 100644
--- a/games/hack/hack.tty.c
+++ b/games/hack/hack.tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.tty.c,v 1.10 2005/04/16 14:19:51 deraadt Exp $ */
+/* $OpenBSD: hack.tty.c,v 1.11 2009/10/27 23:59:25 deraadt Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)hack.tty.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: hack.tty.c,v 1.10 2005/04/16 14:19:51 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
* Amsterdam
diff --git a/games/hack/hack.u_init.c b/games/hack/hack.u_init.c
index a1642e5eba4..ff2adadf163 100644
--- a/games/hack/hack.u_init.c
+++ b/games/hack/hack.u_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.u_init.c,v 1.8 2003/07/06 02:07:45 avsm Exp $ */
+/* $OpenBSD: hack.u_init.c,v 1.9 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.u_init.c,v 1.8 2003/07/06 02:07:45 avsm Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/hack/hack.unix.c b/games/hack/hack.unix.c
index 6a7ee74a0e3..8017b810cb1 100644
--- a/games/hack/hack.unix.c
+++ b/games/hack/hack.unix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.unix.c,v 1.13 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.unix.c,v 1.14 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.unix.c,v 1.13 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
/* This file collects some Unix dependencies; hack.pager.c contains some more */
/*
diff --git a/games/hack/hack.vault.c b/games/hack/hack.vault.c
index ec260df705f..d37b2c7fa4c 100644
--- a/games/hack/hack.vault.c
+++ b/games/hack/hack.vault.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.vault.c,v 1.6 2003/05/19 09:00:54 pjanzen Exp $ */
+/* $OpenBSD: hack.vault.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.vault.c,v 1.6 2003/05/19 09:00:54 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include "hack.h"
#ifdef QUEST
diff --git a/games/hack/hack.version.c b/games/hack/hack.version.c
index 1ea0fe728c7..90dbc07faba 100644
--- a/games/hack/hack.version.c
+++ b/games/hack/hack.version.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.version.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.version.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.version.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "date.h"
#include "hack.h"
diff --git a/games/hack/hack.wield.c b/games/hack/hack.wield.c
index 82cb9aac148..ecbadf1bb13 100644
--- a/games/hack/hack.wield.c
+++ b/games/hack/hack.wield.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.wield.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.wield.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.wield.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
extern struct obj zeroobj;
diff --git a/games/hack/hack.wizard.c b/games/hack/hack.wizard.c
index 619106d8ecd..36cf021782a 100644
--- a/games/hack/hack.wizard.c
+++ b/games/hack/hack.wizard.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.wizard.c,v 1.5 2003/05/19 09:00:54 pjanzen Exp $ */
+/* $OpenBSD: hack.wizard.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.wizard.c,v 1.5 2003/05/19 09:00:54 pjanzen Exp $";
-#endif /* not lint */
-
/* wizard code - inspired by rogue code from Merlyn Leroy (digi-g!brian) */
#include <stdlib.h>
diff --git a/games/hack/hack.worm.c b/games/hack/hack.worm.c
index b57d9dbd04b..7b03b536d03 100644
--- a/games/hack/hack.worm.c
+++ b/games/hack/hack.worm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.worm.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.worm.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.worm.c,v 1.5 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include "hack.h"
#ifndef NOWORM
diff --git a/games/hack/hack.worn.c b/games/hack/hack.worn.c
index a9c3c211365..059d42992ec 100644
--- a/games/hack/hack.worn.c
+++ b/games/hack/hack.worn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.worn.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: hack.worn.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.worn.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#include "hack.h"
struct worn {
diff --git a/games/hack/hack.zap.c b/games/hack/hack.zap.c
index 1695734aa0d..445150a7ce4 100644
--- a/games/hack/hack.zap.c
+++ b/games/hack/hack.zap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hack.zap.c,v 1.9 2004/09/17 21:07:26 mickey Exp $ */
+/* $OpenBSD: hack.zap.c,v 1.10 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hack.zap.c,v 1.9 2004/09/17 21:07:26 mickey Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include "hack.h"
diff --git a/games/hack/makedefs.c b/games/hack/makedefs.c
index c62b3dbd535..44d117efee1 100644
--- a/games/hack/makedefs.c
+++ b/games/hack/makedefs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: makedefs.c,v 1.6 2003/05/19 09:00:54 pjanzen Exp $ */
+/* $OpenBSD: makedefs.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: makedefs.c,v 1.6 2003/05/19 09:00:54 pjanzen Exp $";
-#endif /* not lint */
-
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/hack/rnd.c b/games/hack/rnd.c
index b76a96abd5f..dadf143f8c1 100644
--- a/games/hack/rnd.c
+++ b/games/hack/rnd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rnd.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $ */
+/* $OpenBSD: rnd.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -61,10 +61,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: rnd.c,v 1.4 2003/05/19 06:30:56 pjanzen Exp $";
-#endif /* not lint */
-
#define RND(x) ((random()>>3) % x)
#include <stdlib.h>
diff --git a/games/hangman/endgame.c b/games/hangman/endgame.c
index 3fdf768a621..819febccf3a 100644
--- a/games/hangman/endgame.c
+++ b/games/hangman/endgame.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: endgame.c,v 1.5 2004/11/29 08:52:28 jsg Exp $ */
+/* $OpenBSD: endgame.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: endgame.c,v 1.3 1995/03/23 08:32:40 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)endgame.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: endgame.c,v 1.5 2004/11/29 08:52:28 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include "hangman.h"
/*
diff --git a/games/hangman/extern.c b/games/hangman/extern.c
index 128ab216034..7b66d2cc446 100644
--- a/games/hangman/extern.c
+++ b/games/hangman/extern.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.c,v 1.5 2008/04/01 21:05:50 miod Exp $ */
+/* $OpenBSD: extern.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: extern.c,v 1.3 1995/03/23 08:32:41 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: extern.c,v 1.5 2008/04/01 21:05:50 miod Exp $";
-#endif
-#endif /* not lint */
-
#include "hangman.h"
bool Guessed[26];
diff --git a/games/hangman/getguess.c b/games/hangman/getguess.c
index 59e8082eea0..ba3301c655d 100644
--- a/games/hangman/getguess.c
+++ b/games/hangman/getguess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getguess.c,v 1.8 2008/04/01 21:05:50 miod Exp $ */
+/* $OpenBSD: getguess.c,v 1.9 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: getguess.c,v 1.5 1995/03/23 08:32:43 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)getguess.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: getguess.c,v 1.8 2008/04/01 21:05:50 miod Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/ttydefaults.h>
#include "hangman.h"
diff --git a/games/hangman/getword.c b/games/hangman/getword.c
index f0978f91cfa..d50d6b4abae 100644
--- a/games/hangman/getword.c
+++ b/games/hangman/getword.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getword.c,v 1.6 2006/10/24 17:20:41 moritz Exp $ */
+/* $OpenBSD: getword.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: getword.c,v 1.4 1995/03/23 08:32:45 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)getword.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: getword.c,v 1.6 2006/10/24 17:20:41 moritz Exp $";
-#endif
-#endif /* not lint */
-
#include <stdlib.h>
#include "hangman.h"
#include "pathnames.h"
diff --git a/games/hangman/main.c b/games/hangman/main.c
index bda43f64e3a..206e3cae39f 100644
--- a/games/hangman/main.c
+++ b/games/hangman/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.10 2008/04/01 21:05:50 miod Exp $ */
+/* $OpenBSD: main.c,v 1.11 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: main.c,v 1.3 1995/03/23 08:32:50 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[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.10 2008/04/01 21:05:50 miod Exp $";
-#endif
-#endif /* not lint */
-
# include "hangman.h"
#include <paths.h>
diff --git a/games/hangman/playgame.c b/games/hangman/playgame.c
index 8591fc7b22c..853c057062d 100644
--- a/games/hangman/playgame.c
+++ b/games/hangman/playgame.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: playgame.c,v 1.7 2008/04/01 21:05:50 miod Exp $ */
+/* $OpenBSD: playgame.c,v 1.8 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: playgame.c,v 1.3 1995/03/23 08:32:53 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)playgame.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: playgame.c,v 1.7 2008/04/01 21:05:50 miod Exp $";
-#endif
-#endif /* not lint */
-
#include "hangman.h"
/*
diff --git a/games/hangman/prdata.c b/games/hangman/prdata.c
index 541dc5a34e8..2d7765558a4 100644
--- a/games/hangman/prdata.c
+++ b/games/hangman/prdata.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prdata.c,v 1.5 2004/11/29 08:52:28 jsg Exp $ */
+/* $OpenBSD: prdata.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: prdata.c,v 1.3 1995/03/23 08:32:54 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)prdata.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: prdata.c,v 1.5 2004/11/29 08:52:28 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include "hangman.h"
/*
diff --git a/games/hangman/prman.c b/games/hangman/prman.c
index bf24b2db2eb..b43265ef811 100644
--- a/games/hangman/prman.c
+++ b/games/hangman/prman.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prman.c,v 1.5 2004/11/29 08:52:28 jsg Exp $ */
+/* $OpenBSD: prman.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: prman.c,v 1.3 1995/03/23 08:32:56 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)prman.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: prman.c,v 1.5 2004/11/29 08:52:28 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include "hangman.h"
/*
diff --git a/games/hangman/prword.c b/games/hangman/prword.c
index 3872522b136..309d0501a4c 100644
--- a/games/hangman/prword.c
+++ b/games/hangman/prword.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prword.c,v 1.4 2004/11/29 08:52:28 jsg Exp $ */
+/* $OpenBSD: prword.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: prword.c,v 1.3 1995/03/23 08:32:58 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)prword.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: prword.c,v 1.4 2004/11/29 08:52:28 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include "hangman.h"
/*
diff --git a/games/hangman/setup.c b/games/hangman/setup.c
index ea96c85c54b..453fd4b2bc7 100644
--- a/games/hangman/setup.c
+++ b/games/hangman/setup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setup.c,v 1.9 2008/04/01 21:05:50 miod Exp $ */
+/* $OpenBSD: setup.c,v 1.10 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: setup.c,v 1.3 1995/03/23 08:32:59 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)setup.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: setup.c,v 1.9 2008/04/01 21:05:50 miod Exp $";
-#endif
-#endif /* not lint */
-
#include <time.h>
#include "hangman.h"
diff --git a/games/mille/comp.c b/games/mille/comp.c
index 2f5533291bb..044403606f4 100644
--- a/games/mille/comp.c
+++ b/games/mille/comp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: comp.c,v 1.6 2006/03/27 00:10:15 tedu Exp $ */
+/* $OpenBSD: comp.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: comp.c,v 1.4 1995/03/24 05:01:11 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)comp.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: comp.c,v 1.6 2006/03/27 00:10:15 tedu Exp $";
-#endif
-#endif /* not lint */
-
# include "mille.h"
/*
diff --git a/games/mille/end.c b/games/mille/end.c
index 281a57c5b24..37c799cb4ee 100644
--- a/games/mille/end.c
+++ b/games/mille/end.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: end.c,v 1.5 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: end.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: end.c,v 1.4 1995/03/24 05:01:30 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)end.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: end.c,v 1.5 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "mille.h"
/*
diff --git a/games/mille/extern.c b/games/mille/extern.c
index b069343e713..c84f20eaf17 100644
--- a/games/mille/extern.c
+++ b/games/mille/extern.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.c,v 1.5 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: extern.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: extern.c,v 1.4 1995/03/24 05:01:36 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: extern.c,v 1.5 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
# include "mille.h"
/*
diff --git a/games/mille/init.c b/games/mille/init.c
index fd994e9ecc5..87a6e0bc813 100644
--- a/games/mille/init.c
+++ b/games/mille/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.5 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: init.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: init.c,v 1.5 1995/03/24 05:01:40 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.5 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
# include "mille.h"
/*
diff --git a/games/mille/mille.c b/games/mille/mille.c
index 0d8e9d5fd83..0335c38a80a 100644
--- a/games/mille/mille.c
+++ b/games/mille/mille.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mille.c,v 1.17 2009/10/17 22:03:44 sobrado Exp $ */
+/* $OpenBSD: mille.c,v 1.18 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: mille.c,v 1.4 1995/03/24 05:01:48 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1982, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mille.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: mille.c,v 1.17 2009/10/17 22:03:44 sobrado Exp $";
-#endif
-#endif /* not lint */
-
# include "mille.h"
# include <signal.h>
diff --git a/games/mille/misc.c b/games/mille/misc.c
index 57ac4229f9a..80e5d111f2f 100644
--- a/games/mille/misc.c
+++ b/games/mille/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.9 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: misc.c,v 1.10 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.4 1995/03/24 05:01:54 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.9 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/file.h>
#include <termios.h>
#include <stdarg.h>
diff --git a/games/mille/move.c b/games/mille/move.c
index 84722a6464b..9e1f97af09a 100644
--- a/games/mille/move.c
+++ b/games/mille/move.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: move.c,v 1.10 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: move.c,v 1.11 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: move.c,v 1.4 1995/03/24 05:01:57 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: move.c,v 1.10 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#ifdef DEBUG
#include <sys/param.h>
#endif
diff --git a/games/mille/print.c b/games/mille/print.c
index 31aa807380c..9b4d693552c 100644
--- a/games/mille/print.c
+++ b/games/mille/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.5 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: print.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: print.c,v 1.4 1995/03/24 05:02:02 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.5 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
# include "mille.h"
/*
diff --git a/games/mille/roll.c b/games/mille/roll.c
index 846cb6044d2..44864ddd96d 100644
--- a/games/mille/roll.c
+++ b/games/mille/roll.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: roll.c,v 1.4 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: roll.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $ */
/* $NetBSD: roll.c,v 1.4 1995/03/24 05:02:07 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)roll.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: roll.c,v 1.4 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
# include "mille.h"
/*
diff --git a/games/mille/save.c b/games/mille/save.c
index 94597430878..9d44ca32580 100644
--- a/games/mille/save.c
+++ b/games/mille/save.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: save.c,v 1.7 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: save.c,v 1.8 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: save.c,v 1.4 1995/03/24 05:02:13 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: save.c,v 1.7 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <time.h>
#include "mille.h"
diff --git a/games/mille/types.c b/games/mille/types.c
index 04a7f08e0db..7c598537222 100644
--- a/games/mille/types.c
+++ b/games/mille/types.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.c,v 1.6 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: types.c,v 1.7 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: types.c,v 1.4 1995/03/24 05:02:22 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)types.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: types.c,v 1.6 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
# include "mille.h"
/*
diff --git a/games/mille/varpush.c b/games/mille/varpush.c
index 4b6bbe29541..5d2855315e4 100644
--- a/games/mille/varpush.c
+++ b/games/mille/varpush.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: varpush.c,v 1.6 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: varpush.c,v 1.7 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: varpush.c,v 1.4 1995/03/24 05:02:35 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)varpush.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: varpush.c,v 1.6 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
# include <paths.h>
# include "mille.h"
diff --git a/games/monop/cards.c b/games/monop/cards.c
index f82fc03cec8..4ceb220f9cf 100644
--- a/games/monop/cards.c
+++ b/games/monop/cards.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cards.c,v 1.8 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: cards.c,v 1.9 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: cards.c,v 1.3 1995/03/23 08:34:35 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cards.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: cards.c,v 1.8 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include "monop.ext"
#include "pathnames.h"
diff --git a/games/monop/execute.c b/games/monop/execute.c
index 34e777bb8df..ee2361447a7 100644
--- a/games/monop/execute.c
+++ b/games/monop/execute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: execute.c,v 1.8 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: execute.c,v 1.9 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: execute.c,v 1.3 1995/03/23 08:34:38 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)execute.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: execute.c,v 1.8 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "monop.ext"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/games/monop/getinp.c b/games/monop/getinp.c
index f6684fe3465..ad93241656a 100644
--- a/games/monop/getinp.c
+++ b/games/monop/getinp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getinp.c,v 1.8 2007/03/02 04:32:32 ray Exp $ */
+/* $OpenBSD: getinp.c,v 1.9 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: getinp.c,v 1.4 1995/04/24 12:24:20 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)getinp.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: getinp.c,v 1.8 2007/03/02 04:32:32 ray Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <string.h>
#include <ctype.h>
diff --git a/games/monop/houses.c b/games/monop/houses.c
index cf2acd4f31d..bfa62738c7e 100644
--- a/games/monop/houses.c
+++ b/games/monop/houses.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: houses.c,v 1.7 2008/11/10 18:02:17 sthen Exp $ */
+/* $OpenBSD: houses.c,v 1.8 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: houses.c,v 1.3 1995/03/23 08:34:40 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)houses.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: houses.c,v 1.7 2008/11/10 18:02:17 sthen Exp $";
-#endif
-#endif /* not lint */
-
# include "monop.ext"
static char *names[N_MON+2],
diff --git a/games/monop/initdeck.c b/games/monop/initdeck.c
index 165f153408e..7b51519108c 100644
--- a/games/monop/initdeck.c
+++ b/games/monop/initdeck.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: initdeck.c,v 1.12 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: initdeck.c,v 1.13 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: initdeck.c,v 1.3 1995/03/23 08:34:43 cgd 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 char sccsid[] = "@(#)initdeck.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: initdeck.c,v 1.12 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/monop/jail.c b/games/monop/jail.c
index ef763f29a3a..c794732d46a 100644
--- a/games/monop/jail.c
+++ b/games/monop/jail.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: jail.c,v 1.4 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: jail.c,v 1.5 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: jail.c,v 1.3 1995/03/23 08:34:44 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)jail.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: jail.c,v 1.4 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "monop.ext"
/*
diff --git a/games/monop/misc.c b/games/monop/misc.c
index 112001987a1..1fc01e0ec19 100644
--- a/games/monop/misc.c
+++ b/games/monop/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.9 2006/03/27 00:10:15 tedu Exp $ */
+/* $OpenBSD: misc.c,v 1.10 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.4 1995/03/23 08:34:47 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: misc.c,v 1.9 2006/03/27 00:10:15 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include "monop.ext"
#include <ctype.h>
#include <signal.h>
diff --git a/games/monop/monop.c b/games/monop/monop.c
index c249c94a01d..918557d13d5 100644
--- a/games/monop/monop.c
+++ b/games/monop/monop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monop.c,v 1.9 2007/09/11 15:21:05 gilles Exp $ */
+/* $OpenBSD: monop.c,v 1.10 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: monop.c,v 1.3 1995/03/23 08:34:52 cgd 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 char sccsid[] = "@(#)monop.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: monop.c,v 1.9 2007/09/11 15:21:05 gilles Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/games/monop/morg.c b/games/monop/morg.c
index c7e439bb62d..6172aa2914f 100644
--- a/games/monop/morg.c
+++ b/games/monop/morg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: morg.c,v 1.5 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: morg.c,v 1.6 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: morg.c,v 1.4 1995/03/23 08:35:02 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)morg.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: morg.c,v 1.5 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
# include "monop.ext"
/*
diff --git a/games/monop/print.c b/games/monop/print.c
index ece2b451b12..52ef3751e3c 100644
--- a/games/monop/print.c
+++ b/games/monop/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.5 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: print.c,v 1.6 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: print.c,v 1.3 1995/03/23 08:35:05 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: print.c,v 1.5 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "monop.ext"
static const char *header = "Name Own Price Mg # Rent";
diff --git a/games/monop/prop.c b/games/monop/prop.c
index a5613b259c3..45f350bc710 100644
--- a/games/monop/prop.c
+++ b/games/monop/prop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prop.c,v 1.6 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: prop.c,v 1.7 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: prop.c,v 1.3 1995/03/23 08:35:06 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)prop.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: prop.c,v 1.6 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include "monop.ext"
diff --git a/games/monop/rent.c b/games/monop/rent.c
index 7b91474cc06..5984bb7c1ba 100644
--- a/games/monop/rent.c
+++ b/games/monop/rent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rent.c,v 1.4 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: rent.c,v 1.5 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: rent.c,v 1.3 1995/03/23 08:35:11 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)rent.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: rent.c,v 1.4 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "monop.ext"
/*
diff --git a/games/monop/roll.c b/games/monop/roll.c
index fbf0f6cee33..9d7f45967e3 100644
--- a/games/monop/roll.c
+++ b/games/monop/roll.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: roll.c,v 1.4 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: roll.c,v 1.5 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: roll.c,v 1.5 1995/03/23 08:35:13 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)roll.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: roll.c,v 1.4 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdlib.h>
/*
diff --git a/games/monop/spec.c b/games/monop/spec.c
index 1bf1552aee9..68f19fe22ff 100644
--- a/games/monop/spec.c
+++ b/games/monop/spec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spec.c,v 1.4 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: spec.c,v 1.5 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: spec.c,v 1.3 1995/03/23 08:35:16 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)spec.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: spec.c,v 1.4 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "monop.ext"
static char *perc[] = {
diff --git a/games/monop/trade.c b/games/monop/trade.c
index b8155be5873..bb3fe3f5ed2 100644
--- a/games/monop/trade.c
+++ b/games/monop/trade.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trade.c,v 1.5 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: trade.c,v 1.6 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: trade.c,v 1.3 1995/03/23 08:35:19 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)trade.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: trade.c,v 1.5 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "monop.ext"
struct trd_st { /* how much to give to other player */
diff --git a/games/morse/morse.c b/games/morse/morse.c
index 8d6a8d2763c..c362cf03612 100644
--- a/games/morse/morse.c
+++ b/games/morse/morse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: morse.c,v 1.13 2005/11/07 19:09:33 jmc Exp $ */
+/* $OpenBSD: morse.c,v 1.14 2009/10/27 23:59:26 deraadt Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -29,20 +29,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[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: morse.c,v 1.13 2005/11/07 19:09:33 jmc Exp $";
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/number/number.c b/games/number/number.c
index f17fd5a9da1..f58bc7de701 100644
--- a/games/number/number.c
+++ b/games/number/number.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: number.c,v 1.13 2005/11/05 22:55:37 jmc Exp $ */
+/* $OpenBSD: number.c,v 1.14 2009/10/27 23:59:26 deraadt Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -29,20 +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
-#if 0
-static char sccsid[] = "@(#)number.c 8.3 (Berkeley) 5/4/95";
-#else
-static char rcsid[] = "$OpenBSD: number.c,v 1.13 2005/11/05 22:55:37 jmc Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/games/pig/pig.c b/games/pig/pig.c
index cc8e2b80455..1dfd76801f2 100644
--- a/games/pig/pig.c
+++ b/games/pig/pig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pig.c,v 1.10 2004/07/10 07:26:23 deraadt Exp $ */
+/* $OpenBSD: pig.c,v 1.11 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: pig.c,v 1.2 1995/03/23 08:41:40 cgd Exp $ */
/*-
@@ -30,20 +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[] = "@(#)pig.c 8.2 (Berkeley) 5/4/95";
-#else
-static char rcsid[] = "$OpenBSD: pig.c,v 1.10 2004/07/10 07:26:23 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/games/pom/pom.c b/games/pom/pom.c
index 2c70fcf2659..70cc2d565b9 100644
--- a/games/pom/pom.c
+++ b/games/pom/pom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pom.c,v 1.12 2005/11/05 21:25:00 jmc Exp $ */
+/* $OpenBSD: pom.c,v 1.13 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: pom.c,v 1.6 1996/02/06 22:47:29 jtc Exp $ */
/*
@@ -32,20 +32,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[] = "@(#)pom.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: pom.c,v 1.12 2005/11/05 21:25:00 jmc Exp $";
-#endif
-#endif /* not lint */
-
/*
* Phase of the Moon. Calculates the current phase of the moon.
* Based on routines from `Practical Astronomy with Your Calculator',
diff --git a/games/ppt/ppt.c b/games/ppt/ppt.c
index b2ff7dbaab9..765ceb3acc7 100644
--- a/games/ppt/ppt.c
+++ b/games/ppt/ppt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppt.c,v 1.10 2003/07/10 00:03:01 david Exp $ */
+/* $OpenBSD: ppt.c,v 1.11 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: ppt.c,v 1.4 1995/03/23 08:35:40 cgd Exp $ */
/*
@@ -30,20 +30,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 const char sccsid[] = "@(#)ppt.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: ppt.c,v 1.10 2003/07/10 00:03:01 david Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
#include <stdio.h>
diff --git a/games/primes/pattern.c b/games/primes/pattern.c
index 850ba75065b..a3e2737f83b 100644
--- a/games/primes/pattern.c
+++ b/games/primes/pattern.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pattern.c,v 1.4 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: pattern.c,v 1.5 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: pattern.c,v 1.3 1995/03/23 08:35:47 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pattern.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: pattern.c,v 1.4 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* pattern - the Eratosthenes sieve on odd numbers for 3,5,7,11 and 13
*
diff --git a/games/primes/pr_tbl.c b/games/primes/pr_tbl.c
index 9661e43aaec..fc0bed2aece 100644
--- a/games/primes/pr_tbl.c
+++ b/games/primes/pr_tbl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pr_tbl.c,v 1.4 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: pr_tbl.c,v 1.5 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: pr_tbl.c,v 1.3 1995/03/23 08:35:52 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pr_tbl.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: pr_tbl.c,v 1.4 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* prime - prime table
*
diff --git a/games/primes/primes.c b/games/primes/primes.c
index a42aefb6e22..0a54011ab07 100644
--- a/games/primes/primes.c
+++ b/games/primes/primes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: primes.c,v 1.14 2007/09/06 20:50:55 chl Exp $ */
+/* $OpenBSD: primes.c,v 1.15 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: primes.c,v 1.5 1995/04/24 12:24:47 cgd Exp $ */
/*
@@ -33,20 +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[] = "@(#)primes.c 8.5 (Berkeley) 5/10/95";
-#else
-static char rcsid[] = "$OpenBSD: primes.c,v 1.14 2007/09/06 20:50:55 chl Exp $";
-#endif
-#endif /* not lint */
-
/*
* primes - generate a table of primes between two values
*
diff --git a/games/quiz/quiz.c b/games/quiz/quiz.c
index be865ab910e..f25b3aec0c6 100644
--- a/games/quiz/quiz.c
+++ b/games/quiz/quiz.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: quiz.c,v 1.19 2008/10/03 13:00:06 deraadt Exp $ */
+/* $OpenBSD: quiz.c,v 1.20 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: quiz.c,v 1.9 1995/04/22 10:16:58 cgd Exp $ */
/*-
@@ -34,20 +34,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[] = "@(#)quiz.c 8.3 (Berkeley) 5/4/95";
-#else
-static char rcsid[] = "$OpenBSD: quiz.c,v 1.19 2008/10/03 13:00:06 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <errno.h>
#include <stdio.h>
diff --git a/games/quiz/rxp.c b/games/quiz/rxp.c
index f3ae83bbfc3..c64698e305e 100644
--- a/games/quiz/rxp.c
+++ b/games/quiz/rxp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rxp.c,v 1.7 2004/07/10 07:26:23 deraadt Exp $ */
+/* $OpenBSD: rxp.c,v 1.8 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: rxp.c,v 1.5 1995/04/22 10:17:00 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)rxp.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: rxp.c,v 1.7 2004/07/10 07:26:23 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* regular expression parser
*
diff --git a/games/rain/rain.c b/games/rain/rain.c
index 31cb0138854..86aac6f7cfe 100644
--- a/games/rain/rain.c
+++ b/games/rain/rain.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rain.c,v 1.14 2004/07/10 07:26:23 deraadt Exp $ */
+/* $OpenBSD: rain.c,v 1.15 2009/10/27 23:59:26 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,20 +29,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[] = "@(#)rain.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: rain.c,v 1.14 2004/07/10 07:26:23 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* rain 11/3/1980 EPS/CITHEP
* cc rain.c -o rain -O -ltermlib
diff --git a/games/random/random.c b/games/random/random.c
index cb8ee26af4f..2cf7d655150 100644
--- a/games/random/random.c
+++ b/games/random/random.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: random.c,v 1.11 2008/04/13 00:22:16 djm Exp $ */
+/* $OpenBSD: random.c,v 1.12 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: random.c,v 1.3 1995/04/22 07:44:05 cgd Exp $ */
/*
@@ -33,20 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)random.c 8.5 (Berkeley) 4/5/94";
-#else
-static char rcsid[] = "$OpenBSD: random.c,v 1.11 2008/04/13 00:22:16 djm Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <dev/rndvar.h>
diff --git a/games/robots/extern.c b/games/robots/extern.c
index ad0533bdf11..d0cecf34754 100644
--- a/games/robots/extern.c
+++ b/games/robots/extern.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.c,v 1.4 2003/06/03 03:01:40 millert Exp $ */
+/* $OpenBSD: extern.c,v 1.5 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: extern.c,v 1.3 1995/04/22 10:08:49 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: extern.c,v 1.4 2003/06/03 03:01:40 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "robots.h"
bool Dead; /* Player is now dead */
diff --git a/games/robots/init_field.c b/games/robots/init_field.c
index cd6890285ec..52bde5dd8e0 100644
--- a/games/robots/init_field.c
+++ b/games/robots/init_field.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_field.c,v 1.6 2004/11/29 08:52:28 jsg Exp $ */
+/* $OpenBSD: init_field.c,v 1.7 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: init_field.c,v 1.3 1995/04/22 10:08:52 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)init_field.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: init_field.c,v 1.6 2004/11/29 08:52:28 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include "robots.h"
/*
diff --git a/games/robots/main.c b/games/robots/main.c
index f21294a42b7..0c23a0ac935 100644
--- a/games/robots/main.c
+++ b/games/robots/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.16 2005/05/01 02:43:12 djm Exp $ */
+/* $OpenBSD: main.c,v 1.17 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: main.c,v 1.5 1995/04/22 10:08:54 cgd 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[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.16 2005/05/01 02:43:12 djm Exp $";
-#endif
-#endif /* not lint */
-
#include "robots.h"
void
diff --git a/games/robots/make_level.c b/games/robots/make_level.c
index 12f2e4aa86c..03f34e2d331 100644
--- a/games/robots/make_level.c
+++ b/games/robots/make_level.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: make_level.c,v 1.6 2004/11/29 08:52:28 jsg Exp $ */
+/* $OpenBSD: make_level.c,v 1.7 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: make_level.c,v 1.3 1995/04/22 10:08:56 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)make_level.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: make_level.c,v 1.6 2004/11/29 08:52:28 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include "robots.h"
/*
diff --git a/games/robots/move.c b/games/robots/move.c
index 73f7f6312d0..c187d268ac4 100644
--- a/games/robots/move.c
+++ b/games/robots/move.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: move.c,v 1.8 2004/11/29 08:52:28 jsg Exp $ */
+/* $OpenBSD: move.c,v 1.9 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: move.c,v 1.4 1995/04/22 10:08:58 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: move.c,v 1.8 2004/11/29 08:52:28 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include "robots.h"
#define ESC '\033'
diff --git a/games/robots/move_robs.c b/games/robots/move_robs.c
index 2c5a9ea5403..3939218019d 100644
--- a/games/robots/move_robs.c
+++ b/games/robots/move_robs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: move_robs.c,v 1.7 2004/11/29 08:52:28 jsg Exp $ */
+/* $OpenBSD: move_robs.c,v 1.8 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: move_robs.c,v 1.3 1995/04/22 10:08:59 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)move_robs.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: move_robs.c,v 1.7 2004/11/29 08:52:28 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include "robots.h"
/*
diff --git a/games/robots/play_level.c b/games/robots/play_level.c
index f50eaef6f9c..48e9476a1ab 100644
--- a/games/robots/play_level.c
+++ b/games/robots/play_level.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: play_level.c,v 1.8 2004/11/29 08:52:28 jsg Exp $ */
+/* $OpenBSD: play_level.c,v 1.9 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: play_level.c,v 1.3 1995/04/22 10:09:03 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)play_level.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: play_level.c,v 1.8 2004/11/29 08:52:28 jsg Exp $";
-#endif
-#endif /* not lint */
-
# include "robots.h"
/*
diff --git a/games/robots/query.c b/games/robots/query.c
index 498a8b7f5fb..6f98081b549 100644
--- a/games/robots/query.c
+++ b/games/robots/query.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: query.c,v 1.5 2004/11/29 08:52:29 jsg Exp $ */
+/* $OpenBSD: query.c,v 1.6 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: query.c,v 1.3 1995/04/22 10:09:05 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)query.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: query.c,v 1.5 2004/11/29 08:52:29 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include "robots.h"
/*
diff --git a/games/robots/rnd_pos.c b/games/robots/rnd_pos.c
index 734abd6c19a..b123430d9c7 100644
--- a/games/robots/rnd_pos.c
+++ b/games/robots/rnd_pos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rnd_pos.c,v 1.4 2004/11/29 08:52:29 jsg Exp $ */
+/* $OpenBSD: rnd_pos.c,v 1.5 2009/10/27 23:59:26 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)rnd_pos.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: rnd_pos.c,v 1.4 2004/11/29 08:52:29 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include "robots.h"
#define IS_SAME(p,y,x) ((p).y != -1 && (p).y == y && (p).x == x)
diff --git a/games/robots/score.c b/games/robots/score.c
index 2e0ada5d168..2b9fae1532a 100644
--- a/games/robots/score.c
+++ b/games/robots/score.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: score.c,v 1.9 2004/11/29 08:52:29 jsg Exp $ */
+/* $OpenBSD: score.c,v 1.10 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: score.c,v 1.3 1995/04/22 10:09:12 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: score.c,v 1.9 2004/11/29 08:52:29 jsg Exp $";
-#endif
-#endif /* not lint */
-
#include "robots.h"
#include "pathnames.h"
diff --git a/games/rogue/hit.c b/games/rogue/hit.c
index b1e49d06bf1..dc751ea00ac 100644
--- a/games/rogue/hit.c
+++ b/games/rogue/hit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hit.c,v 1.7 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: hit.c,v 1.8 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: hit.c,v 1.3 1995/04/22 10:27:30 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)hit.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: hit.c,v 1.7 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* hit.c
*
diff --git a/games/rogue/init.c b/games/rogue/init.c
index ebada22b573..2c93ebab551 100644
--- a/games/rogue/init.c
+++ b/games/rogue/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.11 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: init.c,v 1.12 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: init.c,v 1.4 1995/04/28 23:49:19 mycroft Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: init.c,v 1.11 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* init.c
*
diff --git a/games/rogue/inventory.c b/games/rogue/inventory.c
index 027a9e35eb6..e160ab37a47 100644
--- a/games/rogue/inventory.c
+++ b/games/rogue/inventory.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inventory.c,v 1.9 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: inventory.c,v 1.10 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: inventory.c,v 1.3 1995/04/22 10:27:35 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)inventory.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: inventory.c,v 1.9 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* inventory.c
*
diff --git a/games/rogue/level.c b/games/rogue/level.c
index bff445d19c7..19245b19da3 100644
--- a/games/rogue/level.c
+++ b/games/rogue/level.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: level.c,v 1.8 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: level.c,v 1.9 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: level.c,v 1.3 1995/04/22 10:27:37 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)level.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: level.c,v 1.8 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* level.c
*
diff --git a/games/rogue/machdep.c b/games/rogue/machdep.c
index 90cfc59f09c..9dae396f4df 100644
--- a/games/rogue/machdep.c
+++ b/games/rogue/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.11 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: machdep.c,v 1.12 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.5 1995/04/28 23:49:22 mycroft Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)machdep.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: machdep.c,v 1.11 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* machdep.c
*
diff --git a/games/rogue/main.c b/games/rogue/main.c
index 944230708a8..cc6d42ad941 100644
--- a/games/rogue/main.c
+++ b/games/rogue/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.6 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: main.c,v 1.7 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: main.c,v 1.3 1995/04/22 10:27:41 cgd Exp $ */
/*
@@ -33,20 +33,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[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: main.c,v 1.6 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* main.c
*
diff --git a/games/rogue/message.c b/games/rogue/message.c
index 5d5691afaef..0a7d370d946 100644
--- a/games/rogue/message.c
+++ b/games/rogue/message.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: message.c,v 1.12 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: message.c,v 1.13 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: message.c,v 1.5 1995/04/22 10:27:43 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)message.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: message.c,v 1.12 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* message.c
*
diff --git a/games/rogue/monster.c b/games/rogue/monster.c
index eab29297b60..2258d901b7a 100644
--- a/games/rogue/monster.c
+++ b/games/rogue/monster.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monster.c,v 1.8 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: monster.c,v 1.9 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: monster.c,v 1.3 1995/04/22 10:27:45 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)monster.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: monster.c,v 1.8 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* monster.c
*
diff --git a/games/rogue/move.c b/games/rogue/move.c
index 1d1fad677cb..33e6fb54c79 100644
--- a/games/rogue/move.c
+++ b/games/rogue/move.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: move.c,v 1.7 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: move.c,v 1.8 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: move.c,v 1.3 1995/04/22 10:27:47 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: move.c,v 1.7 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* move.c
*
diff --git a/games/rogue/object.c b/games/rogue/object.c
index f6d7c8ede94..87a4193845b 100644
--- a/games/rogue/object.c
+++ b/games/rogue/object.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: object.c,v 1.10 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: object.c,v 1.11 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: object.c,v 1.3 1995/04/22 10:27:50 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)object.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: object.c,v 1.10 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* object.c
*
diff --git a/games/rogue/pack.c b/games/rogue/pack.c
index d4d39fe3c71..4af04f04e5c 100644
--- a/games/rogue/pack.c
+++ b/games/rogue/pack.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pack.c,v 1.11 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: pack.c,v 1.12 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: pack.c,v 1.3 1995/04/22 10:27:54 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pack.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: pack.c,v 1.11 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* pack.c
*
diff --git a/games/rogue/play.c b/games/rogue/play.c
index 450e7d98c1a..99b083a4732 100644
--- a/games/rogue/play.c
+++ b/games/rogue/play.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: play.c,v 1.7 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: play.c,v 1.8 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: play.c,v 1.3 1995/04/22 10:28:04 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)play.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: play.c,v 1.7 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* play.c
*
diff --git a/games/rogue/random.c b/games/rogue/random.c
index f35b2ccc1e7..2cb9d491683 100644
--- a/games/rogue/random.c
+++ b/games/rogue/random.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: random.c,v 1.6 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: random.c,v 1.7 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: random.c,v 1.3 1995/04/22 10:28:06 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)random.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: random.c,v 1.6 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
#include "rogue.h"
/*
diff --git a/games/rogue/ring.c b/games/rogue/ring.c
index f76813e3b2c..0aecf4194ad 100644
--- a/games/rogue/ring.c
+++ b/games/rogue/ring.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ring.c,v 1.7 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: ring.c,v 1.8 2009/10/27 23:59:26 deraadt Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -32,14 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ring.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: ring.c,v 1.7 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* ring.c
*
diff --git a/games/rogue/room.c b/games/rogue/room.c
index 7a8f439e8c8..dcb65e82858 100644
--- a/games/rogue/room.c
+++ b/games/rogue/room.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: room.c,v 1.9 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: room.c,v 1.10 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: room.c,v 1.3 1995/04/22 10:28:17 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)room.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: room.c,v 1.9 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* room.c
*
diff --git a/games/rogue/save.c b/games/rogue/save.c
index 1dd64a2afc7..f62e43a9153 100644
--- a/games/rogue/save.c
+++ b/games/rogue/save.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: save.c,v 1.12 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: save.c,v 1.13 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: save.c,v 1.3 1995/04/22 10:28:21 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: save.c,v 1.12 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* save.c
*
diff --git a/games/rogue/score.c b/games/rogue/score.c
index 7bb31b274da..a3400714ff3 100644
--- a/games/rogue/score.c
+++ b/games/rogue/score.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: score.c,v 1.11 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: score.c,v 1.12 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: score.c,v 1.5 1995/04/22 10:28:26 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: score.c,v 1.11 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* score.c
*
diff --git a/games/rogue/spec_hit.c b/games/rogue/spec_hit.c
index 3bd7be37a01..edb1ef5702e 100644
--- a/games/rogue/spec_hit.c
+++ b/games/rogue/spec_hit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spec_hit.c,v 1.7 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: spec_hit.c,v 1.8 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: spec_hit.c,v 1.3 1995/04/22 10:28:29 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)spec_hit.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: spec_hit.c,v 1.7 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* special_hit.c
*
diff --git a/games/rogue/throw.c b/games/rogue/throw.c
index 4639716af9e..e40dd4acaa6 100644
--- a/games/rogue/throw.c
+++ b/games/rogue/throw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: throw.c,v 1.8 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: throw.c,v 1.9 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: throw.c,v 1.3 1995/04/22 10:28:32 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)throw.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: throw.c,v 1.8 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* throw.c
*
diff --git a/games/rogue/trap.c b/games/rogue/trap.c
index 5f0f1353fe0..f50f5d81e1d 100644
--- a/games/rogue/trap.c
+++ b/games/rogue/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.7 2006/03/08 09:44:35 otto Exp $ */
+/* $OpenBSD: trap.c,v 1.8 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: trap.c,v 1.3 1995/04/22 10:28:35 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)trap.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: trap.c,v 1.7 2006/03/08 09:44:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* trap.c
*
diff --git a/games/rogue/use.c b/games/rogue/use.c
index 09c04411c29..3291363a859 100644
--- a/games/rogue/use.c
+++ b/games/rogue/use.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: use.c,v 1.8 2006/03/08 09:44:36 otto Exp $ */
+/* $OpenBSD: use.c,v 1.9 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: use.c,v 1.3 1995/04/22 10:28:38 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)use.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: use.c,v 1.8 2006/03/08 09:44:36 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* use.c
*
diff --git a/games/rogue/zap.c b/games/rogue/zap.c
index e7f014806fd..54f39c0f2a3 100644
--- a/games/rogue/zap.c
+++ b/games/rogue/zap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zap.c,v 1.7 2006/03/08 09:44:36 otto Exp $ */
+/* $OpenBSD: zap.c,v 1.8 2009/10/27 23:59:26 deraadt Exp $ */
/* $NetBSD: zap.c,v 1.3 1995/04/22 10:28:41 cgd Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)zap.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: zap.c,v 1.7 2006/03/08 09:44:36 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* zap.c
*
diff --git a/games/sail/assorted.c b/games/sail/assorted.c
index d92813c6c27..7a22017aedb 100644
--- a/games/sail/assorted.c
+++ b/games/sail/assorted.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: assorted.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: assorted.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: assorted.c,v 1.3 1995/04/22 10:36:45 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)assorted.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: assorted.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
#include <sys/cdefs.h>
#include <stdlib.h>
diff --git a/games/sail/dr_1.c b/games/sail/dr_1.c
index 107fc7130cc..058247e47fb 100644
--- a/games/sail/dr_1.c
+++ b/games/sail/dr_1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dr_1.c,v 1.5 2006/03/27 00:10:15 tedu Exp $ */
+/* $OpenBSD: dr_1.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: dr_1.c,v 1.4 1995/04/24 12:25:10 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dr_1.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: dr_1.c,v 1.5 2006/03/27 00:10:15 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include "driver.h"
#include <stdlib.h>
diff --git a/games/sail/dr_2.c b/games/sail/dr_2.c
index 6767128a2fc..d16faab1076 100644
--- a/games/sail/dr_2.c
+++ b/games/sail/dr_2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dr_2.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: dr_2.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: dr_2.c,v 1.4 1995/04/24 12:25:12 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dr_2.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: dr_2.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "driver.h"
#include <stdlib.h>
diff --git a/games/sail/dr_3.c b/games/sail/dr_3.c
index 888a829afb8..5b3500b2854 100644
--- a/games/sail/dr_3.c
+++ b/games/sail/dr_3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dr_3.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: dr_3.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: dr_3.c,v 1.3 1995/04/22 10:36:49 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dr_3.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: dr_3.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "driver.h"
#include <stdlib.h>
diff --git a/games/sail/dr_4.c b/games/sail/dr_4.c
index 68c3743336a..d061c1a4133 100644
--- a/games/sail/dr_4.c
+++ b/games/sail/dr_4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dr_4.c,v 1.3 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: dr_4.c,v 1.4 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: dr_4.c,v 1.3 1995/04/22 10:36:50 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dr_4.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: dr_4.c,v 1.3 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
#include <stdlib.h>
diff --git a/games/sail/dr_5.c b/games/sail/dr_5.c
index e1d7f915b51..fa271787122 100644
--- a/games/sail/dr_5.c
+++ b/games/sail/dr_5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dr_5.c,v 1.3 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: dr_5.c,v 1.4 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: dr_5.c,v 1.3 1995/04/22 10:36:51 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dr_5.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: dr_5.c,v 1.3 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
void
diff --git a/games/sail/dr_main.c b/games/sail/dr_main.c
index bd0fad28754..886b94e2ac2 100644
--- a/games/sail/dr_main.c
+++ b/games/sail/dr_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dr_main.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: dr_main.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: dr_main.c,v 1.4 1995/04/22 10:36:52 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dr_main.c 8.2 (Berkeley) 4/16/94";
-#else
-static char rcsid[] = "$OpenBSD: dr_main.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "driver.h"
#include <stdlib.h>
#include <unistd.h>
diff --git a/games/sail/game.c b/games/sail/game.c
index b71143c7a50..d0a05a61aaf 100644
--- a/games/sail/game.c
+++ b/games/sail/game.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: game.c,v 1.3 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: game.c,v 1.4 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: game.c,v 1.3 1995/04/22 10:36:56 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)game.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: game.c,v 1.3 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
int
diff --git a/games/sail/globals.c b/games/sail/globals.c
index f480cc62036..8c626b4a5a7 100644
--- a/games/sail/globals.c
+++ b/games/sail/globals.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: globals.c,v 1.6 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: globals.c,v 1.7 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: globals.c,v 1.4 1995/04/22 10:36:57 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)globals.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: globals.c,v 1.6 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
struct scenario scene[] = {
diff --git a/games/sail/lo_main.c b/games/sail/lo_main.c
index f10d7b98a53..097d3df0e26 100644
--- a/games/sail/lo_main.c
+++ b/games/sail/lo_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lo_main.c,v 1.6 2003/07/10 00:03:01 david Exp $ */
+/* $OpenBSD: lo_main.c,v 1.7 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: lo_main.c,v 1.3 1995/04/22 10:36:59 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lo_main.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: lo_main.c,v 1.6 2003/07/10 00:03:01 david Exp $";
-#endif
-#endif /* not lint */
-
/*
* Print out the top ten SAILors
*
diff --git a/games/sail/main.c b/games/sail/main.c
index db57693fd95..706a60e56a5 100644
--- a/games/sail/main.c
+++ b/games/sail/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.5 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: main.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: main.c,v 1.3 1995/04/22 10:37:01 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[] = "@(#)main.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.5 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
#include <fcntl.h>
#include <unistd.h>
diff --git a/games/sail/misc.c b/games/sail/misc.c
index 101f88c8dca..32a3915b381 100644
--- a/games/sail/misc.c
+++ b/games/sail/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: misc.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.3 1995/04/22 10:37:03 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)misc.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <fcntl.h>
#include <stdlib.h>
#include <sys/file.h>
diff --git a/games/sail/parties.c b/games/sail/parties.c
index 040aba3fe40..d3666d73100 100644
--- a/games/sail/parties.c
+++ b/games/sail/parties.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parties.c,v 1.3 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: parties.c,v 1.4 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: parties.c,v 1.3 1995/04/22 10:37:04 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)parties.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: parties.c,v 1.3 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "extern.h"
int
diff --git a/games/sail/pl_1.c b/games/sail/pl_1.c
index 9b975e81a5b..a68e69a0e5c 100644
--- a/games/sail/pl_1.c
+++ b/games/sail/pl_1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pl_1.c,v 1.8 2003/07/10 00:03:01 david Exp $ */
+/* $OpenBSD: pl_1.c,v 1.9 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: pl_1.c,v 1.3 1995/04/22 10:37:07 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pl_1.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: pl_1.c,v 1.8 2003/07/10 00:03:01 david Exp $";
-#endif
-#endif /* not lint */
-
#include "player.h"
#include <sys/types.h>
#include <errno.h>
diff --git a/games/sail/pl_2.c b/games/sail/pl_2.c
index de485e88e78..b38cb413bdc 100644
--- a/games/sail/pl_2.c
+++ b/games/sail/pl_2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pl_2.c,v 1.3 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: pl_2.c,v 1.4 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: pl_2.c,v 1.3 1995/04/22 10:37:08 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pl_2.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: pl_2.c,v 1.3 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "player.h"
void
diff --git a/games/sail/pl_3.c b/games/sail/pl_3.c
index f03f7ed445e..2e833232983 100644
--- a/games/sail/pl_3.c
+++ b/games/sail/pl_3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pl_3.c,v 1.3 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: pl_3.c,v 1.4 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: pl_3.c,v 1.3 1995/04/22 10:37:09 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pl_3.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: pl_3.c,v 1.3 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "player.h"
#include <stdlib.h>
diff --git a/games/sail/pl_4.c b/games/sail/pl_4.c
index 1553820a8d9..12ff6069a1b 100644
--- a/games/sail/pl_4.c
+++ b/games/sail/pl_4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pl_4.c,v 1.3 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: pl_4.c,v 1.4 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: pl_4.c,v 1.4 1995/04/24 12:25:17 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pl_4.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: pl_4.c,v 1.3 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "player.h"
void
diff --git a/games/sail/pl_5.c b/games/sail/pl_5.c
index 2fb27a9bbdd..858d36c1447 100644
--- a/games/sail/pl_5.c
+++ b/games/sail/pl_5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pl_5.c,v 1.5 2006/03/27 00:10:15 tedu Exp $ */
+/* $OpenBSD: pl_5.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: pl_5.c,v 1.4 1995/04/24 12:25:21 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pl_5.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: pl_5.c,v 1.5 2006/03/27 00:10:15 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include "player.h"
#define turnfirst(x) (*x == 'r' || *x == 'l')
diff --git a/games/sail/pl_6.c b/games/sail/pl_6.c
index 10e91f5ee62..1cec97d981c 100644
--- a/games/sail/pl_6.c
+++ b/games/sail/pl_6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pl_6.c,v 1.3 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: pl_6.c,v 1.4 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: pl_6.c,v 1.3 1995/04/22 10:37:15 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pl_6.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: pl_6.c,v 1.3 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "player.h"
void
diff --git a/games/sail/pl_7.c b/games/sail/pl_7.c
index 9ef56d8c79c..27890c681a1 100644
--- a/games/sail/pl_7.c
+++ b/games/sail/pl_7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pl_7.c,v 1.8 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: pl_7.c,v 1.9 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: pl_7.c,v 1.6 1995/04/22 10:37:17 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pl_7.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: pl_7.c,v 1.8 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/ttydefaults.h>
#include "player.h"
#include <stdarg.h>
diff --git a/games/sail/pl_main.c b/games/sail/pl_main.c
index 67f42e0c7c7..90d87765ffb 100644
--- a/games/sail/pl_main.c
+++ b/games/sail/pl_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pl_main.c,v 1.11 2006/11/02 18:15:02 ray Exp $ */
+/* $OpenBSD: pl_main.c,v 1.12 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: pl_main.c,v 1.5 1995/04/24 12:25:25 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pl_main.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: pl_main.c,v 1.11 2006/11/02 18:15:02 ray Exp $";
-#endif
-#endif /* not lint */
-
#include "player.h"
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/games/sail/sync.c b/games/sail/sync.c
index d77463853fe..9bf85efac9e 100644
--- a/games/sail/sync.c
+++ b/games/sail/sync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sync.c,v 1.8 2004/12/17 18:46:32 moritz Exp $ */
+/* $OpenBSD: sync.c,v 1.9 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: sync.c,v 1.9 1998/08/30 09:19:40 veego Exp $ */
/*
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)sync.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: sync.c,v 1.8 2004/12/17 18:46:32 moritz Exp $";
-#endif
-#endif /* not lint */
-
#include <fcntl.h>
#include <errno.h>
#include <stdarg.h>
diff --git a/games/sail/version.c b/games/sail/version.c
index da472586589..bcbdb8d15e7 100644
--- a/games/sail/version.c
+++ b/games/sail/version.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: version.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: version.c,v 1.3 1995/04/22 10:37:27 cgd Exp $ */
/*
@@ -30,12 +30,4 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)version.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: version.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
char version[] = "Wooden Ships and Iron Men, Version 8.2 (95/04/28)";
diff --git a/games/snake/snake.c b/games/snake/snake.c
index 01a4e18b04e..69d44e077bf 100644
--- a/games/snake/snake.c
+++ b/games/snake/snake.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: snake.c,v 1.12 2007/04/02 15:23:48 jmc Exp $ */
+/* $OpenBSD: snake.c,v 1.13 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: snake.c,v 1.8 1995/04/29 00:06:41 mycroft 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[] = "@(#)snake.c 8.2 (Berkeley) 1/7/94";
-#else
-static char rcsid[] = "$OpenBSD: snake.c,v 1.12 2007/04/02 15:23:48 jmc Exp $";
-#endif
-#endif /* not lint */
-
/*
* snake - crt hack game.
*
diff --git a/games/snake/snscore.c b/games/snake/snscore.c
index 3dafc2cb34c..70cfc7bae47 100644
--- a/games/snake/snscore.c
+++ b/games/snake/snscore.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: snscore.c,v 1.6 2006/03/27 00:10:15 tedu Exp $ */
+/* $OpenBSD: snscore.c,v 1.7 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: snscore.c,v 1.5 1995/04/24 12:25:43 cgd 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[] = "@(#)snscore.c 8.1 (Berkeley) 7/19/93";
-#else
-static char rcsid[] = "$OpenBSD: snscore.c,v 1.6 2006/03/27 00:10:15 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
#include <fcntl.h>
diff --git a/games/trek/abandon.c b/games/trek/abandon.c
index 7cfcfa2209d..f95e2bf0ea4 100644
--- a/games/trek/abandon.c
+++ b/games/trek/abandon.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: abandon.c,v 1.5 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: abandon.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: abandon.c,v 1.3 1995/04/22 10:58:24 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)abandon.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: abandon.c,v 1.5 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/attack.c b/games/trek/attack.c
index ca25941cb32..49774555a4e 100644
--- a/games/trek/attack.c
+++ b/games/trek/attack.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: attack.c,v 1.5 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: attack.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: attack.c,v 1.3 1995/04/22 10:58:26 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)attack.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: attack.c,v 1.5 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <math.h>
#include "trek.h"
diff --git a/games/trek/autover.c b/games/trek/autover.c
index d1f92b79310..f18a776c2a9 100644
--- a/games/trek/autover.c
+++ b/games/trek/autover.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autover.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: autover.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: autover.c,v 1.3 1995/04/22 10:58:28 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)autover.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: autover.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/capture.c b/games/trek/capture.c
index 0da61af20f5..6506ad3f700 100644
--- a/games/trek/capture.c
+++ b/games/trek/capture.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: capture.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: capture.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: capture.c,v 1.3 1995/04/22 10:58:32 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)capture.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: capture.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/check_out.c b/games/trek/check_out.c
index b29fed3152f..226c34cb471 100644
--- a/games/trek/check_out.c
+++ b/games/trek/check_out.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: check_out.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: check_out.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: check_out.c,v 1.3 1995/04/22 10:58:35 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)check_out.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: check_out.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/checkcond.c b/games/trek/checkcond.c
index 3e37a8a1c93..d895df84784 100644
--- a/games/trek/checkcond.c
+++ b/games/trek/checkcond.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: checkcond.c,v 1.3 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: checkcond.c,v 1.4 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: checkcond.c,v 1.3 1995/04/22 10:58:37 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)checkcond.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: checkcond.c,v 1.3 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "trek.h"
/*
diff --git a/games/trek/compkl.c b/games/trek/compkl.c
index 957ded29d02..6a6abbaf9af 100644
--- a/games/trek/compkl.c
+++ b/games/trek/compkl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compkl.c,v 1.5 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: compkl.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: compkl.c,v 1.3 1995/04/22 10:58:38 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)compkl.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: compkl.c,v 1.5 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <math.h>
#include "trek.h"
diff --git a/games/trek/computer.c b/games/trek/computer.c
index 39ca912a5a8..ee0ed6ffd54 100644
--- a/games/trek/computer.c
+++ b/games/trek/computer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: computer.c,v 1.8 2003/07/10 00:03:01 david Exp $ */
+/* $OpenBSD: computer.c,v 1.9 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: computer.c,v 1.4 1995/04/24 12:25:51 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)computer.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: computer.c,v 1.8 2003/07/10 00:03:01 david Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
diff --git a/games/trek/damage.c b/games/trek/damage.c
index ed7ec5fffe3..40ec118d462 100644
--- a/games/trek/damage.c
+++ b/games/trek/damage.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: damage.c,v 1.5 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: damage.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: damage.c,v 1.3 1995/04/22 10:58:40 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)damage.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: damage.c,v 1.5 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <err.h>
#include "trek.h"
diff --git a/games/trek/damaged.c b/games/trek/damaged.c
index 2eb581964ed..a6cbc50d8b5 100644
--- a/games/trek/damaged.c
+++ b/games/trek/damaged.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: damaged.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: damaged.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: damaged.c,v 1.3 1995/04/22 10:58:41 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)damaged.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: damaged.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "trek.h"
/* DAMAGED -- check for device damaged
diff --git a/games/trek/dcrept.c b/games/trek/dcrept.c
index 542a1112ad0..38e60e02326 100644
--- a/games/trek/dcrept.c
+++ b/games/trek/dcrept.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcrept.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: dcrept.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: dcrept.c,v 1.3 1995/04/22 10:58:43 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dcrept.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: dcrept.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/destruct.c b/games/trek/destruct.c
index 6a41fa15190..646c5495727 100644
--- a/games/trek/destruct.c
+++ b/games/trek/destruct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: destruct.c,v 1.6 2003/07/10 00:03:01 david Exp $ */
+/* $OpenBSD: destruct.c,v 1.7 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: destruct.c,v 1.3 1995/04/22 10:58:44 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)destruct.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: destruct.c,v 1.6 2003/07/10 00:03:01 david Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <string.h>
#include <unistd.h>
diff --git a/games/trek/dock.c b/games/trek/dock.c
index 56512f84cef..9414ae85802 100644
--- a/games/trek/dock.c
+++ b/games/trek/dock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dock.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: dock.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: dock.c,v 1.3 1995/04/22 10:58:45 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dock.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: dock.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/dumpgame.c b/games/trek/dumpgame.c
index 511ebdaf7e2..ea8971c40b6 100644
--- a/games/trek/dumpgame.c
+++ b/games/trek/dumpgame.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dumpgame.c,v 1.8 2006/03/27 00:10:15 tedu Exp $ */
+/* $OpenBSD: dumpgame.c,v 1.9 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: dumpgame.c,v 1.4 1995/04/24 12:25:54 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dumpgame.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: dumpgame.c,v 1.8 2006/03/27 00:10:15 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <err.h>
#include <unistd.h>
diff --git a/games/trek/dumpme.c b/games/trek/dumpme.c
index 712a569933e..dbf25752565 100644
--- a/games/trek/dumpme.c
+++ b/games/trek/dumpme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dumpme.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: dumpme.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: dumpme.c,v 1.3 1995/04/22 10:58:48 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dumpme.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: dumpme.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/dumpssradio.c b/games/trek/dumpssradio.c
index 7519a97babf..95a8c3eab1c 100644
--- a/games/trek/dumpssradio.c
+++ b/games/trek/dumpssradio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dumpssradio.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: dumpssradio.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: dumpssradio.c,v 1.3 1995/04/22 10:58:49 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dumpssradio.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: dumpssradio.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/events.c b/games/trek/events.c
index 190cf9b0494..23024c4fdf6 100644
--- a/games/trek/events.c
+++ b/games/trek/events.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: events.c,v 1.5 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: events.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: events.c,v 1.3 1995/04/22 10:58:50 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)events.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: events.c,v 1.5 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <string.h>
#include <math.h>
diff --git a/games/trek/externs.c b/games/trek/externs.c
index d438b90731a..9e7a7a1e6b3 100644
--- a/games/trek/externs.c
+++ b/games/trek/externs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: externs.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: externs.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: externs.c,v 1.3 1995/04/22 10:58:53 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)externs.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: externs.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "trek.h"
/*
diff --git a/games/trek/getcodi.c b/games/trek/getcodi.c
index 8fb1cd22812..f4dc89cc5c8 100644
--- a/games/trek/getcodi.c
+++ b/games/trek/getcodi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getcodi.c,v 1.3 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: getcodi.c,v 1.4 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: getcodi.c,v 1.3 1995/04/22 10:58:55 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)getcodi.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: getcodi.c,v 1.3 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "getpar.h"
#include "trek.h"
diff --git a/games/trek/getpar.c b/games/trek/getpar.c
index 685548a1e0c..c4f036c1ff7 100644
--- a/games/trek/getpar.c
+++ b/games/trek/getpar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getpar.c,v 1.12 2003/07/10 00:03:01 david Exp $ */
+/* $OpenBSD: getpar.c,v 1.13 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: getpar.c,v 1.4 1995/04/24 12:25:57 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)getpar.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: getpar.c,v 1.12 2003/07/10 00:03:01 david Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/games/trek/help.c b/games/trek/help.c
index 4f58204868d..6c2789c79fa 100644
--- a/games/trek/help.c
+++ b/games/trek/help.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: help.c,v 1.5 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: help.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: help.c,v 1.3 1995/04/22 10:59:01 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)help.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: help.c,v 1.5 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <math.h>
#include <unistd.h>
diff --git a/games/trek/impulse.c b/games/trek/impulse.c
index 335728f26d6..5e81ecf8a73 100644
--- a/games/trek/impulse.c
+++ b/games/trek/impulse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: impulse.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: impulse.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: impulse.c,v 1.3 1995/04/22 10:59:03 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)impulse.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: impulse.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
#include "getpar.h"
diff --git a/games/trek/initquad.c b/games/trek/initquad.c
index 81b3fae9436..443fce043a1 100644
--- a/games/trek/initquad.c
+++ b/games/trek/initquad.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: initquad.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: initquad.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: initquad.c,v 1.3 1995/04/22 10:59:04 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)initquad.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: initquad.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/kill.c b/games/trek/kill.c
index 68542841570..e28c1d9c72c 100644
--- a/games/trek/kill.c
+++ b/games/trek/kill.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kill.c,v 1.5 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: kill.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: kill.c,v 1.3 1995/04/22 10:59:06 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)kill.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: kill.c,v 1.5 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/klmove.c b/games/trek/klmove.c
index b304d36b67a..1af621ba971 100644
--- a/games/trek/klmove.c
+++ b/games/trek/klmove.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: klmove.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: klmove.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: klmove.c,v 1.3 1995/04/22 10:59:07 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)klmove.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: klmove.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/lose.c b/games/trek/lose.c
index fd1a13c0cd3..15a30fea94d 100644
--- a/games/trek/lose.c
+++ b/games/trek/lose.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lose.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: lose.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: lose.c,v 1.3 1995/04/22 10:59:08 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lose.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: lose.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <setjmp.h>
#include <unistd.h>
diff --git a/games/trek/lrscan.c b/games/trek/lrscan.c
index c3a12be74cb..316ede8525d 100644
--- a/games/trek/lrscan.c
+++ b/games/trek/lrscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lrscan.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: lrscan.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: lrscan.c,v 1.3 1995/04/22 10:59:09 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lrscan.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: lrscan.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/main.c b/games/trek/main.c
index 84f2902d7a1..b89df78ec41 100644
--- a/games/trek/main.c
+++ b/games/trek/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.11 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: main.c,v 1.12 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: main.c,v 1.4 1995/04/22 10:59:10 cgd 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[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.11 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdio.h>
#include <setjmp.h>
diff --git a/games/trek/move.c b/games/trek/move.c
index e90fa827eb9..041f86c836f 100644
--- a/games/trek/move.c
+++ b/games/trek/move.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: move.c,v 1.5 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: move.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: move.c,v 1.3 1995/04/22 10:59:12 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: move.c,v 1.5 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <math.h>
#include "trek.h"
diff --git a/games/trek/nova.c b/games/trek/nova.c
index d559aad0436..67f700bc50a 100644
--- a/games/trek/nova.c
+++ b/games/trek/nova.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nova.c,v 1.4 2003/06/03 03:01:41 millert Exp $ */
+/* $OpenBSD: nova.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: nova.c,v 1.3 1995/04/22 10:59:14 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)nova.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: nova.c,v 1.4 2003/06/03 03:01:41 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
diff --git a/games/trek/out.c b/games/trek/out.c
index e8f2b63624e..124fd57dd25 100644
--- a/games/trek/out.c
+++ b/games/trek/out.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: out.c,v 1.6 2006/11/02 18:13:03 ray Exp $ */
+/* $OpenBSD: out.c,v 1.7 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: out.c,v 1.3 1995/04/22 10:59:16 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)out.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: out.c,v 1.6 2006/11/02 18:13:03 ray Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <string.h>
#include "trek.h"
diff --git a/games/trek/phaser.c b/games/trek/phaser.c
index 0e6476239e9..49691206e66 100644
--- a/games/trek/phaser.c
+++ b/games/trek/phaser.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: phaser.c,v 1.7 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: phaser.c,v 1.8 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: phaser.c,v 1.4 1995/04/24 12:26:02 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)phaser.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: phaser.c,v 1.7 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <math.h>
#include "trek.h"
diff --git a/games/trek/play.c b/games/trek/play.c
index 48b7585d7a7..12303c59c21 100644
--- a/games/trek/play.c
+++ b/games/trek/play.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: play.c,v 1.4 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: play.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: play.c,v 1.3 1995/04/22 10:59:18 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)play.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: play.c,v 1.4 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <setjmp.h>
#include "trek.h"
diff --git a/games/trek/ram.c b/games/trek/ram.c
index 255d1435f6f..5d743ee778b 100644
--- a/games/trek/ram.c
+++ b/games/trek/ram.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ram.c,v 1.4 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: ram.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: ram.c,v 1.3 1995/04/22 10:59:19 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ram.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: ram.c,v 1.4 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <unistd.h>
#include "trek.h"
diff --git a/games/trek/ranf.c b/games/trek/ranf.c
index 0d61b08146f..8e570eeb132 100644
--- a/games/trek/ranf.c
+++ b/games/trek/ranf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ranf.c,v 1.4 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: ranf.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: ranf.c,v 1.3 1995/04/22 10:59:21 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ranf.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: ranf.c,v 1.4 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
diff --git a/games/trek/rest.c b/games/trek/rest.c
index 89060e76602..8c49aca48e9 100644
--- a/games/trek/rest.c
+++ b/games/trek/rest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rest.c,v 1.4 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: rest.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: rest.c,v 1.3 1995/04/22 10:59:22 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)rest.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: rest.c,v 1.4 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
#include "getpar.h"
diff --git a/games/trek/schedule.c b/games/trek/schedule.c
index 09f53867f9f..68a99109836 100644
--- a/games/trek/schedule.c
+++ b/games/trek/schedule.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: schedule.c,v 1.5 2006/03/27 00:10:15 tedu Exp $ */
+/* $OpenBSD: schedule.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: schedule.c,v 1.3 1995/04/22 10:59:23 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)schedule.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: schedule.c,v 1.5 2006/03/27 00:10:15 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <math.h>
#include <err.h>
diff --git a/games/trek/score.c b/games/trek/score.c
index f23a0c64b17..63a6ef6011d 100644
--- a/games/trek/score.c
+++ b/games/trek/score.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: score.c,v 1.4 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: score.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: score.c,v 1.3 1995/04/22 10:59:24 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: score.c,v 1.4 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
#include "getpar.h"
diff --git a/games/trek/setup.c b/games/trek/setup.c
index dd25cf98313..5019e98418a 100644
--- a/games/trek/setup.c
+++ b/games/trek/setup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setup.c,v 1.7 2006/11/06 21:32:15 deraadt Exp $ */
+/* $OpenBSD: setup.c,v 1.8 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: setup.c,v 1.4 1995/04/24 12:26:06 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)setup.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: setup.c,v 1.7 2006/11/06 21:32:15 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <math.h>
#include <unistd.h>
diff --git a/games/trek/setwarp.c b/games/trek/setwarp.c
index 2807ca12729..c5af78c4b3b 100644
--- a/games/trek/setwarp.c
+++ b/games/trek/setwarp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setwarp.c,v 1.3 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: setwarp.c,v 1.4 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: setwarp.c,v 1.3 1995/04/22 10:59:27 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)setwarp.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: setwarp.c,v 1.3 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
#include "getpar.h"
diff --git a/games/trek/shield.c b/games/trek/shield.c
index 3b4f194c406..07dc344e5bd 100644
--- a/games/trek/shield.c
+++ b/games/trek/shield.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: shield.c,v 1.6 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: shield.c,v 1.7 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: shield.c,v 1.4 1995/04/24 12:26:09 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)shield.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: shield.c,v 1.6 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
#include "getpar.h"
diff --git a/games/trek/snova.c b/games/trek/snova.c
index c566f867efd..8ac6df4f011 100644
--- a/games/trek/snova.c
+++ b/games/trek/snova.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: snova.c,v 1.5 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: snova.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: snova.c,v 1.3 1995/04/22 10:59:29 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)snova.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: snova.c,v 1.5 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <unistd.h>
#include "trek.h"
diff --git a/games/trek/srscan.c b/games/trek/srscan.c
index 2754cee7644..e32e4b584f0 100644
--- a/games/trek/srscan.c
+++ b/games/trek/srscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: srscan.c,v 1.6 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: srscan.c,v 1.7 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: srscan.c,v 1.3 1995/04/22 10:59:31 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)srscan.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: srscan.c,v 1.6 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
#include "getpar.h"
diff --git a/games/trek/systemname.c b/games/trek/systemname.c
index 086bc09376a..2cc3dab926e 100644
--- a/games/trek/systemname.c
+++ b/games/trek/systemname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: systemname.c,v 1.5 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: systemname.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: systemname.c,v 1.3 1995/04/22 10:59:32 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)systemname.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: systemname.c,v 1.5 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "trek.h"
/*
diff --git a/games/trek/torped.c b/games/trek/torped.c
index 324585223c3..1285df7a3ba 100644
--- a/games/trek/torped.c
+++ b/games/trek/torped.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: torped.c,v 1.7 2003/07/10 00:03:01 david Exp $ */
+/* $OpenBSD: torped.c,v 1.8 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: torped.c,v 1.3 1995/04/22 10:59:34 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)torped.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: torped.c,v 1.7 2003/07/10 00:03:01 david Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
diff --git a/games/trek/visual.c b/games/trek/visual.c
index 5ca61bb9728..bb997fdaa50 100644
--- a/games/trek/visual.c
+++ b/games/trek/visual.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: visual.c,v 1.4 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: visual.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: visual.c,v 1.3 1995/04/22 10:59:39 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)visual.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: visual.c,v 1.4 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include "trek.h"
#include "getpar.h"
diff --git a/games/trek/warp.c b/games/trek/warp.c
index f882ed5157f..837b8855314 100644
--- a/games/trek/warp.c
+++ b/games/trek/warp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: warp.c,v 1.5 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: warp.c,v 1.6 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: warp.c,v 1.3 1995/04/22 10:59:40 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)warp.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: warp.c,v 1.5 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/games/trek/win.c b/games/trek/win.c
index 3f2d11249e0..31f93c75574 100644
--- a/games/trek/win.c
+++ b/games/trek/win.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: win.c,v 1.4 2003/06/03 03:01:42 millert Exp $ */
+/* $OpenBSD: win.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $ */
/* $NetBSD: win.c,v 1.3 1995/04/22 10:59:41 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)win.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: win.c,v 1.4 2003/06/03 03:01:42 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <unistd.h>
#include <setjmp.h>
diff --git a/games/worm/worm.c b/games/worm/worm.c
index 6353e3e0eb1..68baffa3271 100644
--- a/games/worm/worm.c
+++ b/games/worm/worm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: worm.c,v 1.22 2004/11/29 08:52:29 jsg Exp $ */
+/* $OpenBSD: worm.c,v 1.23 2009/10/27 23:59:27 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,20 +29,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[] = "@(#)worm.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: worm.c,v 1.22 2004/11/29 08:52:29 jsg Exp $";
-#endif
-#endif /* not lint */
-
/*
* Worm. Written by Michael Toy
* UCSC
diff --git a/games/worms/worms.c b/games/worms/worms.c
index 89eb0418787..131c005062f 100644
--- a/games/worms/worms.c
+++ b/games/worms/worms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: worms.c,v 1.18 2007/09/02 15:19:09 deraadt Exp $ */
+/* $OpenBSD: worms.c,v 1.19 2009/10/27 23:59:27 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,20 +29,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[] = "@(#)worms.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: worms.c,v 1.18 2007/09/02 15:19:09 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
*
* @@@ @@@ @@@@@@@@@@ @@@@@@@@@@@ @@@@@@@@@@@@
diff --git a/games/wump/wump.c b/games/wump/wump.c
index 748fb3f4a3a..5a3967a3066 100644
--- a/games/wump/wump.c
+++ b/games/wump/wump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wump.c,v 1.24 2007/04/02 15:27:13 jmc Exp $ */
+/* $OpenBSD: wump.c,v 1.25 2009/10/27 23:59:28 deraadt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -33,20 +33,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 char sccsid[] = "@(#)wump.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: wump.c,v 1.24 2007/04/02 15:27:13 jmc Exp $";
-#endif
-#endif /* not lint */
-
/*
* A no longer new version of the age-old favorite Hunt-The-Wumpus game that
* has been a part of the BSD distribution for longer than us old folk
diff --git a/lib/csu/alpha/Makefile b/lib/csu/alpha/Makefile
index 40ae624e089..bac425b6750 100644
--- a/lib/csu/alpha/Makefile
+++ b/lib/csu/alpha/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.18 2008/11/11 23:49:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.19 2009/10/27 23:59:58 deraadt Exp $
# $NetBSD: Makefile,v 1.6 1996/10/18 05:27:38 thorpej Exp $
-CFLAGS+= -DLIBC_SCCS -DELFSIZE=64
+CFLAGS+= -DELFSIZE=64
OBJS= crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
SRCS= crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile
index a9e585b866c..725510a2fd6 100644
--- a/lib/csu/amd64/Makefile
+++ b/lib/csu/amd64/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.5 2008/11/11 23:49:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.6 2009/10/27 23:59:58 deraadt Exp $
-CFLAGS+= -DLIBC_SCCS -fno-omit-frame-pointer
+CFLAGS+= -fno-omit-frame-pointer
OBJS= crt0.o gcrt0.o
OBJS+= crtbegin.o crtend.o
OBJS+= crtbeginS.o crtendS.o
diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile
index 08530565d22..f716be253e5 100644
--- a/lib/csu/arm/Makefile
+++ b/lib/csu/arm/Makefile
@@ -1,7 +1,6 @@
-# $OpenBSD: Makefile,v 1.6 2009/06/21 00:38:22 martynas Exp $
+# $OpenBSD: Makefile,v 1.7 2009/10/27 23:59:58 deraadt Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/1/93
-CFLAGS+= -DLIBC_SCCS
OBJS= crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
SRCS= crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
diff --git a/lib/csu/hppa/Makefile b/lib/csu/hppa/Makefile
index b592dadd36a..9a1e3091db3 100644
--- a/lib/csu/hppa/Makefile
+++ b/lib/csu/hppa/Makefile
@@ -1,7 +1,6 @@
-# $OpenBSD: Makefile,v 1.7 2008/11/11 23:49:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.8 2009/10/27 23:59:58 deraadt Exp $
# from: @(#)Makefile 5.5 (Berkeley) 5/21/91
-CFLAGS+= -DLIBC_SCCS
OBJS= crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
SRCS= crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
diff --git a/lib/csu/hppa64/Makefile b/lib/csu/hppa64/Makefile
index b6404728937..fafa236eb3d 100644
--- a/lib/csu/hppa64/Makefile
+++ b/lib/csu/hppa64/Makefile
@@ -1,7 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2008/10/06 14:17:49 kurt Exp $
+# $OpenBSD: Makefile,v 1.3 2009/10/27 23:59:58 deraadt Exp $
# from: @(#)Makefile 5.5 (Berkeley) 5/21/91
-CFLAGS+= -DLIBC_SCCS
OBJS= crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
SRCS= crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index 3aa94ffbd55..a774241122f 100644
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.13 2008/11/11 23:49:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.14 2009/10/27 23:59:58 deraadt Exp $
# from: @(#)Makefile 5.5 (Berkeley) 5/21/91
-CFLAGS+= -DLIBC_SCCS -fno-omit-frame-pointer
+CFLAGS+= -fno-omit-frame-pointer
OBJS= crt0.o gcrt0.o
OBJS+= crtbegin.o crtend.o
OBJS+= crtbeginS.o crtendS.o
diff --git a/lib/csu/m68k/Makefile b/lib/csu/m68k/Makefile
index 7f36634445f..e3da90d2cd9 100644
--- a/lib/csu/m68k/Makefile
+++ b/lib/csu/m68k/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.5 2001/03/24 18:40:20 tholo Exp $
+# $OpenBSD: Makefile,v 1.6 2009/10/27 23:59:58 deraadt Exp $
# from: @(#)Makefile 5.5 (Berkeley) 5/21/91
-CFLAGS+= -DLIBC_SCCS -I${.CURDIR}/..
+CFLAGS+= -I${.CURDIR}/..
OBJS= crt0.o gcrt0.o scrt0.o
SRCS= crt0.c
diff --git a/lib/csu/m88k/Makefile b/lib/csu/m88k/Makefile
index 6902d110477..04bb395097c 100644
--- a/lib/csu/m88k/Makefile
+++ b/lib/csu/m88k/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2001/06/26 22:42:55 miod Exp $
+# $OpenBSD: Makefile,v 1.2 2009/10/27 23:59:58 deraadt Exp $
# from: @(#)Makefile 5.5 (Berkeley) 5/21/91
-CFLAGS+= -DLIBC_SCCS -I${.CURDIR}/..
+CFLAGS+= -I${.CURDIR}/..
OBJS= crt0.o gcrt0.o scrt0.o
SRCS= crt0.c
diff --git a/lib/csu/mips64/Makefile b/lib/csu/mips64/Makefile
index 7883801dfb1..88ad351fd70 100644
--- a/lib/csu/mips64/Makefile
+++ b/lib/csu/mips64/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2004/08/06 22:21:16 pefo Exp $
+# $OpenBSD: Makefile,v 1.2 2009/10/27 23:59:58 deraadt Exp $
-#CFLAGS+= -DLIBC_SCCS -I${.CURDIR} -mips2
-CFLAGS+= -DLIBC_SCCS -I${.CURDIR}
+#CFLAGS+= -I${.CURDIR} -mips2
+CFLAGS+= -I${.CURDIR}
OBJS= crt0.o gcrt0.o scrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
.PATH: ${.CURDIR}/../common_elf
diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile
index acdea1b84d6..f361e66360c 100644
--- a/lib/csu/powerpc/Makefile
+++ b/lib/csu/powerpc/Makefile
@@ -1,7 +1,6 @@
-# $OpenBSD: Makefile,v 1.19 2009/01/14 19:45:20 kurt Exp $
+# $OpenBSD: Makefile,v 1.20 2009/10/27 23:59:58 deraadt Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/1/93
-CFLAGS+= -DLIBC_SCCS
OBJS= crt0.o gcrt0.o
OBJS+= crtbegin.o crtend.o
OBJS+= crtbeginS.o crtendS.o
diff --git a/lib/csu/sh/Makefile b/lib/csu/sh/Makefile
index 22651e0c489..58f1e5dacf2 100644
--- a/lib/csu/sh/Makefile
+++ b/lib/csu/sh/Makefile
@@ -1,7 +1,6 @@
-# $OpenBSD: Makefile,v 1.3 2008/11/11 23:49:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.4 2009/10/27 23:59:58 deraadt Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/1/93
-CFLAGS+= -DLIBC_SCCS
OBJS= crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
SRCS= crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
diff --git a/lib/csu/sparc/Makefile b/lib/csu/sparc/Makefile
index 6ef1bf96538..68960c91d0d 100644
--- a/lib/csu/sparc/Makefile
+++ b/lib/csu/sparc/Makefile
@@ -1,7 +1,6 @@
-# $OpenBSD: Makefile,v 1.9 2008/10/06 14:17:49 kurt Exp $
+# $OpenBSD: Makefile,v 1.10 2009/10/27 23:59:59 deraadt Exp $
# from: @(#)Makefile 5.5 (Berkeley) 5/21/91
-CFLAGS+= -DLIBC_SCCS
OBJS= crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
SRCS= crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
diff --git a/lib/csu/sparc64/Makefile b/lib/csu/sparc64/Makefile
index af8202d6d14..4c6cef8d4ad 100644
--- a/lib/csu/sparc64/Makefile
+++ b/lib/csu/sparc64/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.7 2008/11/11 23:49:46 kurt Exp $
+# $OpenBSD: Makefile,v 1.8 2009/10/27 23:59:59 deraadt Exp $
# $NetBSD: Makefile,v 1.6 1996/10/18 05:27:38 thorpej Exp $
-CFLAGS+= -DLIBC_SCCS -DELFSIZE=64
+CFLAGS+= -DELFSIZE=64
OBJS= crt0.o gcrt0.o
OBJS+= crtbegin.o crtend.o
OBJS+= crtbeginS.o crtendS.o
diff --git a/lib/csu/vax/Makefile b/lib/csu/vax/Makefile
index c55a6b84f3e..0503b671fab 100644
--- a/lib/csu/vax/Makefile
+++ b/lib/csu/vax/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.6 2007/10/30 06:02:22 deraadt Exp $
+# $OpenBSD: Makefile,v 1.7 2009/10/27 23:59:59 deraadt Exp $
# from: @(#)Makefile 5.6 (Berkeley) 5/22/91
-CFLAGS+= -DLIBC_SCCS -I${.CURDIR}/..
+CFLAGS+= -I${.CURDIR}/..
OBJS= crt0.o gcrt0.o scrt0.o
CLEANFILES+= core crt0.out gcrt0.out scrt0.out
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index c058fc258ec..d12d2f2521a 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,10 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2006/03/14 09:19:37 deraadt Exp $
-#
-# All library objects contain sccsid strings by default; they may be
-# excluded as a space-saving measure. To produce a library that does
-# not contain these strings, delete -DLIBC_SCCS and -DSYSLIBC_SCCS
-# from CFLAGS below. To remove these strings from just the system call
-# stubs, remove just -DSYSLIBC_SCCS from CFLAGS.
+# $OpenBSD: Makefile,v 1.27 2009/10/27 23:59:59 deraadt Exp $
#
# The NLS (message catalog) functions are always in libc. To choose that
# strerror(), perror(), strsignal(), psignal(), etc. actually call the NLS
diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc
index cd3e853efd5..1ff69227a46 100644
--- a/lib/libc/Makefile.inc
+++ b/lib/libc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.12 2008/09/07 20:36:07 martynas Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2009/10/27 23:59:59 deraadt Exp $
#
# This file contains make rules used to build libc
#
@@ -8,7 +8,7 @@ all:
@echo "need to define LIBCSRCDIR" >&2; exit 1
.endif
-CFLAGS+= -DLIBC_SCCS -DSYSLIBC_SCCS -I${LIBCSRCDIR}/include
+CFLAGS+= -I${LIBCSRCDIR}/include
# Include link-time warnings about unsafe API uses (ie. strcpy)
CFLAGS+=-DAPIWARN
diff --git a/lib/libc/stdlib/lsearch.c b/lib/libc/stdlib/lsearch.c
index 08154301998..a01d80e0083 100644
--- a/lib/libc/stdlib/lsearch.c
+++ b/lib/libc/stdlib/lsearch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lsearch.c,v 1.3 2004/10/01 04:08:45 jsg Exp $ */
+/* $OpenBSD: lsearch.c,v 1.4 2009/10/27 23:59:59 deraadt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -32,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)lsearch.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <string.h>
#include <search.h>
diff --git a/lib/libc/time/strftime.c b/lib/libc/time/strftime.c
index f32626af6be..5ed91ad8e8d 100644
--- a/lib/libc/time/strftime.c
+++ b/lib/libc/time/strftime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strftime.c,v 1.19 2008/10/31 14:12:17 millert Exp $ */
+/* $OpenBSD: strftime.c,v 1.20 2009/10/27 23:59:59 deraadt Exp $ */
#include "private.h"
/*
@@ -33,14 +33,6 @@
** SUCH DAMAGE.
*/
-#if 0
-#ifndef LIBC_SCCS
-#ifndef lint
-static const char sccsid[] = "@(#)strftime.c 5.4 (Berkeley) 3/14/89";
-#endif /* !defined lint */
-#endif /* !defined LIBC_SCCS */
-#endif
-
#include "tzfile.h"
#include "fcntl.h"
#include "locale.h"
diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c
index 3bd1e01ed5f..7e2d78faba3 100644
--- a/lib/libcompat/4.1/ftime.c
+++ b/lib/libcompat/4.1/ftime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftime.c,v 1.5 2003/06/03 21:09:00 deraadt Exp $ */
+/* $OpenBSD: ftime.c,v 1.6 2009/10/27 23:59:28 deraadt Exp $ */
/*
* Copyright (c) 1997, Jason Downs. All rights reserved.
@@ -55,10 +55,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: ftime.c,v 1.5 2003/06/03 21:09:00 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/timeb.h>
diff --git a/lib/libcompat/4.1/gtty.c b/lib/libcompat/4.1/gtty.c
index 465bd16f1bc..050bb2978a6 100644
--- a/lib/libcompat/4.1/gtty.c
+++ b/lib/libcompat/4.1/gtty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gtty.c,v 1.2 2000/03/02 00:29:47 todd Exp $ */
+/* $OpenBSD: gtty.c,v 1.3 2009/10/27 23:59:28 deraadt Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -30,10 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: gtty.c,v 1.2 2000/03/02 00:29:47 todd Exp $";
-#endif /* not lint */
-
#include <sgtty.h>
/*
diff --git a/lib/libcompat/4.1/stty.c b/lib/libcompat/4.1/stty.c
index 53ae840c78f..f8aa1b52ad4 100644
--- a/lib/libcompat/4.1/stty.c
+++ b/lib/libcompat/4.1/stty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stty.c,v 1.2 2000/03/02 00:29:48 todd Exp $ */
+/* $OpenBSD: stty.c,v 1.3 2009/10/27 23:59:28 deraadt Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -30,10 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: stty.c,v 1.2 2000/03/02 00:29:48 todd Exp $";
-#endif /* not lint */
-
#include <sgtty.h>
/*
diff --git a/lib/libcompat/4.3/regex.c b/lib/libcompat/4.3/regex.c
index 4e248a71907..fae44db652f 100644
--- a/lib/libcompat/4.3/regex.c
+++ b/lib/libcompat/4.3/regex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: regex.c,v 1.6 2003/06/26 23:19:32 deraadt Exp $ */
+/* $OpenBSD: regex.c,v 1.7 2009/10/27 23:59:28 deraadt Exp $ */
/*-
* Copyright (c) 1992 The Regents of the University of California.
@@ -39,11 +39,6 @@
* but most programs should be fine.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char sccsid[] = "from: @(#)regex.c 5.1 (Berkeley) 3/29/92";*/
-static char rcsid[] = "$OpenBSD: regex.c,v 1.6 2003/06/26 23:19:32 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <stddef.h>
#include <regexp.h>
diff --git a/lib/libcompat/4.3/rexec.c b/lib/libcompat/4.3/rexec.c
index fa9cd2c0993..e4b7cd58a34 100644
--- a/lib/libcompat/4.3/rexec.c
+++ b/lib/libcompat/4.3/rexec.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rexec.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/lib/libcompat/4.3/setrgid.c b/lib/libcompat/4.3/setrgid.c
index 72290a2ee71..fc0a6f1fe63 100644
--- a/lib/libcompat/4.3/setrgid.c
+++ b/lib/libcompat/4.3/setrgid.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setrgid.c,v 1.2 2003/06/02 20:18:40 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <unistd.h>
diff --git a/lib/libcompat/4.3/setruid.c b/lib/libcompat/4.3/setruid.c
index d7f190d2974..0089cfbece7 100644
--- a/lib/libcompat/4.3/setruid.c
+++ b/lib/libcompat/4.3/setruid.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setruid.c,v 1.2 2003/06/02 20:18:40 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <unistd.h>
diff --git a/lib/libcompat/4.4/cuserid.c b/lib/libcompat/4.4/cuserid.c
index 9afd2417e18..cbf5a3758e8 100644
--- a/lib/libcompat/4.4/cuserid.c
+++ b/lib/libcompat/4.4/cuserid.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)cuserid.c 8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
#include <pwd.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/libcompat/regexp/regerror.c b/lib/libcompat/regexp/regerror.c
index 92bb8996643..86dd12fa6f5 100644
--- a/lib/libcompat/regexp/regerror.c
+++ b/lib/libcompat/regexp/regerror.c
@@ -1,8 +1,4 @@
-/* $OpenBSD: regerror.c,v 1.6 2003/07/18 23:05:13 david Exp $ */
-#ifndef lint
-static char *rcsid = "$OpenBSD: regerror.c,v 1.6 2003/07/18 23:05:13 david Exp $";
-#endif /* not lint */
-
+/* $OpenBSD: regerror.c,v 1.7 2009/10/27 23:59:28 deraadt Exp $ */
#include <err.h>
#include <regexp.h>
#include <stdio.h>
diff --git a/lib/libcompat/regexp/regexp.c b/lib/libcompat/regexp/regexp.c
index dee45ed3efd..23f5b29ef45 100644
--- a/lib/libcompat/regexp/regexp.c
+++ b/lib/libcompat/regexp/regexp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: regexp.c,v 1.5 2006/04/09 04:58:37 deraadt Exp $ */
+/* $OpenBSD: regexp.c,v 1.6 2009/10/27 23:59:28 deraadt Exp $ */
/*
* regcomp and regexec -- regsub and regerror are elsewhere
@@ -35,10 +35,6 @@
* regular-expression syntax might require a total rethink.
*/
-#ifndef lint
-static char *rcsid = "$OpenBSD: regexp.c,v 1.5 2006/04/09 04:58:37 deraadt Exp $";
-#endif /* not lint */
-
#include <regexp.h>
#include <stdio.h>
#include <ctype.h>
diff --git a/lib/libcompat/regexp/regsub.c b/lib/libcompat/regexp/regsub.c
index ab457a2c17b..1454a3ae503 100644
--- a/lib/libcompat/regexp/regsub.c
+++ b/lib/libcompat/regexp/regsub.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: regsub.c,v 1.3 1996/12/14 07:01:29 tholo Exp $ */
+/* $OpenBSD: regsub.c,v 1.4 2009/10/27 23:59:28 deraadt Exp $ */
/*
* regsub
@@ -21,10 +21,6 @@
* be misrepresented as being the original software.
*/
-#ifndef lint
-static char *rcsid = "$OpenBSD: regsub.c,v 1.3 1996/12/14 07:01:29 tholo Exp $";
-#endif /* not lint */
-
#include <regexp.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/libcurses/tinfo/read_termcap.c b/lib/libcurses/tinfo/read_termcap.c
index f48ffcead66..65dc97fd04a 100644
--- a/lib/libcurses/tinfo/read_termcap.c
+++ b/lib/libcurses/tinfo/read_termcap.c
@@ -117,8 +117,6 @@ static int _nc_nfcmp(const char *, char *);
* SUCH DAMAGE.
*/
-/* static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94"; */
-
#define BFRAG 1024
#define BSIZE 1024
#define ESC ('[' & 037) /* ASCII ESC */
@@ -678,8 +676,6 @@ _nc_nfcmp(const char *nf, char *rec)
* SUCH DAMAGE.
*/
-/* static char sccsid[] = "@(#)termcap.c 8.1 (Berkeley) 6/4/93" */
-
#define PBUFSIZ 512 /* max length of filename path */
#define PVECSIZ 32 /* max number of names in path */
#define TBUFSIZ (2048*2)
diff --git a/lib/libedit/TEST/test.c b/lib/libedit/TEST/test.c
index 03e3d237db3..a4f61e331e0 100644
--- a/lib/libedit/TEST/test.c
+++ b/lib/libedit/TEST/test.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: test.c,v 1.7 2005/05/22 05:45:35 otto Exp $ */
+/* $OpenBSD: test.c,v 1.8 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: test.c,v 1.13 2003/08/07 16:44:35 agc Exp $ */
/*-
@@ -34,18 +34,6 @@
*/
#include "config.h"
-#ifndef lint
-//__COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
-// The Regents of the University of California. All rights reserved.\n");
-#endif /* not lint */
-
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)test.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char *rcsid = "$OpenBSD: test.c,v 1.7 2005/05/22 05:45:35 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* test.c: A little test program
diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c
index 5320542aea7..5a2ffa6b701 100644
--- a/lib/libedit/chared.c
+++ b/lib/libedit/chared.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chared.c,v 1.8 2003/11/25 20:12:38 otto Exp $ */
+/* $OpenBSD: chared.c,v 1.9 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: chared.c,v 1.21 2003/11/02 20:08:41 christos Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: chared.c,v 1.8 2003/11/25 20:12:38 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* chared.c: Character editor utilities
diff --git a/lib/libedit/common.c b/lib/libedit/common.c
index 35176dd75ee..5bc5e36b895 100644
--- a/lib/libedit/common.c
+++ b/lib/libedit/common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: common.c,v 1.6 2003/10/31 08:42:24 otto Exp $ */
+/* $OpenBSD: common.c,v 1.7 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: common.c,v 1.16 2003/08/07 16:44:30 agc Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)common.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: common.c,v 1.6 2003/10/31 08:42:24 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* common.c: Common Editor functions
diff --git a/lib/libedit/el.c b/lib/libedit/el.c
index c7a6a327879..c3fd43b4b2d 100644
--- a/lib/libedit/el.c
+++ b/lib/libedit/el.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: el.c,v 1.14 2004/08/23 18:31:25 otto Exp $ */
+/* $OpenBSD: el.c,v 1.15 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: el.c,v 1.36 2003/10/18 23:48:42 christos Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94";
-#else
-static const char rcsid[] = "$OpenBSD: el.c,v 1.14 2004/08/23 18:31:25 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* el.c: EditLine interface functions
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c
index b0e13cbaa79..75f71f575ad 100644
--- a/lib/libedit/emacs.c
+++ b/lib/libedit/emacs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: emacs.c,v 1.7 2003/11/25 20:12:38 otto Exp $ */
+/* $OpenBSD: emacs.c,v 1.8 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: emacs.c,v 1.16 2003/11/02 20:07:58 christos Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)emacs.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: emacs.c,v 1.7 2003/11/25 20:12:38 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* emacs.c: Emacs functions
diff --git a/lib/libedit/hist.c b/lib/libedit/hist.c
index e56206ba745..25d4aeb38e3 100644
--- a/lib/libedit/hist.c
+++ b/lib/libedit/hist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hist.c,v 1.7 2003/11/25 20:12:38 otto Exp $ */
+/* $OpenBSD: hist.c,v 1.8 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: hist.c,v 1.15 2003/11/01 23:36:39 christos Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: hist.c,v 1.7 2003/11/25 20:12:38 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* hist.c: History access functions
diff --git a/lib/libedit/history.c b/lib/libedit/history.c
index dffbe21dbe0..c72f0eab0d6 100644
--- a/lib/libedit/history.c
+++ b/lib/libedit/history.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: history.c,v 1.13 2004/08/23 18:31:25 otto Exp $ */
+/* $OpenBSD: history.c,v 1.14 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: history.c,v 1.25 2003/10/18 23:48:42 christos Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)history.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: history.c,v 1.13 2004/08/23 18:31:25 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* hist.c: History access functions
diff --git a/lib/libedit/key.c b/lib/libedit/key.c
index eba3dbbcf84..5a32bef030e 100644
--- a/lib/libedit/key.c
+++ b/lib/libedit/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.9 2003/11/25 20:12:38 otto Exp $ */
+/* $OpenBSD: key.c,v 1.10 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: key.c,v 1.15 2003/10/18 23:48:42 christos Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)key.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: key.c,v 1.9 2003/11/25 20:12:38 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* key.c: This module contains the procedures for maintaining
diff --git a/lib/libedit/map.c b/lib/libedit/map.c
index 0e5d50f0639..54a165c9f86 100644
--- a/lib/libedit/map.c
+++ b/lib/libedit/map.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: map.c,v 1.9 2003/10/31 08:42:24 otto Exp $ */
+/* $OpenBSD: map.c,v 1.10 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: map.c,v 1.19 2003/08/07 16:44:32 agc Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: map.c,v 1.9 2003/10/31 08:42:24 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* map.c: Editor function definitions
diff --git a/lib/libedit/parse.c b/lib/libedit/parse.c
index 9dbc09083ae..29670ac5df2 100644
--- a/lib/libedit/parse.c
+++ b/lib/libedit/parse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.c,v 1.8 2003/11/25 20:12:38 otto Exp $ */
+/* $OpenBSD: parse.c,v 1.9 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: parse.c,v 1.19 2003/11/02 20:06:57 christos Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: parse.c,v 1.8 2003/11/25 20:12:38 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* parse.c: parse an editline extended command
diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c
index a7454a1d599..0ad61143164 100644
--- a/lib/libedit/prompt.c
+++ b/lib/libedit/prompt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prompt.c,v 1.7 2003/10/31 08:42:24 otto Exp $ */
+/* $OpenBSD: prompt.c,v 1.8 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: prompt.c,v 1.11 2003/08/07 16:44:32 agc Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)prompt.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: prompt.c,v 1.7 2003/10/31 08:42:24 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* prompt.c: Prompt printing functions
diff --git a/lib/libedit/read.c b/lib/libedit/read.c
index 28686ff81f3..6fa9cf097cb 100644
--- a/lib/libedit/read.c
+++ b/lib/libedit/read.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: read.c,v 1.11 2003/11/25 20:12:38 otto Exp $ */
+/* $OpenBSD: read.c,v 1.12 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: read.c,v 1.30 2003/10/18 23:48:42 christos Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: read.c,v 1.11 2003/11/25 20:12:38 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* read.c: Clean this junk up! This is horrible code.
diff --git a/lib/libedit/readline.c b/lib/libedit/readline.c
index b1dedbe932e..267527fa7c8 100644
--- a/lib/libedit/readline.c
+++ b/lib/libedit/readline.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readline.c,v 1.6 2009/06/21 00:38:22 martynas Exp $ */
+/* $OpenBSD: readline.c,v 1.7 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: readline.c,v 1.43 2003/11/03 03:22:55 christos Exp $ */
/*-
@@ -31,9 +31,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-static const char rcsid[] = "$OpenBSD: readline.c,v 1.6 2009/06/21 00:38:22 martynas Exp $";
-#endif /* not lint && not SCCSID */
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c
index 2f644d32e05..f2b909ea8e2 100644
--- a/lib/libedit/refresh.c
+++ b/lib/libedit/refresh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: refresh.c,v 1.9 2003/10/31 08:42:24 otto Exp $ */
+/* $OpenBSD: refresh.c,v 1.10 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: refresh.c,v 1.26 2003/08/07 16:44:33 agc Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: refresh.c,v 1.9 2003/10/31 08:42:24 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* refresh.c: Lower level screen refreshing functions
diff --git a/lib/libedit/search.c b/lib/libedit/search.c
index 74fb5d91b53..e9112b24564 100644
--- a/lib/libedit/search.c
+++ b/lib/libedit/search.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: search.c,v 1.10 2003/11/25 20:12:38 otto Exp $ */
+/* $OpenBSD: search.c,v 1.11 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: search.c,v 1.19 2003/10/25 06:42:41 christos Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: search.c,v 1.10 2003/11/25 20:12:38 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* search.c: History and character search functions
diff --git a/lib/libedit/sig.c b/lib/libedit/sig.c
index 28ce610b0fe..58a62eabe4f 100644
--- a/lib/libedit/sig.c
+++ b/lib/libedit/sig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sig.c,v 1.10 2003/10/31 08:42:24 otto Exp $ */
+/* $OpenBSD: sig.c,v 1.11 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: sig.c,v 1.11 2003/08/07 16:44:33 agc Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)sig.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: sig.c,v 1.10 2003/10/31 08:42:24 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* sig.c: Signal handling stuff.
diff --git a/lib/libedit/term.c b/lib/libedit/term.c
index 7e92256364a..44af5ff29d7 100644
--- a/lib/libedit/term.c
+++ b/lib/libedit/term.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: term.c,v 1.11 2003/10/31 08:42:24 otto Exp $ */
+/* $OpenBSD: term.c,v 1.12 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: term.c,v 1.38 2003/09/14 21:48:55 christos Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95";
-#else
-static const char rcsid[] = "$OpenBSD: term.c,v 1.11 2003/10/31 08:42:24 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* term.c: Editor/termcap-curses interface
diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c
index 07edc46b350..972e26923cf 100644
--- a/lib/libedit/tokenizer.c
+++ b/lib/libedit/tokenizer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tokenizer.c,v 1.10 2003/11/25 20:12:38 otto Exp $ */
+/* $OpenBSD: tokenizer.c,v 1.11 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: tokenizer.c,v 1.13 2003/10/18 23:48:42 christos Exp $ */
/*-
@@ -34,14 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)tokenizer.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: tokenizer.c,v 1.10 2003/11/25 20:12:38 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
-
/*
* tokenize.c: Bourne shell like tokenizer
*/
diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c
index 18fa5d032da..f02c44a9b0f 100644
--- a/lib/libedit/tty.c
+++ b/lib/libedit/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.10 2003/11/25 20:12:38 otto Exp $ */
+/* $OpenBSD: tty.c,v 1.11 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: tty.c,v 1.20 2003/10/18 22:37:24 christos Exp $ */
/*-
@@ -34,13 +34,6 @@
*/
#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: tty.c,v 1.10 2003/11/25 20:12:38 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
/*
* tty.c: tty interface stuff
diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c
index 888c1469381..7282fcbee10 100644
--- a/lib/libedit/vi.c
+++ b/lib/libedit/vi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vi.c,v 1.7 2003/10/31 08:42:24 otto Exp $ */
+/* $OpenBSD: vi.c,v 1.8 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: vi.c,v 1.19 2003/08/07 16:44:35 agc Exp $ */
/*-
@@ -38,14 +38,6 @@
#include <unistd.h>
#include <sys/wait.h>
-#if !defined(lint) && !defined(SCCSID)
-#if 0
-static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] = "$OpenBSD: vi.c,v 1.7 2003/10/31 08:42:24 otto Exp $";
-#endif
-#endif /* not lint && not SCCSID */
-
/*
* vi.c: Vi mode commands.
*/
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index ca04ff4d731..5e4ec0ab34f 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm.c,v 1.47 2009/06/07 03:09:34 millert Exp $ */
+/* $OpenBSD: kvm.c,v 1.48 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: kvm.c,v 1.43 1996/05/05 04:31:59 gwr Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94";
-#else
-static char *rcsid = "$OpenBSD: kvm.c,v 1.47 2009/06/07 03:09:34 millert Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/user.h>
#include <sys/proc.h>
diff --git a/lib/libkvm/kvm_cd9660.c b/lib/libkvm/kvm_cd9660.c
index 363ccfabdf8..27a8d823458 100644
--- a/lib/libkvm/kvm_cd9660.c
+++ b/lib/libkvm/kvm_cd9660.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_cd9660.c,v 1.2 2009/06/20 20:20:43 millert Exp $ */
+/* $OpenBSD: kvm_cd9660.c,v 1.3 2009/10/27 23:59:28 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.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: kvm_cd9660.c,v 1.2 2009/06/20 20:20:43 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/ucred.h>
#define _KERNEL
diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c
index db97d4b368a..b0b520bcdc5 100644
--- a/lib/libkvm/kvm_file.c
+++ b/lib/libkvm/kvm_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_file.c,v 1.15 2009/06/20 20:20:43 millert Exp $ */
+/* $OpenBSD: kvm_file.c,v 1.16 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: kvm_file.c,v 1.5 1996/03/18 22:33:18 thorpej Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_file.c 8.1 (Berkeley) 6/4/93";
-#else
-static char *rcsid = "$OpenBSD: kvm_file.c,v 1.15 2009/06/20 20:20:43 millert Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
/*
* File list interface for kvm. pstat, fstat and netstat are
* users of this code, so we've factored it out into a separate module.
diff --git a/lib/libkvm/kvm_file2.c b/lib/libkvm/kvm_file2.c
index 20a6ceb7b34..6642b2136c6 100644
--- a/lib/libkvm/kvm_file2.c
+++ b/lib/libkvm/kvm_file2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_file2.c,v 1.12 2009/07/21 14:37:00 millert Exp $ */
+/* $OpenBSD: kvm_file2.c,v 1.13 2009/10/27 23:59:28 deraadt Exp $ */
/*
* Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -45,10 +45,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: kvm_file2.c,v 1.12 2009/07/21 14:37:00 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Extended file list interface for kvm. pstat, fstat and netstat are
* users of this code, so we've factored it out into a separate module.
diff --git a/lib/libkvm/kvm_getloadavg.c b/lib/libkvm/kvm_getloadavg.c
index 66cd9af4fa0..a6461c7b1d3 100644
--- a/lib/libkvm/kvm_getloadavg.c
+++ b/lib/libkvm/kvm_getloadavg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_getloadavg.c,v 1.8 2009/06/20 20:20:43 millert Exp $ */
+/* $OpenBSD: kvm_getloadavg.c,v 1.9 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: kvm_getloadavg.c,v 1.2 1996/03/18 22:33:31 thorpej Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_getloadavg.c 8.1 (Berkeley) 6/4/93";
-#else
-static char *rcsid = "$OpenBSD: kvm_getloadavg.c,v 1.8 2009/06/20 20:20:43 millert Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index 815417c6c2d..78faab55c3d 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_i386.c,v 1.20 2007/02/20 21:15:00 tom Exp $ */
+/* $OpenBSD: kvm_i386.c,v 1.21 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: kvm_i386.c,v 1.9 1996/03/18 22:33:38 thorpej Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
-#else
-static char *rcsid = "$OpenBSD: kvm_i386.c,v 1.20 2007/02/20 21:15:00 tom Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
/*
* i386 machine dependent routines for kvm. Hopefully, the forthcoming
* vm code will one day obsolete this module.
diff --git a/lib/libkvm/kvm_m68k.c b/lib/libkvm/kvm_m68k.c
index f677789b092..c5fc38508b2 100644
--- a/lib/libkvm/kvm_m68k.c
+++ b/lib/libkvm/kvm_m68k.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_m68k.c,v 1.18 2009/06/20 20:20:43 millert Exp $ */
+/* $OpenBSD: kvm_m68k.c,v 1.19 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: kvm_m68k.c,v 1.9 1996/05/07 06:09:11 leo Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
-#else
-static char *rcsid = "$OpenBSD: kvm_m68k.c,v 1.18 2009/06/20 20:20:43 millert Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
/*
* m68k machine dependent routines for kvm. Hopefully, the forthcoming
* vm code will one day obsolete this module.
diff --git a/lib/libkvm/kvm_mips64.c b/lib/libkvm/kvm_mips64.c
index f39d0ded1c2..a2d4df5038d 100644
--- a/lib/libkvm/kvm_mips64.c
+++ b/lib/libkvm/kvm_mips64.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_mips64.c,v 1.8 2009/06/20 20:20:43 millert Exp $ */
+/* $OpenBSD: kvm_mips64.c,v 1.9 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: kvm_mips.c,v 1.3 1996/03/18 22:33:44 thorpej Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_mips.c 8.1 (Berkeley) 6/4/93";
-#else
-static char *rcsid = "$OpenBSD: kvm_mips64.c,v 1.8 2009/06/20 20:20:43 millert Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
/*
* MIPS machine dependent routines for kvm. Hopefully, the forthcoming
* vm code will one day obsolete this module.
diff --git a/lib/libkvm/kvm_ntfs.c b/lib/libkvm/kvm_ntfs.c
index fd36f33a8c6..53a7c19209d 100644
--- a/lib/libkvm/kvm_ntfs.c
+++ b/lib/libkvm/kvm_ntfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_ntfs.c,v 1.1 2009/06/24 13:04:24 millert Exp $ */
+/* $OpenBSD: kvm_ntfs.c,v 1.2 2009/10/27 23:59:28 deraadt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -29,10 +29,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: kvm_ntfs.c,v 1.1 2009/06/24 13:04:24 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/ucred.h>
#define _KERNEL
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 0add3192d49..d12202be2d4 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_proc.c,v 1.38 2009/06/20 20:20:43 millert Exp $ */
+/* $OpenBSD: kvm_proc.c,v 1.39 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -62,14 +62,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93";
-#else
-static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.38 2009/06/20 20:20:43 millert Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
/*
* Proc traversal interface for kvm. ps and w are (probably) the exclusive
* users of this code, so we've factored it out into a separate module.
diff --git a/lib/libkvm/kvm_sparc.c b/lib/libkvm/kvm_sparc.c
index 207cacffe86..c2ae363f667 100644
--- a/lib/libkvm/kvm_sparc.c
+++ b/lib/libkvm/kvm_sparc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_sparc.c,v 1.11 2006/03/20 15:11:48 mickey Exp $ */
+/* $OpenBSD: kvm_sparc.c,v 1.12 2009/10/27 23:59:28 deraadt Exp $ */
/* $NetBSD: kvm_sparc.c,v 1.9 1996/04/01 19:23:03 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93";
-#else
-static char *rcsid = "$OpenBSD: kvm_sparc.c,v 1.11 2006/03/20 15:11:48 mickey Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
/*
* Sparc machine dependent routines for kvm. Hopefully, the forthcoming
* vm code will one day obsolete this module.
diff --git a/lib/libkvm/kvm_udf.c b/lib/libkvm/kvm_udf.c
index c891fb937ed..bbc33c0009b 100644
--- a/lib/libkvm/kvm_udf.c
+++ b/lib/libkvm/kvm_udf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_udf.c,v 1.2 2009/06/20 20:20:43 millert Exp $ */
+/* $OpenBSD: kvm_udf.c,v 1.3 2009/10/27 23:59:28 deraadt Exp $ */
/*
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: kvm_udf.c,v 1.2 2009/06/20 20:20:43 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/ucred.h>
#define _KERNEL
diff --git a/lib/libm/arch/hppa/e_remainder.c b/lib/libm/arch/hppa/e_remainder.c
index 0098c39c911..7dba95689da 100644
--- a/lib/libm/arch/hppa/e_remainder.c
+++ b/lib/libm/arch/hppa/e_remainder.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: e_remainder.c,v 1.2 2008/09/07 20:36:08 martynas Exp $";
-#endif
-
#include "math.h"
double
diff --git a/lib/libm/arch/hppa/e_remainderf.c b/lib/libm/arch/hppa/e_remainderf.c
index 87e0871ec27..6799b4dc58d 100644
--- a/lib/libm/arch/hppa/e_remainderf.c
+++ b/lib/libm/arch/hppa/e_remainderf.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: e_remainderf.c,v 1.3 2008/09/07 20:36:08 martynas Exp $";
-#endif
-
#include "math.h"
float
diff --git a/lib/libm/arch/hppa/e_sqrt.c b/lib/libm/arch/hppa/e_sqrt.c
index f666325aab4..c18d2a8b425 100644
--- a/lib/libm/arch/hppa/e_sqrt.c
+++ b/lib/libm/arch/hppa/e_sqrt.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: e_sqrt.c,v 1.4 2008/12/10 01:08:24 martynas Exp $";
-#endif
-
#include <sys/cdefs.h>
#include <float.h>
#include <math.h>
diff --git a/lib/libm/arch/hppa/e_sqrtf.c b/lib/libm/arch/hppa/e_sqrtf.c
index c5fff115f13..168ad7a1d0d 100644
--- a/lib/libm/arch/hppa/e_sqrtf.c
+++ b/lib/libm/arch/hppa/e_sqrtf.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: e_sqrtf.c,v 1.2 2008/09/07 20:36:08 martynas Exp $";
-#endif
-
#include "math.h"
float
diff --git a/lib/libm/arch/hppa/s_ceil.c b/lib/libm/arch/hppa/s_ceil.c
index 3a5a83cdcad..692300f40f8 100644
--- a/lib/libm/arch/hppa/s_ceil.c
+++ b/lib/libm/arch/hppa/s_ceil.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: s_ceil.c,v 1.3 2003/01/16 19:17:33 mickey Exp $";
-#endif
-
#include <sys/types.h>
#include <machine/ieeefp.h>
#include "math.h"
diff --git a/lib/libm/arch/hppa/s_ceilf.c b/lib/libm/arch/hppa/s_ceilf.c
index 1ca5decd9d7..dcb1e1e0b5d 100644
--- a/lib/libm/arch/hppa/s_ceilf.c
+++ b/lib/libm/arch/hppa/s_ceilf.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: s_ceilf.c,v 1.3 2003/01/16 19:17:33 mickey Exp $";
-#endif
-
#include <sys/types.h>
#include <machine/ieeefp.h>
#include "math.h"
diff --git a/lib/libm/arch/hppa/s_floor.c b/lib/libm/arch/hppa/s_floor.c
index ef9c29dbd51..cea213d8fcb 100644
--- a/lib/libm/arch/hppa/s_floor.c
+++ b/lib/libm/arch/hppa/s_floor.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: s_floor.c,v 1.5 2009/06/30 20:20:20 kettenis Exp $";
-#endif
-
#include <sys/types.h>
#include <machine/ieeefp.h>
#include "math.h"
diff --git a/lib/libm/arch/hppa/s_floorf.c b/lib/libm/arch/hppa/s_floorf.c
index a719cd3a3fd..e503ea32210 100644
--- a/lib/libm/arch/hppa/s_floorf.c
+++ b/lib/libm/arch/hppa/s_floorf.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: s_floorf.c,v 1.5 2009/06/30 20:20:20 kettenis Exp $";
-#endif
-
#include <sys/types.h>
#include <machine/ieeefp.h>
#include "math.h"
diff --git a/lib/libm/arch/hppa/s_rint.c b/lib/libm/arch/hppa/s_rint.c
index ba3a0b28622..d2df79fc475 100644
--- a/lib/libm/arch/hppa/s_rint.c
+++ b/lib/libm/arch/hppa/s_rint.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: s_rint.c,v 1.4 2008/12/10 01:08:24 martynas Exp $";
-#endif
-
#include <sys/cdefs.h>
#include <float.h>
#include <math.h>
diff --git a/lib/libm/arch/hppa/s_rintf.c b/lib/libm/arch/hppa/s_rintf.c
index 637845d6550..89f749819db 100644
--- a/lib/libm/arch/hppa/s_rintf.c
+++ b/lib/libm/arch/hppa/s_rintf.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: s_rintf.c,v 1.2 2002/09/11 15:16:52 mickey Exp $";
-#endif
-
#include "math.h"
float
diff --git a/lib/libm/arch/hppa/s_round.c b/lib/libm/arch/hppa/s_round.c
index 2182450b841..80421933c17 100644
--- a/lib/libm/arch/hppa/s_round.c
+++ b/lib/libm/arch/hppa/s_round.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: s_round.c,v 1.1 2009/07/15 20:08:43 martynas Exp $";
-#endif
-
#include <sys/types.h>
#include <machine/ieeefp.h>
#include "math.h"
diff --git a/lib/libm/arch/hppa/s_roundf.c b/lib/libm/arch/hppa/s_roundf.c
index a1e44d5bd23..91e993d7e44 100644
--- a/lib/libm/arch/hppa/s_roundf.c
+++ b/lib/libm/arch/hppa/s_roundf.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: s_roundf.c,v 1.1 2009/07/15 20:08:43 martynas Exp $";
-#endif
-
#include <sys/types.h>
#include <machine/ieeefp.h>
#include "math.h"
diff --git a/lib/libm/arch/hppa/s_trunc.c b/lib/libm/arch/hppa/s_trunc.c
index b253948d9dc..9d54ec23845 100644
--- a/lib/libm/arch/hppa/s_trunc.c
+++ b/lib/libm/arch/hppa/s_trunc.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: s_trunc.c,v 1.1 2009/07/15 20:08:43 martynas Exp $";
-#endif
-
#include <sys/types.h>
#include <machine/ieeefp.h>
#include "math.h"
diff --git a/lib/libm/arch/hppa/s_truncf.c b/lib/libm/arch/hppa/s_truncf.c
index c8459f1f660..5bc42b7255d 100644
--- a/lib/libm/arch/hppa/s_truncf.c
+++ b/lib/libm/arch/hppa/s_truncf.c
@@ -2,10 +2,6 @@
* Written by Michael Shalayeff. Public Domain
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: s_truncf.c,v 1.1 2009/07/15 20:08:43 martynas Exp $";
-#endif
-
#include <sys/types.h>
#include <machine/ieeefp.h>
#include "math.h"
diff --git a/lib/libm/noieee_src/n_acosh.c b/lib/libm/noieee_src/n_acosh.c
index 52b1d14a1f2..46b2914339f 100644
--- a/lib/libm/noieee_src/n_acosh.c
+++ b/lib/libm/noieee_src/n_acosh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_acosh.c,v 1.8 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_acosh.c,v 1.9 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_acosh.c,v 1.1 1995/10/10 23:36:33 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)acosh.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* ACOSH(X)
* RETURN THE INVERSE HYPERBOLIC COSINE OF X
* DOUBLE PRECISION (VAX D FORMAT 56 BITS, IEEE DOUBLE 53 BITS)
diff --git a/lib/libm/noieee_src/n_asincos.c b/lib/libm/noieee_src/n_asincos.c
index 749039097d1..30fa0473edd 100644
--- a/lib/libm/noieee_src/n_asincos.c
+++ b/lib/libm/noieee_src/n_asincos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_asincos.c,v 1.9 2008/12/10 01:08:24 martynas Exp $ */
+/* $OpenBSD: n_asincos.c,v 1.10 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_asincos.c,v 1.1 1995/10/10 23:36:34 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)asincos.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* ASIN(X)
* RETURNS ARC SINE OF X
* DOUBLE PRECISION (IEEE DOUBLE 53 bits, VAX D FORMAT 56 bits)
diff --git a/lib/libm/noieee_src/n_asinh.c b/lib/libm/noieee_src/n_asinh.c
index 96adfb9df0b..6307c9356b4 100644
--- a/lib/libm/noieee_src/n_asinh.c
+++ b/lib/libm/noieee_src/n_asinh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_asinh.c,v 1.9 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_asinh.c,v 1.10 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_asinh.c,v 1.1 1995/10/10 23:36:35 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)asinh.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* ASINH(X)
* RETURN THE INVERSE HYPERBOLIC SINE OF X
* DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
diff --git a/lib/libm/noieee_src/n_atan.c b/lib/libm/noieee_src/n_atan.c
index e9851440d3b..98f1e67be54 100644
--- a/lib/libm/noieee_src/n_atan.c
+++ b/lib/libm/noieee_src/n_atan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_atan.c,v 1.7 2008/12/10 01:08:24 martynas Exp $ */
+/* $OpenBSD: n_atan.c,v 1.8 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_atan.c,v 1.1 1995/10/10 23:36:36 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)atan.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* ATAN(X)
* RETURNS ARC TANGENT OF X
* DOUBLE PRECISION (IEEE DOUBLE 53 bits, VAX D FORMAT 56 bits)
diff --git a/lib/libm/noieee_src/n_atan2.c b/lib/libm/noieee_src/n_atan2.c
index 201814f4b97..c7d31f9febb 100644
--- a/lib/libm/noieee_src/n_atan2.c
+++ b/lib/libm/noieee_src/n_atan2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_atan2.c,v 1.12 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_atan2.c,v 1.13 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_atan2.c,v 1.1 1995/10/10 23:36:37 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)atan2.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* ATAN2(Y,X)
* RETURN ARG (X+iY)
* DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
diff --git a/lib/libm/noieee_src/n_atanh.c b/lib/libm/noieee_src/n_atanh.c
index 1ab1ae77b45..513065aca5e 100644
--- a/lib/libm/noieee_src/n_atanh.c
+++ b/lib/libm/noieee_src/n_atanh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_atanh.c,v 1.6 2008/06/21 08:26:19 martynas Exp $ */
+/* $OpenBSD: n_atanh.c,v 1.7 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_atanh.c,v 1.1 1995/10/10 23:36:38 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)atanh.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* ATANH(X)
* RETURN THE HYPERBOLIC ARC TANGENT OF X
* DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
diff --git a/lib/libm/noieee_src/n_cbrt.c b/lib/libm/noieee_src/n_cbrt.c
index 164edc8f009..94dba84c850 100644
--- a/lib/libm/noieee_src/n_cbrt.c
+++ b/lib/libm/noieee_src/n_cbrt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_cbrt.c,v 1.5 2008/06/21 08:26:19 martynas Exp $ */
+/* $OpenBSD: n_cbrt.c,v 1.6 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_cbrt.c,v 1.1 1995/10/10 23:36:40 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)cbrt.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
#include <sys/cdefs.h>
/* kahan's cube root (53 bits IEEE double precision)
diff --git a/lib/libm/noieee_src/n_cosh.c b/lib/libm/noieee_src/n_cosh.c
index 795c9c6e4bc..72fe1853972 100644
--- a/lib/libm/noieee_src/n_cosh.c
+++ b/lib/libm/noieee_src/n_cosh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_cosh.c,v 1.9 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_cosh.c,v 1.10 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_cosh.c,v 1.1 1995/10/10 23:36:42 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)cosh.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* COSH(X)
* RETURN THE HYPERBOLIC COSINE OF X
* DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
diff --git a/lib/libm/noieee_src/n_erf.c b/lib/libm/noieee_src/n_erf.c
index 886e6d07262..09995049b61 100644
--- a/lib/libm/noieee_src/n_erf.c
+++ b/lib/libm/noieee_src/n_erf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_erf.c,v 1.6 2008/06/21 08:26:19 martynas Exp $ */
+/* $OpenBSD: n_erf.c,v 1.7 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_erf.c,v 1.1 1995/10/10 23:36:43 ragge Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)erf.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
#include "math.h"
#include "mathimpl.h"
diff --git a/lib/libm/noieee_src/n_exp.c b/lib/libm/noieee_src/n_exp.c
index 0f12ca47ade..b018ff18757 100644
--- a/lib/libm/noieee_src/n_exp.c
+++ b/lib/libm/noieee_src/n_exp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_exp.c,v 1.9 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_exp.c,v 1.10 2009/10/27 23:59:29 deraadt Exp $ */
/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,10 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* EXP(X)
* RETURN THE EXPONENTIAL OF X
* DOUBLE PRECISION (IEEE 53 bits, VAX D FORMAT 56 BITS)
diff --git a/lib/libm/noieee_src/n_exp__E.c b/lib/libm/noieee_src/n_exp__E.c
index bb064cc8b0a..ccdda138c45 100644
--- a/lib/libm/noieee_src/n_exp__E.c
+++ b/lib/libm/noieee_src/n_exp__E.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_exp__E.c,v 1.11 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_exp__E.c,v 1.12 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_exp__E.c,v 1.1 1995/10/10 23:36:45 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)exp__E.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* exp__E(x,c)
* ASSUMPTION: c << x SO THAT fl(x+c)=x.
* (c is the correction term for x)
diff --git a/lib/libm/noieee_src/n_expm1.c b/lib/libm/noieee_src/n_expm1.c
index 2d555686417..435f4c63c6c 100644
--- a/lib/libm/noieee_src/n_expm1.c
+++ b/lib/libm/noieee_src/n_expm1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_expm1.c,v 1.11 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_expm1.c,v 1.12 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_expm1.c,v 1.1 1995/10/10 23:36:46 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)expm1.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* EXPM1(X)
* RETURN THE EXPONENTIAL OF X MINUS ONE
* DOUBLE PRECISION (IEEE 53 BITS, VAX D FORMAT 56 BITS)
diff --git a/lib/libm/noieee_src/n_floor.c b/lib/libm/noieee_src/n_floor.c
index 050cfd4944b..c978b1164c2 100644
--- a/lib/libm/noieee_src/n_floor.c
+++ b/lib/libm/noieee_src/n_floor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_floor.c,v 1.12 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_floor.c,v 1.13 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_floor.c,v 1.1 1995/10/10 23:36:48 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)floor.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
#include <sys/cdefs.h>
#include <math.h>
diff --git a/lib/libm/noieee_src/n_fmod.c b/lib/libm/noieee_src/n_fmod.c
index 06bbc76cff3..e78ae985a62 100644
--- a/lib/libm/noieee_src/n_fmod.c
+++ b/lib/libm/noieee_src/n_fmod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_fmod.c,v 1.6 2008/06/21 08:26:19 martynas Exp $ */
+/* $OpenBSD: n_fmod.c,v 1.7 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_fmod.c,v 1.1 1995/10/10 23:36:49 ragge Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)fmod.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
#include "math.h"
#include "mathimpl.h"
diff --git a/lib/libm/noieee_src/n_hypot.c b/lib/libm/noieee_src/n_hypot.c
index c985d943aa5..2273b1f0a64 100644
--- a/lib/libm/noieee_src/n_hypot.c
+++ b/lib/libm/noieee_src/n_hypot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_hypot.c,v 1.2 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_hypot.c,v 1.3 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_cabs.c,v 1.1 1995/10/10 23:36:39 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)cabs.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* HYPOT(X,Y)
* RETURN THE SQUARE ROOT OF X^2 + Y^2 WHERE Z=X+iY
* DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
diff --git a/lib/libm/noieee_src/n_j0.c b/lib/libm/noieee_src/n_j0.c
index 8b46630b6ad..02c56dd9165 100644
--- a/lib/libm/noieee_src/n_j0.c
+++ b/lib/libm/noieee_src/n_j0.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_j0.c,v 1.6 2008/06/21 08:26:19 martynas Exp $ */
+/* $OpenBSD: n_j0.c,v 1.7 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_j0.c,v 1.1 1995/10/10 23:36:52 ragge Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)j0.c 8.2 (Berkeley) 11/30/93";
-#endif /* not lint */
-
/*
* 16 December 1992
* Minor modifications by Peter McIlroy to adapt non-IEEE architecture.
diff --git a/lib/libm/noieee_src/n_j1.c b/lib/libm/noieee_src/n_j1.c
index dae88b56afe..dd8f28a9a0e 100644
--- a/lib/libm/noieee_src/n_j1.c
+++ b/lib/libm/noieee_src/n_j1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_j1.c,v 1.6 2008/06/25 17:49:31 martynas Exp $ */
+/* $OpenBSD: n_j1.c,v 1.7 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_j1.c,v 1.1 1995/10/10 23:36:53 ragge Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)j1.c 8.2 (Berkeley) 11/30/93";
-#endif /* not lint */
-
/*
* 16 December 1992
* Minor modifications by Peter McIlroy to adapt non-IEEE architecture.
diff --git a/lib/libm/noieee_src/n_jn.c b/lib/libm/noieee_src/n_jn.c
index 5383aa35b34..b5c9d51b9a7 100644
--- a/lib/libm/noieee_src/n_jn.c
+++ b/lib/libm/noieee_src/n_jn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_jn.c,v 1.6 2008/06/25 17:49:31 martynas Exp $ */
+/* $OpenBSD: n_jn.c,v 1.7 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_jn.c,v 1.1 1995/10/10 23:36:54 ragge Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)jn.c 8.2 (Berkeley) 11/30/93";
-#endif /* not lint */
-
/*
* 16 December 1992
* Minor modifications by Peter McIlroy to adapt non-IEEE architecture.
diff --git a/lib/libm/noieee_src/n_lgamma.c b/lib/libm/noieee_src/n_lgamma.c
index 1fe70c44cc2..6758234c623 100644
--- a/lib/libm/noieee_src/n_lgamma.c
+++ b/lib/libm/noieee_src/n_lgamma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_lgamma.c,v 1.8 2008/07/18 13:08:58 martynas Exp $ */
+/* $OpenBSD: n_lgamma.c,v 1.9 2009/10/27 23:59:29 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,10 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)lgamma.c 8.2 (Berkeley) 11/30/93";
-#endif /* not lint */
-
/*
* Coded by Peter McIlroy, Nov 1992;
*
diff --git a/lib/libm/noieee_src/n_log.c b/lib/libm/noieee_src/n_log.c
index 63d1cb943a1..e5c34f764de 100644
--- a/lib/libm/noieee_src/n_log.c
+++ b/lib/libm/noieee_src/n_log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_log.c,v 1.7 2008/07/16 15:25:51 martynas Exp $ */
+/* $OpenBSD: n_log.c,v 1.8 2009/10/27 23:59:29 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,10 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)log.c 8.2 (Berkeley) 11/30/93";
-#endif /* not lint */
-
#include <math.h>
#include <errno.h>
diff --git a/lib/libm/noieee_src/n_log10.c b/lib/libm/noieee_src/n_log10.c
index 85b16f9e8cb..5c0126a0691 100644
--- a/lib/libm/noieee_src/n_log10.c
+++ b/lib/libm/noieee_src/n_log10.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_log10.c,v 1.7 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_log10.c,v 1.8 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_log10.c,v 1.1 1995/10/10 23:36:58 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)log10.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* LOG10(X)
* RETURN THE BASE 10 LOGARITHM OF x
* DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
diff --git a/lib/libm/noieee_src/n_log1p.c b/lib/libm/noieee_src/n_log1p.c
index ba69e4084d6..22f6526b341 100644
--- a/lib/libm/noieee_src/n_log1p.c
+++ b/lib/libm/noieee_src/n_log1p.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_log1p.c,v 1.10 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_log1p.c,v 1.11 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_log1p.c,v 1.1 1995/10/10 23:37:00 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)log1p.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* LOG1P(x)
* RETURN THE LOGARITHM OF 1+x
* DOUBLE PRECISION (VAX D FORMAT 56 bits, IEEE DOUBLE 53 BITS)
diff --git a/lib/libm/noieee_src/n_log__L.c b/lib/libm/noieee_src/n_log__L.c
index 711f0cff0eb..84fa2be7c8c 100644
--- a/lib/libm/noieee_src/n_log__L.c
+++ b/lib/libm/noieee_src/n_log__L.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_log__L.c,v 1.8 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_log__L.c,v 1.9 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_log__L.c,v 1.1 1995/10/10 23:37:01 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)log__L.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* log__L(Z)
* LOG(1+X) - 2S X
* RETURN --------------- WHERE Z = S*S, S = ------- , 0 <= Z <= .0294...
diff --git a/lib/libm/noieee_src/n_pow.c b/lib/libm/noieee_src/n_pow.c
index 26b4cc23b3e..50d5cccc8b9 100644
--- a/lib/libm/noieee_src/n_pow.c
+++ b/lib/libm/noieee_src/n_pow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_pow.c,v 1.11 2009/04/05 02:12:43 martynas Exp $ */
+/* $OpenBSD: n_pow.c,v 1.12 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_pow.c,v 1.1 1995/10/10 23:37:02 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)pow.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* POW(X,Y)
* RETURN X**Y
* DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
diff --git a/lib/libm/noieee_src/n_sincos.c b/lib/libm/noieee_src/n_sincos.c
index 06c21507287..ddea151ff2b 100644
--- a/lib/libm/noieee_src/n_sincos.c
+++ b/lib/libm/noieee_src/n_sincos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_sincos.c,v 1.8 2008/12/10 01:08:24 martynas Exp $ */
+/* $OpenBSD: n_sincos.c,v 1.9 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_sincos.c,v 1.1 1995/10/10 23:37:04 ragge Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)sincos.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
#include <sys/cdefs.h>
#include <math.h>
diff --git a/lib/libm/noieee_src/n_sinh.c b/lib/libm/noieee_src/n_sinh.c
index fd57c726f60..1fb55addabe 100644
--- a/lib/libm/noieee_src/n_sinh.c
+++ b/lib/libm/noieee_src/n_sinh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_sinh.c,v 1.9 2009/04/11 20:03:21 martynas Exp $ */
+/* $OpenBSD: n_sinh.c,v 1.10 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_sinh.c,v 1.1 1995/10/10 23:37:05 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)sinh.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* SINH(X)
* RETURN THE HYPERBOLIC SINE OF X
* DOUBLE PRECISION (VAX D format 56 bits, IEEE DOUBLE 53 BITS)
diff --git a/lib/libm/noieee_src/n_support.c b/lib/libm/noieee_src/n_support.c
index 5ad4721138d..9e69da73085 100644
--- a/lib/libm/noieee_src/n_support.c
+++ b/lib/libm/noieee_src/n_support.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_support.c,v 1.17 2008/12/10 01:08:24 martynas Exp $ */
+/* $OpenBSD: n_support.c,v 1.18 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_support.c,v 1.1 1995/10/10 23:37:06 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)support.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/*
* Some IEEE standard 754 recommended functions and remainder and sqrt for
* supporting the C elementary functions.
diff --git a/lib/libm/noieee_src/n_tan.c b/lib/libm/noieee_src/n_tan.c
index bdaf38d17ae..395fa314324 100644
--- a/lib/libm/noieee_src/n_tan.c
+++ b/lib/libm/noieee_src/n_tan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_tan.c,v 1.8 2008/12/10 01:08:24 martynas Exp $ */
+/* $OpenBSD: n_tan.c,v 1.9 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_tan.c,v 1.1 1995/10/10 23:37:07 ragge Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)tan.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
#include <sys/cdefs.h>
#include <math.h>
diff --git a/lib/libm/noieee_src/n_tanh.c b/lib/libm/noieee_src/n_tanh.c
index 2933b8b23a3..cc13f3e304b 100644
--- a/lib/libm/noieee_src/n_tanh.c
+++ b/lib/libm/noieee_src/n_tanh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_tanh.c,v 1.8 2008/07/17 15:36:28 martynas Exp $ */
+/* $OpenBSD: n_tanh.c,v 1.9 2009/10/27 23:59:29 deraadt Exp $ */
/* $NetBSD: n_tanh.c,v 1.1 1995/10/10 23:37:08 ragge Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)tanh.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
#include "math.h"
/* TANH(X)
diff --git a/lib/libm/noieee_src/n_tgamma.c b/lib/libm/noieee_src/n_tgamma.c
index afaaaf512c6..c752f0ba317 100644
--- a/lib/libm/noieee_src/n_tgamma.c
+++ b/lib/libm/noieee_src/n_tgamma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: n_tgamma.c,v 1.3 2008/06/21 08:26:19 martynas Exp $ */
+/* $OpenBSD: n_tgamma.c,v 1.4 2009/10/27 23:59:29 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,10 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)gamma.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/*
* This code by P. McIlroy, Oct 1992;
*
diff --git a/lib/libm/src/b_exp__D.c b/lib/libm/src/b_exp__D.c
index 7166108c113..6dd24342dea 100644
--- a/lib/libm/src/b_exp__D.c
+++ b/lib/libm/src/b_exp__D.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_exp__D.c,v 1.4 2009/04/05 02:12:43 martynas Exp $ */
+/* $OpenBSD: b_exp__D.c,v 1.5 2009/10/27 23:59:29 deraadt Exp $ */
/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,10 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/* EXP(X)
* RETURN THE EXPONENTIAL OF X
* DOUBLE PRECISION (IEEE 53 bits, VAX D FORMAT 56 BITS)
diff --git a/lib/libm/src/b_log__D.c b/lib/libm/src/b_log__D.c
index e5bee43e2cd..13815ff2bcd 100644
--- a/lib/libm/src/b_log__D.c
+++ b/lib/libm/src/b_log__D.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_log__D.c,v 1.3 2008/07/16 15:25:51 martynas Exp $ */
+/* $OpenBSD: b_log__D.c,v 1.4 2009/10/27 23:59:29 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,10 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)log.c 8.2 (Berkeley) 11/30/93";
-#endif /* not lint */
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/b_tgamma.c b/lib/libm/src/b_tgamma.c
index cb46a0dbc16..b6bacffd311 100644
--- a/lib/libm/src/b_tgamma.c
+++ b/lib/libm/src/b_tgamma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_tgamma.c,v 1.2 2008/06/12 22:15:36 martynas Exp $ */
+/* $OpenBSD: b_tgamma.c,v 1.3 2009/10/27 23:59:29 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,10 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)gamma.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/*
* This code by P. McIlroy, Oct 1992;
*
diff --git a/lib/libm/src/e_acos.c b/lib/libm/src/e_acos.c
index 0282b115f09..566dda2a9d1 100644
--- a/lib/libm/src/e_acos.c
+++ b/lib/libm/src/e_acos.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_acos.c,v 1.9 1995/05/12 04:57:13 jtc Exp $";
-#endif
-
/* acos(x)
* Method :
* acos(x) = pi/2 - asin(x)
diff --git a/lib/libm/src/e_acosf.c b/lib/libm/src/e_acosf.c
index 57f42b18f8f..559c2c34bbd 100644
--- a/lib/libm/src/e_acosf.c
+++ b/lib/libm/src/e_acosf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_acosf.c,v 1.5 1995/05/12 04:57:16 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_acosh.c b/lib/libm/src/e_acosh.c
index 273b93d02a6..c9d8b366dda 100644
--- a/lib/libm/src/e_acosh.c
+++ b/lib/libm/src/e_acosh.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_acosh.c,v 1.9 1995/05/12 04:57:18 jtc Exp $";
-#endif
-
/* acosh(x)
* Method :
* Based on
diff --git a/lib/libm/src/e_acoshf.c b/lib/libm/src/e_acoshf.c
index 515d33daf0c..175f13e67d6 100644
--- a/lib/libm/src/e_acoshf.c
+++ b/lib/libm/src/e_acoshf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_acoshf.c,v 1.5 1995/05/12 04:57:20 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_asin.c b/lib/libm/src/e_asin.c
index 19fefa34552..7b1bd3c0663 100644
--- a/lib/libm/src/e_asin.c
+++ b/lib/libm/src/e_asin.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_asin.c,v 1.9 1995/05/12 04:57:22 jtc Exp $";
-#endif
-
/* asin(x)
* Method :
* Since asin(x) = x + x^3/6 + x^5*3/40 + x^7*15/336 + ...
diff --git a/lib/libm/src/e_asinf.c b/lib/libm/src/e_asinf.c
index 3f70199fbc9..5df02a8a672 100644
--- a/lib/libm/src/e_asinf.c
+++ b/lib/libm/src/e_asinf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_asinf.c,v 1.5 1995/05/12 04:57:25 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_atan2.c b/lib/libm/src/e_atan2.c
index 16487fcdc1c..1c508b31675 100644
--- a/lib/libm/src/e_atan2.c
+++ b/lib/libm/src/e_atan2.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_atan2.c,v 1.8 1995/05/10 20:44:51 jtc Exp $";
-#endif
-
/* atan2(y,x)
* Method :
* 1. Reduce y to positive by atan2(y,x)=-atan2(-y,x).
diff --git a/lib/libm/src/e_atan2f.c b/lib/libm/src/e_atan2f.c
index 0855bd4ffb5..155a36cab99 100644
--- a/lib/libm/src/e_atan2f.c
+++ b/lib/libm/src/e_atan2f.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_atan2f.c,v 1.4 1995/05/10 20:44:53 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_atanh.c b/lib/libm/src/e_atanh.c
index 1cd468b8e56..734aece6f79 100644
--- a/lib/libm/src/e_atanh.c
+++ b/lib/libm/src/e_atanh.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_atanh.c,v 1.8 1995/05/10 20:44:55 jtc Exp $";
-#endif
-
/* atanh(x)
* Method :
* 1.Reduced x to positive by atanh(-x) = -atanh(x)
diff --git a/lib/libm/src/e_atanhf.c b/lib/libm/src/e_atanhf.c
index 40322c2cf0c..dc7eb9aee6f 100644
--- a/lib/libm/src/e_atanhf.c
+++ b/lib/libm/src/e_atanhf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_atanhf.c,v 1.4 1995/05/10 20:44:56 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_cosh.c b/lib/libm/src/e_cosh.c
index afad33162af..795f15b392b 100644
--- a/lib/libm/src/e_cosh.c
+++ b/lib/libm/src/e_cosh.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_cosh.c,v 1.7 1995/05/10 20:44:58 jtc Exp $";
-#endif
-
/* cosh(x)
* Method :
* mathematically cosh(x) if defined to be (exp(x)+exp(-x))/2
diff --git a/lib/libm/src/e_coshf.c b/lib/libm/src/e_coshf.c
index 29eb56cfd4e..10bf05380a8 100644
--- a/lib/libm/src/e_coshf.c
+++ b/lib/libm/src/e_coshf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_coshf.c,v 1.5 1995/05/10 20:45:01 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_exp.c b/lib/libm/src/e_exp.c
index aef00ba006d..23c1d2888b5 100644
--- a/lib/libm/src/e_exp.c
+++ b/lib/libm/src/e_exp.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_exp.c,v 1.8 1995/05/10 20:45:03 jtc Exp $";
-#endif
-
/* exp(x)
* Returns the exponential of x.
*
diff --git a/lib/libm/src/e_expf.c b/lib/libm/src/e_expf.c
index ac0fc40df09..0e0bc542ee4 100644
--- a/lib/libm/src/e_expf.c
+++ b/lib/libm/src/e_expf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_expf.c,v 1.5 1995/05/10 20:45:05 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_fmod.c b/lib/libm/src/e_fmod.c
index 1a85f8295c1..e2b2f0a0b53 100644
--- a/lib/libm/src/e_fmod.c
+++ b/lib/libm/src/e_fmod.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_fmod.c,v 1.8 1995/05/10 20:45:07 jtc Exp $";
-#endif
-
/*
* fmod(x,y)
* Return x mod y in exact arithmetic
diff --git a/lib/libm/src/e_fmodf.c b/lib/libm/src/e_fmodf.c
index 0bb8d172925..cca2f6f63fd 100644
--- a/lib/libm/src/e_fmodf.c
+++ b/lib/libm/src/e_fmodf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_fmodf.c,v 1.4 1995/05/10 20:45:10 jtc Exp $";
-#endif
-
/*
* fmodf(x,y)
* Return x mod y in exact arithmetic
diff --git a/lib/libm/src/e_hypot.c b/lib/libm/src/e_hypot.c
index 23cf67f766d..d5d86fb53a2 100644
--- a/lib/libm/src/e_hypot.c
+++ b/lib/libm/src/e_hypot.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_hypot.c,v 1.9 1995/05/12 04:57:27 jtc Exp $";
-#endif
-
/* hypot(x,y)
*
* Method :
diff --git a/lib/libm/src/e_hypotf.c b/lib/libm/src/e_hypotf.c
index 863899f2ef6..9eb75067099 100644
--- a/lib/libm/src/e_hypotf.c
+++ b/lib/libm/src/e_hypotf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_hypotf.c,v 1.5 1995/05/12 04:57:30 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_j0.c b/lib/libm/src/e_j0.c
index ef34cb7887b..138d90c055b 100644
--- a/lib/libm/src/e_j0.c
+++ b/lib/libm/src/e_j0.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_j0.c,v 1.8 1995/05/10 20:45:23 jtc Exp $";
-#endif
-
/* j0(x), y0(x)
* Bessel function of the first and second kinds of order zero.
* Method -- j0(x):
diff --git a/lib/libm/src/e_j0f.c b/lib/libm/src/e_j0f.c
index f5000adf5b6..e485e55f75b 100644
--- a/lib/libm/src/e_j0f.c
+++ b/lib/libm/src/e_j0f.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_j0f.c,v 1.4 1995/05/10 20:45:25 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_j1.c b/lib/libm/src/e_j1.c
index 3a783c80f08..2c475a5f1a4 100644
--- a/lib/libm/src/e_j1.c
+++ b/lib/libm/src/e_j1.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_j1.c,v 1.8 1995/05/10 20:45:27 jtc Exp $";
-#endif
-
/* j1(x), y1(x)
* Bessel function of the first and second kinds of order zero.
* Method -- j1(x):
diff --git a/lib/libm/src/e_j1f.c b/lib/libm/src/e_j1f.c
index 62b34072ea8..b65abc0e443 100644
--- a/lib/libm/src/e_j1f.c
+++ b/lib/libm/src/e_j1f.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_j1f.c,v 1.4 1995/05/10 20:45:31 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_jn.c b/lib/libm/src/e_jn.c
index f22231a8e97..657c4ddeeb6 100644
--- a/lib/libm/src/e_jn.c
+++ b/lib/libm/src/e_jn.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_jn.c,v 1.9 1995/05/10 20:45:34 jtc Exp $";
-#endif
-
/*
* jn(n, x), yn(n, x)
* floating point Bessel's function of the 1st and 2nd kind
diff --git a/lib/libm/src/e_jnf.c b/lib/libm/src/e_jnf.c
index c96d9670e27..daaf1aea749 100644
--- a/lib/libm/src/e_jnf.c
+++ b/lib/libm/src/e_jnf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_jnf.c,v 1.5 1995/05/10 20:45:37 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_lgamma_r.c b/lib/libm/src/e_lgamma_r.c
index dbca95d5ea0..28c07e29b88 100644
--- a/lib/libm/src/e_lgamma_r.c
+++ b/lib/libm/src/e_lgamma_r.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_lgamma_r.c,v 1.7 1995/05/10 20:45:42 jtc Exp $";
-#endif
-
/* lgamma_r(x, signgamp)
* Reentrant version of the logarithm of the Gamma function
* with user provide pointer for the sign of Gamma(x).
diff --git a/lib/libm/src/e_lgammaf_r.c b/lib/libm/src/e_lgammaf_r.c
index 1dfef89f9f9..2e9bd198c87 100644
--- a/lib/libm/src/e_lgammaf_r.c
+++ b/lib/libm/src/e_lgammaf_r.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_lgammaf_r.c,v 1.3 1995/05/10 20:45:47 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_log.c b/lib/libm/src/e_log.c
index 052deba253c..3c3c63d8098 100644
--- a/lib/libm/src/e_log.c
+++ b/lib/libm/src/e_log.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_log.c,v 1.8 1995/05/10 20:45:49 jtc Exp $";
-#endif
-
/* log(x)
* Return the logrithm of x
*
diff --git a/lib/libm/src/e_log10.c b/lib/libm/src/e_log10.c
index ac8b87cfa03..e6b826c229b 100644
--- a/lib/libm/src/e_log10.c
+++ b/lib/libm/src/e_log10.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_log10.c,v 1.9 1995/05/10 20:45:51 jtc Exp $";
-#endif
-
/* log10(x)
* Return the base 10 logarithm of x
*
diff --git a/lib/libm/src/e_log10f.c b/lib/libm/src/e_log10f.c
index d4777bf8409..c9e7c0990c2 100644
--- a/lib/libm/src/e_log10f.c
+++ b/lib/libm/src/e_log10f.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_log10f.c,v 1.5 1995/05/10 20:45:53 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_logf.c b/lib/libm/src/e_logf.c
index 9491341e6b2..717ae48f071 100644
--- a/lib/libm/src/e_logf.c
+++ b/lib/libm/src/e_logf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_logf.c,v 1.4 1995/05/10 20:45:54 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_pow.c b/lib/libm/src/e_pow.c
index 2aa035eee83..938b37cc798 100644
--- a/lib/libm/src/e_pow.c
+++ b/lib/libm/src/e_pow.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_pow.c,v 1.9 1995/05/12 04:57:32 jtc Exp $";
-#endif
-
/* pow(x,y) return x**y
*
* n
diff --git a/lib/libm/src/e_powf.c b/lib/libm/src/e_powf.c
index 9e520f486b9..d6e52d8b99b 100644
--- a/lib/libm/src/e_powf.c
+++ b/lib/libm/src/e_powf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_powf.c,v 1.6 1995/05/12 04:57:35 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_rem_pio2.c b/lib/libm/src/e_rem_pio2.c
index c1eefcd96b5..ffc7f229887 100644
--- a/lib/libm/src/e_rem_pio2.c
+++ b/lib/libm/src/e_rem_pio2.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_rem_pio2.c,v 1.8 1995/05/10 20:46:02 jtc Exp $";
-#endif
-
/* __ieee754_rem_pio2(x,y)
*
* return the remainder of x rem pi/2 in y[0]+y[1]
diff --git a/lib/libm/src/e_rem_pio2f.c b/lib/libm/src/e_rem_pio2f.c
index 398bdbd166f..f2af8c49509 100644
--- a/lib/libm/src/e_rem_pio2f.c
+++ b/lib/libm/src/e_rem_pio2f.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_rem_pio2f.c,v 1.5 1995/05/10 20:46:03 jtc Exp $";
-#endif
-
/* __ieee754_rem_pio2f(x,y)
*
* return the remainder of x rem pi/2 in y[0]+y[1]
diff --git a/lib/libm/src/e_remainder.c b/lib/libm/src/e_remainder.c
index 623a13b141e..3d7839700e7 100644
--- a/lib/libm/src/e_remainder.c
+++ b/lib/libm/src/e_remainder.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_remainder.c,v 1.8 1995/05/10 20:46:05 jtc Exp $";
-#endif
-
/* remainder(x,p)
* Return :
* returns x REM p = x - [x/p]*p as if in infinite
diff --git a/lib/libm/src/e_remainderf.c b/lib/libm/src/e_remainderf.c
index 4405866914d..d94f09638dc 100644
--- a/lib/libm/src/e_remainderf.c
+++ b/lib/libm/src/e_remainderf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_remainderf.c,v 1.4 1995/05/10 20:46:08 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_scalb.c b/lib/libm/src/e_scalb.c
index d07808896f1..ee459448122 100644
--- a/lib/libm/src/e_scalb.c
+++ b/lib/libm/src/e_scalb.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_scalb.c,v 1.6 1995/05/10 20:46:09 jtc Exp $";
-#endif
-
/*
* scalb(x, fn) is provide for
* passing various standard test suite. One
diff --git a/lib/libm/src/e_scalbf.c b/lib/libm/src/e_scalbf.c
index e50179a1835..12983efd9f0 100644
--- a/lib/libm/src/e_scalbf.c
+++ b/lib/libm/src/e_scalbf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_scalbf.c,v 1.3 1995/05/10 20:46:12 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_sinh.c b/lib/libm/src/e_sinh.c
index 68be7b5080f..a2dbe01acec 100644
--- a/lib/libm/src/e_sinh.c
+++ b/lib/libm/src/e_sinh.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_sinh.c,v 1.7 1995/05/10 20:46:13 jtc Exp $";
-#endif
-
/* sinh(x)
* Method :
* mathematically sinh(x) if defined to be (exp(x)-exp(-x))/2
diff --git a/lib/libm/src/e_sinhf.c b/lib/libm/src/e_sinhf.c
index a593c488b95..d898b474a15 100644
--- a/lib/libm/src/e_sinhf.c
+++ b/lib/libm/src/e_sinhf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_sinhf.c,v 1.4 1995/05/10 20:46:15 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/e_sqrt.c b/lib/libm/src/e_sqrt.c
index a857ac1e098..a08cebb7ee5 100644
--- a/lib/libm/src/e_sqrt.c
+++ b/lib/libm/src/e_sqrt.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_sqrt.c,v 1.8 1995/05/10 20:46:17 jtc Exp $";
-#endif
-
/* sqrt(x)
* Return correctly rounded sqrt.
* ------------------------------------------
diff --git a/lib/libm/src/e_sqrtf.c b/lib/libm/src/e_sqrtf.c
index 2dee4848572..80d35278cad 100644
--- a/lib/libm/src/e_sqrtf.c
+++ b/lib/libm/src/e_sqrtf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_sqrtf.c,v 1.4 1995/05/10 20:46:19 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/k_cos.c b/lib/libm/src/k_cos.c
index eb662b7569d..8f3882b6a00 100644
--- a/lib/libm/src/k_cos.c
+++ b/lib/libm/src/k_cos.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: k_cos.c,v 1.8 1995/05/10 20:46:22 jtc Exp $";
-#endif
-
/*
* __kernel_cos( x, y )
* kernel cos function on [-pi/4, pi/4], pi/4 ~ 0.785398164
diff --git a/lib/libm/src/k_cosf.c b/lib/libm/src/k_cosf.c
index 89d16bb5cae..853c08286ba 100644
--- a/lib/libm/src/k_cosf.c
+++ b/lib/libm/src/k_cosf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: k_cosf.c,v 1.4 1995/05/10 20:46:23 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/k_rem_pio2.c b/lib/libm/src/k_rem_pio2.c
index 6949d6ce783..80279a74377 100644
--- a/lib/libm/src/k_rem_pio2.c
+++ b/lib/libm/src/k_rem_pio2.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: k_rem_pio2.c,v 1.7 1995/05/10 20:46:25 jtc Exp $";
-#endif
-
/*
* __kernel_rem_pio2(x,y,e0,nx,prec)
* double x[],y[]; int e0,nx,prec;
diff --git a/lib/libm/src/k_rem_pio2f.c b/lib/libm/src/k_rem_pio2f.c
index 43b45e5540e..5931cbab9be 100644
--- a/lib/libm/src/k_rem_pio2f.c
+++ b/lib/libm/src/k_rem_pio2f.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: k_rem_pio2f.c,v 1.4 1995/05/10 20:46:28 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/k_sin.c b/lib/libm/src/k_sin.c
index d30ae8d0724..8b3d6272372 100644
--- a/lib/libm/src/k_sin.c
+++ b/lib/libm/src/k_sin.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: k_sin.c,v 1.8 1995/05/10 20:46:31 jtc Exp $";
-#endif
-
/* __kernel_sin( x, y, iy)
* kernel sin function on [-pi/4, pi/4], pi/4 ~ 0.7854
* Input x is assumed to be bounded by ~pi/4 in magnitude.
diff --git a/lib/libm/src/k_sinf.c b/lib/libm/src/k_sinf.c
index 20af7fc9af7..ba17317490c 100644
--- a/lib/libm/src/k_sinf.c
+++ b/lib/libm/src/k_sinf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: k_sinf.c,v 1.4 1995/05/10 20:46:33 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/k_tan.c b/lib/libm/src/k_tan.c
index 33d63a1024d..03a6090758b 100644
--- a/lib/libm/src/k_tan.c
+++ b/lib/libm/src/k_tan.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: k_tan.c,v 1.8 1995/05/10 20:46:37 jtc Exp $";
-#endif
-
/* __kernel_tan( x, y, k )
* kernel tan function on [-pi/4, pi/4], pi/4 ~ 0.7854
* Input x is assumed to be bounded by ~pi/4 in magnitude.
diff --git a/lib/libm/src/k_tanf.c b/lib/libm/src/k_tanf.c
index f7ddddf273e..8327713a9ba 100644
--- a/lib/libm/src/k_tanf.c
+++ b/lib/libm/src/k_tanf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: k_tanf.c,v 1.4 1995/05/10 20:46:39 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_asinh.c b/lib/libm/src/s_asinh.c
index 7398aa9d057..aa4085ae799 100644
--- a/lib/libm/src/s_asinh.c
+++ b/lib/libm/src/s_asinh.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_asinh.c,v 1.9 1995/05/12 04:57:37 jtc Exp $";
-#endif
-
/* asinh(x)
* Method :
* Based on
diff --git a/lib/libm/src/s_asinhf.c b/lib/libm/src/s_asinhf.c
index e6426142985..4ee14f6eac4 100644
--- a/lib/libm/src/s_asinhf.c
+++ b/lib/libm/src/s_asinhf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_asinhf.c,v 1.5 1995/05/12 04:57:39 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_atan.c b/lib/libm/src/s_atan.c
index f4de97d5e8f..01f40001ff4 100644
--- a/lib/libm/src/s_atan.c
+++ b/lib/libm/src/s_atan.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_atan.c,v 1.8 1995/05/10 20:46:45 jtc Exp $";
-#endif
-
/* atan(x)
* Method
* 1. Reduce x to positive by atan(x) = -atan(-x).
diff --git a/lib/libm/src/s_atanf.c b/lib/libm/src/s_atanf.c
index 5cb5624690e..66a0c3e459f 100644
--- a/lib/libm/src/s_atanf.c
+++ b/lib/libm/src/s_atanf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_atanf.c,v 1.4 1995/05/10 20:46:47 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_cbrt.c b/lib/libm/src/s_cbrt.c
index 2ffd516d512..a6245b3c46f 100644
--- a/lib/libm/src/s_cbrt.c
+++ b/lib/libm/src/s_cbrt.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_cbrt.c,v 1.8 1995/05/10 20:46:49 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_cbrtf.c b/lib/libm/src/s_cbrtf.c
index 84fd8e030e1..da59ae83e49 100644
--- a/lib/libm/src/s_cbrtf.c
+++ b/lib/libm/src/s_cbrtf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_cbrtf.c,v 1.4 1995/05/10 20:46:51 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_ceil.c b/lib/libm/src/s_ceil.c
index fd89cebb596..c5daeff163a 100644
--- a/lib/libm/src/s_ceil.c
+++ b/lib/libm/src/s_ceil.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_ceil.c,v 1.8 1995/05/10 20:46:53 jtc Exp $";
-#endif
-
/*
* ceil(x)
* Return x rounded toward -inf to integral value
diff --git a/lib/libm/src/s_ceilf.c b/lib/libm/src/s_ceilf.c
index cd955b8b23a..1f1335f73f4 100644
--- a/lib/libm/src/s_ceilf.c
+++ b/lib/libm/src/s_ceilf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_ceilf.c,v 1.4 1995/05/10 20:46:55 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_copysign.c b/lib/libm/src/s_copysign.c
index 935ecc7136b..8a6d645cd49 100644
--- a/lib/libm/src/s_copysign.c
+++ b/lib/libm/src/s_copysign.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_copysign.c,v 1.8 1995/05/10 20:46:57 jtc Exp $";
-#endif
-
/*
* copysign(double x, double y)
* copysign(x,y) returns a value with the magnitude of x and
diff --git a/lib/libm/src/s_copysignf.c b/lib/libm/src/s_copysignf.c
index a26ded4fc10..267ed2da96a 100644
--- a/lib/libm/src/s_copysignf.c
+++ b/lib/libm/src/s_copysignf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_copysignf.c,v 1.4 1995/05/10 20:46:59 jtc Exp $";
-#endif
-
/*
* copysignf(float x, float y)
* copysignf(x,y) returns a value with the magnitude of x and
diff --git a/lib/libm/src/s_cos.c b/lib/libm/src/s_cos.c
index 0dd4eba2e28..2d057dc9b96 100644
--- a/lib/libm/src/s_cos.c
+++ b/lib/libm/src/s_cos.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_cos.c,v 1.7 1995/05/10 20:47:02 jtc Exp $";
-#endif
-
/* cos(x)
* Return cosine function of x.
*
diff --git a/lib/libm/src/s_cosf.c b/lib/libm/src/s_cosf.c
index d17db5716e6..aaa3d00bf53 100644
--- a/lib/libm/src/s_cosf.c
+++ b/lib/libm/src/s_cosf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_erf.c b/lib/libm/src/s_erf.c
index 22944c1bc83..64d99f411c3 100644
--- a/lib/libm/src/s_erf.c
+++ b/lib/libm/src/s_erf.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_erf.c,v 1.8 1995/05/10 20:47:05 jtc Exp $";
-#endif
-
/* double erf(double x)
* double erfc(double x)
* x
diff --git a/lib/libm/src/s_erff.c b/lib/libm/src/s_erff.c
index 7eadb30dfa3..f94e2d8e02b 100644
--- a/lib/libm/src/s_erff.c
+++ b/lib/libm/src/s_erff.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_erff.c,v 1.4 1995/05/10 20:47:07 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_expm1.c b/lib/libm/src/s_expm1.c
index 37a6db5cea6..3f28b70131b 100644
--- a/lib/libm/src/s_expm1.c
+++ b/lib/libm/src/s_expm1.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_expm1.c,v 1.8 1995/05/10 20:47:09 jtc Exp $";
-#endif
-
/* expm1(x)
* Returns exp(x)-1, the exponential of x minus 1.
*
diff --git a/lib/libm/src/s_expm1f.c b/lib/libm/src/s_expm1f.c
index d4a8bb9c42d..287c365b2cd 100644
--- a/lib/libm/src/s_expm1f.c
+++ b/lib/libm/src/s_expm1f.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_expm1f.c,v 1.5 1995/05/10 20:47:11 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_fabs.c b/lib/libm/src/s_fabs.c
index b800b245d8c..cbabb25bb5c 100644
--- a/lib/libm/src/s_fabs.c
+++ b/lib/libm/src/s_fabs.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_fabs.c,v 1.7 1995/05/10 20:47:13 jtc Exp $";
-#endif
-
/*
* fabs(x) returns the absolute value of x.
*/
diff --git a/lib/libm/src/s_fabsf.c b/lib/libm/src/s_fabsf.c
index 0c1f4397da7..71b9f755e6d 100644
--- a/lib/libm/src/s_fabsf.c
+++ b/lib/libm/src/s_fabsf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_fabsf.c,v 1.4 1995/05/10 20:47:15 jtc Exp $";
-#endif
-
/*
* fabsf(x) returns the absolute value of x.
*/
diff --git a/lib/libm/src/s_floor.c b/lib/libm/src/s_floor.c
index da2c77fad68..cccd7860971 100644
--- a/lib/libm/src/s_floor.c
+++ b/lib/libm/src/s_floor.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_floor.c,v 1.8 1995/05/10 20:47:20 jtc Exp $";
-#endif
-
/*
* floor(x)
* Return x rounded toward -inf to integral value
diff --git a/lib/libm/src/s_floorf.c b/lib/libm/src/s_floorf.c
index db7fd4d866c..8cc5e3058f3 100644
--- a/lib/libm/src/s_floorf.c
+++ b/lib/libm/src/s_floorf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_floorf.c,v 1.4 1995/05/10 20:47:22 jtc Exp $";
-#endif
-
/*
* floorf(x)
* Return x rounded toward -inf to integral value
diff --git a/lib/libm/src/s_frexp.c b/lib/libm/src/s_frexp.c
index 339c650c37c..ae6552ff8d8 100644
--- a/lib/libm/src/s_frexp.c
+++ b/lib/libm/src/s_frexp.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_frexp.c,v 1.9 1995/05/10 20:47:24 jtc Exp $";
-#endif
-
/*
* for non-zero x
* x = frexp(arg,&exp);
diff --git a/lib/libm/src/s_frexpf.c b/lib/libm/src/s_frexpf.c
index a30a6871e59..204b36682ea 100644
--- a/lib/libm/src/s_frexpf.c
+++ b/lib/libm/src/s_frexpf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_frexpf.c,v 1.5 1995/05/10 20:47:26 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_ilogb.c b/lib/libm/src/s_ilogb.c
index 76d9b89746f..e006abf6279 100644
--- a/lib/libm/src/s_ilogb.c
+++ b/lib/libm/src/s_ilogb.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_ilogb.c,v 1.9 1995/05/10 20:47:28 jtc Exp $";
-#endif
-
/* ilogb(double x)
* return the binary exponent of non-zero x
* ilogb(0) = 0x80000001
diff --git a/lib/libm/src/s_ilogbf.c b/lib/libm/src/s_ilogbf.c
index 46603830031..bac38c6b9a3 100644
--- a/lib/libm/src/s_ilogbf.c
+++ b/lib/libm/src/s_ilogbf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_ilogbf.c,v 1.4 1995/05/10 20:47:31 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_log1p.c b/lib/libm/src/s_log1p.c
index 0a8059846e4..076f3d91061 100644
--- a/lib/libm/src/s_log1p.c
+++ b/lib/libm/src/s_log1p.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_log1p.c,v 1.8 1995/05/10 20:47:46 jtc Exp $";
-#endif
-
/* double log1p(double x)
*
* Method :
diff --git a/lib/libm/src/s_log1pf.c b/lib/libm/src/s_log1pf.c
index 39fa745ab9a..c5e10e1c0fa 100644
--- a/lib/libm/src/s_log1pf.c
+++ b/lib/libm/src/s_log1pf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_log1pf.c,v 1.4 1995/05/10 20:47:48 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_logb.c b/lib/libm/src/s_logb.c
index f7d4f00a118..96c1208bf93 100644
--- a/lib/libm/src/s_logb.c
+++ b/lib/libm/src/s_logb.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_logb.c,v 1.8 1995/05/10 20:47:50 jtc Exp $";
-#endif
-
/*
* double logb(x)
* IEEE 754 logb. Included to pass IEEE test suite. Not recommend.
diff --git a/lib/libm/src/s_logbf.c b/lib/libm/src/s_logbf.c
index 4d54f1b16f4..bed408efab6 100644
--- a/lib/libm/src/s_logbf.c
+++ b/lib/libm/src/s_logbf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_logbf.c,v 1.4 1995/05/10 20:47:51 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_modf.c b/lib/libm/src/s_modf.c
index 1d5523a8558..9511e77169c 100644
--- a/lib/libm/src/s_modf.c
+++ b/lib/libm/src/s_modf.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_modf.c,v 1.8 1995/05/10 20:47:55 jtc Exp $";
-#endif
-
/*
* modf(double x, double *iptr)
* return fraction part of x, and return x's integral part in *iptr.
diff --git a/lib/libm/src/s_modff.c b/lib/libm/src/s_modff.c
index 0ede078565d..829bfce7c68 100644
--- a/lib/libm/src/s_modff.c
+++ b/lib/libm/src/s_modff.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_modff.c,v 1.4 1995/05/10 20:47:56 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_nextafter.c b/lib/libm/src/s_nextafter.c
index f597858742c..530148aa37e 100644
--- a/lib/libm/src/s_nextafter.c
+++ b/lib/libm/src/s_nextafter.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_nextafter.c,v 1.8 1995/05/10 20:47:58 jtc Exp $";
-#endif
-
/* IEEE functions
* nextafter(x,y)
* return the next machine floating-point number of x in the
diff --git a/lib/libm/src/s_nextafterf.c b/lib/libm/src/s_nextafterf.c
index 7a9135afb0e..93f7b02372a 100644
--- a/lib/libm/src/s_nextafterf.c
+++ b/lib/libm/src/s_nextafterf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_nextafterf.c,v 1.4 1995/05/10 20:48:01 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_rint.c b/lib/libm/src/s_rint.c
index 8d0abc74afd..282a868fb40 100644
--- a/lib/libm/src/s_rint.c
+++ b/lib/libm/src/s_rint.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_rint.c,v 1.8 1995/05/10 20:48:04 jtc Exp $";
-#endif
-
/*
* rint(x)
* Return x rounded to integral value according to the prevailing
diff --git a/lib/libm/src/s_rintf.c b/lib/libm/src/s_rintf.c
index c4d1ebf9ae1..bef417a7d12 100644
--- a/lib/libm/src/s_rintf.c
+++ b/lib/libm/src/s_rintf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_rintf.c,v 1.4 1995/05/10 20:48:06 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_scalbn.c b/lib/libm/src/s_scalbn.c
index 065fbcb2dec..2f8a36eb668 100644
--- a/lib/libm/src/s_scalbn.c
+++ b/lib/libm/src/s_scalbn.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_scalbn.c,v 1.8 1995/05/10 20:48:08 jtc Exp $";
-#endif
-
/*
* scalbn (double x, int n)
* scalbn(x,n) returns x* 2**n computed by exponent
diff --git a/lib/libm/src/s_scalbnf.c b/lib/libm/src/s_scalbnf.c
index 0f935db76cf..5ab9208b5d9 100644
--- a/lib/libm/src/s_scalbnf.c
+++ b/lib/libm/src/s_scalbnf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_scalbnf.c,v 1.4 1995/05/10 20:48:10 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_significand.c b/lib/libm/src/s_significand.c
index cf4faa24d04..055ff5df2e2 100644
--- a/lib/libm/src/s_significand.c
+++ b/lib/libm/src/s_significand.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_significand.c,v 1.6 1995/05/10 20:48:11 jtc Exp $";
-#endif
-
/*
* significand(x) computes just
* scalb(x, (double) -ilogb(x)),
diff --git a/lib/libm/src/s_significandf.c b/lib/libm/src/s_significandf.c
index 085fabc93d2..e90be9e580f 100644
--- a/lib/libm/src/s_significandf.c
+++ b/lib/libm/src/s_significandf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_significandf.c,v 1.3 1995/05/10 20:48:13 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_sin.c b/lib/libm/src/s_sin.c
index d788c8780e5..6c0ec362b70 100644
--- a/lib/libm/src/s_sin.c
+++ b/lib/libm/src/s_sin.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_sin.c,v 1.7 1995/05/10 20:48:15 jtc Exp $";
-#endif
-
/* sin(x)
* Return sine function of x.
*
diff --git a/lib/libm/src/s_sinf.c b/lib/libm/src/s_sinf.c
index 8c956c15251..7bb90e67fcd 100644
--- a/lib/libm/src/s_sinf.c
+++ b/lib/libm/src/s_sinf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_sinf.c,v 1.4 1995/05/10 20:48:16 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_tan.c b/lib/libm/src/s_tan.c
index 49fac96045f..d2d3e69298c 100644
--- a/lib/libm/src/s_tan.c
+++ b/lib/libm/src/s_tan.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_tan.c,v 1.7 1995/05/10 20:48:18 jtc Exp $";
-#endif
-
/* tan(x)
* Return tangent function of x.
*
diff --git a/lib/libm/src/s_tanf.c b/lib/libm/src/s_tanf.c
index e2b9667f2e5..a79f73fa7df 100644
--- a/lib/libm/src/s_tanf.c
+++ b/lib/libm/src/s_tanf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_tanf.c,v 1.4 1995/05/10 20:48:20 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/s_tanh.c b/lib/libm/src/s_tanh.c
index 60d2f03d1be..1564c47855d 100644
--- a/lib/libm/src/s_tanh.c
+++ b/lib/libm/src/s_tanh.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_tanh.c,v 1.7 1995/05/10 20:48:22 jtc Exp $";
-#endif
-
/* Tanh(x)
* Return the Hyperbolic Tangent of x
*
diff --git a/lib/libm/src/s_tanhf.c b/lib/libm/src/s_tanhf.c
index fb6eb56c6c3..21271e3b6c7 100644
--- a/lib/libm/src/s_tanhf.c
+++ b/lib/libm/src/s_tanhf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_tanhf.c,v 1.4 1995/05/10 20:48:24 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/w_gamma.c b/lib/libm/src/w_gamma.c
index 92112add553..624198c7e11 100644
--- a/lib/libm/src/w_gamma.c
+++ b/lib/libm/src/w_gamma.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: w_gamma.c,v 1.7 1995/11/20 22:06:43 jtc Exp $";
-#endif
-
/* double gamma(double x)
* Return the logarithm of the Gamma function of x.
*
diff --git a/lib/libm/src/w_gamma_r.c b/lib/libm/src/w_gamma_r.c
index dcefb1f4832..cccb9cc2822 100644
--- a/lib/libm/src/w_gamma_r.c
+++ b/lib/libm/src/w_gamma_r.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: w_gamma_r.c,v 1.7 1995/11/20 22:06:45 jtc Exp $";
-#endif
-
/*
* wrapper double gamma_r(double x, int *signgamp)
*/
diff --git a/lib/libm/src/w_gammaf.c b/lib/libm/src/w_gammaf.c
index 16062edf391..6b27e6c4a39 100644
--- a/lib/libm/src/w_gammaf.c
+++ b/lib/libm/src/w_gammaf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: w_gammaf.c,v 1.4 1995/11/20 22:06:48 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libm/src/w_gammaf_r.c b/lib/libm/src/w_gammaf_r.c
index f1c8bbccfa5..88e3af8b988 100644
--- a/lib/libm/src/w_gammaf_r.c
+++ b/lib/libm/src/w_gammaf_r.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: w_gammaf_r.c,v 1.4 1995/11/20 22:06:50 jtc Exp $";
-#endif
-
/*
* wrapper float gammaf_r(float x, int *signgamp)
*/
diff --git a/lib/libm/src/w_lgamma.c b/lib/libm/src/w_lgamma.c
index f53a6be5dcd..8e5b9b7cb8c 100644
--- a/lib/libm/src/w_lgamma.c
+++ b/lib/libm/src/w_lgamma.c
@@ -10,10 +10,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: w_lgamma.c,v 1.6 1995/05/10 20:49:24 jtc Exp $";
-#endif
-
/* double lgamma(double x)
* Return the logarithm of the Gamma function of x.
*
diff --git a/lib/libm/src/w_lgammaf.c b/lib/libm/src/w_lgammaf.c
index 0153f2bb5af..662ced45799 100644
--- a/lib/libm/src/w_lgammaf.c
+++ b/lib/libm/src/w_lgammaf.c
@@ -13,10 +13,6 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: w_lgammaf.c,v 1.3 1995/05/10 20:49:30 jtc Exp $";
-#endif
-
#include "math.h"
#include "math_private.h"
diff --git a/lib/libocurses/EXAMPLES/ex1.c b/lib/libocurses/EXAMPLES/ex1.c
index 9d2c62d187c..5c54c899254 100644
--- a/lib/libocurses/EXAMPLES/ex1.c
+++ b/lib/libocurses/EXAMPLES/ex1.c
@@ -28,15 +28,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
-static char sccsid[] = "@(#)ex1.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
#include <sys/types.h>
#include <curses.h>
#include <stdio.h>
diff --git a/lib/libocurses/TEST/tc1.c b/lib/libocurses/TEST/tc1.c
index f901d213f8a..5263e0051ed 100644
--- a/lib/libocurses/TEST/tc1.c
+++ b/lib/libocurses/TEST/tc1.c
@@ -27,16 +27,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[] = "@(#)tc1.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/*
* tc1 [term]
* dummy program to test termlib.
diff --git a/lib/libocurses/TEST/tc2.c b/lib/libocurses/TEST/tc2.c
index fc474cbad2e..b8723d7f554 100644
--- a/lib/libocurses/TEST/tc2.c
+++ b/lib/libocurses/TEST/tc2.c
@@ -27,16 +27,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[] = "@(#)tc2.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/*
* tc2 [term]
* Dummy program to test out termlib.
diff --git a/lib/libocurses/TEST/tc3.c b/lib/libocurses/TEST/tc3.c
index 116bb002fad..1dc8043d91d 100644
--- a/lib/libocurses/TEST/tc3.c
+++ b/lib/libocurses/TEST/tc3.c
@@ -27,16 +27,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[] = "@(#)tc3.c 8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
/*
* tc3 [term]
* Dummy program to test out termlib. Input two numbers (row and col)
diff --git a/lib/libpcap/grammar.y b/lib/libpcap/grammar.y
index 10cb4de36d2..d784d84f8a7 100644
--- a/lib/libpcap/grammar.y
+++ b/lib/libpcap/grammar.y
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: grammar.y,v 1.18 2009/04/06 12:06:39 henning Exp $ */
+/* $OpenBSD: grammar.y,v 1.19 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996
@@ -22,10 +22,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/grammar.y,v 1.18 2009/04/06 12:06:39 henning Exp $ (LBL)";
-#endif
#include <sys/types.h>
#include <sys/time.h>
diff --git a/lib/libpcap/scanner.l b/lib/libpcap/scanner.l
index ffb1de12934..42c0f7d0e6c 100644
--- a/lib/libpcap/scanner.l
+++ b/lib/libpcap/scanner.l
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: scanner.l,v 1.20 2008/06/11 15:02:21 dtucker Exp $ */
+/* $OpenBSD: scanner.l,v 1.21 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -22,11 +22,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/scanner.l,v 1.20 2008/06/11 15:02:21 dtucker Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/lib/librpcsvc/bootparam_prot.x b/lib/librpcsvc/bootparam_prot.x
index 326ba1bd556..7070a099bad 100644
--- a/lib/librpcsvc/bootparam_prot.x
+++ b/lib/librpcsvc/bootparam_prot.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: bootparam_prot.x,v 1.7 2005/12/21 01:40:23 millert Exp $ */
+/* $OpenBSD: bootparam_prot.x,v 1.8 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -45,12 +45,6 @@
%#include <sys/time.h>
%#include <sys/ucred.h>
%#include <errno.h>
-#else
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)bootparam_prot.x 1.2 87/06/24 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)bootparam_prot.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: bootparam_prot.x,v 1.7 2005/12/21 01:40:23 millert Exp $";
-%#endif /* not lint */
#endif
const MAX_MACHINE_NAME = 255;
diff --git a/lib/librpcsvc/klm_prot.x b/lib/librpcsvc/klm_prot.x
index 8a1425dcf1c..05281d157e1 100644
--- a/lib/librpcsvc/klm_prot.x
+++ b/lib/librpcsvc/klm_prot.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: klm_prot.x,v 1.4 2004/01/17 12:32:11 deraadt Exp $ */
+/* $OpenBSD: klm_prot.x,v 1.5 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -39,11 +39,6 @@
*/
#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)klm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: klm_prot.x,v 1.4 2004/01/17 12:32:11 deraadt Exp $";
-%#endif /* not lint */
#endif
const LM_MAXSTRLEN = 1024;
diff --git a/lib/librpcsvc/mount.x b/lib/librpcsvc/mount.x
index 2e99117933a..9c6f674ee2b 100644
--- a/lib/librpcsvc/mount.x
+++ b/lib/librpcsvc/mount.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $ */
+/* $OpenBSD: mount.x,v 1.4 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -34,11 +34,6 @@
*/
#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)mount.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: mount.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
-%#endif /* not lint */
#endif
const MNTPATHLEN = 1024; /* maximum bytes in a pathname argument */
diff --git a/lib/librpcsvc/nfs_prot.x b/lib/librpcsvc/nfs_prot.x
index cd4faad538b..f4684874d41 100644
--- a/lib/librpcsvc/nfs_prot.x
+++ b/lib/librpcsvc/nfs_prot.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_prot.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $ */
+/* $OpenBSD: nfs_prot.x,v 1.4 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,11 +30,6 @@
*/
#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)nfs_prot.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: nfs_prot.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
-%#endif /* not lint */
#endif
const NFS_PORT = 2049;
diff --git a/lib/librpcsvc/rex.x b/lib/librpcsvc/rex.x
index 71b2a292e79..ff2a83342fd 100644
--- a/lib/librpcsvc/rex.x
+++ b/lib/librpcsvc/rex.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: rex.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $ */
+/* $OpenBSD: rex.x,v 1.4 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -34,11 +34,6 @@
*/
#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)rex.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: rex.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
-%#endif /* not lint */
#endif
const STRINGSIZE = 1024;
diff --git a/lib/librpcsvc/rnusers.x b/lib/librpcsvc/rnusers.x
index 3edc3db03d5..8b2e94d4183 100644
--- a/lib/librpcsvc/rnusers.x
+++ b/lib/librpcsvc/rnusers.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: rnusers.x,v 1.12 2004/01/17 12:32:11 deraadt Exp $ */
+/* $OpenBSD: rnusers.x,v 1.13 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -34,11 +34,6 @@
*/
#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)rnusers.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: rnusers.x,v 1.12 2004/01/17 12:32:11 deraadt Exp $";
-%#endif /* not lint */
#endif
diff --git a/lib/librpcsvc/rquota.x b/lib/librpcsvc/rquota.x
index 83807f4368c..adf93923c1b 100644
--- a/lib/librpcsvc/rquota.x
+++ b/lib/librpcsvc/rquota.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: rquota.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $ */
+/* $OpenBSD: rquota.x,v 1.4 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Remote quota protocol
@@ -6,11 +6,6 @@
*/
#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)rquota.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: rquota.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
-%#endif /* not lint */
#endif
const RQ_PATHLEN = 1024;
diff --git a/lib/librpcsvc/rstat.x b/lib/librpcsvc/rstat.x
index 80b06f8c194..bb2dc179383 100644
--- a/lib/librpcsvc/rstat.x
+++ b/lib/librpcsvc/rstat.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: rstat.x,v 1.4 2004/01/17 12:32:11 deraadt Exp $ */
+/* $OpenBSD: rstat.x,v 1.5 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -46,12 +46,6 @@
#else
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)rstat.x 2.2 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: rstat.x,v 1.4 2004/01/17 12:32:11 deraadt Exp $";
-%#endif /* not lint */
-
#endif /* def RPC_HDR */
const CPUSTATES = 4;
diff --git a/lib/librpcsvc/rusers.x b/lib/librpcsvc/rusers.x
index 85e1afbb987..30c7c01e48b 100644
--- a/lib/librpcsvc/rusers.x
+++ b/lib/librpcsvc/rusers.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: rusers.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $ */
+/* $OpenBSD: rusers.x,v 1.4 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -34,11 +34,6 @@
*/
#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
-/* @(#)rusers.x 1.1 91/12/01 Copyright 1991 Sun Microsystems, Inc. */
-%static char rcsid[] = "$OpenBSD: rusers.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
-%#endif /* not lint */
#endif
%/*
diff --git a/lib/librpcsvc/rwall.x b/lib/librpcsvc/rwall.x
index 10a74e7ff5c..e4c489eecdf 100644
--- a/lib/librpcsvc/rwall.x
+++ b/lib/librpcsvc/rwall.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: rwall.x,v 1.2 1997/08/19 07:54:51 niklas Exp $ */
+/* $OpenBSD: rwall.x,v 1.3 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
@@ -36,9 +36,6 @@
*/
#ifndef RPC_HDR
-%#ifndef lint
-%static char rcsid[] = "$OpenBSD: rwall.x,v 1.2 1997/08/19 07:54:51 niklas Exp $";
-%#endif /* not lint */
#endif
program WALLPROG {
diff --git a/lib/librpcsvc/sm_inter.x b/lib/librpcsvc/sm_inter.x
index 8d232915da9..2b320fd8944 100644
--- a/lib/librpcsvc/sm_inter.x
+++ b/lib/librpcsvc/sm_inter.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: sm_inter.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $ */
+/* $OpenBSD: sm_inter.x,v 1.4 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -36,11 +36,6 @@
*/
#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)sm_inter.x 1.7 87/06/24 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)sm_inter.x 2.2 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: sm_inter.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
-%#endif /* not lint */
#endif
program SM_PROG {
diff --git a/lib/librpcsvc/spray.x b/lib/librpcsvc/spray.x
index 63d5558b691..11eed0060c4 100644
--- a/lib/librpcsvc/spray.x
+++ b/lib/librpcsvc/spray.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: spray.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $ */
+/* $OpenBSD: spray.x,v 1.4 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,11 +35,6 @@
*/
#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)spray.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: spray.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
-%#endif /* not lint */
#endif
#ifdef RPC_HDR
diff --git a/lib/librpcsvc/yp.x b/lib/librpcsvc/yp.x
index 552f61634f7..d96d23b17da 100644
--- a/lib/librpcsvc/yp.x
+++ b/lib/librpcsvc/yp.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: yp.x,v 1.5 2004/01/17 12:32:11 deraadt Exp $ */
+/* $OpenBSD: yp.x,v 1.6 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -34,10 +34,6 @@
*/
#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)yp.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: yp.x,v 1.5 2004/01/17 12:32:11 deraadt Exp $";
-%#endif /* not lint */
#endif
const YPMAXRECORD = 1024;
diff --git a/lib/librpcsvc/yppasswd.x b/lib/librpcsvc/yppasswd.x
index c4980eccf7d..51605244d14 100644
--- a/lib/librpcsvc/yppasswd.x
+++ b/lib/librpcsvc/yppasswd.x
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppasswd.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $ */
+/* $OpenBSD: yppasswd.x,v 1.4 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,11 +35,6 @@
*/
#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: yppasswd.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
-%#endif /* not lint */
#endif
program YPPASSWDPROG {
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index 23a71a47c81..0c10f8cced0 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uucplock.c,v 1.15 2006/03/30 20:56:54 deraadt Exp $ */
+/* $OpenBSD: uucplock.c,v 1.16 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,10 +30,6 @@
*
*/
-#ifndef lint
-static const char sccsid[] = "@(#)uucplock.c 8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
#include <sys/types.h>
#include <dirent.h>
#include <errno.h>
diff --git a/lib/libwrap/clean_exit.c b/lib/libwrap/clean_exit.c
index 8b23e53e3bb..ef20a166be5 100644
--- a/lib/libwrap/clean_exit.c
+++ b/lib/libwrap/clean_exit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clean_exit.c,v 1.2 2003/07/18 23:05:13 david Exp $ */
+/* $OpenBSD: clean_exit.c,v 1.3 2009/10/27 23:59:30 deraadt Exp $ */
/*
* clean_exit() cleans up and terminates the program. It should be called
@@ -10,14 +10,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) clean_exit.c 1.4 94/12/28 17:42:19";
-#else
-static char rcsid[] = "$OpenBSD: clean_exit.c,v 1.2 2003/07/18 23:05:13 david Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/lib/libwrap/diag.c b/lib/libwrap/diag.c
index 2a7e3e45f4e..0b8ff2f7f55 100644
--- a/lib/libwrap/diag.c
+++ b/lib/libwrap/diag.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diag.c,v 1.4 2002/06/19 07:12:42 deraadt Exp $ */
+/* $OpenBSD: diag.c,v 1.5 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Routines to report various classes of problems. Each report is decorated
@@ -11,14 +11,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) diag.c 1.1 94/12/28 17:42:20";
-#else
-static char rcsid[] = "$OpenBSD: diag.c,v 1.4 2002/06/19 07:12:42 deraadt Exp $";
-#endif
-#endif
-
/* System libraries */
#include <syslog.h>
diff --git a/lib/libwrap/eval.c b/lib/libwrap/eval.c
index 99481ea3367..3151d85df45 100644
--- a/lib/libwrap/eval.c
+++ b/lib/libwrap/eval.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eval.c,v 1.3 2002/06/07 00:03:34 itojun Exp $ */
+/* $OpenBSD: eval.c,v 1.4 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Routines for controlled evaluation of host names, user names, and so on.
@@ -20,14 +20,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) eval.c 1.3 95/01/30 19:51:45";
-#else
-static char rcsid[] = "$OpenBSD: eval.c,v 1.3 2002/06/07 00:03:34 itojun Exp $";
-#endif
-#endif
-
/* System libraries. */
#include <stdio.h>
diff --git a/lib/libwrap/fix_options.c b/lib/libwrap/fix_options.c
index b1aec1a6301..8845b84d626 100644
--- a/lib/libwrap/fix_options.c
+++ b/lib/libwrap/fix_options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fix_options.c,v 1.7 2006/04/14 18:27:49 dhill Exp $ */
+/* $OpenBSD: fix_options.c,v 1.8 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Routine to disable IP-level socket options. This code was taken from 4.4BSD
@@ -7,14 +7,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) fix_options.c 1.4 97/02/12 02:13:22";
-#else
-static char rcsid[] = "$OpenBSD: fix_options.c,v 1.7 2006/04/14 18:27:49 dhill Exp $";
-#endif
-#endif
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/lib/libwrap/hosts_access.c b/lib/libwrap/hosts_access.c
index 27617b4fbc6..fbde0025fb0 100644
--- a/lib/libwrap/hosts_access.c
+++ b/lib/libwrap/hosts_access.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hosts_access.c,v 1.11 2003/04/19 18:31:48 avsm Exp $ */
+/* $OpenBSD: hosts_access.c,v 1.12 2009/10/27 23:59:30 deraadt Exp $ */
/*
* This module implements a simple access control language that is based on
@@ -19,14 +19,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) hosts_access.c 1.21 97/02/12 02:13:22";
-#else
-static char rcsid[] = "$OpenBSD: hosts_access.c,v 1.11 2003/04/19 18:31:48 avsm Exp $";
-#endif
-#endif
-
/* System libraries. */
#include <sys/types.h>
diff --git a/lib/libwrap/hosts_ctl.c b/lib/libwrap/hosts_ctl.c
index ec53c3f2694..0161f9fda54 100644
--- a/lib/libwrap/hosts_ctl.c
+++ b/lib/libwrap/hosts_ctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hosts_ctl.c,v 1.1 1997/02/26 03:06:53 downsj Exp $ */
+/* $OpenBSD: hosts_ctl.c,v 1.2 2009/10/27 23:59:30 deraadt Exp $ */
/*
* hosts_ctl() combines common applications of the host access control
@@ -13,14 +13,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) hosts_ctl.c 1.4 94/12/28 17:42:27";
-#else
-static char rcsid[] = "$OpenBSD: hosts_ctl.c,v 1.1 1997/02/26 03:06:53 downsj Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include "tcpd.h"
diff --git a/lib/libwrap/misc.c b/lib/libwrap/misc.c
index b0573286160..d1f3811a52f 100644
--- a/lib/libwrap/misc.c
+++ b/lib/libwrap/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.6 2003/05/15 04:45:28 pjanzen Exp $ */
+/* $OpenBSD: misc.c,v 1.7 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Misc routines that are used by tcpd and by tcpdchk.
@@ -6,14 +6,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsic[] = "@(#) misc.c 1.2 96/02/11 17:01:29";
-#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.6 2003/05/15 04:45:28 pjanzen Exp $";
-#endif
-#endif
-
#include <sys/types.h>
#include <sys/param.h>
#include <netinet/in.h>
diff --git a/lib/libwrap/options.c b/lib/libwrap/options.c
index ee2cbfd778f..6cb3f24c082 100644
--- a/lib/libwrap/options.c
+++ b/lib/libwrap/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.5 2003/04/05 00:43:20 tdeval Exp $ */
+/* $OpenBSD: options.c,v 1.6 2009/10/27 23:59:30 deraadt Exp $ */
/*
* General skeleton for adding options to the access control language. The
@@ -30,14 +30,6 @@
* course of action.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) options.c 1.17 96/02/11 17:01:31";
-#else
-static char rcsid[] = "$OpenBSD: options.c,v 1.5 2003/04/05 00:43:20 tdeval Exp $";
-#endif
-#endif
-
/* System libraries. */
#include <sys/types.h>
diff --git a/lib/libwrap/percent_m.c b/lib/libwrap/percent_m.c
index 5c941d61744..c2aa835e216 100644
--- a/lib/libwrap/percent_m.c
+++ b/lib/libwrap/percent_m.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: percent_m.c,v 1.3 2004/05/31 10:39:08 otto Exp $ */
+/* $OpenBSD: percent_m.c,v 1.4 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Replace %m by system error message.
@@ -6,14 +6,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) percent_m.c 1.1 94/12/28 17:42:37";
-#else
-static char rcsid[] = "$OpenBSD: percent_m.c,v 1.3 2004/05/31 10:39:08 otto Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <stdarg.h>
#include <errno.h>
diff --git a/lib/libwrap/percent_x.c b/lib/libwrap/percent_x.c
index 60291685f93..15afce17677 100644
--- a/lib/libwrap/percent_x.c
+++ b/lib/libwrap/percent_x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: percent_x.c,v 1.2 2003/07/18 23:05:13 david Exp $ */
+/* $OpenBSD: percent_x.c,v 1.3 2009/10/27 23:59:30 deraadt Exp $ */
/*
* percent_x() takes a string and performs %<char> expansions. It aborts the
@@ -12,14 +12,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) percent_x.c 1.4 94/12/28 17:42:37";
-#else
-static char rcsid[] = "$OpenBSD: percent_x.c,v 1.2 2003/07/18 23:05:13 david Exp $";
-#endif
-#endif
-
/* System libraries. */
#include <stdio.h>
diff --git a/lib/libwrap/refuse.c b/lib/libwrap/refuse.c
index 4860986db5b..4b89ca88cce 100644
--- a/lib/libwrap/refuse.c
+++ b/lib/libwrap/refuse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: refuse.c,v 1.1 1997/02/26 03:06:55 downsj Exp $ */
+/* $OpenBSD: refuse.c,v 1.2 2009/10/27 23:59:30 deraadt Exp $ */
/*
* refuse() reports a refused connection, and takes the consequences: in
@@ -9,14 +9,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) refuse.c 1.5 94/12/28 17:42:39";
-#else
-static char rcsid[] = "$OpenBSD: refuse.c,v 1.1 1997/02/26 03:06:55 downsj Exp $";
-#endif
-#endif
-
/* System libraries. */
#include <stdio.h>
diff --git a/lib/libwrap/rfc931.c b/lib/libwrap/rfc931.c
index b72b1a872b9..0501dd880a1 100644
--- a/lib/libwrap/rfc931.c
+++ b/lib/libwrap/rfc931.c
@@ -1,14 +1,10 @@
-/* $OpenBSD: rfc931.c,v 1.11 2006/04/14 18:27:49 dhill Exp $ */
+/* $OpenBSD: rfc931.c,v 1.12 2009/10/27 23:59:30 deraadt Exp $ */
/* rfc1413 does an attempt at an ident query to a client. Originally written
* by Wietse Venema, rewritten by Bob Beck <beck@openbsd.org> to avoid
* potential longjmp problems and get rid of stdio usage on sockets.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: rfc931.c,v 1.11 2006/04/14 18:27:49 dhill Exp $";
-#endif
-
#include <stdio.h>
#include <sys/types.h>
#include <sys/time.h>
diff --git a/lib/libwrap/shell_cmd.c b/lib/libwrap/shell_cmd.c
index e5e2dab0dd9..dbd8d7eade4 100644
--- a/lib/libwrap/shell_cmd.c
+++ b/lib/libwrap/shell_cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: shell_cmd.c,v 1.2 2002/01/02 20:18:33 deraadt Exp $ */
+/* $OpenBSD: shell_cmd.c,v 1.3 2009/10/27 23:59:30 deraadt Exp $ */
/*
* shell_cmd() takes a shell command after %<character> substitutions. The
@@ -10,14 +10,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) shell_cmd.c 1.5 94/12/28 17:42:44";
-#else
-static char rcsid[] = "$OpenBSD: shell_cmd.c,v 1.2 2002/01/02 20:18:33 deraadt Exp $";
-#endif
-#endif
-
/* System libraries. */
#include <sys/types.h>
diff --git a/lib/libwrap/socket.c b/lib/libwrap/socket.c
index 5816855e108..93bb7f13400 100644
--- a/lib/libwrap/socket.c
+++ b/lib/libwrap/socket.c
@@ -17,14 +17,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) socket.c 1.15 97/03/21 19:27:24";
-#else
-static char rcsid[] = "$OpenBSD: socket.c,v 1.8 2006/04/14 18:27:49 dhill Exp $";
-#endif
-#endif
-
/* System libraries. */
#include <sys/types.h>
diff --git a/lib/libwrap/update.c b/lib/libwrap/update.c
index 2a5223cac89..7d3c2746d3a 100644
--- a/lib/libwrap/update.c
+++ b/lib/libwrap/update.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: update.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $ */
+/* $OpenBSD: update.c,v 1.6 2009/10/27 23:59:30 deraadt Exp $ */
/*
* Routines for controlled update/initialization of request structures.
@@ -15,14 +15,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) update.c 1.1 94/12/28 17:42:56";
-#else
-static char rcsid[] = "$OpenBSD: update.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $";
-#endif
-#endif
-
/* System libraries */
#include <stdio.h>
diff --git a/lib/liby/main.c b/lib/liby/main.c
index 1fffd5cd3ab..f0a502fd5e2 100644
--- a/lib/liby/main.c
+++ b/lib/liby/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.4 2003/06/02 20:18:42 millert Exp $ */
+/* $OpenBSD: main.c,v 1.5 2009/10/27 23:59:30 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)main.c 5.3 (Berkeley) 1/13/91";*/
-static char rcsid[] = "$OpenBSD: main.c,v 1.4 2003/06/02 20:18:42 millert Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
extern int yyparse();
diff --git a/lib/liby/yyerror.c b/lib/liby/yyerror.c
index 705a1d50677..95bc08cc44c 100644
--- a/lib/liby/yyerror.c
+++ b/lib/liby/yyerror.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yyerror.c,v 1.5 2004/05/29 06:59:01 deraadt Exp $ */
+/* $OpenBSD: yyerror.c,v 1.6 2009/10/27 23:59:31 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)yyerror.c 5.2 (Berkeley) 5/15/90";*/
-static char rcsid[] = "$OpenBSD: yyerror.c,v 1.5 2004/05/29 06:59:01 deraadt Exp $";
-#endif /* not lint */
-
#include <stdio.h>
int
diff --git a/lib/libz/deflate.c b/lib/libz/deflate.c
index 9907240f5ec..5cc3f7a31b8 100644
--- a/lib/libz/deflate.c
+++ b/lib/libz/deflate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: deflate.c,v 1.10 2005/07/20 15:56:41 millert Exp $ */
+/* $OpenBSD: deflate.c,v 1.11 2009/10/27 23:59:31 deraadt Exp $ */
/* deflate.c -- compress data using the deflation algorithm
* Copyright (C) 1995-2005 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
@@ -51,8 +51,6 @@
#include "deflate.h"
-const char deflate_copyright[] =
- " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
diff --git a/lib/libz/inftrees.c b/lib/libz/inftrees.c
index 2c516bb2952..0b879cd7d0f 100644
--- a/lib/libz/inftrees.c
+++ b/lib/libz/inftrees.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inftrees.c,v 1.8 2005/07/20 15:56:41 millert Exp $ */
+/* $OpenBSD: inftrees.c,v 1.9 2009/10/27 23:59:31 deraadt Exp $ */
/* inftrees.c -- generate Huffman trees for efficient decoding
* Copyright (C) 1995-2005 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
@@ -9,8 +9,6 @@
#define MAXBITS 15
-const char inflate_copyright[] =
- " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index 3f8328eafa4..eb2e1b49e87 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: comsat.c,v 1.35 2006/08/17 23:52:06 ray Exp $ */
+/* $OpenBSD: comsat.c,v 1.36 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -29,17 +29,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
-/*static char sccsid[] = "from: @(#)comsat.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: comsat.c,v 1.35 2006/08/17 23:52:06 ray Exp $";
-#endif /* not lint */
-
#include <sys/limits.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index cecbbdd386c..d4f9ce68acb 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fingerd.c,v 1.34 2008/08/11 17:17:53 tobias Exp $ */
+/* $OpenBSD: fingerd.c,v 1.35 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -29,20 +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
-#if 0
-static char sccsid[] = "from: @(#)fingerd.c 8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$OpenBSD: fingerd.c,v 1.34 2008/08/11 17:17:53 tobias Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index bf62735a8b5..ae380720483 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftpcmd.y,v 1.52 2008/09/13 12:04:49 moritz Exp $ */
+/* $OpenBSD: ftpcmd.y,v 1.53 2009/10/27 23:59:31 deraadt Exp $ */
/* $NetBSD: ftpcmd.y,v 1.7 1996/04/08 19:03:11 jtc Exp $ */
/*
@@ -39,15 +39,6 @@
%{
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94";
-#else
-static const char rcsid[] =
- "$OpenBSD: ftpcmd.y,v 1.52 2008/09/13 12:04:49 moritz Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 4001ba597c2..eedf6a71588 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftpd.c,v 1.186 2009/04/20 21:04:25 schwarze Exp $ */
+/* $OpenBSD: ftpd.c,v 1.187 2009/10/27 23:59:31 deraadt Exp $ */
/* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */
/*
@@ -59,21 +59,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1985, 1988, 1990, 1992, 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[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94";
-#else
-static const char rcsid[] =
- "$OpenBSD: ftpd.c,v 1.186 2009/04/20 21:04:25 schwarze Exp $";
-#endif
-#endif /* not lint */
-
/*
* FTP server.
*/
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 3ec0fac2cc0..4e62ac6dc91 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: logwtmp.c,v 1.10 2008/06/30 12:03:51 ragge Exp $ */
+/* $OpenBSD: logwtmp.c,v 1.11 2009/10/27 23:59:31 deraadt Exp $ */
/* $NetBSD: logwtmp.c,v 1.4 1995/04/11 02:44:58 cgd Exp $ */
/*
@@ -31,15 +31,6 @@
*
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] =
- "$OpenBSD: logwtmp.c,v 1.10 2008/06/30 12:03:51 ragge Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index 3bd0dfbae9c..2121a675e4b 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: popen.c,v 1.22 2008/06/30 12:03:51 ragge Exp $ */
+/* $OpenBSD: popen.c,v 1.23 2009/10/27 23:59:31 deraadt Exp $ */
/* $NetBSD: popen.c,v 1.5 1995/04/11 02:45:00 cgd Exp $ */
/*
@@ -34,15 +34,6 @@
*
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94";
-#else
-static const char rcsid[] =
- "$OpenBSD: popen.c,v 1.22 2008/06/30 12:03:51 ragge Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c
index b51c1735f86..5238ffc666c 100644
--- a/libexec/getNAME/getNAME.c
+++ b/libexec/getNAME/getNAME.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getNAME.c,v 1.15 2006/08/17 23:53:52 ray Exp $ */
+/* $OpenBSD: getNAME.c,v 1.16 2009/10/27 23:59:31 deraadt Exp $ */
/* $NetBSD: getNAME.c,v 1.7.2.1 1997/11/10 19:54:46 thorpej 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 char sccsid[] = "@(#)getNAME.c 8.1 (Berkeley) 6/30/93";
-#else
-static const char rcsid[] = "$OpenBSD: getNAME.c,v 1.15 2006/08/17 23:53:52 ray Exp $";
-#endif
-#endif /* not lint */
-
/*
* Get name sections from manual pages.
* -t for building toc
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index 43fa0637ae1..b274f6d46ef 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.6 2003/06/02 19:38:24 millert Exp $ */
+/* $OpenBSD: init.c,v 1.7 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)init.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: init.c,v 1.6 2003/06/02 19:38:24 millert Exp $";
-#endif /* not lint */
-
/*
* Getty table initializations.
*
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index 789376b6397..9ad71b01710 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.29 2008/02/09 10:13:34 mbalmer Exp $ */
+/* $OpenBSD: main.c,v 1.30 2009/10/27 23:59:31 deraadt Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -29,17 +29,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
-/*static char sccsid[] = "from: @(#)main.c 8.1 (Berkeley) 6/20/93";*/
-static char rcsid[] = "$OpenBSD: main.c,v 1.29 2008/02/09 10:13:34 mbalmer Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <termios.h>
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index ea51a45f8c7..b97c0074a9a 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr.c,v 1.18 2003/06/02 19:38:24 millert Exp $ */
+/* $OpenBSD: subr.c,v 1.19 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)subr.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: subr.c,v 1.18 2003/06/02 19:38:24 millert Exp $";
-#endif /* not lint */
-
/*
* Melbourne getty.
*/
diff --git a/libexec/ld.so/dir.c b/libexec/ld.so/dir.c
index c061d8f4a0a..17de54d2b08 100644
--- a/libexec/ld.so/dir.c
+++ b/libexec/ld.so/dir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dir.c,v 1.13 2007/02/09 14:51:13 drahn Exp $ */
+/* $OpenBSD: dir.c,v 1.14 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -28,10 +28,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = ": opendir.c,v 1.6 1998/08/15 08:10:14 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/stat.h>
@@ -88,9 +84,6 @@ _dl_opendir(const char *name)
}
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$ closedir.c,v 1.3 1998/11/20 11:18:37 d Exp $";
-#endif /* LIBC_SCCS and not lint */
/*
* close a directory.
*/
@@ -110,9 +103,6 @@ _dl_closedir(DIR *dirp)
}
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$ readdir.c,v 1.5 2001/05/17 20:20:36 rees Exp $";
-#endif /* LIBC_SCCS and not lint */
/*
* get next entry in a directory.
*/
diff --git a/libexec/lockspool/lockspool.c b/libexec/lockspool/lockspool.c
index 496a9e443f2..67cc7eb45e7 100644
--- a/libexec/lockspool/lockspool.c
+++ b/libexec/lockspool/lockspool.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lockspool.c,v 1.15 2008/10/01 20:32:44 millert Exp $ */
+/* $OpenBSD: lockspool.c,v 1.16 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1998 Theo de Raadt <deraadt@theos.com>
@@ -26,10 +26,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: lockspool.c,v 1.15 2008/10/01 20:32:44 millert Exp $";
-#endif /* not lint */
-
#include <signal.h>
#include <pwd.h>
#include <syslog.h>
diff --git a/libexec/mail.local/locking.c b/libexec/mail.local/locking.c
index a74aa49ba06..441edd5bd89 100644
--- a/libexec/mail.local/locking.c
+++ b/libexec/mail.local/locking.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: locking.c,v 1.8 2006/04/01 22:48:57 deraadt Exp $ */
+/* $OpenBSD: locking.c,v 1.9 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1996-1998 Theo de Raadt <deraadt@theos.com>
@@ -28,10 +28,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: locking.c,v 1.8 2006/04/01 22:48:57 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/libexec/mail.local/mail.local.c b/libexec/mail.local/mail.local.c
index 57be1c18b0e..5c776327558 100644
--- a/libexec/mail.local/mail.local.c
+++ b/libexec/mail.local/mail.local.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mail.local.c,v 1.31 2008/05/26 09:22:03 sobrado Exp $ */
+/* $OpenBSD: mail.local.c,v 1.32 2009/10/27 23:59:31 deraadt Exp $ */
/*-
* Copyright (c) 1996-1998 Theo de Raadt <deraadt@theos.com>
@@ -31,20 +31,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
-#if 0
-static char sccsid[] = "from: @(#)mail.local.c 5.6 (Berkeley) 6/19/91";
-#else
-static char rcsid[] = "$OpenBSD: mail.local.c,v 1.31 2008/05/26 09:22:03 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/socket.h>
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index 65541221193..c8eb0bd00b9 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rstat_proc.c,v 1.26 2004/09/15 19:05:35 deraadt Exp $ */
+/* $OpenBSD: rstat_proc.c,v 1.27 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -28,11 +28,6 @@
* 2550 Garcia Avenue
* Mountain View, California 94043
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/
-/*static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";*/
-static char rcsid[] = "$OpenBSD: rstat_proc.c,v 1.26 2004/09/15 19:05:35 deraadt Exp $";
-#endif
/*
* rstat service: built with rstat.x and derived from rpc.rstatd.c
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index 7c2d8f4e56a..3df74833f90 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rstatd.c,v 1.22 2009/05/20 20:37:43 thib Exp $ */
+/* $OpenBSD: rstatd.c,v 1.23 2009/10/27 23:59:31 deraadt Exp $ */
/*-
* Copyright (c) 1993, John Brezak
@@ -28,10 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: rstatd.c,v 1.22 2009/05/20 20:37:43 thib Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/socket.h>
#include <stdio.h>
diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index 8039b625f8b..2cecb9f2c78 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rusers_proc.c,v 1.21 2004/11/04 20:09:18 deraadt Exp $ */
+/* $OpenBSD: rusers_proc.c,v 1.22 2009/10/27 23:59:31 deraadt Exp $ */
/*-
* Copyright (c) 1993 John Brezak
@@ -28,10 +28,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: rusers_proc.c,v 1.21 2004/11/04 20:09:18 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 225359614bc..36cbbbe79ca 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rusersd.c,v 1.15 2004/09/15 19:03:19 deraadt Exp $ */
+/* $OpenBSD: rusersd.c,v 1.16 2009/10/27 23:59:31 deraadt Exp $ */
/*-
* Copyright (c) 1993 John Brezak
@@ -28,10 +28,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: rusersd.c,v 1.15 2004/09/15 19:03:19 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/file.h>
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index b49157ff8d8..0c799733f2f 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rwalld.c,v 1.13 2009/05/20 20:37:43 thib Exp $ */
+/* $OpenBSD: rwalld.c,v 1.14 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: rwalld.c,v 1.13 2009/05/20 20:37:43 thib Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h>
diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c
index 8a21a9448c0..c7f0da7e413 100644
--- a/libexec/rpc.sprayd/sprayd.c
+++ b/libexec/rpc.sprayd/sprayd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sprayd.c,v 1.9 2004/06/02 02:21:15 brad Exp $*/
+/* $OpenBSD: sprayd.c,v 1.10 2009/10/27 23:59:31 deraadt Exp $*/
/*
* Copyright (c) 1994 Christos Zoulas
@@ -31,10 +31,6 @@
*
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: sprayd.c,v 1.9 2004/06/02 02:21:15 brad Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/libexec/rpc.yppasswdd/rpc.yppasswdd.c b/libexec/rpc.yppasswdd/rpc.yppasswdd.c
index 934662295ff..1478d7addff 100644
--- a/libexec/rpc.yppasswdd/rpc.yppasswdd.c
+++ b/libexec/rpc.yppasswdd/rpc.yppasswdd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc.yppasswdd.c,v 1.20 2008/05/17 23:31:52 sobrado Exp $ */
+/* $OpenBSD: rpc.yppasswdd.c,v 1.21 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: rpc.yppasswdd.c,v 1.20 2008/05/17 23:31:52 sobrado Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/libexec/rpc.yppasswdd/yppasswdd_mkpw.c b/libexec/rpc.yppasswdd/yppasswdd_mkpw.c
index 1706810b77e..e98cab85c53 100644
--- a/libexec/rpc.yppasswdd/yppasswdd_mkpw.c
+++ b/libexec/rpc.yppasswdd/yppasswdd_mkpw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppasswdd_mkpw.c,v 1.28 2006/04/02 01:29:29 deraadt Exp $ */
+/* $OpenBSD: yppasswdd_mkpw.c,v 1.29 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: yppasswdd_mkpw.c,v 1.28 2006/04/02 01:29:29 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/libexec/rpc.yppasswdd/yppasswdd_proc.c b/libexec/rpc.yppasswdd/yppasswdd_proc.c
index 07dede8d04e..b4983c59f06 100644
--- a/libexec/rpc.yppasswdd/yppasswdd_proc.c
+++ b/libexec/rpc.yppasswdd/yppasswdd_proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppasswdd_proc.c,v 1.12 2006/04/02 01:29:29 deraadt Exp $ */
+/* $OpenBSD: yppasswdd_proc.c,v 1.13 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: yppasswdd_proc.c,v 1.12 2006/04/02 01:29:29 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <rpc/rpc.h>
#include <stdio.h>
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index f6ef85133f6..ddd005a8478 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rshd.c,v 1.52 2008/04/08 19:16:05 deraadt Exp $ */
+/* $OpenBSD: rshd.c,v 1.53 2009/10/27 23:59:31 deraadt Exp $ */
/*-
* Copyright (c) 1988, 1989, 1992, 1993, 1994
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1989, 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/* from: static char sccsid[] = "@(#)rshd.c 8.2 (Berkeley) 4/6/94"; */
-static char *rcsid = "$OpenBSD: rshd.c,v 1.52 2008/04/08 19:16:05 deraadt Exp $";
-#endif /* not lint */
-
/*
* remote shell server:
* [port]\0
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index e2347dc7045..f29a19627c1 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: announce.c,v 1.20 2004/03/10 04:32:45 deraadt Exp $ */
+/* $OpenBSD: announce.c,v 1.21 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)announce.c 5.9 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: announce.c,v 1.20 2004/03/10 04:32:45 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c
index 022357b082a..9a2dadc34c6 100644
--- a/libexec/talkd/print.c
+++ b/libexec/talkd/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.10 2006/03/17 08:23:14 otto Exp $ */
+/* $OpenBSD: print.c,v 1.11 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)print.c 5.8 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: print.c,v 1.10 2006/03/17 08:23:14 otto Exp $";
-#endif /* not lint */
-
/* debug print routines */
#include <sys/types.h>
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index ea99eec8642..6d2df621f04 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: process.c,v 1.18 2006/10/18 21:23:11 deraadt Exp $ */
+/* $OpenBSD: process.c,v 1.19 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)process.c 5.10 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: process.c,v 1.18 2006/10/18 21:23:11 deraadt Exp $";
-#endif /* not lint */
-
/*
* process.c handles the requests, which can be of three types:
* ANNOUNCE - announce to a user that a talk is wanted
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index aae66629ef4..5bf065ae1fb 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: table.c,v 1.13 2005/10/14 15:39:19 otto Exp $ */
+/* $OpenBSD: table.c,v 1.14 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)table.c 5.7 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: table.c,v 1.13 2005/10/14 15:39:19 otto Exp $";
-#endif /* not lint */
-
/*
* Routines to handle insertion, deletion, etc on the table
* of requests kept by the daemon. Nothing fancy here, linear
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index 16dd24105e4..ee2e7be2bad 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: talkd.c,v 1.21 2004/08/08 19:32:45 deraadt Exp $ */
+/* $OpenBSD: talkd.c,v 1.22 2009/10/27 23:59:31 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)talkd.c 5.8 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: talkd.c,v 1.21 2004/08/08 19:32:45 deraadt Exp $";
-#endif /* not lint */
-
/*
* The top level of the daemon, the format is heavily borrowed
* from rwhod.c. Basically: find out who and where you are;
diff --git a/libexec/tcpd/safe_finger/safe_finger.c b/libexec/tcpd/safe_finger/safe_finger.c
index 0b8692dded9..6b4c4a8858a 100644
--- a/libexec/tcpd/safe_finger/safe_finger.c
+++ b/libexec/tcpd/safe_finger/safe_finger.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: safe_finger.c,v 1.3 2002/02/16 21:27:31 millert Exp $ */
+/* $OpenBSD: safe_finger.c,v 1.4 2009/10/27 23:59:31 deraadt Exp $ */
/*
* safe_finger - finger client wrapper that protects against nasty stuff
@@ -16,14 +16,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) safe_finger.c 1.4 94/12/28 17:42:41";
-#else
-static char rcsid[] = "$OpenBSD: safe_finger.c,v 1.3 2002/02/16 21:27:31 millert Exp $";
-#endif
-#endif
-
/* System libraries */
#include <sys/types.h>
diff --git a/libexec/tcpd/tcpd/tcpd.c b/libexec/tcpd/tcpd/tcpd.c
index 84122c15ce5..18cc19b4079 100644
--- a/libexec/tcpd/tcpd/tcpd.c
+++ b/libexec/tcpd/tcpd/tcpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcpd.c,v 1.3 2003/06/26 07:53:26 deraadt Exp $ */
+/* $OpenBSD: tcpd.c,v 1.4 2009/10/27 23:59:31 deraadt Exp $ */
/*
* General front end for stream and datagram IP services. This program logs
@@ -12,14 +12,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) tcpd.c 1.10 96/02/11 17:01:32";
-#else
-static char rcsid[] = "$OpenBSD: tcpd.c,v 1.3 2003/06/26 07:53:26 deraadt Exp $";
-#endif
-#endif
-
/* System libraries. */
#include <sys/types.h>
diff --git a/libexec/tcpd/tcpdchk/inetcf.c b/libexec/tcpd/tcpdchk/inetcf.c
index ba13ab4ef16..96f1b460b78 100644
--- a/libexec/tcpd/tcpdchk/inetcf.c
+++ b/libexec/tcpd/tcpdchk/inetcf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inetcf.c,v 1.4 2003/06/26 07:53:27 deraadt Exp $ */
+/* $OpenBSD: inetcf.c,v 1.5 2009/10/27 23:59:32 deraadt Exp $ */
/*
* Routines to parse an inetd.conf or tlid.conf file. This would be a great
@@ -7,14 +7,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23";
-#else
-static char rcsid[] = "$OpenBSD: inetcf.c,v 1.4 2003/06/26 07:53:27 deraadt Exp $";
-#endif
-#endif
-
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
diff --git a/libexec/tcpd/tcpdchk/scaffold.c b/libexec/tcpd/tcpdchk/scaffold.c
index da0467d383b..ac8b05ba5e6 100644
--- a/libexec/tcpd/tcpdchk/scaffold.c
+++ b/libexec/tcpd/tcpdchk/scaffold.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scaffold.c,v 1.7 2002/07/30 22:27:20 deraadt Exp $ */
+/* $OpenBSD: scaffold.c,v 1.8 2009/10/27 23:59:32 deraadt Exp $ */
/*
* Routines for testing only. Not really industrial strength.
@@ -6,14 +6,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccs_id[] = "@(#) scaffold.c 1.5 95/01/03 09:13:48";
-#else
-static char rcsid[] = "$OpenBSD: scaffold.c,v 1.7 2002/07/30 22:27:20 deraadt Exp $";
-#endif
-#endif
-
/* System libraries. */
#include <sys/types.h>
diff --git a/libexec/tcpd/tcpdchk/tcpdchk.c b/libexec/tcpd/tcpdchk/tcpdchk.c
index 28e361a6e4b..20213a83465 100644
--- a/libexec/tcpd/tcpdchk/tcpdchk.c
+++ b/libexec/tcpd/tcpdchk/tcpdchk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcpdchk.c,v 1.10 2008/05/17 23:31:52 sobrado Exp $ */
+/* $OpenBSD: tcpdchk.c,v 1.11 2009/10/27 23:59:32 deraadt Exp $ */
/*
* tcpdchk - examine all tcpd access control rules and inetd.conf entries
@@ -16,14 +16,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) tcpdchk.c 1.8 97/02/12 02:13:25";
-#else
-static char rcsid[] = "$OpenBSD: tcpdchk.c,v 1.10 2008/05/17 23:31:52 sobrado Exp $";
-#endif
-#endif
-
/* System libraries. */
#include <sys/types.h>
diff --git a/libexec/tcpd/tcpdmatch/tcpdmatch.c b/libexec/tcpd/tcpdmatch/tcpdmatch.c
index af71303d672..ebb94f76227 100644
--- a/libexec/tcpd/tcpdmatch/tcpdmatch.c
+++ b/libexec/tcpd/tcpdmatch/tcpdmatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcpdmatch.c,v 1.7 2003/06/26 07:53:27 deraadt Exp $ */
+/* $OpenBSD: tcpdmatch.c,v 1.8 2009/10/27 23:59:32 deraadt Exp $ */
/*
* tcpdmatch - explain what tcpd would do in a specific case
@@ -15,14 +15,6 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#) tcpdmatch.c 1.5 96/02/11 17:01:36";
-#else
-static char rcsid[] = "$OpenBSD: tcpdmatch.c,v 1.7 2003/06/26 07:53:27 deraadt Exp $";
-#endif
-#endif
-
/* System libraries. */
#include <sys/types.h>
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index 0a30406ba45..01e9f155327 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tftpd.c,v 1.62 2008/03/24 16:11:00 deraadt Exp $ */
+/* $OpenBSD: tftpd.c,v 1.63 2009/10/27 23:59:32 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)tftpd.c 5.13 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$OpenBSD: tftpd.c,v 1.62 2008/03/24 16:11:00 deraadt Exp $";
-#endif /* not lint */
-
/*
* Trivial file transfer protocol server.
*
diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c
index 54bfc33e4ba..2b38ea62ad2 100644
--- a/libexec/uucpd/uucpd.c
+++ b/libexec/uucpd/uucpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uucpd.c,v 1.31 2006/04/02 00:48:55 deraadt Exp $ */
+/* $OpenBSD: uucpd.c,v 1.32 2009/10/27 23:59:32 deraadt Exp $ */
/*
* Copyright (c) 1985 The Regents of the University of California.
@@ -32,17 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1985 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)uucpd.c 5.10 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$OpenBSD: uucpd.c,v 1.31 2006/04/02 00:48:55 deraadt Exp $";
-#endif /* not lint */
-
/*
* 4.2BSD TCP/IP server for uucico
* uucico's TCP channel causes this server to be run at the remote end.
diff --git a/regress/lib/libc/db/dbtest.c b/regress/lib/libc/db/dbtest.c
index 8eda40d6b3a..c28ec0db5eb 100644
--- a/regress/lib/libc/db/dbtest.c
+++ b/regress/lib/libc/db/dbtest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dbtest.c,v 1.11 2003/07/31 21:48:02 deraadt Exp $ */
+/* $OpenBSD: dbtest.c,v 1.12 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: dbtest.c,v 1.8 1996/05/03 21:57:48 cgd Exp $ */
/*-
@@ -30,20 +30,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
-#if 0
-static char sccsid[] = "@(#)dbtest.c 8.17 (Berkeley) 9/1/94";
-#else
-static char rcsid[] = "$OpenBSD: dbtest.c,v 1.11 2003/07/31 21:48:02 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/regress/lib/libc/hsearch/hsearchtest.c b/regress/lib/libc/hsearch/hsearchtest.c
index 2972b547944..8659ef7e771 100644
--- a/regress/lib/libc/hsearch/hsearchtest.c
+++ b/regress/lib/libc/hsearch/hsearchtest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hsearchtest.c,v 1.1 2004/06/24 04:33:07 millert Exp $ */
+/* $OpenBSD: hsearchtest.c,v 1.2 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: hsearchtest.c,v 1.5 2003/07/26 19:38:46 salo Exp $ */
/*
@@ -39,15 +39,6 @@
* Test program for hsearch() et al.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 2001 Christopher G. Demetriou. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hsearchtest.c,v 1.1 2004/06/24 04:33:07 millert Exp $";
-#endif /* not lint */
-
#include <search.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index f3ecb9bdb32..4329b07b23d 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: badsect.c,v 1.18 2007/08/06 19:16:05 sobrado Exp $ */
+/* $OpenBSD: badsect.c,v 1.19 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: badsect.c,v 1.10 1995/03/18 14:54:28 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1981, 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)badsect.c 8.1 (Berkeley) 6/5/93";
-#else
-static const char rcsid[] = "$OpenBSD: badsect.c,v 1.18 2007/08/06 19:16:05 sobrado Exp $";
-#endif
-#endif /* not lint */
-
/*
* badsect
*
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index f0a6dbe6f66..77237015ffb 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clri.c,v 1.11 2007/05/21 18:13:11 millert Exp $ */
+/* $OpenBSD: clri.c,v 1.12 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: clri.c,v 1.19 2005/01/20 15:50:47 xtraeme Exp $ */
/*
@@ -33,18 +33,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#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
-static char sccsid[] = "@(#)clri.c 8.2 (Berkeley) 9/23/93";
-#endif /* not lint */
-#endif
-
#include <sys/param.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index ef9af498a99..aa0418e044d 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.c,v 1.159 2009/09/15 21:51:51 fgsch Exp $ */
+/* $OpenBSD: disklabel.c,v 1.160 2009/10/27 23:59:32 deraadt Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -32,16 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.159 2009/09/15 21:51:51 fgsch Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
diff --git a/sbin/disklabel/dkcksum.c b/sbin/disklabel/dkcksum.c
index fdb6dea7221..4108280fdbd 100644
--- a/sbin/disklabel/dkcksum.c
+++ b/sbin/disklabel/dkcksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dkcksum.c,v 1.7 2004/09/28 17:57:46 otto Exp $ */
+/* $OpenBSD: dkcksum.c,v 1.8 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: dkcksum.c,v 1.6 1995/03/18 14:54:42 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dkcksum.c 8.1 (Berkeley) 6/5/93";
-#else
-static char rcsid[] = "$OpenBSD: dkcksum.c,v 1.7 2004/09/28 17:57:46 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/disklabel.h>
#include <stdio.h>
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index e5b8a26b2ef..a1c0cc4bf2d 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: editor.c,v 1.222 2009/10/01 16:28:33 deraadt Exp $ */
+/* $OpenBSD: editor.c,v 1.223 2009/10/27 23:59:32 deraadt Exp $ */
/*
* Copyright (c) 1997-2000 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: editor.c,v 1.222 2009/10/01 16:28:33 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index 46857106248..da6a17d07ca 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dumprmt.c,v 1.25 2008/01/02 12:59:35 chl Exp $ */
+/* $OpenBSD: dumprmt.c,v 1.26 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: dumprmt.c,v 1.17 1997/06/05 16:10:47 mrg Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dumprmt.c 8.1 (Berkeley) 6/5/93";
-#else
-static const char rcsid[] = "$OpenBSD: dumprmt.c,v 1.25 2008/01/02 12:59:35 chl Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mtio.h>
#include <sys/ioctl.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index d68349f6d08..d64422b5bb8 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: itime.c,v 1.16 2007/09/10 14:29:53 tobias Exp $ */
+/* $OpenBSD: itime.c,v 1.17 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: itime.c,v 1.4 1997/04/15 01:09:50 lukem Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93";
-#else
-static const char rcsid[] = "$OpenBSD: itime.c,v 1.16 2007/09/10 14:29:53 tobias Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 8995809a03d..202d1015d22 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.42 2007/09/02 15:19:23 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.43 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: main.c,v 1.14 1997/06/05 11:13:24 lukem Exp $ */
/*-
@@ -30,20 +30,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[] = "@(#)main.c 8.4 (Berkeley) 4/15/94";
-#else
-static const char rcsid[] = "$OpenBSD: main.c,v 1.42 2007/09/02 15:19:23 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/stat.h>
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 815183d8fdd..f4564c29c2a 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: optr.c,v 1.30 2007/06/03 20:16:08 millert Exp $ */
+/* $OpenBSD: optr.c,v 1.31 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: optr.c,v 1.11 1997/05/27 08:34:36 mrg Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94";
-#else
-static const char rcsid[] = "$OpenBSD: optr.c,v 1.30 2007/06/03 20:16:08 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/wait.h>
#include <sys/time.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 91f47227172..f87dbf7cc08 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tape.c,v 1.30 2008/01/11 07:04:22 otto Exp $ */
+/* $OpenBSD: tape.c,v 1.31 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: tape.c,v 1.11 1997/06/05 11:13:26 lukem Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tape.c 8.2 (Berkeley) 3/17/94";
-#else
-static const char rcsid[] = "$OpenBSD: tape.c,v 1.30 2008/01/11 07:04:22 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index b603eb61d92..d06a30afbe9 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: traverse.c,v 1.23 2007/06/15 21:07:17 otto Exp $ */
+/* $OpenBSD: traverse.c,v 1.24 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: traverse.c,v 1.17 1997/06/05 11:13:27 lukem Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)traverse.c 8.2 (Berkeley) 9/23/93";
-#else
-static const char rcsid[] = "$OpenBSD: traverse.c,v 1.23 2007/06/15 21:07:17 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 896aec4705a..93904c1f191 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dumpfs.c,v 1.26 2008/08/19 09:41:12 pedro Exp $ */
+/* $OpenBSD: dumpfs.c,v 1.27 2009/10/27 23:59:32 deraadt Exp $ */
/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -38,20 +38,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 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[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95";
-#else
-static const char rcsid[] = "$OpenBSD: dumpfs.c,v 1.26 2008/08/19 09:41:12 pedro Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index c61d43c30fc..cbcff026c32 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsck.c,v 1.26 2007/10/20 18:11:17 sobrado Exp $ */
+/* $OpenBSD: fsck.c,v 1.27 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: fsck.c,v 1.7 1996/10/03 20:06:30 christos Exp $ */
/*
@@ -35,8 +35,6 @@
*
*/
-static const char rcsid[] = "$OpenBSD: fsck.c,v 1.26 2007/10/20 18:11:17 sobrado Exp $";
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/queue.h>
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index 38104b40fc1..5f25f9ecd03 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsutil.c,v 1.16 2007/02/17 15:57:14 grunk Exp $ */
+/* $OpenBSD: fsutil.c,v 1.17 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: fsutil.c,v 1.2 1996/10/03 20:06:31 christos Exp $ */
/*
@@ -29,9 +29,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: fsutil.c,v 1.16 2007/02/17 15:57:14 grunk Exp $";
-#endif /* not lint */
#include <sys/param.h>
#include <stdio.h>
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 4c87b4c5684..6de8746babe 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: preen.c,v 1.16 2005/10/28 07:30:35 otto Exp $ */
+/* $OpenBSD: preen.c,v 1.17 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: preen.c,v 1.15 1996/09/28 19:21:42 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)preen.c 8.3 (Berkeley) 12/6/94";
-#else
-static const char rcsid[] = "$OpenBSD: preen.c,v 1.16 2005/10/28 07:30:35 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/sbin/fsck_ext2fs/main.c b/sbin/fsck_ext2fs/main.c
index 0548dd319f8..f72eff884a4 100644
--- a/sbin/fsck_ext2fs/main.c
+++ b/sbin/fsck_ext2fs/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.15 2006/04/20 02:24:38 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.16 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $ */
/*
@@ -31,24 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1986, 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.2 (Berkeley) 1/23/94";
-#else
-#if 0
-static char rcsid[] = "$NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.15 2006/04/20 02:24:38 deraadt Exp $";
-#endif
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/mount.h>
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index af1e61aa236..1527aaa5127 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dir.c,v 1.23 2008/06/10 23:10:29 otto Exp $ */
+/* $OpenBSD: dir.c,v 1.24 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: dir.c,v 1.20 1996/09/27 22:45:11 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dir.c 8.5 (Berkeley) 12/8/94";
-#else
-static const char rcsid[] = "$OpenBSD: dir.c,v 1.23 2008/06/10 23:10:29 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index c253ea9e8b3..7478ff0dd39 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inode.c,v 1.32 2008/12/29 18:06:10 otto Exp $ */
+/* $OpenBSD: inode.c,v 1.33 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: inode.c,v 1.23 1996/10/11 20:15:47 thorpej Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)inode.c 8.5 (Berkeley) 2/8/95";
-#else
-static const char rcsid[] = "$OpenBSD: inode.c,v 1.32 2008/12/29 18:06:10 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index d92f139396d..0e2fa1aa31a 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.33 2008/06/10 23:10:29 otto Exp $ */
+/* $OpenBSD: main.c,v 1.34 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: main.c,v 1.22 1996/10/11 20:15:48 thorpej Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1986, 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.2 (Berkeley) 1/23/94";
-#else
-static const char rcsid[] = "$OpenBSD: main.c,v 1.33 2008/06/10 23:10:29 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/mount.h>
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index ef6d8f163cf..2a694baa30a 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pass1.c,v 1.31 2009/05/29 07:57:43 otto Exp $ */
+/* $OpenBSD: pass1.c,v 1.32 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: pass1.c,v 1.16 1996/09/27 22:45:15 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pass1.c 8.1 (Berkeley) 6/5/93";
-#else
-static const char rcsid[] = "$OpenBSD: pass1.c,v 1.31 2009/05/29 07:57:43 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index 8f90a2c7497..984fdde2a2d 100644
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pass1b.c,v 1.16 2008/06/10 23:10:29 otto Exp $ */
+/* $OpenBSD: pass1b.c,v 1.17 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: pass1b.c,v 1.10 1996/09/23 16:18:37 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pass1b.c 8.1 (Berkeley) 6/5/93";
-#else
-static const char rcsid[] = "$OpenBSD: pass1b.c,v 1.16 2008/06/10 23:10:29 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index 2888aec7156..92afe5ad48c 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pass2.c,v 1.28 2008/06/10 23:10:29 otto Exp $ */
+/* $OpenBSD: pass2.c,v 1.29 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: pass2.c,v 1.17 1996/09/27 22:45:15 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pass2.c 8.6 (Berkeley) 10/27/94";
-#else
-static const char rcsid[] = "$OpenBSD: pass2.c,v 1.28 2008/06/10 23:10:29 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index 8cd8387a115..4d42c7be468 100644
--- a/sbin/fsck_ffs/pass3.c
+++ b/sbin/fsck_ffs/pass3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pass3.c,v 1.13 2008/06/10 23:10:29 otto Exp $ */
+/* $OpenBSD: pass3.c,v 1.14 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: pass3.c,v 1.8 1995/03/18 14:55:54 cgd Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pass3.c 8.1 (Berkeley) 6/5/93";
-#else
-static const char rcsid[] = "$OpenBSD: pass3.c,v 1.13 2008/06/10 23:10:29 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index df5c208ea69..dd576af00f9 100644
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pass4.c,v 1.18 2008/06/10 23:10:29 otto Exp $ */
+/* $OpenBSD: pass4.c,v 1.19 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: pass4.c,v 1.11 1996/09/27 22:45:17 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pass4.c 8.1 (Berkeley) 6/5/93";
-#else
-static const char rcsid[] = "$OpenBSD: pass4.c,v 1.18 2008/06/10 23:10:29 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <ufs/ufs/dinode.h>
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index 48b3e186d9c..9823e6518a8 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pass5.c,v 1.37 2008/06/10 23:10:29 otto Exp $ */
+/* $OpenBSD: pass5.c,v 1.38 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: pass5.c,v 1.16 1996/09/27 22:45:18 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pass5.c 8.6 (Berkeley) 11/30/94";
-#else
-static const char rcsid[] = "$OpenBSD: pass5.c,v 1.37 2008/06/10 23:10:29 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/lock.h>
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index e5f00150b46..23dda83f2e0 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setup.c,v 1.40 2008/06/10 23:10:29 otto Exp $ */
+/* $OpenBSD: setup.c,v 1.41 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: setup.c,v 1.27 1996/09/27 22:45:19 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)setup.c 8.5 (Berkeley) 11/23/94";
-#else
-static const char rcsid[] = "$OpenBSD: setup.c,v 1.40 2008/06/10 23:10:29 otto Exp $";
-#endif
-#endif /* not lint */
-
#define DKTYPENAMES
#include <sys/param.h>
#include <sys/time.h>
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 1ca340ee89e..43866d42bfd 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utilities.c,v 1.35 2008/06/10 23:10:29 otto Exp $ */
+/* $OpenBSD: utilities.c,v 1.36 2009/10/27 23:59:32 deraadt Exp $ */
/* $NetBSD: utilities.c,v 1.18 1996/09/27 22:45:20 christos Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)utilities.c 8.1 (Berkeley) 6/5/93";
-#else
-static const char rcsid[] = "$OpenBSD: utilities.c,v 1.35 2008/06/10 23:10:29 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
diff --git a/sbin/fsck_msdos/boot.c b/sbin/fsck_msdos/boot.c
index 9c95f6c3e4d..3ac3ab6dbf3 100644
--- a/sbin/fsck_msdos/boot.c
+++ b/sbin/fsck_msdos/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.13 2008/02/07 01:34:12 ian Exp $ */
+/* $OpenBSD: boot.c,v 1.14 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: boot.c,v 1.5 1997/10/17 11:19:23 ws Exp $ */
/*
@@ -33,11 +33,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-#ifndef lint
-static char rcsid[] = "$OpenBSD: boot.c,v 1.13 2008/02/07 01:34:12 ian Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
diff --git a/sbin/fsck_msdos/check.c b/sbin/fsck_msdos/check.c
index a2af26aa2a1..73bfe5368cc 100644
--- a/sbin/fsck_msdos/check.c
+++ b/sbin/fsck_msdos/check.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: check.c,v 1.11 2006/05/27 22:30:09 thib Exp $ */
+/* $OpenBSD: check.c,v 1.12 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: check.c,v 1.8 1997/10/17 11:19:29 ws Exp $ */
/*
@@ -33,11 +33,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-#ifndef lint
-static char rcsid[] = "$OpenBSD: check.c,v 1.11 2006/05/27 22:30:09 thib Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
diff --git a/sbin/fsck_msdos/dir.c b/sbin/fsck_msdos/dir.c
index e45647e7ecc..ae4487e2d0a 100644
--- a/sbin/fsck_msdos/dir.c
+++ b/sbin/fsck_msdos/dir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dir.c,v 1.20 2006/05/27 22:30:09 thib Exp $ */
+/* $OpenBSD: dir.c,v 1.21 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: dir.c,v 1.11 1997/10/17 11:19:35 ws Exp $ */
/*
@@ -35,11 +35,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-#ifndef lint
-static char rcsid[] = "$OpenBSD: dir.c,v 1.20 2006/05/27 22:30:09 thib Exp $";
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/sbin/fsck_msdos/fat.c b/sbin/fsck_msdos/fat.c
index b7c05b4f4c0..07789da8810 100644
--- a/sbin/fsck_msdos/fat.c
+++ b/sbin/fsck_msdos/fat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fat.c,v 1.17 2007/09/02 15:19:23 deraadt Exp $ */
+/* $OpenBSD: fat.c,v 1.18 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: fat.c,v 1.8 1997/10/17 11:19:53 ws Exp $ */
/*
@@ -33,11 +33,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-#ifndef lint
-static char rcsid[] = "$OpenBSD: fat.c,v 1.17 2007/09/02 15:19:23 deraadt Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
diff --git a/sbin/fsck_msdos/main.c b/sbin/fsck_msdos/main.c
index fb6172b70d0..75fe0f366bc 100644
--- a/sbin/fsck_msdos/main.c
+++ b/sbin/fsck_msdos/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.15 2006/03/30 01:16:31 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.16 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: main.c,v 1.8 1996/10/17 20:29:53 cgd Exp $ */
/*
@@ -34,10 +34,6 @@
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: main.c,v 1.15 2006/03/30 01:16:31 deraadt Exp $";
-#endif /* not lint */
-
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 9e3d865eb48..2200301819a 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsdb.c,v 1.22 2008/06/26 05:42:06 ray Exp $ */
+/* $OpenBSD: fsdb.c,v 1.23 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: fsdb.c,v 1.7 1997/01/11 06:50:53 lukem Exp $ */
/*-
@@ -30,10 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: fsdb.c,v 1.22 2008/06/26 05:42:06 ray Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/param.h>
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index cd4a03aeb76..6da84f26e64 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsdbutil.c,v 1.13 2008/06/26 05:42:06 ray Exp $ */
+/* $OpenBSD: fsdbutil.c,v 1.14 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: fsdbutil.c,v 1.5 1996/09/28 19:30:37 christos Exp $ */
/*-
@@ -30,10 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: fsdbutil.c,v 1.13 2008/06/26 05:42:06 ray Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/param.h>
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index bcacdc2b9b4..b189498b65e 100644
--- a/sbin/growfs/debug.c
+++ b/sbin/growfs/debug.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: debug.c,v 1.7 2007/07/07 08:22:55 millert Exp $ */
+/* $OpenBSD: debug.c,v 1.8 2009/10/27 23:59:33 deraadt Exp $ */
/*
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
@@ -41,11 +41,6 @@
*
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: debug.c,v 1.7 2007/07/07 08:22:55 millert Exp $";
-#endif /* not lint */
-
/* ********************************************************** INCLUDES ***** */
#include <sys/param.h>
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index 58cc3c2e881..d01db3c8168 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: growfs.c,v 1.27 2009/04/01 05:31:55 jsg Exp $ */
+/* $OpenBSD: growfs.c,v 1.28 2009/10/27 23:59:33 deraadt Exp $ */
/*
* Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
* Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
@@ -41,13 +41,6 @@
*
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz\n\
-Copyright (c) 1980, 1989, 1993 The Regents of the University of California.\n\
-All rights reserved.\n";
-#endif /* not lint */
-
/* ********************************************************** INCLUDES ***** */
#include <sys/param.h>
#include <sys/disklabel.h>
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 8c61f2aea0e..670a37744d4 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.40 2007/09/03 14:26:54 deraadt Exp $ */
+/* $OpenBSD: init.c,v 1.41 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $ */
/*-
@@ -33,20 +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[] = "@(#)init.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.40 2007/09/03 14:26:54 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/wait.h>
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 81d609288db..3e254114a4a 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mknod.c,v 1.16 2007/12/30 13:52:40 sobrado Exp $ */
+/* $OpenBSD: mknod.c,v 1.17 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: mknod.c,v 1.8 1995/08/11 00:08:18 jtc Exp $ */
/*
@@ -33,20 +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[] = "@(#)mknod.c 8.1 (Berkeley) 6/5/93";
-#else
-static char rcsid[] = "$OpenBSD: mknod.c,v 1.16 2007/12/30 13:52:40 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index 2ed2239b65b..629dd5de653 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getmntopts.c,v 1.10 2006/09/30 17:48:22 ray Exp $ */
+/* $OpenBSD: getmntopts.c,v 1.11 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: getmntopts.c,v 1.3 1995/03/18 14:56:58 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)getmntopts.c 8.1 (Berkeley) 3/27/94";
-#else
-static char rcsid[] = "$OpenBSD: getmntopts.c,v 1.10 2006/09/30 17:48:22 ray Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 30eecb461d5..ddad3f35ed2 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount.c,v 1.49 2009/05/12 23:25:08 thib Exp $ */
+/* $OpenBSD: mount.c,v 1.50 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 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[] = "@(#)mount.c 8.19 (Berkeley) 4/19/94";
-#else
-static char rcsid[] = "$OpenBSD: mount.c,v 1.49 2009/05/12 23:25:08 thib Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/socket.h>
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 69ed81424f3..be5f5292d86 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_cd9660.c,v 1.18 2007/03/21 13:44:04 pedro Exp $ */
+/* $OpenBSD: mount_cd9660.c,v 1.19 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: mount_cd9660.c,v 1.3 1996/04/13 01:31:08 jtc Exp $ */
/*
@@ -35,20 +35,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
-#if 0
-static char sccsid[] = "@(#)mount_cd9660.c 8.4 (Berkeley) 3/27/94";
-#else
-static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.18 2007/03/21 13:44:04 pedro Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#define CD9660
#include <sys/mount.h>
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 30fd4821d51..8797f2df9ac 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_ext2fs.c,v 1.13 2005/04/08 20:09:36 jaredy Exp $ */
+/* $OpenBSD: mount_ext2fs.c,v 1.14 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mount_ufs.c 8.2 (Berkeley) 3/27/94";
-#else
-static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.13 2005/04/08 20:09:36 jaredy Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/sbin/mount_ffs/mount_ffs.c b/sbin/mount_ffs/mount_ffs.c
index 32e1491dc1e..02bf63460a7 100644
--- a/sbin/mount_ffs/mount_ffs.c
+++ b/sbin/mount_ffs/mount_ffs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_ffs.c,v 1.19 2006/08/11 11:47:39 pedro Exp $ */
+/* $OpenBSD: mount_ffs.c,v 1.20 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mount_ufs.c 8.2 (Berkeley) 3/27/94";
-#else
-static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.19 2006/08/11 11:47:39 pedro Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c
index 292c3aebb1a..583a3a7aec3 100644
--- a/sbin/mount_msdos/mount_msdos.c
+++ b/sbin/mount_msdos/mount_msdos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_msdos.c,v 1.22 2007/03/20 03:45:54 tedu Exp $ */
+/* $OpenBSD: mount_msdos.c,v 1.23 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: mount_msdos.c,v 1.16 1996/10/24 00:12:50 cgd Exp $ */
/*
@@ -31,10 +31,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.22 2007/03/20 03:45:54 tedu Exp $";
-#endif /* not lint */
-
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index fd5e4de9efa..2561607c357 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_nfs.c,v 1.48 2009/05/12 23:25:08 thib Exp $ */
+/* $OpenBSD: mount_nfs.c,v 1.49 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: mount_nfs.c,v 1.12.4.1 1996/05/25 22:48:05 fvdl Exp $ */
/*
@@ -33,20 +33,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
-#if 0
-static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95";
-#else
-static char rcsid[] = "$NetBSD: mount_nfs.c,v 1.12.4.1 1996/05/25 22:48:05 fvdl Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/socket.h>
diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c
index 3069735bb28..727470bcfc5 100644
--- a/sbin/mount_portal/mount_portal.c
+++ b/sbin/mount_portal/mount_portal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_portal.c,v 1.28 2008/06/01 18:38:29 sobrado Exp $ */
+/* $OpenBSD: mount_portal.c,v 1.29 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: mount_portal.c,v 1.8 1996/04/13 01:31:54 jtc Exp $ */
/*
@@ -33,20 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mount_portal.c 8.6 (Berkeley) 4/26/95";
-#else
-static char rcsid[] = "$OpenBSD: mount_portal.c,v 1.28 2008/06/01 18:38:29 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/wait.h>
#include <sys/socket.h>
diff --git a/sbin/mount_procfs/mount_procfs.c b/sbin/mount_procfs/mount_procfs.c
index 616b589f12a..6cb036c9f5e 100644
--- a/sbin/mount_procfs/mount_procfs.c
+++ b/sbin/mount_procfs/mount_procfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_procfs.c,v 1.15 2005/04/08 20:09:37 jaredy Exp $ */
+/* $OpenBSD: mount_procfs.c,v 1.16 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: mount_procfs.c,v 1.7 1996/04/13 01:31:59 jtc Exp $ */
/*
@@ -34,20 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mount_procfs.c 8.3 (Berkeley) 3/27/94";
-#else
-static char rcsid[] = "$OpenBSD: mount_procfs.c,v 1.15 2005/04/08 20:09:37 jaredy Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index 645b515c2bf..b24e58695cd 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mountd.c,v 1.69 2007/12/30 13:41:09 sobrado Exp $ */
+/* $OpenBSD: mountd.c,v 1.70 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $ */
/*
@@ -33,20 +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[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95";
-#else
-static char rcsid[] = "$NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/ioctl.h>
diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c
index b4d2a9cf771..2ae65ae46cf 100644
--- a/sbin/ncheck_ffs/ncheck_ffs.c
+++ b/sbin/ncheck_ffs/ncheck_ffs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncheck_ffs.c,v 1.34 2009/06/02 22:37:05 ray Exp $ */
+/* $OpenBSD: ncheck_ffs.c,v 1.35 2009/10/27 23:59:33 deraadt Exp $ */
/*-
* Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
@@ -54,10 +54,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.34 2009/06/02 22:37:05 ray Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index 16851ff45bf..cdbb7ae98ef 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: newfs_msdos.c,v 1.18 2009/07/27 18:11:07 halex Exp $ */
+/* $OpenBSD: newfs_msdos.c,v 1.19 2009/10/27 23:59:33 deraadt Exp $ */
/*
* Copyright (c) 1998 Robert Nordier
@@ -27,11 +27,6 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.9 1999/08/28 00:13:52 peter Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/disklabel.h>
diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c
index ad323a385f3..948efa1e9f1 100644
--- a/sbin/nfsd/nfsd.c
+++ b/sbin/nfsd/nfsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfsd.c,v 1.28 2008/03/13 16:16:42 thib Exp $ */
+/* $OpenBSD: nfsd.c,v 1.29 2009/10/27 23:59:33 deraadt Exp $ */
/* $NetBSD: nfsd.c,v 1.19 1996/02/18 23:18:56 mycroft 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 const char sccsid[] = "@(#)nfsd.c 8.9 (Berkeley) 3/29/95";
-#else
-static const char rcsid[] = "$OpenBSD: nfsd.c,v 1.28 2008/03/13 16:16:42 thib Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 1ef9edebd71..aa4aec78f11 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ping.c,v 1.83 2009/06/05 00:11:26 claudio Exp $ */
+/* $OpenBSD: ping.c,v 1.84 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */
/*
@@ -33,20 +33,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 char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93";
-#else
-static const char rcsid[] = "$OpenBSD: ping.c,v 1.83 2009/06/05 00:11:26 claudio Exp $";
-#endif
-#endif /* not lint */
-
/*
* P I N G . C
*
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 376c2e0bf53..3b964a633da 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ping6.c,v 1.74 2009/05/31 17:33:39 ckuethe Exp $ */
+/* $OpenBSD: ping6.c,v 1.75 2009/10/27 23:59:34 deraadt Exp $ */
/* $KAME: ping6.c,v 1.163 2002/10/25 02:19:06 itojun Exp $ */
/*
@@ -64,16 +64,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
-static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93";
-#endif /* not lint */
-
/*
* Using the InterNet Control Message Protocol (ICMP) "ECHO" facility,
* measure round-trip-delays and packet loss across network paths.
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index dfa0c0a59a9..7431ab8bc8c 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: quotacheck.c,v 1.24 2007/12/16 21:22:53 otto Exp $ */
+/* $OpenBSD: quotacheck.c,v 1.25 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: quotacheck.c,v 1.12 1996/03/30 22:34:25 mark Exp $ */
/*
@@ -33,20 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)quotacheck.c 8.3 (Berkeley) 1/29/94";
-#else
-static char rcsid[] = "$OpenBSD: quotacheck.c,v 1.24 2007/12/16 21:22:53 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* Fix up / report on disk quotas & usage
*/
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index 7af23edd443..bcf03e0c577 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: reboot.c,v 1.29 2007/05/11 01:53:07 tedu Exp $ */
+/* $OpenBSD: reboot.c,v 1.30 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: reboot.c,v 1.8 1995/10/05 05:36:22 mycroft Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1986, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)reboot.c 8.1 (Berkeley) 6/5/93";
-#else
-static char rcsid[] = "$OpenBSD: reboot.c,v 1.29 2007/05/11 01:53:07 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/reboot.h>
#include <sys/fcntl.h>
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index fd8edee7b7c..26c178fb0a1 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dirs.c,v 1.31 2007/06/03 20:16:08 millert Exp $ */
+/* $OpenBSD: dirs.c,v 1.32 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: dirs.c,v 1.26 1997/07/01 05:37:49 lukem Exp $ */
/*
@@ -35,14 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dirs.c 8.5 (Berkeley) 8/31/94";
-#else
-static const char rcsid[] = "$OpenBSD: dirs.c,v 1.31 2007/06/03 20:16:08 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 3eb1eb99511..c9af88d9a90 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interactive.c,v 1.25 2007/09/25 09:51:48 chl Exp $ */
+/* $OpenBSD: interactive.c,v 1.26 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: interactive.c,v 1.10 1997/03/19 08:42:52 lukem Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)interactive.c 8.3 (Berkeley) 9/13/94";
-#else
-static const char rcsid[] = "$OpenBSD: interactive.c,v 1.25 2007/09/25 09:51:48 chl Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index d9c26573e78..f265ef8702f 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.18 2007/09/02 15:19:25 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.19 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: main.c,v 1.13 1997/07/01 05:37:51 lukem 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[] = "@(#)main.c 8.3 (Berkeley) 9/13/94";
-#else
-static const char rcsid[] = "$OpenBSD: main.c,v 1.18 2007/09/02 15:19:25 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 818663194db..6b3dbc1f127 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: restore.c,v 1.15 2007/05/13 19:07:32 millert Exp $ */
+/* $OpenBSD: restore.c,v 1.16 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: restore.c,v 1.9 1997/06/18 07:10:16 lukem Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)restore.c 8.3 (Berkeley) 9/13/94";
-#else
-static const char rcsid[] = "$OpenBSD: restore.c,v 1.15 2007/05/13 19:07:32 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index a454f9f679f..51b4f87ba64 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: symtab.c,v 1.17 2006/10/18 21:18:59 deraadt Exp $ */
+/* $OpenBSD: symtab.c,v 1.18 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: symtab.c,v 1.10 1997/03/19 08:42:54 lukem Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)symtab.c 8.2 (Berkeley) 9/13/94";
-#else
-static const char rcsid[] = "$OpenBSD: symtab.c,v 1.17 2006/10/18 21:18:59 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* These routines maintain the symbol table which tracks the state
* of the file system being restored. They provide lookup by either
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index b4b266b3026..dddf1eb18a1 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tape.c,v 1.37 2008/09/03 23:11:59 krw Exp $ */
+/* $OpenBSD: tape.c,v 1.38 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: tape.c,v 1.26 1997/04/15 07:12:25 lukem Exp $ */
/*
@@ -35,14 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tape.c 8.6 (Berkeley) 9/13/94";
-#else
-static const char rcsid[] = "$OpenBSD: tape.c,v 1.37 2008/09/03 23:11:59 krw Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/mtio.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 5e0261ccadd..e82d6793458 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utilities.c,v 1.15 2005/06/14 19:46:05 millert Exp $ */
+/* $OpenBSD: utilities.c,v 1.16 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: utilities.c,v 1.11 1997/03/19 08:42:56 lukem Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)utilities.c 8.4 (Berkeley) 10/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: utilities.c,v 1.15 2005/06/14 19:46:05 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index f10b54add91..79cb6608c2b 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: savecore.c,v 1.47 2009/06/20 00:15:14 millert Exp $ */
+/* $OpenBSD: savecore.c,v 1.48 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: savecore.c,v 1.26 1996/03/18 21:16:05 leo Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1986, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)savecore.c 8.3 (Berkeley) 1/2/94";
-#else
-static char rcsid[] = "$OpenBSD: savecore.c,v 1.47 2009/06/20 00:15:14 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/mount.h>
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 2a90120b6bf..2082cc72662 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: shutdown.c,v 1.34 2006/10/18 21:58:55 cloder Exp $ */
+/* $OpenBSD: shutdown.c,v 1.35 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: shutdown.c,v 1.9 1995/03/18 15:01:09 cgd Exp $ */
/*
@@ -30,20 +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 */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)shutdown.c 8.2 (Berkeley) 2/16/94";
-#else
-static char rcsid[] = "$OpenBSD: shutdown.c,v 1.34 2006/10/18 21:58:55 cloder Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/resource.h>
#include <sys/syslog.h>
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index 7585af7a246..0b88fabb667 100644
--- a/sbin/slattach/slattach.c
+++ b/sbin/slattach/slattach.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: slattach.c,v 1.15 2003/06/02 20:06:17 millert Exp $ */
+/* $OpenBSD: slattach.c,v 1.16 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: slattach.c,v 1.17 1996/05/19 21:57:39 jonathan Exp $ */
/*
@@ -33,20 +33,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[] = "@(#)slattach.c 8.2 (Berkeley) 1/7/94";
-#else
-static char rcsid[] = "$OpenBSD: slattach.c,v 1.15 2003/06/02 20:06:17 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/types.h>
diff --git a/sbin/sysctl/pathconf.c b/sbin/sysctl/pathconf.c
index 87d24adedaa..a5bb4b71ef2 100644
--- a/sbin/sysctl/pathconf.c
+++ b/sbin/sysctl/pathconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathconf.c,v 1.8 2004/01/11 21:54:27 deraadt Exp $ */
+/* $OpenBSD: pathconf.c,v 1.9 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: pathconf.c,v 1.2 1995/09/30 07:12:47 thorpej Exp $ */
/*
@@ -30,20 +30,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[] = "@(#)pathconf.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: pathconf.c,v 1.8 2004/01/11 21:54:27 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/unistd.h>
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 8ca864e29b0..67ac1904ef7 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysctl.c,v 1.165 2009/10/04 16:08:37 michele Exp $ */
+/* $OpenBSD: sysctl.c,v 1.166 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */
/*
@@ -30,20 +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[] = "@(#)sysctl.c 8.5 (Berkeley) 5/9/95";
-#else
-static const char rcsid[] = "$OpenBSD: sysctl.c,v 1.165 2009/10/04 16:08:37 michele Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/gmon.h>
#include <sys/mount.h>
diff --git a/sbin/ttyflags/ttyflags.c b/sbin/ttyflags/ttyflags.c
index ad0d36e2c00..d2e8b365937 100644
--- a/sbin/ttyflags/ttyflags.c
+++ b/sbin/ttyflags/ttyflags.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttyflags.c,v 1.11 2005/04/20 13:05:51 jmc Exp $ */
+/* $OpenBSD: ttyflags.c,v 1.12 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: ttyflags.c,v 1.8 1996/04/09 05:20:30 cgd Exp $ */
/*
@@ -32,16 +32,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1994 Christopher G. Demetriou\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char rcsid[] = "$OpenBSD: ttyflags.c,v 1.11 2005/04/20 13:05:51 jmc Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/cdefs.h>
#include <sys/ioctl.h>
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index b35b5ab0fba..ad3534d47db 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tunefs.c,v 1.29 2009/06/21 00:38:22 martynas Exp $ */
+/* $OpenBSD: tunefs.c,v 1.30 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: tunefs.c,v 1.33 2005/01/19 20:46:16 xtraeme 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[] = "@(#)tunefs.c 8.3 (Berkeley) 5/3/95";
-#else
-static const char rcsid[] = "$OpenBSD: tunefs.c,v 1.29 2009/06/21 00:38:22 martynas Exp $";
-#endif
-#endif /* not lint */
-
/*
* tunefs: change layout parameters to an existing file system.
*/
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index 4994caacb7e..3ec311d7c06 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umount.c,v 1.20 2008/03/26 06:55:06 otto Exp $ */
+/* $OpenBSD: umount.c,v 1.21 2009/10/27 23:59:34 deraadt Exp $ */
/* $NetBSD: umount.c,v 1.16 1996/05/11 14:13:55 mycroft Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)umount.c 8.3 (Berkeley) 2/20/94";
-#else
-static char rcsid[] = "$OpenBSD: umount.c,v 1.20 2008/03/26 06:55:06 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/mount.h>
diff --git a/sys/arch/amd64/stand/installboot/nlist.c b/sys/arch/amd64/stand/installboot/nlist.c
index 39600a141f2..3de3951f496 100644
--- a/sys/arch/amd64/stand/installboot/nlist.c
+++ b/sys/arch/amd64/stand/installboot/nlist.c
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: nlist.c,v 1.4 2008/06/04 21:12:50 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/mman.h>
diff --git a/sys/arch/hp300/stand/mkboot/mkboot.c b/sys/arch/hp300/stand/mkboot/mkboot.c
index 91f6f8f6c10..4b6e952c7f6 100644
--- a/sys/arch/hp300/stand/mkboot/mkboot.c
+++ b/sys/arch/hp300/stand/mkboot/mkboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkboot.c,v 1.5 2006/08/17 06:31:10 miod Exp $ */
+/* $OpenBSD: mkboot.c,v 1.6 2009/10/27 23:59:34 deraadt Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -31,20 +31,6 @@
* @(#)mkboot.c 8.1 (Berkeley) 7/15/93
*/
-#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[] = "@(#)mkboot.c 7.2 (Berkeley) 12/16/90";
-static char rcsid[] = "$NetBSD: mkboot.c,v 1.5 1994/10/26 07:27:45 cgd Exp $";
-#endif
-static char rcsid[] = "$OpenBSD: mkboot.c,v 1.5 2006/08/17 06:31:10 miod Exp $";
-#endif /* not lint */
-
#include <unistd.h>
#include <string.h>
#include <sys/param.h>
diff --git a/sys/arch/hppa/stand/mkboot/mkboot.c b/sys/arch/hppa/stand/mkboot/mkboot.c
index aa656dcfa99..7c08d7889c3 100644
--- a/sys/arch/hppa/stand/mkboot/mkboot.c
+++ b/sys/arch/hppa/stand/mkboot/mkboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkboot.c,v 1.15 2004/11/22 18:41:42 mickey Exp $ */
+/* $OpenBSD: mkboot.c,v 1.16 2009/10/27 23:59:34 deraadt Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -31,18 +31,6 @@
* @(#)mkboot.c 8.1 (Berkeley) 7/15/93
*/
-#if 0
-#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
-static char rcsid[] = "$OpenBSD: mkboot.c,v 1.15 2004/11/22 18:41:42 mickey Exp $";
-#endif /* not lint */
-#endif
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/sys/arch/hppa64/stand/mkboot/mkboot.c b/sys/arch/hppa64/stand/mkboot/mkboot.c
index ced89972b56..6c7d4cb5f51 100644
--- a/sys/arch/hppa64/stand/mkboot/mkboot.c
+++ b/sys/arch/hppa64/stand/mkboot/mkboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkboot.c,v 1.1 2005/04/01 10:40:49 mickey Exp $ */
+/* $OpenBSD: mkboot.c,v 1.2 2009/10/27 23:59:34 deraadt Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -31,18 +31,6 @@
* @(#)mkboot.c 8.1 (Berkeley) 7/15/93
*/
-#if 0
-#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
-static char rcsid[] = "$OpenBSD: mkboot.c,v 1.1 2005/04/01 10:40:49 mickey Exp $";
-#endif /* not lint */
-#endif
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 59b8fd8b6df..ca8c40c185b 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi.c,v 1.145 2009/08/10 20:29:54 deraadt Exp $ */
+/* $OpenBSD: if_wi.c,v 1.146 2009/10/27 23:59:34 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -124,11 +124,6 @@ u_int32_t widebug = WIDEBUG;
#define DPRINTF(mask,args)
#endif /* WIDEBUG */
-#if !defined(lint) && !defined(__OpenBSD__)
-static const char rcsid[] =
- "$OpenBSD: if_wi.c,v 1.145 2009/08/10 20:29:54 deraadt Exp $";
-#endif /* lint */
-
#ifdef foo
static u_int8_t wi_mcast_addr[6] = { 0x01, 0x60, 0x1D, 0x00, 0x01, 0x00 };
#endif
diff --git a/sys/lib/libkern/adddi3.c b/sys/lib/libkern/adddi3.c
index 8bf39bced9e..ba3f826ff54 100644
--- a/sys/lib/libkern/adddi3.c
+++ b/sys/lib/libkern/adddi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: adddi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/anddi3.c b/sys/lib/libkern/anddi3.c
index dfd7c0b81bc..f89f20ec27d 100644
--- a/sys/lib/libkern/anddi3.c
+++ b/sys/lib/libkern/anddi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: anddi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/ashldi3.c b/sys/lib/libkern/ashldi3.c
index e2dab04b2be..db612f2c5fd 100644
--- a/sys/lib/libkern/ashldi3.c
+++ b/sys/lib/libkern/ashldi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ashldi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/ashrdi3.c b/sys/lib/libkern/ashrdi3.c
index dd265216c6b..5b3d2c959eb 100644
--- a/sys/lib/libkern/ashrdi3.c
+++ b/sys/lib/libkern/ashrdi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ashrdi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/bcmp.c b/sys/lib/libkern/bcmp.c
index 8096e9959f8..535744b4616 100644
--- a/sys/lib/libkern/bcmp.c
+++ b/sys/lib/libkern/bcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcmp.c,v 1.8 2004/11/28 07:23:41 mickey Exp $ */
+/* $OpenBSD: bcmp.c,v 1.9 2009/10/27 23:59:35 deraadt Exp $ */
/*
* Copyright (c) 1987 Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: bcmp.c,v 1.8 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/sys/lib/libkern/bzero.c b/sys/lib/libkern/bzero.c
index 6cbdba7785a..6115ba5812d 100644
--- a/sys/lib/libkern/bzero.c
+++ b/sys/lib/libkern/bzero.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bzero.c,v 1.7 2004/11/28 07:23:41 mickey Exp $ */
+/* $OpenBSD: bzero.c,v 1.8 2009/10/27 23:59:35 deraadt Exp $ */
/*
* Copyright (c) 1987 Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: bzero.c,v 1.7 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/sys/lib/libkern/cmpdi2.c b/sys/lib/libkern/cmpdi2.c
index c44e3276465..ad962efe23a 100644
--- a/sys/lib/libkern/cmpdi2.c
+++ b/sys/lib/libkern/cmpdi2.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: cmpdi2.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/divdi3.c b/sys/lib/libkern/divdi3.c
index c77959ed469..fd615936dc3 100644
--- a/sys/lib/libkern/divdi3.c
+++ b/sys/lib/libkern/divdi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: divdi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/ffs.c b/sys/lib/libkern/ffs.c
index 0e64ffe6682..8710a6181cd 100644
--- a/sys/lib/libkern/ffs.c
+++ b/sys/lib/libkern/ffs.c
@@ -1,14 +1,10 @@
-/* $OpenBSD: ffs.c,v 1.7 2004/11/28 07:23:41 mickey Exp $ */
+/* $OpenBSD: ffs.c,v 1.8 2009/10/27 23:59:35 deraadt Exp $ */
/*
* Public domain.
* Written by Dale Rahn.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: ffs.c,v 1.7 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/sys/lib/libkern/htonl.c b/sys/lib/libkern/htonl.c
index 2c72cbf0862..5b3a26ad479 100644
--- a/sys/lib/libkern/htonl.c
+++ b/sys/lib/libkern/htonl.c
@@ -3,10 +3,6 @@
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: htonl.c,v 1.6 2007/11/24 19:25:02 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <machine/endian.h>
diff --git a/sys/lib/libkern/htons.c b/sys/lib/libkern/htons.c
index 47ffe694094..2f50d082ee3 100644
--- a/sys/lib/libkern/htons.c
+++ b/sys/lib/libkern/htons.c
@@ -3,10 +3,6 @@
* Public domain.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: htons.c,v 1.6 2007/11/24 19:25:02 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#include <machine/endian.h>
diff --git a/sys/lib/libkern/iordi3.c b/sys/lib/libkern/iordi3.c
index c8adf1e4b5f..66bc408183f 100644
--- a/sys/lib/libkern/iordi3.c
+++ b/sys/lib/libkern/iordi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: iordi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/lshldi3.c b/sys/lib/libkern/lshldi3.c
index 9d879bac8d9..7d38b506696 100644
--- a/sys/lib/libkern/lshldi3.c
+++ b/sys/lib/libkern/lshldi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: lshldi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/lshrdi3.c b/sys/lib/libkern/lshrdi3.c
index 651e030f2bf..dafb446ef70 100644
--- a/sys/lib/libkern/lshrdi3.c
+++ b/sys/lib/libkern/lshrdi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: lshrdi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/mcount.c b/sys/lib/libkern/mcount.c
index ce70fffb171..5f27f217814 100644
--- a/sys/lib/libkern/mcount.c
+++ b/sys/lib/libkern/mcount.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mcount.c,v 1.8 2004/08/07 00:38:32 deraadt Exp $ */
+/* $OpenBSD: mcount.c,v 1.9 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: mcount.c,v 1.3.6.1 1996/06/12 04:23:01 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#if !defined(lint) && !defined(_KERNEL) && defined(LIBC_SCCS)
-#if 0
-static char sccsid[] = "@(#)mcount.c 8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$OpenBSD: mcount.c,v 1.8 2004/08/07 00:38:32 deraadt Exp $";
-#endif
-#endif
-
#include <sys/param.h>
#include <sys/gmon.h>
diff --git a/sys/lib/libkern/memchr.c b/sys/lib/libkern/memchr.c
index d5d1537ff1f..91096cdac2f 100644
--- a/sys/lib/libkern/memchr.c
+++ b/sys/lib/libkern/memchr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: memchr.c,v 1.4 2004/08/07 00:38:32 deraadt Exp $ */
+/* $OpenBSD: memchr.c,v 1.5 2009/10/27 23:59:35 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)memchr.c 5.6 (Berkeley) 1/26/91";*/
-static char *rcsid = "$NetBSD: memchr.c,v 1.2 1997/10/24 18:10:30 mjacob Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/sys/lib/libkern/memcmp.c b/sys/lib/libkern/memcmp.c
index 3a4bb91c18c..b75bdab97f6 100644
--- a/sys/lib/libkern/memcmp.c
+++ b/sys/lib/libkern/memcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: memcmp.c,v 1.4 2004/08/07 00:38:32 deraadt Exp $ */
+/* $OpenBSD: memcmp.c,v 1.5 2009/10/27 23:59:35 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: memcmp.c,v 1.4 2004/08/07 00:38:32 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/sys/lib/libkern/memset.c b/sys/lib/libkern/memset.c
index 259d096629b..66a9c8b64f5 100644
--- a/sys/lib/libkern/memset.c
+++ b/sys/lib/libkern/memset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: memset.c,v 1.5 2004/08/07 00:38:32 deraadt Exp $ */
+/* $OpenBSD: memset.c,v 1.6 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: memset.c,v 1.6 1998/03/27 05:35:47 cgd Exp $ */
/*-
@@ -33,15 +33,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)memset.c 8.1 (Berkeley) 6/4/93";
-#else
-__RCSID("$NetBSD: memset.c,v 1.6 1998/03/27 05:35:47 cgd Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-
#include <sys/types.h>
#if !defined(_KERNEL) && !defined(_STANDALONE)
diff --git a/sys/lib/libkern/moddi3.c b/sys/lib/libkern/moddi3.c
index 88f5ab39001..78f65c03e9a 100644
--- a/sys/lib/libkern/moddi3.c
+++ b/sys/lib/libkern/moddi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: moddi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/muldi3.c b/sys/lib/libkern/muldi3.c
index 48f5e303cb2..f854a5c0dd6 100644
--- a/sys/lib/libkern/muldi3.c
+++ b/sys/lib/libkern/muldi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: muldi3.c,v 1.7 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/negdi2.c b/sys/lib/libkern/negdi2.c
index 91648b8131e..eb99545c6ad 100644
--- a/sys/lib/libkern/negdi2.c
+++ b/sys/lib/libkern/negdi2.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: negdi2.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/notdi2.c b/sys/lib/libkern/notdi2.c
index 14572e6a3ca..bb38b31353b 100644
--- a/sys/lib/libkern/notdi2.c
+++ b/sys/lib/libkern/notdi2.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: notdi2.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/qdivrem.c b/sys/lib/libkern/qdivrem.c
index 25cab635277..1cf2e8f62ee 100644
--- a/sys/lib/libkern/qdivrem.c
+++ b/sys/lib/libkern/qdivrem.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: qdivrem.c,v 1.8 2005/02/13 03:37:14 jsg Exp $";
-#endif /* LIBC_SCCS and not lint */
-
/*
* Multiprecision divide. This algorithm is from Knuth vol. 2 (2nd ed),
* section 4.3.1, pp. 257--259.
diff --git a/sys/lib/libkern/softfloat.c b/sys/lib/libkern/softfloat.c
index f8d75e0327c..6b0d4b493d5 100644
--- a/sys/lib/libkern/softfloat.c
+++ b/sys/lib/libkern/softfloat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softfloat.c,v 1.3 2008/10/07 22:06:29 martynas Exp $ */
+/* $OpenBSD: softfloat.c,v 1.4 2009/10/27 23:59:35 deraadt Exp $ */
/* $NetBSD: softfloat.c,v 1.1 2001/04/26 03:10:47 ross Exp $ */
/*
@@ -50,9 +50,6 @@ this code that are retained.
*/
#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: softfloat.c,v 1.1 2001/04/26 03:10:47 ross Exp $");
-#endif /* LIBC_SCCS and not lint */
#ifdef SOFTFLOAT_FOR_GCC
#include "softfloat-for-gcc.h"
diff --git a/sys/lib/libkern/strcmp.c b/sys/lib/libkern/strcmp.c
index f9973e18720..f3439a075c3 100644
--- a/sys/lib/libkern/strcmp.c
+++ b/sys/lib/libkern/strcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strcmp.c,v 1.9 2004/11/28 07:23:41 mickey Exp $ */
+/* $OpenBSD: strcmp.c,v 1.10 2009/10/27 23:59:35 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strcmp.c,v 1.9 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/sys/lib/libkern/strlcat.c b/sys/lib/libkern/strlcat.c
index 8a5d680b085..4de6675cb71 100644
--- a/sys/lib/libkern/strlcat.c
+++ b/sys/lib/libkern/strlcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlcat.c,v 1.5 2004/08/07 00:38:33 deraadt Exp $ */
+/* $OpenBSD: strlcat.c,v 1.6 2009/10/27 23:59:35 deraadt Exp $ */
/*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcat.c,v 1.5 2004/08/07 00:38:33 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <sys/types.h>
#include <string.h>
diff --git a/sys/lib/libkern/strlcpy.c b/sys/lib/libkern/strlcpy.c
index b5150b7a05a..043f5c53ddd 100644
--- a/sys/lib/libkern/strlcpy.c
+++ b/sys/lib/libkern/strlcpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlcpy.c,v 1.5 2004/08/07 00:38:33 deraadt Exp $ */
+/* $OpenBSD: strlcpy.c,v 1.6 2009/10/27 23:59:35 deraadt Exp $ */
/*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2004/08/07 00:38:33 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <sys/types.h>
#include <string.h>
diff --git a/sys/lib/libkern/strlen.c b/sys/lib/libkern/strlen.c
index d45481524a6..7cd4e8e7e12 100644
--- a/sys/lib/libkern/strlen.c
+++ b/sys/lib/libkern/strlen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlen.c,v 1.8 2004/11/28 07:23:41 mickey Exp $ */
+/* $OpenBSD: strlen.c,v 1.9 2009/10/27 23:59:35 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlen.c,v 1.8 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/sys/lib/libkern/strncasecmp.c b/sys/lib/libkern/strncasecmp.c
index d09e48006f9..20576784860 100644
--- a/sys/lib/libkern/strncasecmp.c
+++ b/sys/lib/libkern/strncasecmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strncasecmp.c,v 1.4 2004/08/07 00:38:33 deraadt Exp $ */
+/* $OpenBSD: strncasecmp.c,v 1.5 2009/10/27 23:59:35 deraadt Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -29,10 +29,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$Id: strncasecmp.c,v 1.4 2004/08/07 00:38:33 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/sys/lib/libkern/strncmp.c b/sys/lib/libkern/strncmp.c
index 4101edf8bab..13fb1aa2c3b 100644
--- a/sys/lib/libkern/strncmp.c
+++ b/sys/lib/libkern/strncmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strncmp.c,v 1.9 2004/11/28 07:23:41 mickey Exp $ */
+/* $OpenBSD: strncmp.c,v 1.10 2009/10/27 23:59:35 deraadt Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strncmp.c,v 1.9 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/sys/lib/libkern/strncpy.c b/sys/lib/libkern/strncpy.c
index 906bf99e19b..2972692aa1a 100644
--- a/sys/lib/libkern/strncpy.c
+++ b/sys/lib/libkern/strncpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strncpy.c,v 1.7 2004/11/28 07:23:41 mickey Exp $ */
+/* $OpenBSD: strncpy.c,v 1.8 2009/10/27 23:59:35 deraadt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -32,10 +32,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strncpy.c,v 1.7 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
diff --git a/sys/lib/libkern/subdi3.c b/sys/lib/libkern/subdi3.c
index 606e9d7f77b..a92b96068da 100644
--- a/sys/lib/libkern/subdi3.c
+++ b/sys/lib/libkern/subdi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: subdi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/ucmpdi2.c b/sys/lib/libkern/ucmpdi2.c
index c77f666d2e8..67f27ac5262 100644
--- a/sys/lib/libkern/ucmpdi2.c
+++ b/sys/lib/libkern/ucmpdi2.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ucmpdi2.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/udivdi3.c b/sys/lib/libkern/udivdi3.c
index 138f272be71..3b414150e2f 100644
--- a/sys/lib/libkern/udivdi3.c
+++ b/sys/lib/libkern/udivdi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: udivdi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/umoddi3.c b/sys/lib/libkern/umoddi3.c
index 3265e1defdc..f9bd77c86a1 100644
--- a/sys/lib/libkern/umoddi3.c
+++ b/sys/lib/libkern/umoddi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: umoddi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
diff --git a/sys/lib/libkern/xordi3.c b/sys/lib/libkern/xordi3.c
index 13a8f53aa3b..abf8cf0aaad 100644
--- a/sys/lib/libkern/xordi3.c
+++ b/sys/lib/libkern/xordi3.c
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: xordi3.c,v 1.5 2004/11/28 07:23:41 mickey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
#include "quad.h"
/*
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>
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index ede3854c878..a0e7ae781e6 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -13,10 +13,6 @@
* other than his own.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ac.c,v 1.19 2007/11/17 15:08:57 sobrado Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/file.h>
#include <sys/time.h>
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index 79529053752..241e7eedfbf 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -27,17 +27,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
-/* from: static char sccsid[] = "@(#)accton.c 4.3 (Berkeley) 6/1/90"; */
-static char *rcsid = "$Id: accton.c,v 1.7 2003/06/11 23:33:24 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.sbin/amd/amd/amd.c b/usr.sbin/amd/amd/amd.c
index dc2c76e5ccf..a71f5ea60d3 100644
--- a/usr.sbin/amd/amd/amd.c
+++ b/usr.sbin/amd/amd/amd.c
@@ -32,15 +32,9 @@
* SUCH DAMAGE.
*
* from: @(#)amd.c 8.1 (Berkeley) 6/6/93
- * $Id: amd.c,v 1.15 2009/08/12 13:21:17 deraadt Exp $
+ * $Id: amd.c,v 1.16 2009/10/27 23:59:50 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 */
-
/*
* Automounter
*/
diff --git a/usr.sbin/amd/amd/map.c b/usr.sbin/amd/amd/map.c
index 358ec9ffdd5..187adbf8613 100644
--- a/usr.sbin/amd/amd/map.c
+++ b/usr.sbin/amd/amd/map.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: map.c,v 1.9 2007/11/27 16:22:14 martynas Exp $ */
+/* $OpenBSD: map.c,v 1.10 2009/10/27 23:59:50 deraadt Exp $ */
/*-
* Copyright (c) 1990 Jan-Simon Pendry
@@ -34,11 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)map.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: map.c,v 1.9 2007/11/27 16:22:14 martynas Exp $";
-#endif /* not lint */
-
#include "am.h"
#include <unistd.h>
diff --git a/usr.sbin/amd/amd/mapc.c b/usr.sbin/amd/amd/mapc.c
index 21904f09e44..2d41bf39a27 100644
--- a/usr.sbin/amd/amd/mapc.c
+++ b/usr.sbin/amd/amd/mapc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mapc.c,v 1.12 2003/10/30 16:04:06 millert Exp $ */
+/* $OpenBSD: mapc.c,v 1.13 2009/10/27 23:59:50 deraadt Exp $ */
/*-
* Copyright (c) 1989 Jan-Simon Pendry
@@ -34,11 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)mapc.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: mapc.c,v 1.12 2003/10/30 16:04:06 millert Exp $";
-#endif /* not lint */
-
/*
* Mount map cache
*/
diff --git a/usr.sbin/amd/amd/mntfs.c b/usr.sbin/amd/amd/mntfs.c
index 57ffa1ac071..215bbb52f12 100644
--- a/usr.sbin/amd/amd/mntfs.c
+++ b/usr.sbin/amd/amd/mntfs.c
@@ -32,12 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)mntfs.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: mntfs.c,v 1.5 2003/06/02 23:36:51 millert Exp $";
-#endif /* not lint */
-
-
#include "am.h"
extern qelem mfhead;
diff --git a/usr.sbin/amd/amd/nfs_ops.c b/usr.sbin/amd/amd/nfs_ops.c
index 2a4a0d18117..239146f4ceb 100644
--- a/usr.sbin/amd/amd/nfs_ops.c
+++ b/usr.sbin/amd/amd/nfs_ops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_ops.c,v 1.18 2003/06/02 23:36:51 millert Exp $ */
+/* $OpenBSD: nfs_ops.c,v 1.19 2009/10/27 23:59:50 deraadt Exp $ */
/*-
* Copyright (c) 1990 Jan-Simon Pendry
@@ -34,11 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)nfs_ops.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: nfs_ops.c,v 1.18 2003/06/02 23:36:51 millert Exp $";
-#endif /* not lint */
-
#include "am.h"
#include <sys/stat.h>
diff --git a/usr.sbin/amd/amd/opts.c b/usr.sbin/amd/amd/opts.c
index afd15bfe5ad..6452d637e4e 100644
--- a/usr.sbin/amd/amd/opts.c
+++ b/usr.sbin/amd/amd/opts.c
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)opts.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: opts.c,v 1.9 2003/06/02 23:36:51 millert Exp $";
-#endif /* not lint */
-
#include "am.h"
/*
diff --git a/usr.sbin/amd/amd/restart.c b/usr.sbin/amd/amd/restart.c
index a360e077079..2387e362259 100644
--- a/usr.sbin/amd/amd/restart.c
+++ b/usr.sbin/amd/amd/restart.c
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)restart.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: restart.c,v 1.4 2003/06/02 23:36:51 millert Exp $";
-#endif /* not lint */
-
#include "am.h"
/*
diff --git a/usr.sbin/amd/amq/amq.c b/usr.sbin/amd/amq/amq.c
index befac15f7db..706be15435f 100644
--- a/usr.sbin/amd/amq/amq.c
+++ b/usr.sbin/amd/amq/amq.c
@@ -32,26 +32,13 @@
* SUCH DAMAGE.
*
* from: @(#)amq.c 8.1 (Berkeley) 6/7/93
- * $Id: amq.c,v 1.12 2007/02/18 08:34:38 jmc Exp $
+ * $Id: amq.c,v 1.13 2009/10/27 23:59:50 deraadt Exp $
*/
/*
* Automounter query tool
*/
-#ifndef lint
-char copyright[] = "\
-@(#)Copyright (c) 1990 Jan-Simon Pendry\n\
-@(#)Copyright (c) 1990 Imperial College of Science, Technology & Medicine\n\
-@(#)Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char rcsid[] = "$Id: amq.c,v 1.12 2007/02/18 08:34:38 jmc Exp $";
-static char sccsid[] = "@(#)amq.c 8.1 (Berkeley) 6/7/93";
-#endif /* not lint */
-
#include "am.h"
#include "amq.h"
#include <stdio.h>
diff --git a/usr.sbin/amd/fsinfo/fsinfo.c b/usr.sbin/amd/fsinfo/fsinfo.c
index 3c950b32371..b7c3821e3d6 100644
--- a/usr.sbin/amd/fsinfo/fsinfo.c
+++ b/usr.sbin/amd/fsinfo/fsinfo.c
@@ -32,15 +32,9 @@
* SUCH DAMAGE.
*
* from: @(#)fsinfo.c 8.1 (Berkeley) 6/6/93
- * $Id: fsinfo.c,v 1.8 2005/04/15 18:18:07 millert Exp $
+ * $Id: fsinfo.c,v 1.9 2009/10/27 23:59:51 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 */
-
/*
* fsinfo
*/
diff --git a/usr.sbin/amd/include/am.h b/usr.sbin/amd/include/am.h
index f4436b08b73..a176b7e8b1f 100644
--- a/usr.sbin/amd/include/am.h
+++ b/usr.sbin/amd/include/am.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: am.h,v 1.11 2003/11/08 19:17:29 jmc Exp $ */
+/* $OpenBSD: am.h,v 1.12 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1990 Jan-Simon Pendry
@@ -118,7 +118,6 @@ extern char *karch; /* "sun4c" */
extern char *cluster; /* "r+d-kluster" */
extern char *endian; /* "big" */
extern char *auto_dir; /* "/a" */
-extern char copyright[]; /* Copyright info */
extern char version[]; /* Version info */
typedef struct am_ops am_ops;
diff --git a/usr.sbin/amd/mk-amd-map/mk-amd-map.c b/usr.sbin/amd/mk-amd-map/mk-amd-map.c
index 6d9c3336591..bf73019df85 100644
--- a/usr.sbin/amd/mk-amd-map/mk-amd-map.c
+++ b/usr.sbin/amd/mk-amd-map/mk-amd-map.c
@@ -32,26 +32,13 @@
* SUCH DAMAGE.
*
* from: @(#)mk-amd-map.c 8.1 (Berkeley) 6/28/93
- * $Id: mk-amd-map.c,v 1.9 2007/03/20 04:00:32 tedu Exp $
+ * $Id: mk-amd-map.c,v 1.10 2009/10/27 23:59:51 deraadt Exp $
*/
/*
* Convert a file map into an ndbm map
*/
-#ifndef lint
-char copyright[] = "\
-@(#)Copyright (c) 1990, 1993 Jan-Simon Pendry\n\
-@(#)Copyright (c) 1990 Imperial College of Science, Technology & Medicine\n\
-@(#)Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char rcsid[] = "$Id: mk-amd-map.c,v 1.9 2007/03/20 04:00:32 tedu Exp $";
-static char sccsid[] = "@(#)mk-amd-map.c 8.1 (Berkeley) 6/28/93";
-#endif /* not lint */
-
#include "am.h"
#ifndef SIGINT
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index c7a5aca5e97..c9cd972a652 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chroot.c,v 1.12 2005/05/23 22:52:04 henning Exp $ */
+/* $OpenBSD: chroot.c,v 1.13 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -29,20 +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 const char sccsid[] = "@(#)chroot.c 8.1 (Berkeley) 6/9/93";
-#else
-static const char rcsid[] = "$OpenBSD: chroot.c,v 1.12 2005/05/23 22:52:04 henning Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.sbin/config/cmd.c b/usr.sbin/config/cmd.c
index d4a078d9352..3afe52373ae 100644
--- a/usr.sbin/config/cmd.c
+++ b/usr.sbin/config/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.16 2009/06/03 21:42:16 beck Exp $ */
+/* $OpenBSD: cmd.c,v 1.17 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999-2001 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: cmd.c,v 1.16 2009/06/03 21:42:16 beck Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/device.h>
#include <sys/time.h>
diff --git a/usr.sbin/config/exec.c b/usr.sbin/config/exec.c
index bcbbd5acacd..8bcfb7c5caa 100644
--- a/usr.sbin/config/exec.c
+++ b/usr.sbin/config/exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.c,v 1.6 2003/08/16 14:45:46 henning Exp $ */
+/* $OpenBSD: exec.c,v 1.7 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -28,10 +28,6 @@
#include <sys/types.h>
#include <stdio.h>
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: exec.c,v 1.6 2003/08/16 14:45:46 henning Exp $";
-#endif
-
#ifdef AOUT_SUPPORT
int aout_check(char *);
void aout_loadkernel(char *);
diff --git a/usr.sbin/config/exec_aout.c b/usr.sbin/config/exec_aout.c
index 00409258092..6b538f246a0 100644
--- a/usr.sbin/config/exec_aout.c
+++ b/usr.sbin/config/exec_aout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_aout.c,v 1.9 2009/01/19 20:07:58 miod Exp $ */
+/* $OpenBSD: exec_aout.c,v 1.10 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: exec_aout.c,v 1.9 2009/01/19 20:07:58 miod Exp $";
-#endif
-
#include <err.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/usr.sbin/config/exec_ecoff.c b/usr.sbin/config/exec_ecoff.c
index acd0ebfdd26..e7230009272 100644
--- a/usr.sbin/config/exec_ecoff.c
+++ b/usr.sbin/config/exec_ecoff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_ecoff.c,v 1.9 2003/09/26 17:00:27 deraadt Exp $ */
+/* $OpenBSD: exec_ecoff.c,v 1.10 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: exec_ecoff.c,v 1.9 2003/09/26 17:00:27 deraadt Exp $";
-#endif
-
#include <err.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/usr.sbin/config/exec_elf.c b/usr.sbin/config/exec_elf.c
index c2bb4ab38b9..f84ef4c9fed 100644
--- a/usr.sbin/config/exec_elf.c
+++ b/usr.sbin/config/exec_elf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_elf.c,v 1.11 2008/08/12 09:44:26 otto Exp $ */
+/* $OpenBSD: exec_elf.c,v 1.12 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: exec_elf.c,v 1.11 2008/08/12 09:44:26 otto Exp $";
-#endif
-
#include <err.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 0a9f027aeac..b25eca58861 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.40 2008/10/03 13:01:26 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.41 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: main.c,v 1.22 1997/02/02 21:12:33 thorpej Exp $ */
/*
@@ -41,12 +41,6 @@
* from: @(#)main.c 8.1 (Berkeley) 6/6/93
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/param.h>
diff --git a/usr.sbin/config/misc.c b/usr.sbin/config/misc.c
index 4eea2190c64..9f465baf8b6 100644
--- a/usr.sbin/config/misc.c
+++ b/usr.sbin/config/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.7 2007/09/11 16:30:59 gilles Exp $ */
+/* $OpenBSD: misc.c,v 1.8 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -25,10 +25,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: misc.c,v 1.7 2007/09/11 16:30:59 gilles Exp $";
-#endif
-
#include <sys/types.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.sbin/config/ukc.c b/usr.sbin/config/ukc.c
index 9bb33998742..27d6e3bf506 100644
--- a/usr.sbin/config/ukc.c
+++ b/usr.sbin/config/ukc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukc.c,v 1.14 2007/06/28 00:52:37 ray Exp $ */
+/* $OpenBSD: ukc.c,v 1.15 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999-2001 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: ukc.c,v 1.14 2007/06/28 00:52:37 ray Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/device.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/config/ukcutil.c b/usr.sbin/config/ukcutil.c
index c800a7eeb09..7d0d5299f0d 100644
--- a/usr.sbin/config/ukcutil.c
+++ b/usr.sbin/config/ukcutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukcutil.c,v 1.17 2008/03/24 21:35:03 maja Exp $ */
+/* $OpenBSD: ukcutil.c,v 1.18 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999-2001 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: ukcutil.c,v 1.17 2008/03/24 21:35:03 maja Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/device.h>
diff --git a/usr.sbin/cron/atrun.c b/usr.sbin/cron/atrun.c
index a9b28ee335c..bace65599f2 100644
--- a/usr.sbin/cron/atrun.c
+++ b/usr.sbin/cron/atrun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atrun.c,v 1.15 2006/08/13 20:44:00 millert Exp $ */
+/* $OpenBSD: atrun.c,v 1.16 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 2002-2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -20,10 +20,6 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
-#if !defined(lint) && !defined(LINT)
-static const char rcsid[] = "$OpenBSD: atrun.c,v 1.15 2006/08/13 20:44:00 millert Exp $";
-#endif
-
#include "cron.h"
#include <limits.h>
#include <sys/resource.h>
diff --git a/usr.sbin/cron/cron.c b/usr.sbin/cron/cron.c
index 208c4865c25..7a4442adf9b 100644
--- a/usr.sbin/cron/cron.c
+++ b/usr.sbin/cron/cron.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cron.c,v 1.40 2009/01/29 22:50:16 sobrado Exp $ */
+/* $OpenBSD: cron.c,v 1.41 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static const char rcsid[] = "$OpenBSD: cron.c,v 1.40 2009/01/29 22:50:16 sobrado Exp $";
-#endif
-
#define MAIN_PROGRAM
#include "cron.h"
diff --git a/usr.sbin/cron/database.c b/usr.sbin/cron/database.c
index 3a571adc0ec..eb18c75090f 100644
--- a/usr.sbin/cron/database.c
+++ b/usr.sbin/cron/database.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: database.c,v 1.17 2007/03/28 16:49:25 millert Exp $ */
+/* $OpenBSD: database.c,v 1.18 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: database.c,v 1.17 2007/03/28 16:49:25 millert Exp $";
-#endif
-
/* vix 26jan87 [RCS has the log]
*/
diff --git a/usr.sbin/cron/do_command.c b/usr.sbin/cron/do_command.c
index d5892b9cd90..693e166cb87 100644
--- a/usr.sbin/cron/do_command.c
+++ b/usr.sbin/cron/do_command.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: do_command.c,v 1.32 2007/05/25 17:50:41 millert Exp $ */
+/* $OpenBSD: do_command.c,v 1.33 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: do_command.c,v 1.32 2007/05/25 17:50:41 millert Exp $";
-#endif
-
#include "cron.h"
static void child_process(entry *, user *);
diff --git a/usr.sbin/cron/entry.c b/usr.sbin/cron/entry.c
index 0d5b3357305..2574577b9d8 100644
--- a/usr.sbin/cron/entry.c
+++ b/usr.sbin/cron/entry.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: entry.c,v 1.30 2005/01/30 20:44:50 millert Exp $ */
+/* $OpenBSD: entry.c,v 1.31 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright 1988,1990,1993,1994 by Paul Vixie
@@ -22,10 +22,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: entry.c,v 1.30 2005/01/30 20:44:50 millert Exp $";
-#endif
-
/* vix 26jan87 [RCS'd; rest of log is in RCS file]
* vix 01jan87 [added line-level error recovery]
* vix 31dec86 [added /step to the from-to range, per bob@acornrc]
diff --git a/usr.sbin/cron/env.c b/usr.sbin/cron/env.c
index 3d92bf37d72..2b71b3e9578 100644
--- a/usr.sbin/cron/env.c
+++ b/usr.sbin/cron/env.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: env.c,v 1.21 2008/02/29 23:33:29 deraadt Exp $ */
+/* $OpenBSD: env.c,v 1.22 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: env.c,v 1.21 2008/02/29 23:33:29 deraadt Exp $";
-#endif
-
#include "cron.h"
char **
diff --git a/usr.sbin/cron/job.c b/usr.sbin/cron/job.c
index 43915ce147f..2bc2c049122 100644
--- a/usr.sbin/cron/job.c
+++ b/usr.sbin/cron/job.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: job.c,v 1.7 2004/06/17 22:11:55 millert Exp $ */
+/* $OpenBSD: job.c,v 1.8 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: job.c,v 1.7 2004/06/17 22:11:55 millert Exp $";
-#endif
-
#include "cron.h"
typedef struct _job {
diff --git a/usr.sbin/cron/misc.c b/usr.sbin/cron/misc.c
index d97345a06a5..6d978d7de3f 100644
--- a/usr.sbin/cron/misc.c
+++ b/usr.sbin/cron/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.39 2008/01/05 16:59:06 chl Exp $ */
+/* $OpenBSD: misc.c,v 1.40 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: misc.c,v 1.39 2008/01/05 16:59:06 chl Exp $";
-#endif
-
/* vix 26jan87 [RCS has the rest of the log]
* vix 30dec86 [written]
*/
diff --git a/usr.sbin/cron/popen.c b/usr.sbin/cron/popen.c
index f02c2bb36ba..5cef5ddd791 100644
--- a/usr.sbin/cron/popen.c
+++ b/usr.sbin/cron/popen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: popen.c,v 1.20 2006/04/03 01:31:11 djm Exp $ */
+/* $OpenBSD: popen.c,v 1.21 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -37,14 +37,6 @@
* globbing stuff since we don't need it. also execvp instead of execv.
*/
-#ifndef lint
-#if 0
-static const sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94";
-#else
-static const char rcsid[] = "$OpenBSD: popen.c,v 1.20 2006/04/03 01:31:11 djm Exp $";
-#endif
-#endif /* not lint */
-
#include "cron.h"
#define MAX_ARGV 100
diff --git a/usr.sbin/cron/user.c b/usr.sbin/cron/user.c
index facc0b18c33..29643f424bb 100644
--- a/usr.sbin/cron/user.c
+++ b/usr.sbin/cron/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.7 2004/06/17 22:11:55 millert Exp $ */
+/* $OpenBSD: user.c,v 1.8 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static const char rcsid[] = "$OpenBSD: user.c,v 1.7 2004/06/17 22:11:55 millert Exp $";
-#endif
-
/* vix 26jan87 [log is in RCS file]
*/
diff --git a/usr.sbin/dev_mkdb/dev_mkdb.c b/usr.sbin/dev_mkdb/dev_mkdb.c
index 5048b999404..f979a50fc72 100644
--- a/usr.sbin/dev_mkdb/dev_mkdb.c
+++ b/usr.sbin/dev_mkdb/dev_mkdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dev_mkdb.c,v 1.10 2005/04/04 09:03:07 deraadt Exp $ */
+/* $OpenBSD: dev_mkdb.c,v 1.11 2009/10/27 23:59:51 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,17 +29,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
-/*static char sccsid[] = "from: @(#)dev_mkdb.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: dev_mkdb.c,v 1.10 2005/04/04 09:03:07 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 4b41f31890a..732ebd245e9 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -30,17 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static 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: @(#)edquota.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: edquota.c,v 1.48 2007/10/17 20:02:33 deraadt Exp $";
-#endif /* not lint */
-
/*
* Disk quota editor.
*/
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 2b0c9fd4a6c..12b42897c9b 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inetd.c,v 1.130 2008/07/28 15:42:07 claudio Exp $ */
+/* $OpenBSD: inetd.c,v 1.131 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1983,1991 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static const char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";*/
-static const char rcsid[] = "$OpenBSD: inetd.c,v 1.130 2008/07/28 15:42:07 claudio Exp $";
-#endif /* not lint */
-
/*
* Inetd - Internet super-server
*
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index 52c139dec09..8280b5b52a4 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iostat.c,v 1.25 2007/02/18 20:41:34 jmc Exp $ */
+/* $OpenBSD: iostat.c,v 1.26 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $ */
/*
@@ -62,21 +62,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 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[] = "@(#)iostat.c 8.2 (Berkeley) 1/26/94";
-#else
-static char *rcsid = "$NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $"
-;
-#endif
-#endif /* not lint */
-
#include <sys/dkstat.h>
#include <sys/time.h>
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index 0dd803ea300..7f4c8cf56a7 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kgmon.c,v 1.14 2007/11/26 09:28:34 martynas Exp $ */
+/* $OpenBSD: kgmon.c,v 1.15 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1983, 1992, 1993
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)kgmon.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: kgmon.c,v 1.14 2007/11/26 09:28:34 martynas Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/kvm_mkdb/kvm_mkdb.c b/usr.sbin/kvm_mkdb/kvm_mkdb.c
index cb412cb5ed4..e33d110bcee 100644
--- a/usr.sbin/kvm_mkdb/kvm_mkdb.c
+++ b/usr.sbin/kvm_mkdb/kvm_mkdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_mkdb.c,v 1.16 2005/04/14 22:21:24 djm Exp $ */
+/* $OpenBSD: kvm_mkdb.c,v 1.17 2009/10/27 23:59:51 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#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 char sccsid[] = "from: @(#)kvm_mkdb.c 8.3 (Berkeley) 5/4/95";
-#else
-static const char rcsid[] = "$OpenBSD: kvm_mkdb.c,v 1.16 2005/04/14 22:21:24 djm Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/kvm_mkdb/nlist.c b/usr.sbin/kvm_mkdb/nlist.c
index d29339f8a8c..ff72014e63d 100644
--- a/usr.sbin/kvm_mkdb/nlist.c
+++ b/usr.sbin/kvm_mkdb/nlist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nlist.c,v 1.37 2007/09/02 15:19:38 deraadt Exp $ */
+/* $OpenBSD: nlist.c,v 1.38 2009/10/27 23:59:51 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "from: @(#)nlist.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: nlist.c,v 1.37 2007/09/02 15:19:38 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <a.out.h>
diff --git a/usr.sbin/kvm_mkdb/testdb.c b/usr.sbin/kvm_mkdb/testdb.c
index 2a7f325240c..c4c52ac5188 100644
--- a/usr.sbin/kvm_mkdb/testdb.c
+++ b/usr.sbin/kvm_mkdb/testdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: testdb.c,v 1.7 2004/11/24 17:57:16 millert Exp $ */
+/* $OpenBSD: testdb.c,v 1.8 2009/10/27 23:59:51 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "from: @(#)testdb.c 8.1 (Berkeley) 6/6/93";
-#else
-static char *rcsid = "$OpenBSD: testdb.c,v 1.7 2004/11/24 17:57:16 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index 3635ab3f129..bc7c88cf981 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: common.c,v 1.32 2007/09/02 15:19:38 deraadt Exp $ */
+/* $OpenBSD: common.c,v 1.33 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: common.c,v 1.21 2000/08/09 14:28:50 itojun Exp $ */
/*
@@ -35,14 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: common.c,v 1.32 2007/09/02 15:19:38 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.sbin/lpr/common_source/common_vars.c b/usr.sbin/lpr/common_source/common_vars.c
index 44251400310..a7cdb5fb494 100644
--- a/usr.sbin/lpr/common_source/common_vars.c
+++ b/usr.sbin/lpr/common_source/common_vars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: common_vars.c,v 1.3 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: common_vars.c,v 1.4 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: common.c,v 1.15 1999/09/26 10:32:27 mrg Exp $ */
/*
@@ -35,10 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: common_vars.c,v 1.3 2003/06/02 23:36:53 millert Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include "pathnames.h"
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index d4b5f6f0ac8..2f37e6c758e 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: displayq.c,v 1.30 2009/03/03 04:42:48 stevesk Exp $ */
+/* $OpenBSD: displayq.c,v 1.31 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: displayq.c,v 1.21 2001/08/30 00:51:50 itojun Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: displayq.c,v 1.30 2009/03/03 04:42:48 stevesk Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c
index cc3373a6d67..3fb97b1281c 100644
--- a/usr.sbin/lpr/common_source/rmjob.c
+++ b/usr.sbin/lpr/common_source/rmjob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmjob.c,v 1.17 2007/04/07 21:12:12 stevesk Exp $ */
+/* $OpenBSD: rmjob.c,v 1.18 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: rmjob.c,v 1.16 2000/04/16 14:43:58 mrg Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)rmjob.c 8.2 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: rmjob.c,v 1.17 2007/04/07 21:12:12 stevesk Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <signal.h>
diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c
index c264340b1fe..ca646693bb4 100644
--- a/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr.sbin/lpr/common_source/startdaemon.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: startdaemon.c,v 1.12 2007/05/01 16:32:06 stevesk Exp $ */
+/* $OpenBSD: startdaemon.c,v 1.13 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: startdaemon.c,v 1.10 1998/07/18 05:04:39 lukem Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)startdaemon.c 8.2 (Berkeley) 4/17/94";
-#else
-static const char rcsid[] = "$OpenBSD: startdaemon.c,v 1.12 2007/05/01 16:32:06 stevesk Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 1a6f79d3da3..31f60b9f295 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpf.c,v 1.11 2004/04/14 20:52:20 millert Exp $ */
+/* $OpenBSD: lpf.c,v 1.12 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lpf.c,v 1.8 2000/04/29 00:12:32 abs 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 const char sccsid[] = "@(#)lpf.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: lpf.c,v 1.11 2004/04/14 20:52:20 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* filter which reads the output of nroff and converts lines
* with ^H's to overwritten lines. Thus this works like 'ul'
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 04a8ef4bb41..6d787774d2a 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.19 2007/04/07 21:57:26 stevesk Exp $ */
+/* $OpenBSD: cmds.c,v 1.20 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: cmds.c,v 1.12 1997/10/05 15:12:06 mrg Exp $ */
/*
@@ -31,20 +31,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[] = "@(#)cmds.c 8.2 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: cmds.c,v 1.19 2007/04/07 21:57:26 stevesk Exp $";
-#endif
-#endif /* not lint */
-
/*
* lpc -- line printer control program -- commands:
*/
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index 688996ed2ea..b9420b7f530 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmdtab.c,v 1.5 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: cmdtab.c,v 1.6 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: cmdtab.c,v 1.4 1995/11/15 22:27:34 pk Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.5 2003/06/02 23:36:53 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/cdefs.h>
#include "lpc.h"
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index ac389b731ee..833a3369479 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpc.c,v 1.17 2004/09/30 18:20:06 millert Exp $ */
+/* $OpenBSD: lpc.c,v 1.18 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lpc.c,v 1.11 2001/11/14 03:01:15 enami Exp $ */
/*
@@ -31,20 +31,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[] = "@(#)lpc.c 8.3 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: lpc.c,v 1.17 2004/09/30 18:20:06 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <dirent.h>
diff --git a/usr.sbin/lpr/lpd/key.c b/usr.sbin/lpr/lpd/key.c
index eb22e300d51..be14b708fe7 100644
--- a/usr.sbin/lpr/lpd/key.c
+++ b/usr.sbin/lpr/lpd/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.6 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: key.c,v 1.7 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: key.c,v 1.3 1997/10/20 08:08:28 scottr Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)key.c 8.3 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] = "$OpenBSD: key.c,v 1.6 2003/06/02 23:36:53 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index 32314723374..9995eb222ad 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpd.c,v 1.49 2008/05/26 06:30:35 otto Exp $ */
+/* $OpenBSD: lpd.c,v 1.50 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lpd.c,v 1.33 2002/01/21 14:42:29 wiz Exp $ */
/*
@@ -31,20 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 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[] = "@(#)lpd.c 8.7 (Berkeley) 5/10/95";
-#else
-static const char rcsid[] = "$OpenBSD: lpd.c,v 1.49 2008/05/26 06:30:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* lpd -- line printer daemon.
*
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index a70dd2b1541..7ea79be211d 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpdchar.c,v 1.5 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: lpdchar.c,v 1.6 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lpdchar.c,v 1.5 1997/07/17 05:44:32 mikel Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)lpdchar.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: lpdchar.c,v 1.5 2003/06/02 23:36:53 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* Character set for line printer daemon
*/
diff --git a/usr.sbin/lpr/lpd/modes.c b/usr.sbin/lpr/lpd/modes.c
index 337de4736c9..b59fda51ad7 100644
--- a/usr.sbin/lpr/lpd/modes.c
+++ b/usr.sbin/lpr/lpd/modes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: modes.c,v 1.6 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: modes.c,v 1.7 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: modes.c,v 1.3 1997/10/20 08:08:31 scottr Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)modes.c 8.3 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] = "$OpenBSD: modes.c,v 1.6 2003/06/02 23:36:53 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h>
#include <stddef.h>
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index 5df200c0ca3..6e46375afef 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printjob.c,v 1.44 2007/09/10 14:29:53 tobias Exp $ */
+/* $OpenBSD: printjob.c,v 1.45 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: printjob.c,v 1.31 2002/01/21 14:42:30 wiz Exp $ */
/*
@@ -31,17 +31,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
-static const char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95";
-#endif /* not lint */
-
-
/*
* printjob -- print jobs in the queue.
*
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index d1a9b3b24a4..5ab57f223d2 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: recvjob.c,v 1.24 2008/09/02 00:14:23 deraadt Exp $ */
+/* $OpenBSD: recvjob.c,v 1.25 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: recvjob.c,v 1.14 2001/12/04 22:52:44 christos Exp $ */
/*
@@ -31,20 +31,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[] = "@(#)recvjob.c 8.2 (Berkeley) 4/27/95";
-#else
-static const char rcsid[] = "$OpenBSD: recvjob.c,v 1.24 2008/09/02 00:14:23 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* Receive printer jobs from the network, queue them and
* start the printer daemon.
diff --git a/usr.sbin/lpr/lpd/ttcompat.c b/usr.sbin/lpr/lpd/ttcompat.c
index cf4f40d5684..ad5ac839f35 100644
--- a/usr.sbin/lpr/lpd/ttcompat.c
+++ b/usr.sbin/lpr/lpd/ttcompat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttcompat.c,v 1.6 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: ttcompat.c,v 1.7 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: ttcompat.c,v 1.9 1995/11/15 22:50:00 pk Exp $ */
/*
@@ -36,10 +36,6 @@
* originally from /sys/kern/tty_compat.c
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ttcompat.c,v 1.6 2003/06/02 23:36:53 millert Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index a1be85efb4a..5db0762eef4 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpq.c,v 1.18 2008/05/26 06:30:36 otto Exp $ */
+/* $OpenBSD: lpq.c,v 1.19 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lpq.c,v 1.9 1999/12/07 14:54:47 mrg Exp $ */
/*
@@ -31,20 +31,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[] = "@(#)lpq.c 8.3 (Berkeley) 5/10/95";
-#else
-static const char rcsid[] = "$OpenBSD: lpq.c,v 1.18 2008/05/26 06:30:36 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* Spool Queue examination program
*
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 83ffd06631b..831758cb882 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpr.c,v 1.41 2007/04/07 21:57:27 stevesk Exp $ */
+/* $OpenBSD: lpr.c,v 1.42 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lpr.c,v 1.19 2000/10/11 20:23:52 is Exp $ */
/*
@@ -36,20 +36,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const 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 const char sccsid[] = "@(#)lpr.c 8.4 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: lpr.c,v 1.41 2007/04/07 21:57:27 stevesk Exp $";
-#endif
-#endif /* not lint */
-
/*
* lpr -- off line print
*
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index 2130a486079..0087be7c1f0 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lprm.c,v 1.17 2007/02/16 13:34:58 jmc Exp $ */
+/* $OpenBSD: lprm.c,v 1.18 2009/10/27 23:59:52 deraadt Exp $ */
/* $$NetBSD: lprm.c,v 1.9 1999/08/16 03:12:32 simonb Exp $ */
/*
@@ -31,20 +31,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[] = "@(#)lprm.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: lprm.c,v 1.17 2007/02/16 13:34:58 jmc Exp $";
-#endif
-#endif /* not lint */
-
/*
* lprm - remove the current user's spool entry
*
diff --git a/usr.sbin/lpr/lptest/lptest.c b/usr.sbin/lpr/lptest/lptest.c
index cca90fd067b..a8970c55071 100644
--- a/usr.sbin/lpr/lptest/lptest.c
+++ b/usr.sbin/lpr/lptest/lptest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lptest.c,v 1.7 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: lptest.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lptest.c,v 1.6 1996/12/09 09:57:50 mrg Exp $ */
/*
@@ -31,20 +31,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[] = "@(#)lptest.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: lptest.c,v 1.7 2003/06/02 23:36:53 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdlib.h>
#include <stdio.h>
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index 894699eef0b..f1f2fffe3e1 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pac.c,v 1.18 2007/09/02 15:19:39 deraadt Exp $ */
+/* $OpenBSD: pac.c,v 1.19 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: pac.c,v 1.14 2000/04/27 13:40:18 msaitoh Exp $ */
/*
@@ -31,20 +31,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[] = "@(#)pac.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: pac.c,v 1.18 2007/09/02 15:19:39 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* Do Printer accounting summary.
* Currently, usage is
diff --git a/usr.sbin/mopd/common/cmp.c b/usr.sbin/mopd/common/cmp.c
index 6942cb29dd5..74b1a83179b 100644
--- a/usr.sbin/mopd/common/cmp.c
+++ b/usr.sbin/mopd/common/cmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmp.c,v 1.8 2006/04/17 13:17:07 maja Exp $ */
+/* $OpenBSD: cmp.c,v 1.9 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: cmp.c,v 1.8 2006/04/17 13:17:07 maja Exp $";
-#endif
-
#include "os.h"
int
diff --git a/usr.sbin/mopd/common/device.c b/usr.sbin/mopd/common/device.c
index f916877112e..394719a8777 100644
--- a/usr.sbin/mopd/common/device.c
+++ b/usr.sbin/mopd/common/device.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: device.c,v 1.13 2006/04/17 16:23:01 deraadt Exp $ */
+/* $OpenBSD: device.c,v 1.14 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: device.c,v 1.13 2006/04/17 16:23:01 deraadt Exp $";
-#endif
-
#include "os.h"
#include "common/common.h"
#include "common/mopdef.h"
diff --git a/usr.sbin/mopd/common/dl.c b/usr.sbin/mopd/common/dl.c
index b9562916fb4..87cf6b87e28 100644
--- a/usr.sbin/mopd/common/dl.c
+++ b/usr.sbin/mopd/common/dl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dl.c,v 1.7 2006/04/17 13:17:07 maja Exp $ */
+/* $OpenBSD: dl.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: dl.c,v 1.7 2006/04/17 13:17:07 maja Exp $";
-#endif
-
#include "os.h"
#include "common/get.h"
#include "common/print.h"
diff --git a/usr.sbin/mopd/common/file.c b/usr.sbin/mopd/common/file.c
index c01566c21d3..b6838378c8b 100644
--- a/usr.sbin/mopd/common/file.c
+++ b/usr.sbin/mopd/common/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.12 2006/05/11 05:18:38 maja Exp $ */
+/* $OpenBSD: file.c,v 1.13 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: file.c,v 1.12 2006/05/11 05:18:38 maja Exp $";
-#endif
-
#include "os.h"
#include "common/common.h"
#include "common/mopdef.h"
diff --git a/usr.sbin/mopd/common/get.c b/usr.sbin/mopd/common/get.c
index c3398fc46cb..f1329138603 100644
--- a/usr.sbin/mopd/common/get.c
+++ b/usr.sbin/mopd/common/get.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: get.c,v 1.7 2006/04/17 13:17:07 maja Exp $ */
+/* $OpenBSD: get.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-2006 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: get.c,v 1.7 2006/04/17 13:17:07 maja Exp $";
-#endif
-
#include <sys/types.h>
#include "common/mopdef.h"
diff --git a/usr.sbin/mopd/common/loop-bsd.c b/usr.sbin/mopd/common/loop-bsd.c
index 303cd15da11..9822038ae1b 100644
--- a/usr.sbin/mopd/common/loop-bsd.c
+++ b/usr.sbin/mopd/common/loop-bsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: loop-bsd.c,v 1.12 2006/10/11 20:56:59 deraadt Exp $ */
+/* $OpenBSD: loop-bsd.c,v 1.13 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: loop-bsd.c,v 1.12 2006/10/11 20:56:59 deraadt Exp $";
-#endif
-
#include <errno.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/mopd/common/mopdef.c b/usr.sbin/mopd/common/mopdef.c
index d6850597428..45237cbf372 100644
--- a/usr.sbin/mopd/common/mopdef.c
+++ b/usr.sbin/mopd/common/mopdef.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mopdef.c,v 1.7 2006/04/17 13:17:07 maja Exp $ */
+/* $OpenBSD: mopdef.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: mopdef.c,v 1.7 2006/04/17 13:17:07 maja Exp $";
-#endif
-
#include <sys/types.h>
#define MOPDEF_SURPESS_EXTERN
diff --git a/usr.sbin/mopd/common/nma.c b/usr.sbin/mopd/common/nma.c
index 2e89bce5026..31884aa101a 100644
--- a/usr.sbin/mopd/common/nma.c
+++ b/usr.sbin/mopd/common/nma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nma.c,v 1.6 2006/04/17 13:17:07 maja Exp $ */
+/* $OpenBSD: nma.c,v 1.7 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: nma.c,v 1.6 2006/04/17 13:17:07 maja Exp $";
-#endif
-
#include <stddef.h>
#include "common/nmadef.h"
diff --git a/usr.sbin/mopd/common/pf.c b/usr.sbin/mopd/common/pf.c
index 7a1be9ca41a..e01cf27bec6 100644
--- a/usr.sbin/mopd/common/pf.c
+++ b/usr.sbin/mopd/common/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.14 2006/04/20 08:52:52 maja Exp $ */
+/* $OpenBSD: pf.c,v 1.15 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -28,11 +28,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: pf.c,v 1.14 2006/04/20 08:52:52 maja Exp $";
-#endif
-
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
diff --git a/usr.sbin/mopd/common/print.c b/usr.sbin/mopd/common/print.c
index f6d0cf13dcd..0b881938f73 100644
--- a/usr.sbin/mopd/common/print.c
+++ b/usr.sbin/mopd/common/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.11 2006/04/20 08:52:52 maja Exp $ */
+/* $OpenBSD: print.c,v 1.12 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: print.c,v 1.11 2006/04/20 08:52:52 maja Exp $";
-#endif
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/mopd/common/put.c b/usr.sbin/mopd/common/put.c
index 693fe3e646a..39da5d47293 100644
--- a/usr.sbin/mopd/common/put.c
+++ b/usr.sbin/mopd/common/put.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: put.c,v 1.7 2006/04/17 13:17:07 maja Exp $ */
+/* $OpenBSD: put.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-2006 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: put.c,v 1.7 2006/04/17 13:17:07 maja Exp $";
-#endif
-
#include <stddef.h>
#include <sys/types.h>
#include <time.h>
diff --git a/usr.sbin/mopd/common/rc.c b/usr.sbin/mopd/common/rc.c
index e390d10f718..5a38ba4088f 100644
--- a/usr.sbin/mopd/common/rc.c
+++ b/usr.sbin/mopd/common/rc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc.c,v 1.7 2006/11/10 23:02:08 maja Exp $ */
+/* $OpenBSD: rc.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: rc.c,v 1.7 2006/11/10 23:02:08 maja Exp $";
-#endif
-
#include "os.h"
#include "common/get.h"
#include "common/print.h"
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.c b/usr.sbin/mopd/mopa.out/mopa.out.c
index a0d6d2f2d11..adbc3d1d515 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.c
+++ b/usr.sbin/mopd/mopa.out/mopa.out.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mopa.out.c,v 1.9 2009/07/11 13:42:32 sobrado Exp $ */
+/* $OpenBSD: mopa.out.c,v 1.10 2009/10/27 23:59:52 deraadt Exp $ */
/* mopa.out - Convert a Unix format kernel into something that
* can be transferred via MOP.
@@ -47,10 +47,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: mopa.out.c,v 1.9 2009/07/11 13:42:32 sobrado Exp $";
-#endif
-
#include "os.h"
#include "common/common.h"
#include "common/mopdef.h"
diff --git a/usr.sbin/mopd/mopchk/mopchk.c b/usr.sbin/mopd/mopchk/mopchk.c
index 85b529c0dda..28b8806ef70 100644
--- a/usr.sbin/mopd/mopchk/mopchk.c
+++ b/usr.sbin/mopd/mopchk/mopchk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mopchk.c,v 1.13 2009/07/11 13:42:32 sobrado Exp $ */
+/* $OpenBSD: mopchk.c,v 1.14 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: mopchk.c,v 1.13 2009/07/11 13:42:32 sobrado Exp $";
-#endif
-
/*
* mopchk - MOP Check Utility
*
diff --git a/usr.sbin/mopd/mopd/mopd.c b/usr.sbin/mopd/mopd/mopd.c
index 4d5684ccb48..a093c4610ce 100644
--- a/usr.sbin/mopd/mopd/mopd.c
+++ b/usr.sbin/mopd/mopd/mopd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mopd.c,v 1.16 2009/07/11 13:42:32 sobrado Exp $ */
+/* $OpenBSD: mopd.c,v 1.17 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: mopd.c,v 1.16 2009/07/11 13:42:32 sobrado Exp $";
-#endif
-
/*
* mopd - MOP Dump/Load Daemon
*
diff --git a/usr.sbin/mopd/mopd/process.c b/usr.sbin/mopd/mopd/process.c
index 67e2d68918d..524fdd49705 100644
--- a/usr.sbin/mopd/mopd/process.c
+++ b/usr.sbin/mopd/mopd/process.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: process.c,v 1.17 2006/04/29 16:26:56 maja Exp $ */
+/* $OpenBSD: process.c,v 1.18 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: process.c,v 1.17 2006/04/29 16:26:56 maja Exp $";
-#endif
-
#include "os.h"
#include "common/common.h"
#include "common/mopdef.h"
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.c b/usr.sbin/mopd/mopprobe/mopprobe.c
index 6987c40346d..d7219a28319 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.c
+++ b/usr.sbin/mopd/mopprobe/mopprobe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mopprobe.c,v 1.11 2009/07/11 13:42:32 sobrado Exp $ */
+/* $OpenBSD: mopprobe.c,v 1.12 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: mopprobe.c,v 1.11 2009/07/11 13:42:32 sobrado Exp $";
-#endif
-
/*
* mopprobe - MOP Probe Utility
*
diff --git a/usr.sbin/mopd/moptrace/moptrace.c b/usr.sbin/mopd/moptrace/moptrace.c
index 6278b927504..8083fc5959b 100644
--- a/usr.sbin/mopd/moptrace/moptrace.c
+++ b/usr.sbin/mopd/moptrace/moptrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moptrace.c,v 1.10 2009/07/11 13:42:32 sobrado Exp $ */
+/* $OpenBSD: moptrace.c,v 1.11 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: moptrace.c,v 1.10 2009/07/11 13:42:32 sobrado Exp $";
-#endif
-
/*
* moptrace - MOP Trace Utility
*
diff --git a/usr.sbin/mopd/otherOS/loop-linux2.c b/usr.sbin/mopd/otherOS/loop-linux2.c
index 50c3eeb4834..1fc9827c3ca 100644
--- a/usr.sbin/mopd/otherOS/loop-linux2.c
+++ b/usr.sbin/mopd/otherOS/loop-linux2.c
@@ -22,10 +22,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$Id: loop-linux2.c,v 1.6 2006/04/17 16:23:01 deraadt Exp $";
-#endif
-
#include <errno.h>
#include <stdlib.h>
#include <strings.h>
diff --git a/usr.sbin/mopd/otherOS/loop.c b/usr.sbin/mopd/otherOS/loop.c
index 72fc6540f20..58f06bbd3a7 100644
--- a/usr.sbin/mopd/otherOS/loop.c
+++ b/usr.sbin/mopd/otherOS/loop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: loop.c,v 1.7 2006/04/17 16:23:01 deraadt Exp $ */
+/* $OpenBSD: loop.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: loop.c,v 1.7 2006/04/17 16:23:01 deraadt Exp $";
-#endif
-
#include "os.h"
#include "common/common.h"
#include "common/mopdef.h"
diff --git a/usr.sbin/mopd/otherOS/pf-snit.c b/usr.sbin/mopd/otherOS/pf-snit.c
index bb54a32a529..c9c88ac41e2 100644
--- a/usr.sbin/mopd/otherOS/pf-snit.c
+++ b/usr.sbin/mopd/otherOS/pf-snit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf-snit.c,v 1.7 2006/04/17 16:23:01 deraadt Exp $ */
+/* $OpenBSD: pf-snit.c,v 1.8 2009/10/27 23:59:53 deraadt Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: pf-snit.c,v 1.7 2006/04/17 16:23:01 deraadt Exp $";
-#endif
-
#include <stdio.h>
#include <sys/types.h>
#include <sys/time.h>
diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c
index 376f0450502..9dc0a6fdfba 100644
--- a/usr.sbin/mrinfo/mrinfo.c
+++ b/usr.sbin/mrinfo/mrinfo.c
@@ -74,14 +74,6 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] =
- "@(#) $OpenBSD: mrinfo.c,v 1.22 2007/09/02 15:19:39 deraadt Exp $";
-/* original rcsid:
- "@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
-*/
-#endif
-
#include <string.h>
#include <netdb.h>
#include <sys/time.h>
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 70cdc3679f4..a217940a862 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -24,11 +24,6 @@
#include <fcntl.h>
#include <util.h>
-#ifndef lint
-static char rcsid[] =
- "@(#) $Id: main.c,v 1.17 2007/02/18 21:04:14 jmc Exp $";
-#endif
-
extern char *configfilename;
char versionstring[100];
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c
index 86148eb7211..82b3f6b0131 100644
--- a/usr.sbin/mtrace/mtrace.c
+++ b/usr.sbin/mtrace/mtrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mtrace.c,v 1.27 2009/04/16 20:13:13 sobrado Exp $ */
+/* $OpenBSD: mtrace.c,v 1.28 2009/10/27 23:59:53 deraadt Exp $ */
/* $NetBSD: mtrace.c,v 1.5 1995/12/10 10:57:15 mycroft Exp $ */
/*
@@ -51,11 +51,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] =
- "@(#) $Id: mtrace.c,v 1.27 2009/04/16 20:13:13 sobrado Exp $";
-#endif
-
#include <netdb.h>
#include <sys/time.h>
#include <memory.h>
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 6d0017dde53..adc121c0088 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -1,5 +1,5 @@
/* $NetBSD: compare.c,v 1.11 1996/09/05 09:56:48 mycroft Exp $ */
-/* $OpenBSD: compare.c,v 1.21 2005/08/10 00:42:09 millert Exp $ */
+/* $OpenBSD: compare.c,v 1.22 2009/10/27 23:59:53 deraadt Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)compare.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: compare.c,v 1.21 2005/08/10 00:42:09 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/usr.sbin/mtree/crc.c b/usr.sbin/mtree/crc.c
index 026c657f303..c33b8ac061b 100644
--- a/usr.sbin/mtree/crc.c
+++ b/usr.sbin/mtree/crc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crc.c,v 1.2 2004/08/01 18:32:20 deraadt Exp $ */
+/* $OpenBSD: crc.c,v 1.3 2009/10/27 23:59:53 deraadt Exp $ */
/* $NetBSD: crc.c,v 1.7 1996/02/27 21:29:53 jtc Exp $ */
/*-
@@ -33,15 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "$NetBSD: crc.c,v 1.7 1996/02/27 21:29:53 jtc Exp $";
-#else
-static char rcsid[] = "$OpenBSD: crc.c,v 1.2 2004/08/01 18:32:20 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <unistd.h>
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index 28a05d5a4db..21319a6fb4f 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -1,5 +1,5 @@
/* $NetBSD: create.c,v 1.11 1996/09/05 09:24:19 mycroft Exp $ */
-/* $OpenBSD: create.c,v 1.25 2005/08/10 00:42:09 millert Exp $ */
+/* $OpenBSD: create.c,v 1.26 2009/10/27 23:59:53 deraadt Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: create.c,v 1.25 2005/08/10 00:42:09 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <time.h>
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index 8e0f9a38413..af746d68342 100644
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mtree.c,v 1.19 2008/05/17 23:31:52 sobrado Exp $ */
+/* $OpenBSD: mtree.c,v 1.20 2009/10/27 23:59:53 deraadt Exp $ */
/* $NetBSD: mtree.c,v 1.7 1996/09/05 23:29:22 thorpej Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 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[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: mtree.c,v 1.19 2008/05/17 23:31:52 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index 27958df5375..2bf0a42c962 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -1,5 +1,5 @@
/* $NetBSD: spec.c,v 1.6 1995/03/07 21:12:12 cgd Exp $ */
-/* $OpenBSD: spec.c,v 1.24 2008/06/13 20:47:29 espie Exp $ */
+/* $OpenBSD: spec.c,v 1.25 2009/10/27 23:59:53 deraadt Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)spec.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: spec.c,v 1.24 2008/06/13 20:47:29 espie Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <pwd.h>
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index 9c46384c569..763e5b9b53c 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: verify.c,v 1.18 2009/01/09 19:55:27 stsp Exp $ */
+/* $OpenBSD: verify.c,v 1.19 2009/10/27 23:59:53 deraadt Exp $ */
/* $NetBSD: verify.c,v 1.10 1995/03/07 21:26:28 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)verify.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: verify.c,v 1.18 2009/01/09 19:55:27 stsp Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <dirent.h>
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
index 2e630d9ed41..3f7926abe1c 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netgroup_mkdb.c,v 1.14 2008/05/17 23:31:52 sobrado Exp $ */
+/* $OpenBSD: netgroup_mkdb.c,v 1.15 2009/10/27 23:59:53 deraadt Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@@ -30,9 +30,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#ifndef lint
-static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.14 2008/05/17 23:31:52 sobrado Exp $";
-#endif
#include <sys/types.h>
#include <sys/param.h>
diff --git a/usr.sbin/netgroup_mkdb/str.c b/usr.sbin/netgroup_mkdb/str.c
index e312103435a..748041b63e4 100644
--- a/usr.sbin/netgroup_mkdb/str.c
+++ b/usr.sbin/netgroup_mkdb/str.c
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char *rcsid = "$Id: str.c,v 1.3 2005/05/16 03:12:59 deraadt Exp $";
-#endif
-
/*
* Counted strings
*/
diff --git a/usr.sbin/netgroup_mkdb/util.c b/usr.sbin/netgroup_mkdb/util.c
index d315831c57d..1b4439d2fdc 100644
--- a/usr.sbin/netgroup_mkdb/util.c
+++ b/usr.sbin/netgroup_mkdb/util.c
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char *rcsid = "$Id: util.c,v 1.4 2005/05/16 03:12:59 deraadt Exp $";
-#endif
-
#include <err.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c
index b76e8aee894..1eb21d78827 100644
--- a/usr.sbin/portmap/portmap.c
+++ b/usr.sbin/portmap/portmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: portmap.c,v 1.37 2009/05/20 20:37:43 thib Exp $ */
+/* $OpenBSD: portmap.c,v 1.38 2009/10/27 23:59:53 deraadt Exp $ */
/*-
* Copyright (c) 1996, 1997 Theo de Raadt (OpenBSD). All rights reserved.
@@ -30,25 +30,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
-#if 0
-static char sccsid[] = "from: @(#)portmap.c 5.4 (Berkeley) 4/19/91";
-#else
-static char rcsid[] = "$OpenBSD: portmap.c,v 1.37 2009/05/20 20:37:43 thib Exp $";
-#endif
-#endif /* not lint */
-
-/*
-@(#)portmap.c 2.3 88/08/11 4.0 RPCSRC
-static char sccsid[] = "@(#)portmap.c 1.32 87/08/06 Copyr 1984 Sun Micro";
-*/
-
/*
* portmap.c, Implements the program,version to port number mapping for
* rpc.
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index f303847e2f4..eb377517fdb 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.30 2003/09/26 06:01:42 pvalchev Exp $ */
+/* $OpenBSD: auth.c,v 1.31 2009/10/27 23:59:53 deraadt Exp $ */
/*
* auth.c - PPP authentication and phase control.
@@ -73,14 +73,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: auth.c,v 1.37 1998/03/26 04:46:03 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: auth.c,v 1.30 2003/09/26 06:01:42 pvalchev Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
diff --git a/usr.sbin/pppd/cbcp.c b/usr.sbin/pppd/cbcp.c
index e89214f23b5..18d961a4296 100644
--- a/usr.sbin/pppd/cbcp.c
+++ b/usr.sbin/pppd/cbcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cbcp.c,v 1.6 2004/11/03 03:33:11 danh Exp $ */
+/* $OpenBSD: cbcp.c,v 1.7 2009/10/27 23:59:53 deraadt Exp $ */
/*
* cbcp - Call Back Configuration Protocol.
@@ -30,14 +30,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: cbcp.c,v 1.2 1997/04/30 05:50:26 paulus Exp";
-#else
-static char rcsid[] = "$OpenBSD: cbcp.c,v 1.6 2004/11/03 03:33:11 danh Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c
index 05526283776..70c205a0d80 100644
--- a/usr.sbin/pppd/ccp.c
+++ b/usr.sbin/pppd/ccp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ccp.c,v 1.12 2003/04/04 20:25:07 deraadt Exp $ */
+/* $OpenBSD: ccp.c,v 1.13 2009/10/27 23:59:53 deraadt Exp $ */
/*
* ccp.c - PPP Compression Control Protocol.
@@ -35,14 +35,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: ccp.c,v 1.22 1998/03/25 01:25:02 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: ccp.c,v 1.12 2003/04/04 20:25:07 deraadt Exp $";
-#endif
-#endif
-
#include <string.h>
#include <syslog.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c
index 2eddac898bd..830b849d2ae 100644
--- a/usr.sbin/pppd/chap.c
+++ b/usr.sbin/pppd/chap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chap.c,v 1.12 2003/04/04 20:25:07 deraadt Exp $ */
+/* $OpenBSD: chap.c,v 1.13 2009/10/27 23:59:53 deraadt Exp $ */
/*
* chap.c - Challenge Handshake Authentication Protocol.
@@ -51,14 +51,6 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: chap.c,v 1.15 1997/11/27 06:07:48 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: chap.c,v 1.12 2003/04/04 20:25:07 deraadt Exp $";
-#endif
-#endif
-
/*
* TODO:
*/
diff --git a/usr.sbin/pppd/chap_ms.c b/usr.sbin/pppd/chap_ms.c
index f808f09477e..d5cc0e342a6 100644
--- a/usr.sbin/pppd/chap_ms.c
+++ b/usr.sbin/pppd/chap_ms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chap_ms.c,v 1.9 2004/06/29 22:04:44 millert Exp $ */
+/* $OpenBSD: chap_ms.c,v 1.10 2009/10/27 23:59:53 deraadt Exp $ */
/*
* chap_ms.c - Microsoft MS-CHAP compatible implementation.
@@ -41,14 +41,6 @@
* You should also use DOMAIN\\USERNAME as described in README.MSCHAP80
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: chap_ms.c,v 1.8 1998/04/01 00:15:43 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: chap_ms.c,v 1.9 2004/06/29 22:04:44 millert Exp $";
-#endif
-#endif
-
#ifdef CHAPMS
#include <stdio.h>
diff --git a/usr.sbin/pppd/chat/chat.c b/usr.sbin/pppd/chat/chat.c
index bcb7fad4a9f..1ac55b272b9 100644
--- a/usr.sbin/pppd/chat/chat.c
+++ b/usr.sbin/pppd/chat/chat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chat.c,v 1.26 2009/08/08 18:36:34 jmc Exp $ */
+/* $OpenBSD: chat.c,v 1.27 2009/10/27 23:59:53 deraadt Exp $ */
/*
* Chat -- a program for automatic session establishment (i.e. dial
@@ -79,14 +79,6 @@
*
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: chat.c,v 1.19 1998/03/24 23:57:48 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: chat.c,v 1.26 2009/08/08 18:36:34 jmc Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <ctype.h>
#include <time.h>
diff --git a/usr.sbin/pppd/demand.c b/usr.sbin/pppd/demand.c
index fb1f8180b7c..7f951fbae49 100644
--- a/usr.sbin/pppd/demand.c
+++ b/usr.sbin/pppd/demand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: demand.c,v 1.8 2002/09/13 00:12:10 deraadt Exp $ */
+/* $OpenBSD: demand.c,v 1.9 2009/10/27 23:59:53 deraadt Exp $ */
/*
* demand.c - Support routines for demand-dialling.
@@ -35,14 +35,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: demand.c,v 1.7 1997/11/27 06:08:26 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: demand.c,v 1.8 2002/09/13 00:12:10 deraadt Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c
index 0f572a7e178..0a95205bf4d 100644
--- a/usr.sbin/pppd/fsm.c
+++ b/usr.sbin/pppd/fsm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsm.c,v 1.7 2002/07/01 19:31:37 deraadt Exp $ */
+/* $OpenBSD: fsm.c,v 1.8 2009/10/27 23:59:53 deraadt Exp $ */
/*
* fsm.c - {Link, IP} Control Protocol Finite State Machine.
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: fsm.c,v 1.13 1997/04/30 05:52:17 paulus Exp";
-#else
-static char rcsid[] = "$OpenBSD: fsm.c,v 1.7 2002/07/01 19:31:37 deraadt Exp $";
-#endif
-#endif
-
/*
* TODO:
* Randomize fsm id on link/init.
diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c
index 30de2b92ed6..34c921bf256 100644
--- a/usr.sbin/pppd/ipcp.c
+++ b/usr.sbin/pppd/ipcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipcp.c,v 1.11 2003/07/18 22:58:56 david Exp $ */
+/* $OpenBSD: ipcp.c,v 1.12 2009/10/27 23:59:53 deraadt Exp $ */
/*
* ipcp.c - PPP IP Control Protocol.
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: ipcp.c,v 1.34 1998/04/28 23:38:09 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: ipcp.c,v 1.11 2003/07/18 22:58:56 david Exp $";
-#endif
-#endif
-
/*
* TODO:
*/
diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c
index a12c56c9162..278ea6cc637 100644
--- a/usr.sbin/pppd/lcp.c
+++ b/usr.sbin/pppd/lcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lcp.c,v 1.9 2002/07/01 19:31:37 deraadt Exp $ */
+/* $OpenBSD: lcp.c,v 1.10 2009/10/27 23:59:53 deraadt Exp $ */
/*
* lcp.c - PPP Link Control Protocol.
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: lcp.c,v 1.31 1997/11/27 06:08:44 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: lcp.c,v 1.9 2002/07/01 19:31:37 deraadt Exp $";
-#endif
-#endif
-
/*
* TODO:
*/
diff --git a/usr.sbin/pppd/magic.c b/usr.sbin/pppd/magic.c
index 39044c4b89e..265e55d572a 100644
--- a/usr.sbin/pppd/magic.c
+++ b/usr.sbin/pppd/magic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: magic.c,v 1.8 2002/07/01 19:31:37 deraadt Exp $ */
+/* $OpenBSD: magic.c,v 1.9 2009/10/27 23:59:53 deraadt Exp $ */
/*
* magic.c - PPP Magic Number routines.
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: magic.c,v 1.7 1998/03/25 03:07:49 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: magic.c,v 1.8 2002/07/01 19:31:37 deraadt Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index 5703590365c..55290d782db 100644
--- a/usr.sbin/pppd/main.c
+++ b/usr.sbin/pppd/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.47 2007/09/02 15:19:39 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.48 2009/10/27 23:59:53 deraadt Exp $ */
/*
* main.c - Point-to-Point Protocol main module
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: main.c,v 1.49 1998/05/05 05:24:17 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.47 2007/09/02 15:19:39 deraadt Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c
index 8dd3d7680e5..8dbcc133da2 100644
--- a/usr.sbin/pppd/options.c
+++ b/usr.sbin/pppd/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.23 2007/10/17 20:10:44 chl Exp $ */
+/* $OpenBSD: options.c,v 1.24 2009/10/27 23:59:53 deraadt Exp $ */
/*
* options.c - handles option processing for PPP.
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: options.c,v 1.42 1998/03/26 04:46:06 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: options.c,v 1.23 2007/10/17 20:10:44 chl Exp $";
-#endif
-#endif
-
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
diff --git a/usr.sbin/pppd/pppstats/pppstats.c b/usr.sbin/pppd/pppstats/pppstats.c
index 3c5923e23a1..0d0fde8840c 100644
--- a/usr.sbin/pppd/pppstats/pppstats.c
+++ b/usr.sbin/pppd/pppstats/pppstats.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pppstats.c,v 1.9 2007/02/18 21:20:08 jmc Exp $ */
+/* $OpenBSD: pppstats.c,v 1.10 2009/10/27 23:59:53 deraadt Exp $ */
/*
* print PPP statistics:
@@ -47,14 +47,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: pppstats.c,v 1.22 1998/03/31 23:48:03 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: pppstats.c,v 1.9 2007/02/18 21:20:08 jmc Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c
index 8be3b23f524..a13ed05b4a6 100644
--- a/usr.sbin/pppd/sys-bsd.c
+++ b/usr.sbin/pppd/sys-bsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys-bsd.c,v 1.25 2008/10/08 18:42:21 claudio Exp $ */
+/* $OpenBSD: sys-bsd.c,v 1.26 2009/10/27 23:59:53 deraadt Exp $ */
/*
* sys-bsd.c - System-dependent procedures for setting up
@@ -74,14 +74,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: sys-bsd.c,v 1.31 1998/04/02 12:04:19 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: sys-bsd.c,v 1.25 2008/10/08 18:42:21 claudio Exp $";
-#endif
-#endif
-
/*
* TODO:
*/
diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c
index 191569bf4ef..4c8d32135c9 100644
--- a/usr.sbin/pppd/upap.c
+++ b/usr.sbin/pppd/upap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: upap.c,v 1.9 2002/07/01 19:31:37 deraadt Exp $ */
+/* $OpenBSD: upap.c,v 1.10 2009/10/27 23:59:53 deraadt Exp $ */
/*
* upap.c - User/Password Authentication Protocol.
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: upap.c,v 1.11 1997/04/30 05:59:56 paulus Exp";
-#else
-static char rcsid[] = "$OpenBSD: upap.c,v 1.9 2002/07/01 19:31:37 deraadt Exp $";
-#endif
-#endif
-
/*
* TODO:
*/
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 266212f7456..6f92e801753 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pstat.c,v 1.76 2009/05/31 19:31:23 thib Exp $ */
+/* $OpenBSD: pstat.c,v 1.77 2009/10/27 23:59:53 deraadt Exp $ */
/* $NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-from: static char sccsid[] = "@(#)pstat.c 8.9 (Berkeley) 2/16/94";
-#else
-static char *rcsid = "$OpenBSD: pstat.c,v 1.76 2009/05/31 19:31:23 thib Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/buf.h>
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 3393b06fba0..1a8e492d7fb 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pwd_mkdb.c,v 1.41 2009/10/04 18:11:35 ajacoutot Exp $ */
+/* $OpenBSD: pwd_mkdb.c,v 1.42 2009/10/27 23:59:54 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -31,20 +31,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
-#if 0
-static const char sccsid[] = "from: @(#)pwd_mkdb.c 8.5 (Berkeley) 4/20/94";
-#else
-static const char rcsid[] = "$OpenBSD: pwd_mkdb.c,v 1.41 2009/10/04 18:11:35 ajacoutot Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index 047c89879c3..a9044ff8bbe 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: quot.c,v 1.19 2008/03/17 20:30:17 sobrado Exp $ */
+/* $OpenBSD: quot.c,v 1.20 2009/10/27 23:59:54 deraadt Exp $ */
/*
* Copyright (C) 1991, 1994 Wolfgang Solfrank.
@@ -31,10 +31,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$Id: quot.c,v 1.19 2008/03/17 20:30:17 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/time.h>
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 5c08a047057..cbfce7e737b 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -30,17 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static 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: @(#)quotaon.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: quotaon.c,v 1.22 2007/02/18 23:04:56 jmc Exp $";
-#endif /* not lint */
-
/*
* Turn quota on/off for a filesystem.
*/
diff --git a/usr.sbin/rarpd/arptab.c b/usr.sbin/rarpd/arptab.c
index be73e146cf7..e846bba1a8d 100644
--- a/usr.sbin/rarpd/arptab.c
+++ b/usr.sbin/rarpd/arptab.c
@@ -30,16 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1984, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)arp.c 8.2 (Berkeley) 1/2/94";
-#endif /* not lint */
-
/*
* set arp table entries
*/
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index 3ae0eab4a33..bdfadfb5bde 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rarpd.c,v 1.48 2008/05/17 23:31:52 sobrado Exp $ */
+/* $OpenBSD: rarpd.c,v 1.49 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $ */
/*
@@ -21,16 +21,6 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#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 rcsid[] = "$OpenBSD: rarpd.c,v 1.48 2008/05/17 23:31:52 sobrado Exp $";
-#endif
-
/*
* rarpd - Reverse ARP Daemon
diff --git a/usr.sbin/rbootd/bpf.c b/usr.sbin/rbootd/bpf.c
index 139dc6035e0..8b986ca7081 100644
--- a/usr.sbin/rbootd/bpf.c
+++ b/usr.sbin/rbootd/bpf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bpf.c,v 1.16 2004/05/10 20:50:21 canacar Exp $ */
+/* $OpenBSD: bpf.c,v 1.17 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: bpf.c,v 1.5.2.1 1995/11/14 08:45:42 thorpej Exp $ */
/*
@@ -43,11 +43,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)bpf.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: bpf.c,v 1.16 2004/05/10 20:50:21 canacar Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/usr.sbin/rbootd/conf.c b/usr.sbin/rbootd/conf.c
index d076431bdbb..90e53369f33 100644
--- a/usr.sbin/rbootd/conf.c
+++ b/usr.sbin/rbootd/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.6 2004/05/01 00:39:22 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.7 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: conf.c,v 1.5 1995/10/06 05:12:13 thorpej Exp $ */
/*
@@ -43,11 +43,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)conf.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: conf.c,v 1.6 2004/05/01 00:39:22 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/rbootd/parseconf.c b/usr.sbin/rbootd/parseconf.c
index 025cc104d23..cb9c282f4e6 100644
--- a/usr.sbin/rbootd/parseconf.c
+++ b/usr.sbin/rbootd/parseconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parseconf.c,v 1.9 2005/09/22 14:24:51 jmc Exp $ */
+/* $OpenBSD: parseconf.c,v 1.10 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: parseconf.c,v 1.4 1995/10/06 05:12:16 thorpej Exp $ */
/*
@@ -43,11 +43,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)parseconf.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: parseconf.c,v 1.9 2005/09/22 14:24:51 jmc Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/rbootd/rbootd.c b/usr.sbin/rbootd/rbootd.c
index 0ad8f8cc3e5..5f3695d8aa6 100644
--- a/usr.sbin/rbootd/rbootd.c
+++ b/usr.sbin/rbootd/rbootd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rbootd.c,v 1.22 2005/09/22 14:24:51 jmc Exp $ */
+/* $OpenBSD: rbootd.c,v 1.23 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: rbootd.c,v 1.5 1995/10/06 05:12:17 thorpej Exp $ */
/*
@@ -43,17 +43,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#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
-/*static char sccsid[] = "@(#)rbootd.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: rbootd.c,v 1.22 2005/09/22 14:24:51 jmc Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/rbootd/rmpproto.c b/usr.sbin/rbootd/rmpproto.c
index b6adab5bc25..809cf83ac43 100644
--- a/usr.sbin/rbootd/rmpproto.c
+++ b/usr.sbin/rbootd/rmpproto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmpproto.c,v 1.9 2003/06/02 23:36:54 millert Exp $ */
+/* $OpenBSD: rmpproto.c,v 1.10 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: rmpproto.c,v 1.5.2.1 1995/11/14 08:45:44 thorpej Exp $ */
/*
@@ -43,11 +43,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)rmpproto.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: rmpproto.c,v 1.9 2003/06/02 23:36:54 millert Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/rbootd/utils.c b/usr.sbin/rbootd/utils.c
index 428c85b9d68..eb22f6d870e 100644
--- a/usr.sbin/rbootd/utils.c
+++ b/usr.sbin/rbootd/utils.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utils.c,v 1.9 2004/05/01 00:39:22 deraadt Exp $ */
+/* $OpenBSD: utils.c,v 1.10 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: utils.c,v 1.5.2.1 1995/11/14 08:45:46 thorpej Exp $ */
/*
@@ -43,11 +43,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)utils.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: utils.c,v 1.9 2004/05/01 00:39:22 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <fcntl.h>
diff --git a/usr.sbin/rdate/rdate.c b/usr.sbin/rdate/rdate.c
index 2ab9981419c..2f768d5f23c 100644
--- a/usr.sbin/rdate/rdate.c
+++ b/usr.sbin/rdate/rdate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rdate.c,v 1.23 2008/07/09 19:41:56 sobrado Exp $ */
+/* $OpenBSD: rdate.c,v 1.24 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: rdate.c,v 1.4 1996/03/16 12:37:45 pk Exp $ */
/*
@@ -38,13 +38,6 @@
* Time is returned as the number of seconds since
* midnight January 1st 1900.
*/
-#ifndef lint
-#if 0
-from: static char rcsid[] = "$NetBSD: rdate.c,v 1.3 1996/02/22 06:59:18 thorpej Exp $";
-#else
-static const char rcsid[] = "$OpenBSD: rdate.c,v 1.23 2008/07/09 19:41:56 sobrado Exp $";
-#endif
-#endif /* lint */
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.sbin/rdate/rfc868time.c b/usr.sbin/rdate/rfc868time.c
index f87a65f855d..59e83100832 100644
--- a/usr.sbin/rdate/rfc868time.c
+++ b/usr.sbin/rdate/rfc868time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rfc868time.c,v 1.6 2004/02/16 21:25:41 jakob Exp $ */
+/* $OpenBSD: rfc868time.c,v 1.7 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: rdate.c,v 1.4 1996/03/16 12:37:45 pk Exp $ */
/*
@@ -39,14 +39,6 @@
* midnight January 1st 1900.
*/
-#ifndef lint
-#if 0
-from: static char rcsid[] = "$NetBSD: rdate.c,v 1.3 1996/02/22 06:59:18 thorpej Exp $";
-#else
-static const char rcsid[] = "$OpenBSD: rfc868time.c,v 1.6 2004/02/16 21:25:41 jakob Exp $";
-#endif
-#endif /* lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index c347b3ee8b2..39ecebde192 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -30,17 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static 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: @(#)repquota.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: repquota.c,v 1.29 2007/09/07 14:23:55 mbalmer Exp $";
-#endif /* not lint */
-
/*
* Quota report
*/
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index cc5e196dc0c..6da32686053 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmt.c,v 1.12 2005/03/07 16:08:19 henning Exp $ */
+/* $OpenBSD: rmt.c,v 1.13 2009/10/27 23:59:54 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)rmt.c 5.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: rmt.c,v 1.12 2005/03/07 16:08:19 henning Exp $";
-#endif /* not lint */
-
/*
* rmt
*/
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 0508ebf809d..00ba8e12a0f 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route6d.c,v 1.54 2009/06/26 09:50:12 claudio Exp $ */
+/* $OpenBSD: route6d.c,v 1.55 2009/10/27 23:59:54 deraadt Exp $ */
/* $KAME: route6d.c,v 1.111 2006/10/25 06:38:13 jinmei Exp $ */
/*
@@ -30,10 +30,6 @@
* SUCH DAMAGE.
*/
-#if 0
-static char _rcsid[] = "$OpenBSD: route6d.c,v 1.54 2009/06/26 09:50:12 claudio Exp $";
-#endif
-
#include <stdio.h>
#include <time.h>
diff --git a/usr.sbin/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c
index bdcda13ac17..11fb4febdb5 100644
--- a/usr.sbin/rpc.lockd/test.c
+++ b/usr.sbin/rpc.lockd/test.c
@@ -1,12 +1,7 @@
-/* $OpenBSD: test.c,v 1.4 2003/07/06 21:26:14 deraadt Exp $ */
+/* $OpenBSD: test.c,v 1.5 2009/10/27 23:59:54 deraadt Exp $ */
#include <rpc/rpc.h>
#include <rpcsvc/nlm_prot.h>
-#ifndef lint
-/*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/
-/*static char sccsid[] = "from: * @(#)nlm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/
-static char rcsid[] = "nlm_prot.x,v 1.1 1994/08/04 19:01:48 wollman Exp";
-#endif /* not lint */
/* Default timeout can be changed using clnt_control() */
static struct timeval TIMEOUT = {0, 0};
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index fc57baa63c8..5a77492d007 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -27,17 +27,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[] = "@(#)rwhod.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: rwhod.c,v 1.32 2009/06/26 09:44:55 claudio Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index c0342d81173..741f84a9ef3 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.10 2005/05/04 09:02:54 jmc Exp $ */
+/* $OpenBSD: main.c,v 1.11 2009/10/27 23:59:54 deraadt Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
@@ -29,14 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char copright[] =
-"@(#) Copyright (c) 1994 Christopher G. Demetriou\n\
- All rights reserved.\n";
-
-static char rcsid[] = "$Id: main.c,v 1.10 2005/05/04 09:02:54 jmc Exp $";
-#endif
-
/*
* sa: system accounting
*/
diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c
index bce0183ad33..c8e82aed26b 100644
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pdb.c,v 1.7 2003/06/28 20:22:21 deraadt Exp $ */
+/* $OpenBSD: pdb.c,v 1.8 2009/10/27 23:59:54 deraadt Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
@@ -29,10 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$Id: pdb.c,v 1.7 2003/06/28 20:22:21 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/acct.h>
#include <err.h>
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index cad4e043263..cd05b969df0 100644
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usrdb.c,v 1.7 2003/06/28 20:22:21 deraadt Exp $ */
+/* $OpenBSD: usrdb.c,v 1.8 2009/10/27 23:59:54 deraadt Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
@@ -29,10 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$Id: usrdb.c,v 1.7 2003/06/28 20:22:21 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/acct.h>
#include <err.h>
diff --git a/usr.sbin/sliplogin/sliplogin.c b/usr.sbin/sliplogin/sliplogin.c
index 2eddab16729..2555671bbf7 100644
--- a/usr.sbin/sliplogin/sliplogin.c
+++ b/usr.sbin/sliplogin/sliplogin.c
@@ -27,17 +27,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: @(#)sliplogin.c 5.6 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: sliplogin.c,v 1.28 2007/09/14 14:29:20 chl Exp $";
-#endif /* not lint */
-
/*
* sliplogin.c
* [MUST BE RUN SUID, SLOPEN DOES A SUSER()!]
diff --git a/usr.sbin/slstats/slstats.c b/usr.sbin/slstats/slstats.c
index 0b98bf08fba..cb07dc07543 100644
--- a/usr.sbin/slstats/slstats.c
+++ b/usr.sbin/slstats/slstats.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: slstats.c,v 1.20 2005/04/04 09:03:08 deraadt Exp $ */
+/* $OpenBSD: slstats.c,v 1.21 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: slstats.c,v 1.6.6.1 1996/06/07 01:42:30 thorpej Exp $ */
/*
@@ -35,10 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: slstats.c,v 1.20 2005/04/04 09:03:08 deraadt Exp $";
-#endif
-
#define INET
#include <sys/param.h>
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 57725003bc3..cc9782b75df 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: syslogd.c,v 1.102 2008/09/29 18:42:54 deraadt Exp $ */
+/* $OpenBSD: syslogd.c,v 1.103 2009/10/27 23:59:54 deraadt Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1988, 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[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
-#else
-static const char rcsid[] = "$OpenBSD: syslogd.c,v 1.102 2008/09/29 18:42:54 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* syslogd -- log system messages
*
diff --git a/usr.sbin/syslogd/ttymsg.c b/usr.sbin/syslogd/ttymsg.c
index b88a3924b8b..72159af0050 100644
--- a/usr.sbin/syslogd/ttymsg.c
+++ b/usr.sbin/syslogd/ttymsg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttymsg.c,v 1.3 2004/07/03 23:40:44 djm Exp $ */
+/* $OpenBSD: ttymsg.c,v 1.4 2009/10/27 23:59:54 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.3 2004/07/03 23:40:44 djm Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/uio.h>
#include <signal.h>
diff --git a/usr.sbin/tcpdump/addrtoname.c b/usr.sbin/tcpdump/addrtoname.c
index d26552e20b9..c3ff5168345 100644
--- a/usr.sbin/tcpdump/addrtoname.c
+++ b/usr.sbin/tcpdump/addrtoname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: addrtoname.c,v 1.30 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: addrtoname.c,v 1.31 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -23,10 +23,6 @@
* Internet, ethernet, port, and protocol string to address
* and address to string conversion routines
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: addrtoname.c,v 1.30 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/bpf_dump.c b/usr.sbin/tcpdump/bpf_dump.c
index 588055ad742..ff71083afac 100644
--- a/usr.sbin/tcpdump/bpf_dump.c
+++ b/usr.sbin/tcpdump/bpf_dump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bpf_dump.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: bpf_dump.c,v 1.8 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996
@@ -20,10 +20,6 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: bpf_dump.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
#include <sys/types.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/gmt2local.c b/usr.sbin/tcpdump/gmt2local.c
index 34fb15644b3..a752caea333 100644
--- a/usr.sbin/tcpdump/gmt2local.c
+++ b/usr.sbin/tcpdump/gmt2local.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gmt2local.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: gmt2local.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: gmt2local.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/machdep.c b/usr.sbin/tcpdump/machdep.c
index 434c812f5de..c94d5fcc6bf 100644
--- a/usr.sbin/tcpdump/machdep.c
+++ b/usr.sbin/tcpdump/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.8 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: machdep.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#ifdef __osf__
#include <sys/sysinfo.h>
diff --git a/usr.sbin/tcpdump/parsenfsfh.c b/usr.sbin/tcpdump/parsenfsfh.c
index f8c9465a167..1652be88ae0 100644
--- a/usr.sbin/tcpdump/parsenfsfh.c
+++ b/usr.sbin/tcpdump/parsenfsfh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parsenfsfh.c,v 1.9 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: parsenfsfh.c,v 1.10 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1993, 1994 Jeffrey C. Mogul, Digital Equipment Corporation,
@@ -42,11 +42,6 @@
* Western Research Laboratory
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: parsenfsfh.c,v 1.9 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-arp.c b/usr.sbin/tcpdump/print-arp.c
index db0311825ba..1f1c5123dce 100644
--- a/usr.sbin/tcpdump/print-arp.c
+++ b/usr.sbin/tcpdump/print-arp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-arp.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-arp.c,v 1.12 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-arp.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-atalk.c b/usr.sbin/tcpdump/print-atalk.c
index fc016c6575b..ceb2e1a4f1d 100644
--- a/usr.sbin/tcpdump/print-atalk.c
+++ b/usr.sbin/tcpdump/print-atalk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-atalk.c,v 1.25 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-atalk.c,v 1.26 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -23,11 +23,6 @@
* Format and print AppleTalk packets.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-atalk.c,v 1.25 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-atm.c b/usr.sbin/tcpdump/print-atm.c
index 713bdb4b175..73b37908f48 100644
--- a/usr.sbin/tcpdump/print-atm.c
+++ b/usr.sbin/tcpdump/print-atm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-atm.c,v 1.8 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-atm.c,v 1.9 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1994, 1995, 1996, 1997
@@ -20,10 +20,6 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-atm.c,v 1.8 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-bgp.c b/usr.sbin/tcpdump/print-bgp.c
index 6ca2143f5cd..01aa9ee026e 100644
--- a/usr.sbin/tcpdump/print-bgp.c
+++ b/usr.sbin/tcpdump/print-bgp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-bgp.c,v 1.13 2009/09/08 15:53:11 claudio Exp $ */
+/* $OpenBSD: print-bgp.c,v 1.14 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (C) 1999 WIDE Project.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-bgp.c,v 1.13 2009/09/08 15:53:11 claudio Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
diff --git a/usr.sbin/tcpdump/print-bootp.c b/usr.sbin/tcpdump/print-bootp.c
index 25bd3d741e2..7991f0d7d65 100644
--- a/usr.sbin/tcpdump/print-bootp.c
+++ b/usr.sbin/tcpdump/print-bootp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-bootp.c,v 1.16 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-bootp.c,v 1.17 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -22,11 +22,6 @@
*
* Format and print bootp packets.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-bootp.c,v 1.16 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-carp.c b/usr.sbin/tcpdump/print-carp.c
index 39cf632ceb5..2c02a73e76c 100644
--- a/usr.sbin/tcpdump/print-carp.c
+++ b/usr.sbin/tcpdump/print-carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-carp.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-carp.c,v 1.6 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 2000 William C. Fenner.
@@ -28,11 +28,6 @@
* Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.3 2000/10/10 05:05:08 guy Exp
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-carp.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/usr.sbin/tcpdump/print-cdp.c b/usr.sbin/tcpdump/print-cdp.c
index b58b4743667..bfb20b0db6c 100644
--- a/usr.sbin/tcpdump/print-cdp.c
+++ b/usr.sbin/tcpdump/print-cdp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-cdp.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-cdp.c,v 1.4 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997
@@ -26,11 +26,6 @@
* http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-cdp.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-decnet.c b/usr.sbin/tcpdump/print-decnet.c
index f506ea33a5e..8615abff887 100644
--- a/usr.sbin/tcpdump/print-decnet.c
+++ b/usr.sbin/tcpdump/print-decnet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-decnet.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-decnet.c,v 1.12 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-decnet.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-dhcp6.c b/usr.sbin/tcpdump/print-dhcp6.c
index 3176101d6ad..3546b6c9ac5 100644
--- a/usr.sbin/tcpdump/print-dhcp6.c
+++ b/usr.sbin/tcpdump/print-dhcp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-dhcp6.c,v 1.6 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-dhcp6.c,v 1.7 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (C) 1998 and 1999 WIDE Project.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-dhcp6.c,v 1.6 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#ifdef INET6
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-domain.c b/usr.sbin/tcpdump/print-domain.c
index 47bf259f925..91ec24d5fca 100644
--- a/usr.sbin/tcpdump/print-domain.c
+++ b/usr.sbin/tcpdump/print-domain.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-domain.c,v 1.16 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-domain.c,v 1.17 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-domain.c,v 1.16 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-dvmrp.c b/usr.sbin/tcpdump/print-dvmrp.c
index f22e807521b..41718706113 100644
--- a/usr.sbin/tcpdump/print-dvmrp.c
+++ b/usr.sbin/tcpdump/print-dvmrp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-dvmrp.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-dvmrp.c,v 1.6 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-dvmrp.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-enc.c b/usr.sbin/tcpdump/print-enc.c
index 3f548d0ff77..994d0825c39 100644
--- a/usr.sbin/tcpdump/print-enc.c
+++ b/usr.sbin/tcpdump/print-enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-enc.c,v 1.10 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-enc.c,v 1.11 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-enc.c,v 1.10 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ether.c b/usr.sbin/tcpdump/print-ether.c
index 208d3ecdf38..2b6f87af220 100644
--- a/usr.sbin/tcpdump/print-ether.c
+++ b/usr.sbin/tcpdump/print-ether.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ether.c,v 1.25 2008/12/05 01:25:24 sthen Exp $ */
+/* $OpenBSD: print-ether.c,v 1.26 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -20,10 +20,6 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ether.c,v 1.25 2008/12/05 01:25:24 sthen Exp $ (LBL)";
-#endif
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-etherip.c b/usr.sbin/tcpdump/print-etherip.c
index be4f39f9072..d28268ed8d9 100644
--- a/usr.sbin/tcpdump/print-etherip.c
+++ b/usr.sbin/tcpdump/print-etherip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-etherip.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-etherip.c,v 1.6 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -30,11 +30,6 @@
* Format and print etherip packets
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-etherip.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-fddi.c b/usr.sbin/tcpdump/print-fddi.c
index 0abe979d210..a9bfb4daaeb 100644
--- a/usr.sbin/tcpdump/print-fddi.c
+++ b/usr.sbin/tcpdump/print-fddi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-fddi.c,v 1.13 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-fddi.c,v 1.14 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-fddi.c,v 1.13 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#ifdef HAVE_FDDI
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-frag6.c b/usr.sbin/tcpdump/print-frag6.c
index 1ceace94955..816a31d7213 100644
--- a/usr.sbin/tcpdump/print-frag6.c
+++ b/usr.sbin/tcpdump/print-frag6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-frag6.c,v 1.3 2006/05/27 21:52:38 moritz Exp $ */
+/* $OpenBSD: print-frag6.c,v 1.4 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
-#endif
-
#ifdef INET6
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-hsrp.c b/usr.sbin/tcpdump/print-hsrp.c
index c91cc91cbc4..523971d9bf1 100644
--- a/usr.sbin/tcpdump/print-hsrp.c
+++ b/usr.sbin/tcpdump/print-hsrp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-hsrp.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-hsrp.c,v 1.4 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (C) 2001 Julian Cowley
@@ -31,11 +31,6 @@
/* Cisco Hot Standby Router Protocol (HSRP). */
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-hsrp.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/usr.sbin/tcpdump/print-icmp.c b/usr.sbin/tcpdump/print-icmp.c
index f224e2528fd..6348b76affb 100644
--- a/usr.sbin/tcpdump/print-icmp.c
+++ b/usr.sbin/tcpdump/print-icmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-icmp.c,v 1.19 2009/05/25 10:53:35 sthen Exp $ */
+/* $OpenBSD: print-icmp.c,v 1.20 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994, 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-icmp.c,v 1.19 2009/05/25 10:53:35 sthen Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-icmp6.c b/usr.sbin/tcpdump/print-icmp6.c
index 941dad30951..2d5803a2d16 100644
--- a/usr.sbin/tcpdump/print-icmp6.c
+++ b/usr.sbin/tcpdump/print-icmp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-icmp6.c,v 1.6 2009/05/25 10:53:35 sthen Exp $ */
+/* $OpenBSD: print-icmp6.c,v 1.7 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
-#endif
-
#ifdef INET6
#include <ctype.h>
diff --git a/usr.sbin/tcpdump/print-igrp.c b/usr.sbin/tcpdump/print-igrp.c
index eb38147c7d9..ccb02f41308 100644
--- a/usr.sbin/tcpdump/print-igrp.c
+++ b/usr.sbin/tcpdump/print-igrp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-igrp.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-igrp.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1996, 1997
@@ -23,11 +23,6 @@
* Initial contribution from Francis Dupont (francis.dupont@inria.fr)
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-igrp.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/types.h> /* concession to AIX */
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ike.c b/usr.sbin/tcpdump/print-ike.c
index 73375a7eb68..7396a9a2a8a 100644
--- a/usr.sbin/tcpdump/print-ike.c
+++ b/usr.sbin/tcpdump/print-ike.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ike.c,v 1.31 2008/12/18 16:18:49 hshoexer Exp $ */
+/* $OpenBSD: print-ike.c,v 1.32 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -27,11 +27,6 @@
* in co-operation with SSH Communications Security, Espoo, Finland
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ike.c,v 1.31 2008/12/18 16:18:49 hshoexer Exp $ (XXX)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ip.c b/usr.sbin/tcpdump/print-ip.c
index 04ccfe9503e..9ea03d17154 100644
--- a/usr.sbin/tcpdump/print-ip.c
+++ b/usr.sbin/tcpdump/print-ip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ip.c,v 1.34 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-ip.c,v 1.35 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ip.c,v 1.34 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ip6.c b/usr.sbin/tcpdump/print-ip6.c
index 9063102a0e0..629c5e12fee 100644
--- a/usr.sbin/tcpdump/print-ip6.c
+++ b/usr.sbin/tcpdump/print-ip6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ip6.c,v 1.10 2007/10/04 18:38:29 canacar Exp $ */
+/* $OpenBSD: print-ip6.c,v 1.11 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) /master/usr.sbin/tcpdump/tcpdump/print-ip.c,v 2.1 1995/02/03 18:14:45 polk Exp (LBL)";
-#endif
-
#ifdef INET6
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-ipsec.c b/usr.sbin/tcpdump/print-ipsec.c
index 38da430924f..dd6204a3c88 100644
--- a/usr.sbin/tcpdump/print-ipsec.c
+++ b/usr.sbin/tcpdump/print-ipsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ipsec.c,v 1.13 2009/02/18 01:53:06 mcbride Exp $ */
+/* $OpenBSD: print-ipsec.c,v 1.14 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -26,11 +26,6 @@
* in co-operation with SSH Communications Security, Espoo, Finland
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ipsec.c,v 1.13 2009/02/18 01:53:06 mcbride Exp $ (XXX)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ipx.c b/usr.sbin/tcpdump/print-ipx.c
index 498c2c29bca..4ddd73bce27 100644
--- a/usr.sbin/tcpdump/print-ipx.c
+++ b/usr.sbin/tcpdump/print-ipx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ipx.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-ipx.c,v 1.12 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1994, 1995, 1996
@@ -24,11 +24,6 @@
* Contributed by Brad Parker (brad@fcr.com).
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ipx.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-isoclns.c b/usr.sbin/tcpdump/print-isoclns.c
index 7fca8ff687a..12df60a81d5 100644
--- a/usr.sbin/tcpdump/print-isoclns.c
+++ b/usr.sbin/tcpdump/print-isoclns.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-isoclns.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-isoclns.c,v 1.12 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996
@@ -23,11 +23,6 @@
* Original code by Matt Thomas, Digital Equipment Corporation
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-isoclns.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-krb.c b/usr.sbin/tcpdump/print-krb.c
index f7dff0aeeba..99f7cd093b9 100644
--- a/usr.sbin/tcpdump/print-krb.c
+++ b/usr.sbin/tcpdump/print-krb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-krb.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-krb.c,v 1.8 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1995, 1996, 1997
@@ -23,11 +23,6 @@
* Initial contribution from John Hawkinson (jhawk@mit.edu).
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-krb.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-l2tp.c b/usr.sbin/tcpdump/print-l2tp.c
index 15473c13207..caa639112fc 100644
--- a/usr.sbin/tcpdump/print-l2tp.c
+++ b/usr.sbin/tcpdump/print-l2tp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-l2tp.c,v 1.4 2009/07/12 18:11:03 jsg Exp $ */
+/* $OpenBSD: print-l2tp.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
@@ -23,11 +23,6 @@
* L2TP support contributed by Motonori Shindo (mshindo@ascend.co.jp)
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-l2tp.c,v 1.4 2009/07/12 18:11:03 jsg Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/param.h>
#include <stdio.h>
diff --git a/usr.sbin/tcpdump/print-llc.c b/usr.sbin/tcpdump/print-llc.c
index c4bf1ab76d3..2f78c6809db 100644
--- a/usr.sbin/tcpdump/print-llc.c
+++ b/usr.sbin/tcpdump/print-llc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-llc.c,v 1.17 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-llc.c,v 1.18 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997
@@ -24,11 +24,6 @@
* with an awful lot of hacking by Jeffrey Mogul, DECWRL
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-llc.c,v 1.17 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-lwres.c b/usr.sbin/tcpdump/print-lwres.c
index bac6e833c07..b6113d3c688 100644
--- a/usr.sbin/tcpdump/print-lwres.c
+++ b/usr.sbin/tcpdump/print-lwres.c
@@ -27,11 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-lwres.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/usr.sbin/tcpdump/print-netbios.c b/usr.sbin/tcpdump/print-netbios.c
index 30065872633..09fc475b3c2 100644
--- a/usr.sbin/tcpdump/print-netbios.c
+++ b/usr.sbin/tcpdump/print-netbios.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-netbios.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-netbios.c,v 1.8 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1994, 1995, 1996
@@ -24,11 +24,6 @@
* Contributed by Brad Parker (brad@fcr.com).
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-netbios.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-nfs.c b/usr.sbin/tcpdump/print-nfs.c
index 006e8e209bf..d63920fbde9 100644
--- a/usr.sbin/tcpdump/print-nfs.c
+++ b/usr.sbin/tcpdump/print-nfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-nfs.c,v 1.15 2007/06/29 11:39:25 thib Exp $ */
+/* $OpenBSD: print-nfs.c,v 1.16 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) Header: print-nfs.c,v 1.64 97/06/30 13:51:16 leres Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ntp.c b/usr.sbin/tcpdump/print-ntp.c
index e5e77ba3d5b..f3ea0df5092 100644
--- a/usr.sbin/tcpdump/print-ntp.c
+++ b/usr.sbin/tcpdump/print-ntp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ntp.c,v 1.14 2009/03/04 16:54:42 stevesk Exp $ */
+/* $OpenBSD: print-ntp.c,v 1.15 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -25,11 +25,6 @@
* loosely based on print-bootp.c
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ntp.c,v 1.14 2009/03/04 16:54:42 stevesk Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-null.c b/usr.sbin/tcpdump/print-null.c
index c07c60e792d..3c57edc7565 100644
--- a/usr.sbin/tcpdump/print-null.c
+++ b/usr.sbin/tcpdump/print-null.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-null.c,v 1.18 2008/12/29 10:02:55 michele Exp $ */
+/* $OpenBSD: print-null.c,v 1.19 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-null.c,v 1.18 2008/12/29 10:02:55 michele Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ospf.c b/usr.sbin/tcpdump/print-ospf.c
index 87c771fd2c6..a69898c3ded 100644
--- a/usr.sbin/tcpdump/print-ospf.c
+++ b/usr.sbin/tcpdump/print-ospf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ospf.c,v 1.13 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-ospf.c,v 1.14 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997
@@ -23,11 +23,6 @@
* OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu)
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ospf.c,v 1.13 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ospf6.c b/usr.sbin/tcpdump/print-ospf6.c
index c23e18de05e..ae7da9986e4 100644
--- a/usr.sbin/tcpdump/print-ospf6.c
+++ b/usr.sbin/tcpdump/print-ospf6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ospf6.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-ospf6.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $ */
/*
@@ -24,11 +24,6 @@
* OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu)
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ospf6.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#ifdef INET6
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-pflog.c b/usr.sbin/tcpdump/print-pflog.c
index f5855051e82..f42d5000144 100644
--- a/usr.sbin/tcpdump/print-pflog.c
+++ b/usr.sbin/tcpdump/print-pflog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-pflog.c,v 1.19 2009/04/06 12:09:06 henning Exp $ */
+/* $OpenBSD: print-pflog.c,v 1.20 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-pflog.c,v 1.19 2009/04/06 12:09:06 henning Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-pfsync.c b/usr.sbin/tcpdump/print-pfsync.c
index f54b4d6c9a6..79f9cf151df 100644
--- a/usr.sbin/tcpdump/print-pfsync.c
+++ b/usr.sbin/tcpdump/print-pfsync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-pfsync.c,v 1.35 2009/03/31 01:21:29 dlg Exp $ */
+/* $OpenBSD: print-pfsync.c,v 1.36 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff
@@ -26,11 +26,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-pfsync.c,v 1.35 2009/03/31 01:21:29 dlg Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-pim.c b/usr.sbin/tcpdump/print-pim.c
index 05b514c18a4..342d9dcb47a 100644
--- a/usr.sbin/tcpdump/print-pim.c
+++ b/usr.sbin/tcpdump/print-pim.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-pim.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-pim.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-pim.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ppp.c b/usr.sbin/tcpdump/print-ppp.c
index 50048942a95..7654d538938 100644
--- a/usr.sbin/tcpdump/print-ppp.c
+++ b/usr.sbin/tcpdump/print-ppp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ppp.c,v 1.20 2008/10/10 15:24:24 claudio Exp $ */
+/* $OpenBSD: print-ppp.c,v 1.21 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ppp.c,v 1.20 2008/10/10 15:24:24 claudio Exp $ (LBL)";
-#endif
-
#ifdef PPP
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-raw.c b/usr.sbin/tcpdump/print-raw.c
index 1af4f0d4d24..ba46f884d7f 100644
--- a/usr.sbin/tcpdump/print-raw.c
+++ b/usr.sbin/tcpdump/print-raw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-raw.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-raw.c,v 1.6 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-raw.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-rip.c b/usr.sbin/tcpdump/print-rip.c
index ab3ca64c651..60e1e3c273b 100644
--- a/usr.sbin/tcpdump/print-rip.c
+++ b/usr.sbin/tcpdump/print-rip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-rip.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-rip.c,v 1.12 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1989, 1990, 1991, 1993, 1994, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-rip.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ripng.c b/usr.sbin/tcpdump/print-ripng.c
index dda0af337ae..aee45c201f4 100644
--- a/usr.sbin/tcpdump/print-ripng.c
+++ b/usr.sbin/tcpdump/print-ripng.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ripng.c,v 1.1 2000/04/26 21:35:42 jakob Exp $ */
+/* $OpenBSD: print-ripng.c,v 1.2 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1989, 1990, 1991, 1993, 1994
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) /master/usr.sbin/tcpdump/tcpdump/print-rip.c,v 2.1 1995/02/03 18:15:05 polk Exp (LBL)";
-#endif
-
#ifdef INET6
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-rt6.c b/usr.sbin/tcpdump/print-rt6.c
index 4c8371479a4..0b926e67002 100644
--- a/usr.sbin/tcpdump/print-rt6.c
+++ b/usr.sbin/tcpdump/print-rt6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-rt6.c,v 1.2 2007/05/06 09:56:45 claudio Exp $ */
+/* $OpenBSD: print-rt6.c,v 1.3 2009/10/27 23:59:55 deraadt Exp $ */
/*
@@ -22,11 +22,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
-#endif
-
#ifdef INET6
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-sl.c b/usr.sbin/tcpdump/print-sl.c
index 3842de53f87..3772d225df7 100644
--- a/usr.sbin/tcpdump/print-sl.c
+++ b/usr.sbin/tcpdump/print-sl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-sl.c,v 1.13 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-sl.c,v 1.14 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1989, 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-sl.c,v 1.13 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#ifdef HAVE_NET_SLIP_H
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-smb.c b/usr.sbin/tcpdump/print-smb.c
index 58917d14a54..c74a2742317 100644
--- a/usr.sbin/tcpdump/print-smb.c
+++ b/usr.sbin/tcpdump/print-smb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-smb.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-smb.c,v 1.4 2009/10/27 23:59:55 deraadt Exp $ */
/*
Copyright (C) Andrew Tridgell 1995-1999
@@ -11,11 +11,6 @@
#include "config.h"
#endif
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-smb.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
diff --git a/usr.sbin/tcpdump/print-snmp.c b/usr.sbin/tcpdump/print-snmp.c
index 32603168af3..1f63238a17a 100644
--- a/usr.sbin/tcpdump/print-snmp.c
+++ b/usr.sbin/tcpdump/print-snmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-snmp.c,v 1.15 2008/01/17 17:33:15 reyk Exp $ */
+/* $OpenBSD: print-snmp.c,v 1.16 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -55,11 +55,6 @@
# @(#)snmp.awk.x 1.1 (LANL) 1/15/90
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-snmp.c,v 1.15 2008/01/17 17:33:15 reyk Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-sunrpc.c b/usr.sbin/tcpdump/print-sunrpc.c
index 9356951a9cf..fdcf642b990 100644
--- a/usr.sbin/tcpdump/print-sunrpc.c
+++ b/usr.sbin/tcpdump/print-sunrpc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-sunrpc.c,v 1.16 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-sunrpc.c,v 1.17 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-sunrpc.c,v 1.16 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-tcp.c b/usr.sbin/tcpdump/print-tcp.c
index 6a75bd99e24..f393d1aff25 100644
--- a/usr.sbin/tcpdump/print-tcp.c
+++ b/usr.sbin/tcpdump/print-tcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-tcp.c,v 1.26 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-tcp.c,v 1.27 2009/10/27 23:59:56 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-tcp.c,v 1.26 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-tftp.c b/usr.sbin/tcpdump/print-tftp.c
index 4f7dd1da5e4..2d23e71bc93 100644
--- a/usr.sbin/tcpdump/print-tftp.c
+++ b/usr.sbin/tcpdump/print-tftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-tftp.c,v 1.9 2009/07/30 15:36:19 sthen Exp $ */
+/* $OpenBSD: print-tftp.c,v 1.10 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -23,11 +23,6 @@
* Format and print trivial file transfer protocol packets.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-tftp.c,v 1.9 2009/07/30 15:36:19 sthen Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-timed.c b/usr.sbin/tcpdump/print-timed.c
index a711d224945..fa0713e9770 100644
--- a/usr.sbin/tcpdump/print-timed.c
+++ b/usr.sbin/tcpdump/print-timed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-timed.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-timed.c,v 1.5 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 2000 Ben Smithurst <ben@scientia.demon.co.uk>
@@ -25,11 +25,6 @@
*
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-timed.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/usr.sbin/tcpdump/print-udp.c b/usr.sbin/tcpdump/print-udp.c
index 3156c404674..e84c1f5d568 100644
--- a/usr.sbin/tcpdump/print-udp.c
+++ b/usr.sbin/tcpdump/print-udp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-udp.c,v 1.30 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-udp.c,v 1.31 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-udp.c,v 1.30 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-udpencap.c b/usr.sbin/tcpdump/print-udpencap.c
index cfdb69ae851..e9b88f4ec39 100644
--- a/usr.sbin/tcpdump/print-udpencap.c
+++ b/usr.sbin/tcpdump/print-udpencap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-udpencap.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-udpencap.c,v 1.5 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 2003 Markus Friedl. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-udpencap.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (XXX)";
-#endif
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/tcpdump/print-vrrp.c b/usr.sbin/tcpdump/print-vrrp.c
index fe0c0531b00..226fceba8da 100644
--- a/usr.sbin/tcpdump/print-vrrp.c
+++ b/usr.sbin/tcpdump/print-vrrp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-vrrp.c,v 1.2 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-vrrp.c,v 1.3 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 2000 William C. Fenner.
@@ -28,11 +28,6 @@
* Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.3 2000/10/10 05:05:08 guy Exp
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-vrrp.c,v 1.2 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/usr.sbin/tcpdump/print-wb.c b/usr.sbin/tcpdump/print-wb.c
index b99130aaead..304ad43542a 100644
--- a/usr.sbin/tcpdump/print-wb.c
+++ b/usr.sbin/tcpdump/print-wb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-wb.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-wb.c,v 1.8 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1993, 1994, 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-wb.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/savestr.c b/usr.sbin/tcpdump/savestr.c
index 9bf84a00fec..f3cb5955f3e 100644
--- a/usr.sbin/tcpdump/savestr.c
+++ b/usr.sbin/tcpdump/savestr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: savestr.c,v 1.6 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: savestr.c,v 1.7 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: savestr.c,v 1.6 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/tcpdump/setsignal.c b/usr.sbin/tcpdump/setsignal.c
index fd27cb21723..2421ca87a54 100644
--- a/usr.sbin/tcpdump/setsignal.c
+++ b/usr.sbin/tcpdump/setsignal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setsignal.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: setsignal.c,v 1.4 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: setsignal.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#ifdef HAVE_MEMORY_H
diff --git a/usr.sbin/tcpdump/smbutil.c b/usr.sbin/tcpdump/smbutil.c
index 9207b9d777e..a060bff39b5 100644
--- a/usr.sbin/tcpdump/smbutil.c
+++ b/usr.sbin/tcpdump/smbutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smbutil.c,v 1.6 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: smbutil.c,v 1.7 2009/10/27 23:59:57 deraadt Exp $ */
/*
Copyright (C) Andrew Tridgell 1995-1999
@@ -11,11 +11,6 @@
#include "config.h"
#endif
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: smbutil.c,v 1.6 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
diff --git a/usr.sbin/tcpdump/tcpdump.c b/usr.sbin/tcpdump/tcpdump.c
index 81ee8f662d3..0a13c88f547 100644
--- a/usr.sbin/tcpdump/tcpdump.c
+++ b/usr.sbin/tcpdump/tcpdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcpdump.c,v 1.61 2009/02/14 11:18:56 sthen Exp $ */
+/* $OpenBSD: tcpdump.c,v 1.62 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,14 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char copyright[] =
- "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
-The Regents of the University of California. All rights reserved.\n";
-static const char rcsid[] =
- "@(#) $Id: tcpdump.c,v 1.61 2009/02/14 11:18:56 sthen Exp $ (LBL)";
-#endif
-
/*
* tcpdump - monitor tcp/ip traffic on an ethernet.
*
diff --git a/usr.sbin/tcpdump/util.c b/usr.sbin/tcpdump/util.c
index d103c04193e..15921ff078d 100644
--- a/usr.sbin/tcpdump/util.c
+++ b/usr.sbin/tcpdump/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.24 2008/09/19 08:52:16 mpf Exp $ */
+/* $OpenBSD: util.c,v 1.25 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: util.c,v 1.24 2008/09/19 08:52:16 mpf Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/file.h>
diff --git a/usr.sbin/timed/timed/acksend.c b/usr.sbin/timed/timed/acksend.c
index 5c1bec0d71e..5672d7ee362 100644
--- a/usr.sbin/timed/timed/acksend.c
+++ b/usr.sbin/timed/timed/acksend.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acksend.c,v 1.6 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: acksend.c,v 1.7 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)acksend.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
diff --git a/usr.sbin/timed/timed/byteorder.c b/usr.sbin/timed/timed/byteorder.c
index 89fb602efc6..6bd4f794a98 100644
--- a/usr.sbin/timed/timed/byteorder.c
+++ b/usr.sbin/timed/timed/byteorder.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: byteorder.c,v 1.5 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: byteorder.c,v 1.6 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)byteorder.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
/*
diff --git a/usr.sbin/timed/timed/candidate.c b/usr.sbin/timed/timed/candidate.c
index e16768dd47a..264cc12b583 100644
--- a/usr.sbin/timed/timed/candidate.c
+++ b/usr.sbin/timed/timed/candidate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: candidate.c,v 1.6 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: candidate.c,v 1.7 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)candidate.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
/*
diff --git a/usr.sbin/timed/timed/cksum.c b/usr.sbin/timed/timed/cksum.c
index 06ddda24f7b..b8040c1219e 100644
--- a/usr.sbin/timed/timed/cksum.c
+++ b/usr.sbin/timed/timed/cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cksum.c,v 1.5 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: cksum.c,v 1.6 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)cksum.c 5.2 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include <sys/types.h>
/*
diff --git a/usr.sbin/timed/timed/correct.c b/usr.sbin/timed/timed/correct.c
index 7c9b3943d21..a159ced26eb 100644
--- a/usr.sbin/timed/timed/correct.c
+++ b/usr.sbin/timed/timed/correct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: correct.c,v 1.8 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: correct.c,v 1.9 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)correct.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
#include <math.h>
#include <sys/types.h>
diff --git a/usr.sbin/timed/timed/master.c b/usr.sbin/timed/timed/master.c
index 4c95f92a576..dd8896079f0 100644
--- a/usr.sbin/timed/timed/master.c
+++ b/usr.sbin/timed/timed/master.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: master.c,v 1.9 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: master.c,v 1.10 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)master.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
#include <sys/file.h>
#include <sys/types.h>
diff --git a/usr.sbin/timed/timed/measure.c b/usr.sbin/timed/timed/measure.c
index b11194a9164..34fbf792694 100644
--- a/usr.sbin/timed/timed/measure.c
+++ b/usr.sbin/timed/timed/measure.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: measure.c,v 1.13 2003/11/19 20:14:58 millert Exp $ */
+/* $OpenBSD: measure.c,v 1.14 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)measure.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
#include <netinet/in_systm.h>
#include <netinet/ip.h>
diff --git a/usr.sbin/timed/timed/networkdelta.c b/usr.sbin/timed/timed/networkdelta.c
index 4c70ba499f5..8962d55cba8 100644
--- a/usr.sbin/timed/timed/networkdelta.c
+++ b/usr.sbin/timed/timed/networkdelta.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: networkdelta.c,v 1.7 2003/06/12 21:09:48 deraadt Exp $ */
+/* $OpenBSD: networkdelta.c,v 1.8 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)networkdelta.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
static long median(float, float*, long*, long*, unsigned int);
diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c
index 512869eba9e..8a71bf18ff0 100644
--- a/usr.sbin/timed/timed/readmsg.c
+++ b/usr.sbin/timed/timed/readmsg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readmsg.c,v 1.15 2003/11/19 19:17:59 dhartmei Exp $ */
+/* $OpenBSD: readmsg.c,v 1.16 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)readmsg.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
extern char *tsptype[];
diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c
index 4df32931f75..982fe5b206b 100644
--- a/usr.sbin/timed/timed/slave.c
+++ b/usr.sbin/timed/timed/slave.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: slave.c,v 1.11 2003/08/19 19:41:21 deraadt Exp $ */
+/* $OpenBSD: slave.c,v 1.12 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)slave.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
#include <setjmp.h>
#include "pathnames.h"
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index fed9c0f5cc7..bd42eff30c3 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timed.c,v 1.28 2008/03/17 16:29:25 sobrado Exp $ */
+/* $OpenBSD: timed.c,v 1.29 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1985, 1993 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)timed.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#define TSPTYPES
#include "globals.h"
#include <net/if.h>
diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c
index 0f1ef82865e..04bf9d0f2dd 100644
--- a/usr.sbin/timed/timedc/cmds.c
+++ b/usr.sbin/timed/timedc/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.20 2008/03/17 16:29:25 sobrado Exp $ */
+/* $OpenBSD: cmds.c,v 1.21 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,12 +29,8 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)cmds.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#ifdef sgi
-#ident "$Revision: 1.20 $"
+#ident "$Revision: 1.21 $"
#endif
#include "timedc.h"
diff --git a/usr.sbin/timed/timedc/cmdtab.c b/usr.sbin/timed/timedc/cmdtab.c
index 7cb957902eb..7c93deeffd5 100644
--- a/usr.sbin/timed/timedc/cmdtab.c
+++ b/usr.sbin/timed/timedc/cmdtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmdtab.c,v 1.4 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: cmdtab.c,v 1.5 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)cmdtab.c 2.7 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "timedc.h"
char clockdiffhelp[] = "measures clock differences between machines";
diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c
index 01c11781c09..94d085dc107 100644
--- a/usr.sbin/timed/timedc/timedc.c
+++ b/usr.sbin/timed/timedc/timedc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timedc.c,v 1.13 2004/01/23 21:07:38 deraadt Exp $ */
+/* $OpenBSD: timedc.c,v 1.14 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1985, 1993 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)timedc.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "timedc.h"
#include <string.h>
#include <signal.h>
diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c
index 261988cb384..274ba3a7369 100644
--- a/usr.sbin/traceroute/traceroute.c
+++ b/usr.sbin/traceroute/traceroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: traceroute.c,v 1.67 2009/06/05 00:10:01 claudio Exp $ */
+/* $OpenBSD: traceroute.c,v 1.68 2009/10/27 23:59:57 deraadt Exp $ */
/* $NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $ */
/*-
@@ -33,20 +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[] = "@(#)traceroute.c 8.1 (Berkeley) 6/6/93";*/
-#else
-static char rcsid[] = "$OpenBSD: traceroute.c,v 1.67 2009/06/05 00:10:01 claudio Exp $";
-#endif
-#endif /* not lint */
-
/*
* traceroute host - trace the route ip packets follow going to "host".
*
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index af4a4b9c452..bad45a93211 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: traceroute6.c,v 1.45 2008/03/24 16:11:06 deraadt Exp $ */
+/* $OpenBSD: traceroute6.c,v 1.46 2009/10/27 23:59:57 deraadt Exp $ */
/* $KAME: traceroute6.c,v 1.63 2002/10/24 12:53:25 itojun Exp $ */
/*
@@ -62,16 +62,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
-static char sccsid[] = "@(#)traceroute.c 8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
/*
* traceroute host - trace the route ip packets follow going to "host".
*
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index 2fcd1dc12d8..f7aece1b50a 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trpt.c,v 1.24 2008/06/26 05:42:21 ray Exp $ */
+/* $OpenBSD: trpt.c,v 1.25 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -59,16 +59,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1983, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)trpt.c 8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index 012800221e6..a20421e047c 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vipw.c,v 1.14 2007/11/17 16:09:29 millert Exp $ */
+/* $OpenBSD: vipw.c,v 1.15 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -29,16 +29,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
-static char sccsid[] = "@(#)vipw.c 8.3 (Berkeley) 4/2/94";
-#endif /* not lint */
-
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 5be7afbeb35..4fdd29a4c38 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypbind.c,v 1.58 2008/08/02 04:13:37 deraadt Exp $ */
+/* $OpenBSD: ypbind.c,v 1.59 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1996, 1997, 1998 Theo de Raadt <deraadt@openbsd.org>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: ypbind.c,v 1.58 2008/08/02 04:13:37 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index 936a01c37d3..227c5ce0242 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppoll.c,v 1.11 2007/02/18 23:32:02 jmc Exp $ */
+/* $OpenBSD: yppoll.c,v 1.12 2009/10/27 23:59:57 deraadt Exp $ */
/* $NetBSD: yppoll.c,v 1.5 1996/05/13 02:46:36 thorpej Exp $ */
/*
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$Id: yppoll.c,v 1.11 2007/02/18 23:32:02 jmc Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ypserv/common/yplib_host.c b/usr.sbin/ypserv/common/yplib_host.c
index d984265de1a..2cca2a0ff38 100644
--- a/usr.sbin/ypserv/common/yplib_host.c
+++ b/usr.sbin/ypserv/common/yplib_host.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yplib_host.c,v 1.15 2006/04/03 05:01:20 deraadt Exp $ */
+/* $OpenBSD: yplib_host.c,v 1.16 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: yplib_host.c,v 1.15 2006/04/03 05:01:20 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ypserv/makedbm/db.c b/usr.sbin/ypserv/makedbm/db.c
index a9f08d48c81..b57399f8280 100644
--- a/usr.sbin/ypserv/makedbm/db.c
+++ b/usr.sbin/ypserv/makedbm/db.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db.c,v 1.7 2006/04/03 05:01:22 deraadt Exp $ */
+/* $OpenBSD: db.c,v 1.8 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: db.c,v 1.7 2006/04/03 05:01:22 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <db.h>
#include <fcntl.h>
diff --git a/usr.sbin/ypserv/makedbm/makedbm.c b/usr.sbin/ypserv/makedbm/makedbm.c
index 393779d8883..f819b752efa 100644
--- a/usr.sbin/ypserv/makedbm/makedbm.c
+++ b/usr.sbin/ypserv/makedbm/makedbm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: makedbm.c,v 1.28 2007/02/19 21:42:41 jmc Exp $ */
+/* $OpenBSD: makedbm.c,v 1.29 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1994-97 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: makedbm.c,v 1.28 2007/02/19 21:42:41 jmc Exp $";
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
diff --git a/usr.sbin/ypserv/mkalias/mkalias.c b/usr.sbin/ypserv/mkalias/mkalias.c
index 11ede3a250c..55c7e784ede 100644
--- a/usr.sbin/ypserv/mkalias/mkalias.c
+++ b/usr.sbin/ypserv/mkalias/mkalias.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkalias.c,v 1.22 2009/10/20 09:47:03 sobrado Exp $ */
+/* $OpenBSD: mkalias.c,v 1.23 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: mkalias.c,v 1.22 2009/10/20 09:47:03 sobrado Exp $";
-#endif
-
#include <ctype.h>
#include <fcntl.h>
#include <netdb.h>
diff --git a/usr.sbin/ypserv/mknetid/mknetid.c b/usr.sbin/ypserv/mknetid/mknetid.c
index 0732fa63247..a901ad545aa 100644
--- a/usr.sbin/ypserv/mknetid/mknetid.c
+++ b/usr.sbin/ypserv/mknetid/mknetid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mknetid.c,v 1.16 2009/10/16 09:46:40 sobrado Exp $ */
+/* $OpenBSD: mknetid.c,v 1.17 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: mknetid.c,v 1.16 2009/10/16 09:46:40 sobrado Exp $";
-#endif
-
#include <sys/param.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/usr.sbin/ypserv/revnetgroup/hash.c b/usr.sbin/ypserv/revnetgroup/hash.c
index 40582a2ba65..1d97d45f55f 100644
--- a/usr.sbin/ypserv/revnetgroup/hash.c
+++ b/usr.sbin/ypserv/revnetgroup/hash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hash.c,v 1.6 2006/04/03 05:01:23 deraadt Exp $ */
+/* $OpenBSD: hash.c,v 1.7 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -39,10 +39,6 @@
#include <sys/types.h>
#include "hash.h"
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hash.c,v 1.6 2006/04/03 05:01:23 deraadt Exp $";
-#endif
-
/*
* This hash function is stolen directly from the
* Berkeley DB package. It already exists inside libc, but
diff --git a/usr.sbin/ypserv/revnetgroup/parse_netgroup.c b/usr.sbin/ypserv/revnetgroup/parse_netgroup.c
index 831a084b9cc..97ea08458e0 100644
--- a/usr.sbin/ypserv/revnetgroup/parse_netgroup.c
+++ b/usr.sbin/ypserv/revnetgroup/parse_netgroup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse_netgroup.c,v 1.11 2007/02/20 01:44:16 ray Exp $ */
+/* $OpenBSD: parse_netgroup.c,v 1.12 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -46,10 +46,6 @@
#include <unistd.h>
#include "hash.h"
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: parse_netgroup.c,v 1.11 2007/02/20 01:44:16 ray Exp $";
-#endif
-
/*
* Static Variables and functions used by setnetgrent(), getnetgrent() and
* __endnetgrent().
diff --git a/usr.sbin/ypserv/revnetgroup/revnetgroup.c b/usr.sbin/ypserv/revnetgroup/revnetgroup.c
index d6a938e7c8c..97113a9ac78 100644
--- a/usr.sbin/ypserv/revnetgroup/revnetgroup.c
+++ b/usr.sbin/ypserv/revnetgroup/revnetgroup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: revnetgroup.c,v 1.8 2009/10/20 11:01:31 sobrado Exp $ */
+/* $OpenBSD: revnetgroup.c,v 1.9 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -47,10 +47,6 @@
#include <err.h>
#include "hash.h"
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: revnetgroup.c,v 1.8 2009/10/20 11:01:31 sobrado Exp $";
-#endif
-
/* Default location of netgroup file. */
char *netgroup = "/etc/netgroup";
diff --git a/usr.sbin/ypserv/stdethers/stdethers.c b/usr.sbin/ypserv/stdethers/stdethers.c
index da1b754ef90..6d0e26e7dc5 100644
--- a/usr.sbin/ypserv/stdethers/stdethers.c
+++ b/usr.sbin/ypserv/stdethers/stdethers.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdethers.c,v 1.14 2006/04/03 05:01:23 deraadt Exp $ */
+/* $OpenBSD: stdethers.c,v 1.15 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: stdethers.c,v 1.14 2006/04/03 05:01:23 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>
diff --git a/usr.sbin/ypserv/stdhosts/stdhosts.c b/usr.sbin/ypserv/stdhosts/stdhosts.c
index 292ccb41e47..71787d6a9f0 100644
--- a/usr.sbin/ypserv/stdhosts/stdhosts.c
+++ b/usr.sbin/ypserv/stdhosts/stdhosts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdhosts.c,v 1.15 2006/04/03 05:01:23 deraadt Exp $ */
+/* $OpenBSD: stdhosts.c,v 1.16 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: stdhosts.c,v 1.15 2006/04/03 05:01:23 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/usr.sbin/ypserv/yppush/yppush.c b/usr.sbin/ypserv/yppush/yppush.c
index 0eb6ea8f295..f828d5b88d1 100644
--- a/usr.sbin/ypserv/yppush/yppush.c
+++ b/usr.sbin/ypserv/yppush/yppush.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppush.c,v 1.26 2008/06/01 21:45:08 sobrado Exp $ */
+/* $OpenBSD: yppush.c,v 1.27 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: yppush.c,v 1.26 2008/06/01 21:45:08 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/resource.h>
diff --git a/usr.sbin/ypserv/yppush/yppush_err.c b/usr.sbin/ypserv/yppush/yppush_err.c
index 074aaed8d75..e678052f9ee 100644
--- a/usr.sbin/ypserv/yppush/yppush_err.c
+++ b/usr.sbin/ypserv/yppush/yppush_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppush_err.c,v 1.7 2003/07/15 06:10:46 deraadt Exp $ */
+/* $OpenBSD: yppush_err.c,v 1.8 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: yppush_err.c,v 1.7 2003/07/15 06:10:46 deraadt Exp $";
-#endif /* not lint */
-
#include <rpcsvc/yp.h>
#include "yppush.h"
diff --git a/usr.sbin/ypserv/yppush/yppush_proc.c b/usr.sbin/ypserv/yppush/yppush_proc.c
index 8e2309f3834..e147ab6edc4 100644
--- a/usr.sbin/ypserv/yppush/yppush_proc.c
+++ b/usr.sbin/ypserv/yppush/yppush_proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppush_proc.c,v 1.8 2003/07/15 06:10:46 deraadt Exp $ */
+/* $OpenBSD: yppush_proc.c,v 1.9 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: yppush_proc.c,v 1.8 2003/07/15 06:10:46 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <rpcsvc/yp.h>
#include <stdio.h>
diff --git a/usr.sbin/ypserv/yppush/yppush_svc.c b/usr.sbin/ypserv/yppush/yppush_svc.c
index 60bcc903a9d..d54ac1046b8 100644
--- a/usr.sbin/ypserv/yppush/yppush_svc.c
+++ b/usr.sbin/ypserv/yppush/yppush_svc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppush_svc.c,v 1.12 2006/04/03 05:01:23 deraadt Exp $ */
+/* $OpenBSD: yppush_svc.c,v 1.13 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: yppush_svc.c,v 1.12 2006/04/03 05:01:23 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ttycom.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ypserv/ypserv/acl.c b/usr.sbin/ypserv/ypserv/acl.c
index 82f220b12be..23a8a4a5ecd 100644
--- a/usr.sbin/ypserv/ypserv/acl.c
+++ b/usr.sbin/ypserv/ypserv/acl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acl.c,v 1.13 2006/04/03 05:01:23 deraadt Exp $ */
+/* $OpenBSD: acl.c,v 1.14 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: acl.c,v 1.13 2006/04/03 05:01:23 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c
index fb38c253b1e..bd17d318278 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.c
+++ b/usr.sbin/ypserv/ypserv/ypserv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypserv.c,v 1.35 2007/02/18 23:34:57 jmc Exp $ */
+/* $OpenBSD: ypserv.c,v 1.36 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ypserv.c,v 1.35 2007/02/18 23:34:57 jmc Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/ypserv/ypserv/ypserv_db.c b/usr.sbin/ypserv/ypserv/ypserv_db.c
index ffcbe2a0cef..24588d149eb 100644
--- a/usr.sbin/ypserv/ypserv/ypserv_db.c
+++ b/usr.sbin/ypserv/ypserv/ypserv_db.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypserv_db.c,v 1.25 2007/05/29 21:11:10 maja Exp $ */
+/* $OpenBSD: ypserv_db.c,v 1.26 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ypserv_db.c,v 1.25 2007/05/29 21:11:10 maja Exp $";
-#endif
-
/*
* major revision/cleanup of Mats' version
* done by Chuck Cranor <chuck@ccrc.wustl.edu>
diff --git a/usr.sbin/ypserv/ypserv/ypserv_proc.c b/usr.sbin/ypserv/ypserv/ypserv_proc.c
index aa5c0cad51d..174ce6006c3 100644
--- a/usr.sbin/ypserv/ypserv/ypserv_proc.c
+++ b/usr.sbin/ypserv/ypserv/ypserv_proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypserv_proc.c,v 1.26 2006/09/25 05:59:28 otto Exp $ */
+/* $OpenBSD: ypserv_proc.c,v 1.27 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ypserv_proc.c,v 1.26 2006/09/25 05:59:28 otto Exp $";
-#endif
-
#include <rpc/rpc.h>
#include <rpcsvc/yp.h>
#include "ypv1.h"
diff --git a/usr.sbin/ypserv/yptest/yptest.c b/usr.sbin/ypserv/yptest/yptest.c
index a6d64976c4a..ec9a2b12a42 100644
--- a/usr.sbin/ypserv/yptest/yptest.c
+++ b/usr.sbin/ypserv/yptest/yptest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yptest.c,v 1.16 2006/04/03 05:01:24 deraadt Exp $ */
+/* $OpenBSD: yptest.c,v 1.17 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: yptest.c,v 1.16 2006/04/03 05:01:24 deraadt Exp $";
-#endif
-
#include <stdio.h>
#include <unistd.h>
#include <string.h>
diff --git a/usr.sbin/ypserv/ypxfr/ypxfr.c b/usr.sbin/ypserv/ypxfr/ypxfr.c
index 4a9a5d87cc3..6e2dc635679 100644
--- a/usr.sbin/ypserv/ypxfr/ypxfr.c
+++ b/usr.sbin/ypserv/ypxfr/ypxfr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypxfr.c,v 1.36 2008/06/01 21:45:08 sobrado Exp $ */
+/* $OpenBSD: ypxfr.c,v 1.37 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ypxfr.c,v 1.36 2008/06/01 21:45:08 sobrado Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index 3013210b408..59d9736659b 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypset.c,v 1.18 2008/07/28 16:22:11 deraadt Exp $ */
+/* $OpenBSD: ypset.c,v 1.19 2009/10/27 23:59:58 deraadt Exp $ */
/* $NetBSD: ypset.c,v 1.8 1996/05/13 02:46:33 thorpej Exp $ */
/*
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: ypset.c,v 1.18 2008/07/28 16:22:11 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>