From b80da2a01d0bb632707b7b4e974aa32eaebbcc6f Mon Sep 17 00:00:00 2001 From: David van Moolenbroek Date: Fri, 25 Sep 2015 12:15:49 +0000 Subject: [PATCH] commands: move manpages into command directories Change-Id: Icf8a2d26629a1822725022c9ee21c587d3c4c3b4 --- distrib/sets/lists/minix/md.i386 | 2 + distrib/sets/lists/minix/mi | 33 +- minix/commands/add_route/Makefile | 2 +- .../man8 => commands/add_route}/add_route.8 | 0 minix/commands/at/Makefile | 1 - minix/{man/man1 => commands/at}/at.1 | 0 minix/commands/backup/Makefile | 2 +- minix/{man/man8 => commands/backup}/backup.8 | 0 minix/commands/cawf/Makefile | 3 - minix/{man/man1 => commands/cawf}/bsfilt.1 | 0 minix/{man/man1 => commands/cawf}/cawf.1 | 0 minix/commands/cdprobe/Makefile | 2 +- .../{man/man8 => commands/cdprobe}/cdprobe.8 | 0 minix/commands/cleantmp/Makefile | 2 +- .../man8 => commands/cleantmp}/cleantmp.8 | 0 minix/commands/compress/Makefile | 3 +- .../man1 => commands/compress}/compress.1 | 0 minix/commands/crc/Makefile | 1 - minix/{man/man1 => commands/crc}/crc.1 | 0 minix/commands/cron/Makefile | 2 +- minix/{man/man8 => commands/cron}/cron.8 | 0 minix/commands/crontab/Makefile | 1 - .../{man/man1 => commands/crontab}/crontab.1 | 0 minix/commands/dhcpd/Makefile | 2 +- .../{man/man5 => commands/dhcpd}/dhcp.conf.5 | 0 minix/{man/man8 => commands/dhcpd}/dhcpd.8 | 0 minix/commands/dhrystone/Makefile | 1 - .../man1 => commands/dhrystone}/dhrystone.1 | 0 minix/commands/dosread/Makefile | 2 +- minix/{man/man1 => commands/dosread}/dosdir.1 | 0 .../{man/man1 => commands/dosread}/dosread.1 | 0 .../{man/man1 => commands/dosread}/doswrite.1 | 0 minix/commands/eject/Makefile | 1 - minix/{man/man1 => commands/eject}/eject.1 | 0 minix/commands/fdisk/Makefile | 2 +- minix/{man/man8 => commands/fdisk}/fdisk.8 | 0 minix/commands/format/Makefile | 1 - minix/{man/man1 => commands/format}/format.1 | 0 minix/commands/fsck.mfs/Makefile | 2 +- .../man1 => commands/fsck.mfs}/fsck.mfs.1 | 0 minix/commands/host/Makefile | 1 - minix/{man/man1 => commands/host}/host.1 | 0 minix/commands/hostaddr/Makefile | 1 - .../man1 => commands/hostaddr}/hostaddr.1 | 0 minix/commands/ifconfig/Makefile | 2 +- .../man8 => commands/ifconfig}/ifconfig.8 | 0 minix/commands/ifdef/Makefile | 1 - minix/{man/man1 => commands/ifdef}/ifdef.1 | 0 minix/commands/intr/Makefile | 2 +- minix/{man/man8 => commands/intr}/intr.8 | 0 minix/commands/irdpd/Makefile | 2 +- minix/{man/man8 => commands/irdpd}/irdpd.8 | 0 minix/commands/isoread/Makefile | 2 +- minix/{man/man1 => commands/isoread}/isodir.1 | 0 .../{man/man1 => commands/isoread}/isoinfo.1 | 0 .../{man/man1 => commands/isoread}/isoread.1 | 0 minix/commands/loadfont/Makefile | 1 - .../man1 => commands/loadfont}/loadfont.1 | 0 minix/commands/loadkeys/Makefile | 1 - .../man1 => commands/loadkeys}/loadkeys.1 | 0 minix/commands/loadramdisk/Makefile | 2 +- .../loadramdisk}/loadramdisk.8 | 0 minix/commands/logger/Makefile | 1 - minix/{man/man1 => commands/logger}/logger.1 | 0 minix/commands/look/Makefile | 1 - minix/{man/man1 => commands/look}/look.1 | 0 minix/commands/lp/Makefile | 1 - minix/{man/man1 => commands/lp}/lp.1 | 0 minix/commands/lspci/Makefile | 2 +- minix/{man/man1 => commands/lspci}/lspci.1 | 0 minix/commands/mail/Makefile | 1 - minix/{man/man1 => commands/mail}/mail.1 | 0 minix/commands/mount/Makefile | 1 - minix/{man/man1 => commands/mount}/mount.1 | 0 minix/commands/mt/Makefile | 1 - minix/{man/man1 => commands/mt}/mt.1 | 0 minix/commands/netconf/Makefile | 2 +- .../{man/man8 => commands/netconf}/netconf.8 | 0 minix/commands/nonamed/Makefile | 2 +- .../{man/man8 => commands/nonamed}/nonamed.8 | 0 minix/commands/part/Makefile | 2 +- minix/{man/man8 => commands/part}/part.8 | 0 minix/commands/partition/Makefile | 2 +- .../man8 => commands/partition}/partition.8 | 0 minix/commands/playwave/Makefile | 1 - .../man1 => commands/playwave}/playwave.1 | 0 minix/commands/pr_routes/Makefile | 2 +- .../man8 => commands/pr_routes}/pr_routes.8 | 0 minix/commands/prep/Makefile | 1 - minix/{man/man1 => commands/prep}/prep.1 | 0 minix/commands/printroot/Makefile | 2 +- .../man8 => commands/printroot}/printroot.8 | 0 minix/commands/profile/Makefile | 1 - .../{man/man1 => commands/profile}/profile.1 | 0 minix/commands/ps/Makefile | 1 - minix/{man/man1 => commands/ps}/ps.1 | 0 minix/commands/pwdauth/Makefile | 2 +- .../{man/man8 => commands/pwdauth}/pwdauth.8 | 0 minix/commands/rarpd/Makefile | 2 +- minix/{man/man8 => commands/rarpd}/rarpd.8 | 0 minix/commands/readclock/Makefile | 4 +- .../man8 => commands/readclock}/readclock.8 | 0 minix/commands/recwave/Makefile | 1 - .../{man/man1 => commands/recwave}/recwave.1 | 0 minix/commands/remsync/Makefile | 1 - .../{man/man1 => commands/remsync}/remsync.1 | 0 minix/commands/repartition/Makefile | 2 +- .../repartition}/repartition.8 | 0 minix/commands/rget/Makefile | 1 - minix/{man/man1 => commands/rget}/rget.1 | 0 minix/commands/rlogin/Makefile | 1 - minix/{man/man1 => commands/rlogin}/rlogin.1 | 0 minix/commands/screendump/Makefile | 2 +- .../man8 => commands/screendump}/screendump.8 | 0 minix/commands/service/Makefile | 2 +- .../man5 => commands/service}/system.conf.5 | 0 minix/commands/setup/Makefile | 2 +- minix/{man/man8 => commands/setup}/setup.8 | 0 minix/commands/slip/Makefile | 2 +- minix/{man/man8 => commands/slip}/slip.8 | 0 minix/commands/spell/Makefile | 2 +- minix/{man/man1 => commands/spell}/spell.1 | 0 minix/commands/srccrc/Makefile | 2 +- minix/{man/man8 => commands/srccrc}/srccrc.8 | 0 minix/commands/svrctl/Makefile | 1 - minix/{man/man1 => commands/svrctl}/svrctl.1 | 0 minix/commands/synctree/Makefile | 1 - .../man1 => commands/synctree}/synctree.1 | 0 minix/commands/sysenv/Makefile | 1 - minix/{man/man1 => commands/sysenv}/sysenv.1 | 0 minix/commands/tcpd/Makefile | 2 +- minix/{man/man8 => commands/tcpd}/tcpd.8 | 0 minix/commands/telnet/Makefile | 2 +- minix/{man/man1 => commands/telnet}/telnet.1 | 0 minix/commands/term/Makefile | 1 - minix/{man/man1 => commands/term}/term.1 | 0 minix/commands/termcap/Makefile | 1 - .../{man/man1 => commands/termcap}/termcap.1 | 0 minix/commands/tget/Makefile | 1 - minix/{man/man1 => commands/tget}/tget.1 | 0 minix/commands/time/Makefile | 1 - minix/{man/man1 => commands/time}/time.1 | 0 minix/commands/truncate/Makefile | 1 - .../man1 => commands/truncate}/truncate.1 | 22 +- minix/commands/umount/Makefile | 1 - minix/{man/man1 => commands/umount}/umount.1 | 0 minix/commands/update/Makefile | 2 +- minix/{man/man8 => commands/update}/update.8 | 0 minix/commands/vol/Makefile | 1 - minix/{man/man1 => commands/vol}/vol.1 | 0 minix/commands/zmodem/Makefile | 2 - minix/{man/man1 => commands/zmodem}/rz.1 | 0 minix/{man/man1 => commands/zmodem}/sz.1 | 0 minix/fs/hgfs/Makefile | 1 + minix/{man/man8 => fs/hgfs}/hgfs.8 | 0 minix/fs/vbfs/Makefile | 1 + minix/{man/man8 => fs/vbfs}/vbfs.8 | 0 minix/man/Makefile | 2 +- minix/man/man1/Makefile | 26 - minix/man/man1/cdiff.1 | 37 - minix/man/man1/chgrp.1 | 44 - minix/man/man1/flexdoc.1 | 2442 ----------------- minix/man/man1/linkfarm.1 | 148 - minix/man/man1/mixer.1 | 24 - minix/man/man1/pkg_view.1 | 276 -- minix/man/man1/template.1 | 46 - minix/man/man1/yap.1 | 391 --- minix/man/man4/Makefile | 2 +- minix/man/man5/Makefile | 6 +- minix/man/man5/dir.5 | 43 - minix/man/man5/http_status.5 | 72 - minix/man/man5/httpd.conf.5 | 334 --- minix/man/man8/Makefile | 17 +- minix/man/man8/getty.8 | 40 - minix/man/man8/halt.8 | 33 - minix/man/man8/httpd.8 | 124 - minix/man/man8/init.8 | 141 - minix/man/man8/newroot.8 | 40 - minix/man/man8/ossdevlinks.8 | 38 - minix/man/man8/serial-ip.8 | 232 -- minix/man/man8/shutdown.8 | 86 - minix/net/inet/Makefile | 1 + minix/{man/man8 => net/inet}/inet.8 | 0 minix/net/uds/Makefile | 1 + minix/{man/man4/uds.4 => net/uds/uds.8} | 2 +- minix/{man/man8 => net/uds}/unix.8 | 2 +- minix/usr.sbin/mkproto/Makefile | 2 +- .../{man/man1 => usr.sbin/mkproto}/mkproto.1 | 0 188 files changed, 80 insertions(+), 4744 deletions(-) rename minix/{man/man8 => commands/add_route}/add_route.8 (100%) rename minix/{man/man1 => commands/at}/at.1 (100%) rename minix/{man/man8 => commands/backup}/backup.8 (100%) rename minix/{man/man1 => commands/cawf}/bsfilt.1 (100%) rename minix/{man/man1 => commands/cawf}/cawf.1 (100%) rename minix/{man/man8 => commands/cdprobe}/cdprobe.8 (100%) rename minix/{man/man8 => commands/cleantmp}/cleantmp.8 (100%) rename minix/{man/man1 => commands/compress}/compress.1 (100%) rename minix/{man/man1 => commands/crc}/crc.1 (100%) rename minix/{man/man8 => commands/cron}/cron.8 (100%) rename minix/{man/man1 => commands/crontab}/crontab.1 (100%) rename minix/{man/man5 => commands/dhcpd}/dhcp.conf.5 (100%) rename minix/{man/man8 => commands/dhcpd}/dhcpd.8 (100%) rename minix/{man/man1 => commands/dhrystone}/dhrystone.1 (100%) rename minix/{man/man1 => commands/dosread}/dosdir.1 (100%) rename minix/{man/man1 => commands/dosread}/dosread.1 (100%) rename minix/{man/man1 => commands/dosread}/doswrite.1 (100%) rename minix/{man/man1 => commands/eject}/eject.1 (100%) rename minix/{man/man8 => commands/fdisk}/fdisk.8 (100%) rename minix/{man/man1 => commands/format}/format.1 (100%) rename minix/{man/man1 => commands/fsck.mfs}/fsck.mfs.1 (100%) rename minix/{man/man1 => commands/host}/host.1 (100%) rename minix/{man/man1 => commands/hostaddr}/hostaddr.1 (100%) rename minix/{man/man8 => commands/ifconfig}/ifconfig.8 (100%) rename minix/{man/man1 => commands/ifdef}/ifdef.1 (100%) rename minix/{man/man8 => commands/intr}/intr.8 (100%) rename minix/{man/man8 => commands/irdpd}/irdpd.8 (100%) rename minix/{man/man1 => commands/isoread}/isodir.1 (100%) rename minix/{man/man1 => commands/isoread}/isoinfo.1 (100%) rename minix/{man/man1 => commands/isoread}/isoread.1 (100%) rename minix/{man/man1 => commands/loadfont}/loadfont.1 (100%) rename minix/{man/man1 => commands/loadkeys}/loadkeys.1 (100%) rename minix/{man/man8 => commands/loadramdisk}/loadramdisk.8 (100%) rename minix/{man/man1 => commands/logger}/logger.1 (100%) rename minix/{man/man1 => commands/look}/look.1 (100%) rename minix/{man/man1 => commands/lp}/lp.1 (100%) rename minix/{man/man1 => commands/lspci}/lspci.1 (100%) rename minix/{man/man1 => commands/mail}/mail.1 (100%) rename minix/{man/man1 => commands/mount}/mount.1 (100%) rename minix/{man/man1 => commands/mt}/mt.1 (100%) rename minix/{man/man8 => commands/netconf}/netconf.8 (100%) rename minix/{man/man8 => commands/nonamed}/nonamed.8 (100%) rename minix/{man/man8 => commands/part}/part.8 (100%) rename minix/{man/man8 => commands/partition}/partition.8 (100%) rename minix/{man/man1 => commands/playwave}/playwave.1 (100%) rename minix/{man/man8 => commands/pr_routes}/pr_routes.8 (100%) rename minix/{man/man1 => commands/prep}/prep.1 (100%) rename minix/{man/man8 => commands/printroot}/printroot.8 (100%) rename minix/{man/man1 => commands/profile}/profile.1 (100%) rename minix/{man/man1 => commands/ps}/ps.1 (100%) rename minix/{man/man8 => commands/pwdauth}/pwdauth.8 (100%) rename minix/{man/man8 => commands/rarpd}/rarpd.8 (100%) rename minix/{man/man8 => commands/readclock}/readclock.8 (100%) rename minix/{man/man1 => commands/recwave}/recwave.1 (100%) rename minix/{man/man1 => commands/remsync}/remsync.1 (100%) rename minix/{man/man8 => commands/repartition}/repartition.8 (100%) rename minix/{man/man1 => commands/rget}/rget.1 (100%) rename minix/{man/man1 => commands/rlogin}/rlogin.1 (100%) rename minix/{man/man8 => commands/screendump}/screendump.8 (100%) rename minix/{man/man5 => commands/service}/system.conf.5 (100%) rename minix/{man/man8 => commands/setup}/setup.8 (100%) rename minix/{man/man8 => commands/slip}/slip.8 (100%) rename minix/{man/man1 => commands/spell}/spell.1 (100%) rename minix/{man/man8 => commands/srccrc}/srccrc.8 (100%) rename minix/{man/man1 => commands/svrctl}/svrctl.1 (100%) rename minix/{man/man1 => commands/synctree}/synctree.1 (100%) rename minix/{man/man1 => commands/sysenv}/sysenv.1 (100%) rename minix/{man/man8 => commands/tcpd}/tcpd.8 (100%) rename minix/{man/man1 => commands/telnet}/telnet.1 (100%) rename minix/{man/man1 => commands/term}/term.1 (100%) rename minix/{man/man1 => commands/termcap}/termcap.1 (100%) rename minix/{man/man1 => commands/tget}/tget.1 (100%) rename minix/{man/man1 => commands/time}/time.1 (100%) rename minix/{man/man1 => commands/truncate}/truncate.1 (96%) rename minix/{man/man1 => commands/umount}/umount.1 (100%) rename minix/{man/man8 => commands/update}/update.8 (100%) rename minix/{man/man1 => commands/vol}/vol.1 (100%) rename minix/{man/man1 => commands/zmodem}/rz.1 (100%) rename minix/{man/man1 => commands/zmodem}/sz.1 (100%) rename minix/{man/man8 => fs/hgfs}/hgfs.8 (100%) rename minix/{man/man8 => fs/vbfs}/vbfs.8 (100%) delete mode 100644 minix/man/man1/Makefile delete mode 100644 minix/man/man1/cdiff.1 delete mode 100644 minix/man/man1/chgrp.1 delete mode 100644 minix/man/man1/flexdoc.1 delete mode 100644 minix/man/man1/linkfarm.1 delete mode 100644 minix/man/man1/mixer.1 delete mode 100644 minix/man/man1/pkg_view.1 delete mode 100644 minix/man/man1/template.1 delete mode 100644 minix/man/man1/yap.1 delete mode 100644 minix/man/man5/dir.5 delete mode 100644 minix/man/man5/http_status.5 delete mode 100644 minix/man/man5/httpd.conf.5 delete mode 100644 minix/man/man8/getty.8 delete mode 100644 minix/man/man8/halt.8 delete mode 100644 minix/man/man8/httpd.8 delete mode 100644 minix/man/man8/init.8 delete mode 100644 minix/man/man8/newroot.8 delete mode 100644 minix/man/man8/ossdevlinks.8 delete mode 100644 minix/man/man8/serial-ip.8 delete mode 100644 minix/man/man8/shutdown.8 rename minix/{man/man8 => net/inet}/inet.8 (100%) rename minix/{man/man4/uds.4 => net/uds/uds.8} (97%) rename minix/{man/man8 => net/uds}/unix.8 (98%) rename minix/{man/man1 => usr.sbin/mkproto}/mkproto.1 (100%) diff --git a/distrib/sets/lists/minix/md.i386 b/distrib/sets/lists/minix/md.i386 index 60f4f4d44..13a731d1d 100644 --- a/distrib/sets/lists/minix/md.i386 +++ b/distrib/sets/lists/minix/md.i386 @@ -167,6 +167,8 @@ ./usr/lib/libvirtio.a minix-sys ./usr/lib/libvirtio_pic.a minix-sys ./usr/mdec minix-sys +./usr/man/man8/hgfs.8 minix-sys +./usr/man/man8/vbfs.8 minix-sys ./usr/mdec/boot_monitor minix-sys ./usr/mdec/bootxx_cd9660 minix-sys ./usr/mdec/bootxx_ext2fs minix-sys diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index 691c27a27..6ba620154 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -2405,7 +2405,7 @@ ./usr/man/man1/find.1 minix-sys ./usr/man/man1/finger.1 minix-sys ./usr/man/man1/flex.1 minix-sys -./usr/man/man1/flexdoc.1 minix-sys +./usr/man/man1/flexdoc.1 minix-sys obsolete ./usr/man/man1/flock.1 minix-sys ./usr/man/man1/fold.1 minix-sys ./usr/man/man1/for.1 minix-sys obsolete @@ -2476,7 +2476,7 @@ ./usr/man/man1/lessecho.1 minix-sys ./usr/man/man1/lesskey.1 minix-sys ./usr/man/man1/lex.1 minix-sys -./usr/man/man1/linkfarm.1 minix-sys +./usr/man/man1/linkfarm.1 minix-sys obsolete ./usr/man/man1/ln.1 minix-sys ./usr/man/man1/loadfont.1 minix-sys ./usr/man/man1/loadkeys.1 minix-sys @@ -2509,7 +2509,7 @@ ./usr/man/man1/mesg.1 minix-sys ./usr/man/man1/mined.1 minix-sys ./usr/man/man1/ministat.1 minix-sys -./usr/man/man1/mixer.1 minix-sys +./usr/man/man1/mixer.1 minix-sys obsolete ./usr/man/man1/mkdep.1 minix-sys ./usr/man/man1/mkdir.1 minix-sys ./usr/man/man1/mkfifo.1 minix-sys @@ -2539,7 +2539,7 @@ ./usr/man/man1/pathchk.1 minix-sys ./usr/man/man1/pax.1 minix-sys ./usr/man/man1/ping.1 minix-sys obsolete -./usr/man/man1/pkg_view.1 minix-sys +./usr/man/man1/pkg_view.1 minix-sys obsolete ./usr/man/man1/playwave.1 minix-sys ./usr/man/man1/pr.1 minix-sys ./usr/man/man1/prep.1 minix-sys @@ -2600,7 +2600,7 @@ ./usr/man/man1/tar.1 minix-sys ./usr/man/man1/tee.1 minix-sys ./usr/man/man1/telnet.1 minix-sys -./usr/man/man1/template.1 minix-sys +./usr/man/man1/template.1 minix-sys obsolete ./usr/man/man1/term.1 minix-sys ./usr/man/man1/termcap.1 minix-sys ./usr/man/man1/test.1 minix-sys @@ -2664,7 +2664,7 @@ ./usr/man/man1/xz.1 minix-sys ./usr/man/man1/xzcat.1 minix-sys ./usr/man/man1/yacc.1 minix-sys -./usr/man/man1/yap.1 minix-sys +./usr/man/man1/yap.1 minix-sys obsolete ./usr/man/man1/yes.1 minix-sys ./usr/man/man1/zcat.1 minix-sys ./usr/man/man1/zcmp.1 minix-sys @@ -5098,7 +5098,7 @@ ./usr/man/man4/tape.4 minix-sys ./usr/man/man4/tty.4 minix-sys ./usr/man/man4/udp.4 minix-sys -./usr/man/man4/uds.4 minix-sys +./usr/man/man4/uds.4 minix-sys obsolete ./usr/man/man5 minix-sys ./usr/man/man5/atf-formats.5 minix-sys atf ./usr/man/man5/boot.cfg.5 minix-sys @@ -5107,7 +5107,7 @@ ./usr/man/man5/cpio.5 minix-sys ./usr/man/man5/crontab.5 minix-sys ./usr/man/man5/dhcp.conf.5 minix-sys -./usr/man/man5/dir.5 minix-sys +./usr/man/man5/dir.5 minix-sys obsolete ./usr/man/man5/editrc.5 minix-sys ./usr/man/man5/ethers.5 minix-sys ./usr/man/man5/fstab.5 minix-sys @@ -5117,8 +5117,8 @@ ./usr/man/man5/gettytab.5 minix-sys ./usr/man/man5/group.5 minix-sys ./usr/man/man5/hosts.5 minix-sys -./usr/man/man5/httpd.conf.5 minix-sys -./usr/man/man5/http_status.5 minix-sys +./usr/man/man5/httpd.conf.5 minix-sys obsolete +./usr/man/man5/http_status.5 minix-sys obsolete ./usr/man/man5/info.5 minix-sys ./usr/man/man5/keymap.5 minix-sys ./usr/man/man5/kyua.conf.5 minix-sys kyua @@ -5222,12 +5222,11 @@ ./usr/man/man8/groupinfo.8 minix-sys ./usr/man/man8/groupmod.8 minix-sys ./usr/man/man8/halt.8 minix-sys -./usr/man/man8/hgfs.8 minix-sys -./usr/man/man8/httpd.8 minix-sys +./usr/man/man8/httpd.8 minix-sys obsolete ./usr/man/man8/i2cscan.8 minix-sys ./usr/man/man8/ifconfig.8 minix-sys ./usr/man/man8/inet.8 minix-sys -./usr/man/man8/in.httpd.8 minix-sys +./usr/man/man8/in.httpd.8 minix-sys obsolete ./usr/man/man8/init.8 minix-sys ./usr/man/man8/installboot_nbsd.8 minix-sys ./usr/man/man8/intr.8 minix-sys @@ -5240,10 +5239,10 @@ ./usr/man/man8/mtree.8 minix-sys ./usr/man/man8/netconf.8 minix-sys ./usr/man/man8/newfs_ext2fs.8 minix-sys -./usr/man/man8/newroot.8 minix-sys +./usr/man/man8/newroot.8 minix-sys obsolete ./usr/man/man8/nologin.8 minix-sys ./usr/man/man8/nonamed.8 minix-sys -./usr/man/man8/ossdevlinks.8 minix-sys +./usr/man/man8/ossdevlinks.8 minix-sys obsolete ./usr/man/man8/part.8 minix-sys ./usr/man/man8/partition.8 minix-sys ./usr/man/man8/ping.8 minix-sys @@ -5263,7 +5262,7 @@ ./usr/man/man8/rotate.8 minix-sys ./usr/man/man8/rshd.8 minix-sys ./usr/man/man8/screendump.8 minix-sys -./usr/man/man8/serial-ip.8 minix-sys +./usr/man/man8/serial-ip.8 minix-sys obsolete ./usr/man/man8/service.8 minix-sys ./usr/man/man8/setup.8 minix-sys ./usr/man/man8/shutdown.8 minix-sys @@ -5276,6 +5275,7 @@ ./usr/man/man8/syslogd.8 minix-sys ./usr/man/man8/tcpd.8 minix-sys ./usr/man/man8/traceroute.8 minix-sys +./usr/man/man8/uds.8 minix-sys ./usr/man/man8/unix.8 minix-sys ./usr/man/man8/unlink.8 minix-sys ./usr/man/man8/unstr.8 minix-sys @@ -5289,7 +5289,6 @@ ./usr/man/man8/userdel.8 minix-sys ./usr/man/man8/userinfo.8 minix-sys ./usr/man/man8/usermod.8 minix-sys -./usr/man/man8/vbfs.8 minix-sys ./usr/man/man8/vipw.8 minix-sys ./usr/man/man8/virecover.8 minix-sys ./usr/man/man8/vnconfig.8 minix-sys diff --git a/minix/commands/add_route/Makefile b/minix/commands/add_route/Makefile index 350296a3b..e1e0d742f 100644 --- a/minix/commands/add_route/Makefile +++ b/minix/commands/add_route/Makefile @@ -1,5 +1,5 @@ PROG= add_route -MAN= +MAN= add_route.8 LINKS+= ${BINDIR}/add_route ${BINDIR}/del_route diff --git a/minix/man/man8/add_route.8 b/minix/commands/add_route/add_route.8 similarity index 100% rename from minix/man/man8/add_route.8 rename to minix/commands/add_route/add_route.8 diff --git a/minix/commands/at/Makefile b/minix/commands/at/Makefile index 65e8e3b86..2ceeac4f6 100644 --- a/minix/commands/at/Makefile +++ b/minix/commands/at/Makefile @@ -1,5 +1,4 @@ PROG= at BINMODE= 4755 -MAN= .include diff --git a/minix/man/man1/at.1 b/minix/commands/at/at.1 similarity index 100% rename from minix/man/man1/at.1 rename to minix/commands/at/at.1 diff --git a/minix/commands/backup/Makefile b/minix/commands/backup/Makefile index 0d4a75d35..ba759fec3 100644 --- a/minix/commands/backup/Makefile +++ b/minix/commands/backup/Makefile @@ -1,5 +1,5 @@ PROG= backup -MAN= +MAN= backup.8 LINKS+= ${BINDIR}/backup ${BINDIR}/restore diff --git a/minix/man/man8/backup.8 b/minix/commands/backup/backup.8 similarity index 100% rename from minix/man/man8/backup.8 rename to minix/commands/backup/backup.8 diff --git a/minix/commands/cawf/Makefile b/minix/commands/cawf/Makefile index 170cfd4c2..c7bd03815 100644 --- a/minix/commands/cawf/Makefile +++ b/minix/commands/cawf/Makefile @@ -46,9 +46,6 @@ LINKS+= ${BINDIR}/cawf ${BINDIR}/nroff # replaced by usr.bin/colcrt #LINKS+= ${BINDIR}/bsfilt ${BINDIR}/colcrt -MAN.cawf= -MAN.bsfilt= - FILESDIR= /usr/lib/cawf FILES= common device.cf dumb.dev man.mac me.mac ms.mac mnx.mac diff --git a/minix/man/man1/bsfilt.1 b/minix/commands/cawf/bsfilt.1 similarity index 100% rename from minix/man/man1/bsfilt.1 rename to minix/commands/cawf/bsfilt.1 diff --git a/minix/man/man1/cawf.1 b/minix/commands/cawf/cawf.1 similarity index 100% rename from minix/man/man1/cawf.1 rename to minix/commands/cawf/cawf.1 diff --git a/minix/commands/cdprobe/Makefile b/minix/commands/cdprobe/Makefile index 238a4c7ee..3d8b42d4e 100644 --- a/minix/commands/cdprobe/Makefile +++ b/minix/commands/cdprobe/Makefile @@ -1,5 +1,5 @@ PROG= cdprobe CPPFLAGS+= -I${NETBSDSRCDIR}/minix/fs -MAN= +MAN= cdprobe.8 .include diff --git a/minix/man/man8/cdprobe.8 b/minix/commands/cdprobe/cdprobe.8 similarity index 100% rename from minix/man/man8/cdprobe.8 rename to minix/commands/cdprobe/cdprobe.8 diff --git a/minix/commands/cleantmp/Makefile b/minix/commands/cleantmp/Makefile index ff4c1f285..3cbb5efaa 100644 --- a/minix/commands/cleantmp/Makefile +++ b/minix/commands/cleantmp/Makefile @@ -1,4 +1,4 @@ PROG= cleantmp -MAN= +MAN= cleantmp.8 .include diff --git a/minix/man/man8/cleantmp.8 b/minix/commands/cleantmp/cleantmp.8 similarity index 100% rename from minix/man/man8/cleantmp.8 rename to minix/commands/cleantmp/cleantmp.8 diff --git a/minix/commands/compress/Makefile b/minix/commands/compress/Makefile index 8243f7655..7ee891b45 100644 --- a/minix/commands/compress/Makefile +++ b/minix/commands/compress/Makefile @@ -1,6 +1,7 @@ PROG= compress -MAN= LINKS+= ${BINDIR}/compress ${BINDIR}/uncompress +MLINKS+= compress.1 uncompress.1 + .include diff --git a/minix/man/man1/compress.1 b/minix/commands/compress/compress.1 similarity index 100% rename from minix/man/man1/compress.1 rename to minix/commands/compress/compress.1 diff --git a/minix/commands/crc/Makefile b/minix/commands/crc/Makefile index e07f16f19..0e72c4393 100644 --- a/minix/commands/crc/Makefile +++ b/minix/commands/crc/Makefile @@ -1,4 +1,3 @@ PROG= crc -MAN= .include diff --git a/minix/man/man1/crc.1 b/minix/commands/crc/crc.1 similarity index 100% rename from minix/man/man1/crc.1 rename to minix/commands/crc/crc.1 diff --git a/minix/commands/cron/Makefile b/minix/commands/cron/Makefile index df2ab4c1b..22d1196d2 100644 --- a/minix/commands/cron/Makefile +++ b/minix/commands/cron/Makefile @@ -1,6 +1,6 @@ # Makefile for cron. PROG= cron SRCS= cron.c tab.c misc.c -MAN= +MAN= cron.8 .include diff --git a/minix/man/man8/cron.8 b/minix/commands/cron/cron.8 similarity index 100% rename from minix/man/man8/cron.8 rename to minix/commands/cron/cron.8 diff --git a/minix/commands/crontab/Makefile b/minix/commands/crontab/Makefile index 29b4a2718..b2b30b990 100644 --- a/minix/commands/crontab/Makefile +++ b/minix/commands/crontab/Makefile @@ -6,7 +6,6 @@ PROG= crontab SRCS= crontab.c tab.c misc.c CPPFLAGS+= -I${.CURDIR} -I${NETBSDSRCDIR}/minix/commands/cron BINMODE= 4755 -MAN= .PATH: ${NETBSDSRCDIR}/minix/commands/cron diff --git a/minix/man/man1/crontab.1 b/minix/commands/crontab/crontab.1 similarity index 100% rename from minix/man/man1/crontab.1 rename to minix/commands/crontab/crontab.1 diff --git a/minix/commands/dhcpd/Makefile b/minix/commands/dhcpd/Makefile index 140616514..ec9267b41 100644 --- a/minix/commands/dhcpd/Makefile +++ b/minix/commands/dhcpd/Makefile @@ -2,6 +2,6 @@ PROG= dhcpd SRCS= dhcpd.c tags.c devices.c ether.c -MAN= +MAN= dhcpd.8 dhcp.conf.5 .include diff --git a/minix/man/man5/dhcp.conf.5 b/minix/commands/dhcpd/dhcp.conf.5 similarity index 100% rename from minix/man/man5/dhcp.conf.5 rename to minix/commands/dhcpd/dhcp.conf.5 diff --git a/minix/man/man8/dhcpd.8 b/minix/commands/dhcpd/dhcpd.8 similarity index 100% rename from minix/man/man8/dhcpd.8 rename to minix/commands/dhcpd/dhcpd.8 diff --git a/minix/commands/dhrystone/Makefile b/minix/commands/dhrystone/Makefile index 8f7bef374..1f907d5db 100644 --- a/minix/commands/dhrystone/Makefile +++ b/minix/commands/dhrystone/Makefile @@ -1,4 +1,3 @@ PROG= dhrystone -MAN= .include diff --git a/minix/man/man1/dhrystone.1 b/minix/commands/dhrystone/dhrystone.1 similarity index 100% rename from minix/man/man1/dhrystone.1 rename to minix/commands/dhrystone/dhrystone.1 diff --git a/minix/commands/dosread/Makefile b/minix/commands/dosread/Makefile index 5b694f9d7..aaebc762c 100644 --- a/minix/commands/dosread/Makefile +++ b/minix/commands/dosread/Makefile @@ -1,5 +1,5 @@ PROG= dosread -MAN= +MAN= dosread.1 doswrite.1 dosdir.1 LINKS+= ${BINDIR}/dosread ${BINDIR}/doswrite LINKS+= ${BINDIR}/dosread ${BINDIR}/dosdir diff --git a/minix/man/man1/dosdir.1 b/minix/commands/dosread/dosdir.1 similarity index 100% rename from minix/man/man1/dosdir.1 rename to minix/commands/dosread/dosdir.1 diff --git a/minix/man/man1/dosread.1 b/minix/commands/dosread/dosread.1 similarity index 100% rename from minix/man/man1/dosread.1 rename to minix/commands/dosread/dosread.1 diff --git a/minix/man/man1/doswrite.1 b/minix/commands/dosread/doswrite.1 similarity index 100% rename from minix/man/man1/doswrite.1 rename to minix/commands/dosread/doswrite.1 diff --git a/minix/commands/eject/Makefile b/minix/commands/eject/Makefile index 24b9b0055..92e678d1c 100644 --- a/minix/commands/eject/Makefile +++ b/minix/commands/eject/Makefile @@ -1,4 +1,3 @@ PROG= eject -MAN= .include diff --git a/minix/man/man1/eject.1 b/minix/commands/eject/eject.1 similarity index 100% rename from minix/man/man1/eject.1 rename to minix/commands/eject/eject.1 diff --git a/minix/commands/fdisk/Makefile b/minix/commands/fdisk/Makefile index cbf169b08..9730b6a44 100644 --- a/minix/commands/fdisk/Makefile +++ b/minix/commands/fdisk/Makefile @@ -1,4 +1,4 @@ PROG= fdisk -MAN= +MAN= fdisk.8 .include diff --git a/minix/man/man8/fdisk.8 b/minix/commands/fdisk/fdisk.8 similarity index 100% rename from minix/man/man8/fdisk.8 rename to minix/commands/fdisk/fdisk.8 diff --git a/minix/commands/format/Makefile b/minix/commands/format/Makefile index 7d0de0436..78d1f9178 100644 --- a/minix/commands/format/Makefile +++ b/minix/commands/format/Makefile @@ -1,4 +1,3 @@ PROG= format -MAN= .include diff --git a/minix/man/man1/format.1 b/minix/commands/format/format.1 similarity index 100% rename from minix/man/man1/format.1 rename to minix/commands/format/format.1 diff --git a/minix/commands/fsck.mfs/Makefile b/minix/commands/fsck.mfs/Makefile index adb971a93..a1482444b 100644 --- a/minix/commands/fsck.mfs/Makefile +++ b/minix/commands/fsck.mfs/Makefile @@ -3,6 +3,6 @@ PROG= fsck_mfs SRCS= fsck.c CPPFLAGS+= -I${NETBSDSRCDIR}/minix/fs -I${FSCK} BINDIR= /sbin -MAN= +MAN= fsck.mfs.1 .include diff --git a/minix/man/man1/fsck.mfs.1 b/minix/commands/fsck.mfs/fsck.mfs.1 similarity index 100% rename from minix/man/man1/fsck.mfs.1 rename to minix/commands/fsck.mfs/fsck.mfs.1 diff --git a/minix/commands/host/Makefile b/minix/commands/host/Makefile index 1186419b0..c8a2abcf9 100644 --- a/minix/commands/host/Makefile +++ b/minix/commands/host/Makefile @@ -1,4 +1,3 @@ PROG= host -MAN= .include diff --git a/minix/man/man1/host.1 b/minix/commands/host/host.1 similarity index 100% rename from minix/man/man1/host.1 rename to minix/commands/host/host.1 diff --git a/minix/commands/hostaddr/Makefile b/minix/commands/hostaddr/Makefile index 3828d967c..5b382be84 100644 --- a/minix/commands/hostaddr/Makefile +++ b/minix/commands/hostaddr/Makefile @@ -1,4 +1,3 @@ PROG= hostaddr -MAN= .include diff --git a/minix/man/man1/hostaddr.1 b/minix/commands/hostaddr/hostaddr.1 similarity index 100% rename from minix/man/man1/hostaddr.1 rename to minix/commands/hostaddr/hostaddr.1 diff --git a/minix/commands/ifconfig/Makefile b/minix/commands/ifconfig/Makefile index 3f6f2127f..03f0f3c9e 100644 --- a/minix/commands/ifconfig/Makefile +++ b/minix/commands/ifconfig/Makefile @@ -1,4 +1,4 @@ PROG= ifconfig -MAN= +MAN= ifconfig.8 .include diff --git a/minix/man/man8/ifconfig.8 b/minix/commands/ifconfig/ifconfig.8 similarity index 100% rename from minix/man/man8/ifconfig.8 rename to minix/commands/ifconfig/ifconfig.8 diff --git a/minix/commands/ifdef/Makefile b/minix/commands/ifdef/Makefile index 6328f1968..69167c2f4 100644 --- a/minix/commands/ifdef/Makefile +++ b/minix/commands/ifdef/Makefile @@ -1,4 +1,3 @@ PROG= ifdef -MAN= .include diff --git a/minix/man/man1/ifdef.1 b/minix/commands/ifdef/ifdef.1 similarity index 100% rename from minix/man/man1/ifdef.1 rename to minix/commands/ifdef/ifdef.1 diff --git a/minix/commands/intr/Makefile b/minix/commands/intr/Makefile index 579e447d6..73836d04b 100644 --- a/minix/commands/intr/Makefile +++ b/minix/commands/intr/Makefile @@ -1,5 +1,5 @@ PROG= intr BINDIR= /bin -MAN= +MAN= intr.8 .include diff --git a/minix/man/man8/intr.8 b/minix/commands/intr/intr.8 similarity index 100% rename from minix/man/man8/intr.8 rename to minix/commands/intr/intr.8 diff --git a/minix/commands/irdpd/Makefile b/minix/commands/irdpd/Makefile index 5df971fd1..64cdc624d 100644 --- a/minix/commands/irdpd/Makefile +++ b/minix/commands/irdpd/Makefile @@ -1,4 +1,4 @@ PROG= irdpd -MAN= +MAN= irdpd.8 .include diff --git a/minix/man/man8/irdpd.8 b/minix/commands/irdpd/irdpd.8 similarity index 100% rename from minix/man/man8/irdpd.8 rename to minix/commands/irdpd/irdpd.8 diff --git a/minix/commands/isoread/Makefile b/minix/commands/isoread/Makefile index 952acafca..0bc2064d6 100644 --- a/minix/commands/isoread/Makefile +++ b/minix/commands/isoread/Makefile @@ -1,5 +1,5 @@ PROG= isoread -MAN= +MAN= isoread.1 isodir.1 isoinfo.1 LINKS+= ${BINDIR}/isoread ${BINDIR}/isodir LINKS+= ${BINDIR}/isoread ${BINDIR}/isoinfo diff --git a/minix/man/man1/isodir.1 b/minix/commands/isoread/isodir.1 similarity index 100% rename from minix/man/man1/isodir.1 rename to minix/commands/isoread/isodir.1 diff --git a/minix/man/man1/isoinfo.1 b/minix/commands/isoread/isoinfo.1 similarity index 100% rename from minix/man/man1/isoinfo.1 rename to minix/commands/isoread/isoinfo.1 diff --git a/minix/man/man1/isoread.1 b/minix/commands/isoread/isoread.1 similarity index 100% rename from minix/man/man1/isoread.1 rename to minix/commands/isoread/isoread.1 diff --git a/minix/commands/loadfont/Makefile b/minix/commands/loadfont/Makefile index 8e64875c5..c0f454fdc 100644 --- a/minix/commands/loadfont/Makefile +++ b/minix/commands/loadfont/Makefile @@ -1,4 +1,3 @@ PROG= loadfont -MAN= .include diff --git a/minix/man/man1/loadfont.1 b/minix/commands/loadfont/loadfont.1 similarity index 100% rename from minix/man/man1/loadfont.1 rename to minix/commands/loadfont/loadfont.1 diff --git a/minix/commands/loadkeys/Makefile b/minix/commands/loadkeys/Makefile index 5f24f2328..e0d0846ef 100644 --- a/minix/commands/loadkeys/Makefile +++ b/minix/commands/loadkeys/Makefile @@ -1,5 +1,4 @@ PROG= loadkeys BINDIR= /bin -MAN= .include diff --git a/minix/man/man1/loadkeys.1 b/minix/commands/loadkeys/loadkeys.1 similarity index 100% rename from minix/man/man1/loadkeys.1 rename to minix/commands/loadkeys/loadkeys.1 diff --git a/minix/commands/loadramdisk/Makefile b/minix/commands/loadramdisk/Makefile index 7f19f90dd..ab526d82d 100644 --- a/minix/commands/loadramdisk/Makefile +++ b/minix/commands/loadramdisk/Makefile @@ -1,4 +1,4 @@ PROG= loadramdisk -MAN= +MAN= loadramdisk.8 .include diff --git a/minix/man/man8/loadramdisk.8 b/minix/commands/loadramdisk/loadramdisk.8 similarity index 100% rename from minix/man/man8/loadramdisk.8 rename to minix/commands/loadramdisk/loadramdisk.8 diff --git a/minix/commands/logger/Makefile b/minix/commands/logger/Makefile index ac8698341..b91335469 100644 --- a/minix/commands/logger/Makefile +++ b/minix/commands/logger/Makefile @@ -1,4 +1,3 @@ PROG= logger -MAN= .include diff --git a/minix/man/man1/logger.1 b/minix/commands/logger/logger.1 similarity index 100% rename from minix/man/man1/logger.1 rename to minix/commands/logger/logger.1 diff --git a/minix/commands/look/Makefile b/minix/commands/look/Makefile index e4e0f7196..e1331bfdc 100644 --- a/minix/commands/look/Makefile +++ b/minix/commands/look/Makefile @@ -1,4 +1,3 @@ PROG= look -MAN= .include diff --git a/minix/man/man1/look.1 b/minix/commands/look/look.1 similarity index 100% rename from minix/man/man1/look.1 rename to minix/commands/look/look.1 diff --git a/minix/commands/lp/Makefile b/minix/commands/lp/Makefile index e0c1d933c..3672a188b 100644 --- a/minix/commands/lp/Makefile +++ b/minix/commands/lp/Makefile @@ -1,4 +1,3 @@ PROG= lp -MAN= .include diff --git a/minix/man/man1/lp.1 b/minix/commands/lp/lp.1 similarity index 100% rename from minix/man/man1/lp.1 rename to minix/commands/lp/lp.1 diff --git a/minix/commands/lspci/Makefile b/minix/commands/lspci/Makefile index bc82f474d..5a0399779 100644 --- a/minix/commands/lspci/Makefile +++ b/minix/commands/lspci/Makefile @@ -1,4 +1,4 @@ SCRIPTS= lspci.sh -MAN= +MAN= lspci.1 .include diff --git a/minix/man/man1/lspci.1 b/minix/commands/lspci/lspci.1 similarity index 100% rename from minix/man/man1/lspci.1 rename to minix/commands/lspci/lspci.1 diff --git a/minix/commands/mail/Makefile b/minix/commands/mail/Makefile index b7f35183f..202262be5 100644 --- a/minix/commands/mail/Makefile +++ b/minix/commands/mail/Makefile @@ -1,5 +1,4 @@ PROG= mail BINMODE= 4755 -MAN= .include diff --git a/minix/man/man1/mail.1 b/minix/commands/mail/mail.1 similarity index 100% rename from minix/man/man1/mail.1 rename to minix/commands/mail/mail.1 diff --git a/minix/commands/mount/Makefile b/minix/commands/mount/Makefile index c708bfdc2..ef0682ec5 100644 --- a/minix/commands/mount/Makefile +++ b/minix/commands/mount/Makefile @@ -1,5 +1,4 @@ PROG= mount BINDIR= /bin -MAN= .include diff --git a/minix/man/man1/mount.1 b/minix/commands/mount/mount.1 similarity index 100% rename from minix/man/man1/mount.1 rename to minix/commands/mount/mount.1 diff --git a/minix/commands/mt/Makefile b/minix/commands/mt/Makefile index 1aa8c53bc..dcd28a78e 100644 --- a/minix/commands/mt/Makefile +++ b/minix/commands/mt/Makefile @@ -1,4 +1,3 @@ PROG= mt -MAN= .include diff --git a/minix/man/man1/mt.1 b/minix/commands/mt/mt.1 similarity index 100% rename from minix/man/man1/mt.1 rename to minix/commands/mt/mt.1 diff --git a/minix/commands/netconf/Makefile b/minix/commands/netconf/Makefile index 8a30ab1fd..22ad46e88 100644 --- a/minix/commands/netconf/Makefile +++ b/minix/commands/netconf/Makefile @@ -1,5 +1,5 @@ SCRIPTS= netconf.sh BINDIR= /bin -MAN= +MAN= netconf.8 .include diff --git a/minix/man/man8/netconf.8 b/minix/commands/netconf/netconf.8 similarity index 100% rename from minix/man/man8/netconf.8 rename to minix/commands/netconf/netconf.8 diff --git a/minix/commands/nonamed/Makefile b/minix/commands/nonamed/Makefile index 251068e78..b9a10b1d5 100644 --- a/minix/commands/nonamed/Makefile +++ b/minix/commands/nonamed/Makefile @@ -1,4 +1,4 @@ PROG= nonamed -MAN= +MAN= nonamed.8 .include diff --git a/minix/man/man8/nonamed.8 b/minix/commands/nonamed/nonamed.8 similarity index 100% rename from minix/man/man8/nonamed.8 rename to minix/commands/nonamed/nonamed.8 diff --git a/minix/commands/part/Makefile b/minix/commands/part/Makefile index 6106023dd..574550bbb 100644 --- a/minix/commands/part/Makefile +++ b/minix/commands/part/Makefile @@ -1,4 +1,4 @@ PROG= part -MAN= +MAN= part.8 .include diff --git a/minix/man/man8/part.8 b/minix/commands/part/part.8 similarity index 100% rename from minix/man/man8/part.8 rename to minix/commands/part/part.8 diff --git a/minix/commands/partition/Makefile b/minix/commands/partition/Makefile index 4d7418456..89b1747a4 100644 --- a/minix/commands/partition/Makefile +++ b/minix/commands/partition/Makefile @@ -1,5 +1,5 @@ PROG= partition -MAN= +MAN= partition.8 # We need this to find our partition.h while compiling natively # on non-Minix. diff --git a/minix/man/man8/partition.8 b/minix/commands/partition/partition.8 similarity index 100% rename from minix/man/man8/partition.8 rename to minix/commands/partition/partition.8 diff --git a/minix/commands/playwave/Makefile b/minix/commands/playwave/Makefile index d11f8fb00..54831ecaf 100644 --- a/minix/commands/playwave/Makefile +++ b/minix/commands/playwave/Makefile @@ -1,4 +1,3 @@ PROG= playwave -MAN= .include diff --git a/minix/man/man1/playwave.1 b/minix/commands/playwave/playwave.1 similarity index 100% rename from minix/man/man1/playwave.1 rename to minix/commands/playwave/playwave.1 diff --git a/minix/commands/pr_routes/Makefile b/minix/commands/pr_routes/Makefile index a79af1a39..87cddaa2b 100644 --- a/minix/commands/pr_routes/Makefile +++ b/minix/commands/pr_routes/Makefile @@ -1,4 +1,4 @@ PROG= pr_routes -MAN= +MAN= pr_routes.8 .include diff --git a/minix/man/man8/pr_routes.8 b/minix/commands/pr_routes/pr_routes.8 similarity index 100% rename from minix/man/man8/pr_routes.8 rename to minix/commands/pr_routes/pr_routes.8 diff --git a/minix/commands/prep/Makefile b/minix/commands/prep/Makefile index eef68c664..af06a58b5 100644 --- a/minix/commands/prep/Makefile +++ b/minix/commands/prep/Makefile @@ -1,4 +1,3 @@ PROG= prep -MAN= .include diff --git a/minix/man/man1/prep.1 b/minix/commands/prep/prep.1 similarity index 100% rename from minix/man/man1/prep.1 rename to minix/commands/prep/prep.1 diff --git a/minix/commands/printroot/Makefile b/minix/commands/printroot/Makefile index 92f1bda09..3a0f02f5b 100644 --- a/minix/commands/printroot/Makefile +++ b/minix/commands/printroot/Makefile @@ -1,5 +1,5 @@ PROG= printroot BINDIR= /bin -MAN= +MAN= printroot.8 .include diff --git a/minix/man/man8/printroot.8 b/minix/commands/printroot/printroot.8 similarity index 100% rename from minix/man/man8/printroot.8 rename to minix/commands/printroot/printroot.8 diff --git a/minix/commands/profile/Makefile b/minix/commands/profile/Makefile index d97a89570..5c624014c 100644 --- a/minix/commands/profile/Makefile +++ b/minix/commands/profile/Makefile @@ -1,6 +1,5 @@ # Makefile for profile PROG= profile -MAN= .include diff --git a/minix/man/man1/profile.1 b/minix/commands/profile/profile.1 similarity index 100% rename from minix/man/man1/profile.1 rename to minix/commands/profile/profile.1 diff --git a/minix/commands/ps/Makefile b/minix/commands/ps/Makefile index 8a91ff441..96f376b31 100644 --- a/minix/commands/ps/Makefile +++ b/minix/commands/ps/Makefile @@ -2,6 +2,5 @@ # PROG= ps -MAN= .include diff --git a/minix/man/man1/ps.1 b/minix/commands/ps/ps.1 similarity index 100% rename from minix/man/man1/ps.1 rename to minix/commands/ps/ps.1 diff --git a/minix/commands/pwdauth/Makefile b/minix/commands/pwdauth/Makefile index 48adab625..beba9b27e 100644 --- a/minix/commands/pwdauth/Makefile +++ b/minix/commands/pwdauth/Makefile @@ -1,7 +1,7 @@ PROG= pwdauth BINDIR= /usr/lib BINMODE= 4755 -MAN= +MAN= pwdauth.8 LDADD+=-lcrypt diff --git a/minix/man/man8/pwdauth.8 b/minix/commands/pwdauth/pwdauth.8 similarity index 100% rename from minix/man/man8/pwdauth.8 rename to minix/commands/pwdauth/pwdauth.8 diff --git a/minix/commands/rarpd/Makefile b/minix/commands/rarpd/Makefile index 6a54de2f1..2fe26076c 100644 --- a/minix/commands/rarpd/Makefile +++ b/minix/commands/rarpd/Makefile @@ -1,4 +1,4 @@ PROG= rarpd -MAN= +MAN= rarpd.8 .include diff --git a/minix/man/man8/rarpd.8 b/minix/commands/rarpd/rarpd.8 similarity index 100% rename from minix/man/man8/rarpd.8 rename to minix/commands/rarpd/rarpd.8 diff --git a/minix/commands/readclock/Makefile b/minix/commands/readclock/Makefile index 9ad094193..806443edb 100644 --- a/minix/commands/readclock/Makefile +++ b/minix/commands/readclock/Makefile @@ -1,8 +1,6 @@ PROG= readclock SRCS= readclock.c +MAN= readclock.8 BINDIR= /bin -# no man page here, it's handled in ../man/man8/ -MAN= - .include diff --git a/minix/man/man8/readclock.8 b/minix/commands/readclock/readclock.8 similarity index 100% rename from minix/man/man8/readclock.8 rename to minix/commands/readclock/readclock.8 diff --git a/minix/commands/recwave/Makefile b/minix/commands/recwave/Makefile index a0bf13198..cbf7cde84 100644 --- a/minix/commands/recwave/Makefile +++ b/minix/commands/recwave/Makefile @@ -1,4 +1,3 @@ PROG= recwave -MAN= .include diff --git a/minix/man/man1/recwave.1 b/minix/commands/recwave/recwave.1 similarity index 100% rename from minix/man/man1/recwave.1 rename to minix/commands/recwave/recwave.1 diff --git a/minix/commands/remsync/Makefile b/minix/commands/remsync/Makefile index 5a1a161c7..c987c883d 100644 --- a/minix/commands/remsync/Makefile +++ b/minix/commands/remsync/Makefile @@ -1,4 +1,3 @@ PROG= remsync -MAN= .include diff --git a/minix/man/man1/remsync.1 b/minix/commands/remsync/remsync.1 similarity index 100% rename from minix/man/man1/remsync.1 rename to minix/commands/remsync/remsync.1 diff --git a/minix/commands/repartition/Makefile b/minix/commands/repartition/Makefile index 08321c12e..ed734f2a8 100644 --- a/minix/commands/repartition/Makefile +++ b/minix/commands/repartition/Makefile @@ -1,4 +1,4 @@ PROG= repartition -MAN= +MAN= repartition.8 .include diff --git a/minix/man/man8/repartition.8 b/minix/commands/repartition/repartition.8 similarity index 100% rename from minix/man/man8/repartition.8 rename to minix/commands/repartition/repartition.8 diff --git a/minix/commands/rget/Makefile b/minix/commands/rget/Makefile index 152c89177..d29d927b7 100644 --- a/minix/commands/rget/Makefile +++ b/minix/commands/rget/Makefile @@ -1,5 +1,4 @@ PROG= rget -MAN= LINKS+= ${BINDIR}/rget ${BINDIR}/rput diff --git a/minix/man/man1/rget.1 b/minix/commands/rget/rget.1 similarity index 100% rename from minix/man/man1/rget.1 rename to minix/commands/rget/rget.1 diff --git a/minix/commands/rlogin/Makefile b/minix/commands/rlogin/Makefile index 2cb2186b1..6589c0b0e 100644 --- a/minix/commands/rlogin/Makefile +++ b/minix/commands/rlogin/Makefile @@ -1,4 +1,3 @@ PROG= rlogin -MAN= .include diff --git a/minix/man/man1/rlogin.1 b/minix/commands/rlogin/rlogin.1 similarity index 100% rename from minix/man/man1/rlogin.1 rename to minix/commands/rlogin/rlogin.1 diff --git a/minix/commands/screendump/Makefile b/minix/commands/screendump/Makefile index c0e1fb210..b3765d1aa 100644 --- a/minix/commands/screendump/Makefile +++ b/minix/commands/screendump/Makefile @@ -1,4 +1,4 @@ PROG= screendump -MAN= +MAN= screendump.8 .include diff --git a/minix/man/man8/screendump.8 b/minix/commands/screendump/screendump.8 similarity index 100% rename from minix/man/man8/screendump.8 rename to minix/commands/screendump/screendump.8 diff --git a/minix/commands/service/Makefile b/minix/commands/service/Makefile index 735a70e04..f29caf664 100644 --- a/minix/commands/service/Makefile +++ b/minix/commands/service/Makefile @@ -4,7 +4,7 @@ SRCS.service=service.c parse.c util.c SRCS.printconfig=print.c parse.c util.c BINDIR= /bin -MAN.service= service.8 +MAN.service= service.8 system.conf.5 MAN.printconfig= .include diff --git a/minix/man/man5/system.conf.5 b/minix/commands/service/system.conf.5 similarity index 100% rename from minix/man/man5/system.conf.5 rename to minix/commands/service/system.conf.5 diff --git a/minix/commands/setup/Makefile b/minix/commands/setup/Makefile index 763d61716..bde948368 100644 --- a/minix/commands/setup/Makefile +++ b/minix/commands/setup/Makefile @@ -1,5 +1,5 @@ SCRIPTS= setup.sh BINDIR= /bin -MAN= +MAN= setup.8 .include diff --git a/minix/man/man8/setup.8 b/minix/commands/setup/setup.8 similarity index 100% rename from minix/man/man8/setup.8 rename to minix/commands/setup/setup.8 diff --git a/minix/commands/slip/Makefile b/minix/commands/slip/Makefile index a6e745f39..10b9852c3 100644 --- a/minix/commands/slip/Makefile +++ b/minix/commands/slip/Makefile @@ -1,4 +1,4 @@ PROG= slip -MAN= +MAN= slip.8 .include diff --git a/minix/man/man8/slip.8 b/minix/commands/slip/slip.8 similarity index 100% rename from minix/man/man8/slip.8 rename to minix/commands/slip/slip.8 diff --git a/minix/commands/spell/Makefile b/minix/commands/spell/Makefile index a899cff05..254bd7221 100644 --- a/minix/commands/spell/Makefile +++ b/minix/commands/spell/Makefile @@ -1,4 +1,4 @@ SCRIPTS= spell.sh -MAN= +MAN= spell.1 .include diff --git a/minix/man/man1/spell.1 b/minix/commands/spell/spell.1 similarity index 100% rename from minix/man/man1/spell.1 rename to minix/commands/spell/spell.1 diff --git a/minix/commands/srccrc/Makefile b/minix/commands/srccrc/Makefile index 5b1e2039e..e8cca2db0 100644 --- a/minix/commands/srccrc/Makefile +++ b/minix/commands/srccrc/Makefile @@ -1,4 +1,4 @@ SCRIPTS= srccrc.sh -MAN= +MAN= srccrc.8 .include diff --git a/minix/man/man8/srccrc.8 b/minix/commands/srccrc/srccrc.8 similarity index 100% rename from minix/man/man8/srccrc.8 rename to minix/commands/srccrc/srccrc.8 diff --git a/minix/commands/svrctl/Makefile b/minix/commands/svrctl/Makefile index 1877b235c..311f4a333 100644 --- a/minix/commands/svrctl/Makefile +++ b/minix/commands/svrctl/Makefile @@ -1,5 +1,4 @@ PROG= svrctl BINDIR= /usr/bin -MAN= .include diff --git a/minix/man/man1/svrctl.1 b/minix/commands/svrctl/svrctl.1 similarity index 100% rename from minix/man/man1/svrctl.1 rename to minix/commands/svrctl/svrctl.1 diff --git a/minix/commands/synctree/Makefile b/minix/commands/synctree/Makefile index 305c01c35..f37dc23a4 100644 --- a/minix/commands/synctree/Makefile +++ b/minix/commands/synctree/Makefile @@ -1,4 +1,3 @@ PROG= synctree -MAN= .include diff --git a/minix/man/man1/synctree.1 b/minix/commands/synctree/synctree.1 similarity index 100% rename from minix/man/man1/synctree.1 rename to minix/commands/synctree/synctree.1 diff --git a/minix/commands/sysenv/Makefile b/minix/commands/sysenv/Makefile index 481b90185..f09a9636e 100644 --- a/minix/commands/sysenv/Makefile +++ b/minix/commands/sysenv/Makefile @@ -1,5 +1,4 @@ PROG= sysenv BINDIR= /bin -MAN= .include diff --git a/minix/man/man1/sysenv.1 b/minix/commands/sysenv/sysenv.1 similarity index 100% rename from minix/man/man1/sysenv.1 rename to minix/commands/sysenv/sysenv.1 diff --git a/minix/commands/tcpd/Makefile b/minix/commands/tcpd/Makefile index be91672d2..71392402a 100644 --- a/minix/commands/tcpd/Makefile +++ b/minix/commands/tcpd/Makefile @@ -1,5 +1,5 @@ PROG= tcpd CPPFLAGS+= -DPARANOID=0 -MAN= +MAN= tcpd.8 .include diff --git a/minix/man/man8/tcpd.8 b/minix/commands/tcpd/tcpd.8 similarity index 100% rename from minix/man/man8/tcpd.8 rename to minix/commands/tcpd/tcpd.8 diff --git a/minix/commands/telnet/Makefile b/minix/commands/telnet/Makefile index c93dca90c..e1f2bf9f0 100644 --- a/minix/commands/telnet/Makefile +++ b/minix/commands/telnet/Makefile @@ -2,6 +2,6 @@ PROG= ttn SRCS= ttn.c ttn_conf.c -MAN= +MAN= telnet.1 .include diff --git a/minix/man/man1/telnet.1 b/minix/commands/telnet/telnet.1 similarity index 100% rename from minix/man/man1/telnet.1 rename to minix/commands/telnet/telnet.1 diff --git a/minix/commands/term/Makefile b/minix/commands/term/Makefile index 126f7b2c7..c07f4c436 100644 --- a/minix/commands/term/Makefile +++ b/minix/commands/term/Makefile @@ -1,6 +1,5 @@ PROG= term BINGRP= uucp BINMODE= 2755 -MAN= .include diff --git a/minix/man/man1/term.1 b/minix/commands/term/term.1 similarity index 100% rename from minix/man/man1/term.1 rename to minix/commands/term/term.1 diff --git a/minix/commands/termcap/Makefile b/minix/commands/termcap/Makefile index 285150307..58b2ff979 100644 --- a/minix/commands/termcap/Makefile +++ b/minix/commands/termcap/Makefile @@ -1,4 +1,3 @@ PROG= termcap -MAN= .include diff --git a/minix/man/man1/termcap.1 b/minix/commands/termcap/termcap.1 similarity index 100% rename from minix/man/man1/termcap.1 rename to minix/commands/termcap/termcap.1 diff --git a/minix/commands/tget/Makefile b/minix/commands/tget/Makefile index bb4e5def5..0370b5f8b 100644 --- a/minix/commands/tget/Makefile +++ b/minix/commands/tget/Makefile @@ -1,4 +1,3 @@ PROG= tget -MAN= .include diff --git a/minix/man/man1/tget.1 b/minix/commands/tget/tget.1 similarity index 100% rename from minix/man/man1/tget.1 rename to minix/commands/tget/tget.1 diff --git a/minix/commands/time/Makefile b/minix/commands/time/Makefile index 34f79b863..a91e94f20 100644 --- a/minix/commands/time/Makefile +++ b/minix/commands/time/Makefile @@ -1,4 +1,3 @@ PROG= time -MAN= .include diff --git a/minix/man/man1/time.1 b/minix/commands/time/time.1 similarity index 100% rename from minix/man/man1/time.1 rename to minix/commands/time/time.1 diff --git a/minix/commands/truncate/Makefile b/minix/commands/truncate/Makefile index a634f293c..44005492e 100644 --- a/minix/commands/truncate/Makefile +++ b/minix/commands/truncate/Makefile @@ -1,4 +1,3 @@ PROG= truncate -MAN= .include diff --git a/minix/man/man1/truncate.1 b/minix/commands/truncate/truncate.1 similarity index 96% rename from minix/man/man1/truncate.1 rename to minix/commands/truncate/truncate.1 index 3169b2323..de8c7ebfc 100644 --- a/minix/man/man1/truncate.1 +++ b/minix/commands/truncate/truncate.1 @@ -28,9 +28,9 @@ .Dd July 4, 2000 .Dt TRUNCATE 1 .Os -.SH NAME +.Sh NAME truncate \- truncate or extend the length of files -.SH SYNOPSIS +.Sh SYNOPSIS truncate .Op Fl c .Bk -words @@ -49,7 +49,7 @@ truncate .Fl r Ar rfile .Ek .Ar -.SH DESCRIPTION +.Sh DESCRIPTION The truncate utility adjusts the length of each regular file given on the command-line. @@ -124,23 +124,23 @@ using (for example) the shell's .Ql >> redirection syntax, or .Xr dd 1 . -.SH EXIT STATUS +.Sh EXIT STATUS .Ex -std If the operation fails for an argument, truncate will issue a diagnostic and continue processing the remaining arguments. -.SH SEE ALSO -.BR dd(1), -.BR touch(1), -.BR truncate(2) -.SH STANDARDS +.Sh SEE ALSO +.Xr dd 1 , +.Xr touch 1 , +.Xr truncate 2 +.Sh STANDARDS The truncate utility conforms to no known standards. -.SH HISTORY +.Sh HISTORY The truncate utility first appeared in FreeBSD 4.2. -.SH AUTHORS +.Sh AUTHORS The truncate utility was written by Sheldon Hearn . diff --git a/minix/commands/umount/Makefile b/minix/commands/umount/Makefile index 5d167b23f..e9ce9aad3 100644 --- a/minix/commands/umount/Makefile +++ b/minix/commands/umount/Makefile @@ -1,5 +1,4 @@ PROG= umount BINDIR= /bin -MAN= .include diff --git a/minix/man/man1/umount.1 b/minix/commands/umount/umount.1 similarity index 100% rename from minix/man/man1/umount.1 rename to minix/commands/umount/umount.1 diff --git a/minix/commands/update/Makefile b/minix/commands/update/Makefile index 687504e04..9c11872b7 100644 --- a/minix/commands/update/Makefile +++ b/minix/commands/update/Makefile @@ -1,4 +1,4 @@ PROG= update -MAN= +MAN= update.8 .include diff --git a/minix/man/man8/update.8 b/minix/commands/update/update.8 similarity index 100% rename from minix/man/man8/update.8 rename to minix/commands/update/update.8 diff --git a/minix/commands/vol/Makefile b/minix/commands/vol/Makefile index 3ff08af79..e44c8d8cf 100644 --- a/minix/commands/vol/Makefile +++ b/minix/commands/vol/Makefile @@ -1,4 +1,3 @@ PROG= vol -MAN= .include diff --git a/minix/man/man1/vol.1 b/minix/commands/vol/vol.1 similarity index 100% rename from minix/man/man1/vol.1 rename to minix/commands/vol/vol.1 diff --git a/minix/commands/zmodem/Makefile b/minix/commands/zmodem/Makefile index 35dd33a6c..1882e8d59 100644 --- a/minix/commands/zmodem/Makefile +++ b/minix/commands/zmodem/Makefile @@ -2,7 +2,5 @@ PROGS= rz sz CPPFLAGS+= -DPOSIX -MAN.rz= -MAN.sz= .include diff --git a/minix/man/man1/rz.1 b/minix/commands/zmodem/rz.1 similarity index 100% rename from minix/man/man1/rz.1 rename to minix/commands/zmodem/rz.1 diff --git a/minix/man/man1/sz.1 b/minix/commands/zmodem/sz.1 similarity index 100% rename from minix/man/man1/sz.1 rename to minix/commands/zmodem/sz.1 diff --git a/minix/fs/hgfs/Makefile b/minix/fs/hgfs/Makefile index 774a2925d..4a73a968d 100644 --- a/minix/fs/hgfs/Makefile +++ b/minix/fs/hgfs/Makefile @@ -1,6 +1,7 @@ # Makefile for VMware Host/Guest File System (HGFS) server PROG= hgfs SRCS= hgfs.c +MAN= hgfs.8 DPADD+= ${LIBSFFS} ${LIBHGFS} ${LIBFSDRIVER} ${LIBSYS} LDADD+= -lsffs -lhgfs -lfsdriver -lsys diff --git a/minix/man/man8/hgfs.8 b/minix/fs/hgfs/hgfs.8 similarity index 100% rename from minix/man/man8/hgfs.8 rename to minix/fs/hgfs/hgfs.8 diff --git a/minix/fs/vbfs/Makefile b/minix/fs/vbfs/Makefile index 41b6b22a3..b1b2b4626 100644 --- a/minix/fs/vbfs/Makefile +++ b/minix/fs/vbfs/Makefile @@ -1,6 +1,7 @@ # Makefile for VirtualBox Shared Folders File System (VBFS) server PROG= vbfs SRCS= vbfs.c +MAN= vbfs.8 DPADD+= ${LIBSFFS} ${LIBVBOXFS} ${LIBFSDRIVER} ${LIBSYS} LDADD+= -lsffs -lvboxfs -lfsdriver -lsys diff --git a/minix/man/man8/vbfs.8 b/minix/fs/vbfs/vbfs.8 similarity index 100% rename from minix/man/man8/vbfs.8 rename to minix/fs/vbfs/vbfs.8 diff --git a/minix/man/Makefile b/minix/man/Makefile index 6da640c9c..5e2733280 100644 --- a/minix/man/Makefile +++ b/minix/man/Makefile @@ -1,6 +1,6 @@ .include -SUBDIR= man1 man2 man4 man5 man7 man8 man9 +SUBDIR= man2 man4 man5 man7 man8 man9 WHATISDBDIR?= /usr/man diff --git a/minix/man/man1/Makefile b/minix/man/man1/Makefile deleted file mode 100644 index c688ce346..000000000 --- a/minix/man/man1/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -MAN= at.1 \ - bsfilt.1 cawf.1 chgrp.1 \ - compress.1 \ - crc.1 crontab.1 \ - dhrystone.1 dosdir.1 dosread.1 doswrite.1 \ - eject.1 \ - flexdoc.1 format.1 \ - fsck.mfs.1 host.1 hostaddr.1 ifdef.1 \ - isodir.1 isoinfo.1 isoread.1 \ - loadfont.1 loadkeys.1 logger.1 \ - look.1 lp.1 lspci.1 mail.1 \ - mixer.1 \ - mkproto.1 mount.1 mt.1 \ - playwave.1 prep.1 \ - profile.1 ps.1 recwave.1 \ - remsync.1 rget.1 rlogin.1 rz.1 \ - spell.1 svrctl.1 \ - synctree.1 sysenv.1 sz.1 telnet.1 template.1 \ - term.1 termcap.1 tget.1 time.1 \ - truncate.1 umount.1 \ - vol.1 \ - yap.1 linkfarm.1 pkg_view.1 - -MLINKS += compress.1 uncompress.1 - -.include diff --git a/minix/man/man1/cdiff.1 b/minix/man/man1/cdiff.1 deleted file mode 100644 index d28342c3d..000000000 --- a/minix/man/man1/cdiff.1 +++ /dev/null @@ -1,37 +0,0 @@ -.TH CDIFF 1 -.SH NAME -cdiff \- context diff -.SH SYNOPSIS -\fBcdiff\fR [\fB\-c\fIn\fR] \fIoldfile \fInewfile\fR -.br -.de FL -.TP -\\fB\\$1\\fR -\\$2 -.. -.de EX -.TP 20 -\\fB\\$1\\fR -# \\$2 -.. -.SH OPTIONS -.TP 5 -.B \-c -# Provide \fIn\fR lines of context -.SH EXAMPLES -.TP 20 -.B cdiff old new >f -# Write context diff on \fIf\fR -.TP 20 -.B cdiff \-c1 old new >f -# Use only 1 line of context -.SH DESCRIPTION -.PP -\fICdiff\fR produces a context diff by first running \fIdiff\fR and then -adding context. -Some update programs, like \fIpatch\fR, can use context diffs to update -files, even in the presence of other, independent changes. -.SH "SEE ALSO" -.BR cmp (1), -.BR diff (1), -.BR patch (1). diff --git a/minix/man/man1/chgrp.1 b/minix/man/man1/chgrp.1 deleted file mode 100644 index c2bb6ca5b..000000000 --- a/minix/man/man1/chgrp.1 +++ /dev/null @@ -1,44 +0,0 @@ -.TH CHGRP 1 -.SH NAME -chgrp \- change group -.SH SYNOPSIS -\fBchgrp [\fB\-R\fR] [\fIowner:\fR]\fIgroup \fIfile\fR ...\fR -.br -.de FL -.TP -\\fB\\$1\\fR -\\$2 -.. -.de EX -.TP 20 -\\fB\\$1\\fR -# \\$2 -.. -.SH OPTIONS -.TP 5 -.B \-R -# Change directory hierarchies -.SH EXAMPLES -.TP 20 -.B chgrp system file1 file2 -# Make \fIsystem\fR the group of the files -.TP 20 -.B chrgp \-R other dir1 -# Make \fIother\fR the group of all files below dir1 -.SH DESCRIPTION -.PP -The group field (and optionally owner field) of the named files is changed to -.I group -and -.I owner . -Alternatively, a decimal gid (uid) may be specified instead of a group name. -If the \fB\-R\fR flag is used, the changes will be applied recursively to -all files in named directories. Only the superuser may execute this command -to set arbitrary groups. Normal users can only change the group if they own -the file, and the group is their own group (MINIX 3), or one of their -supplementary groups (Minix-vmd). -.SH "SEE ALSO" -.BR chown (8), -.BR chmod (1), -.BR ls (1), -.BR chown (2). diff --git a/minix/man/man1/flexdoc.1 b/minix/man/man1/flexdoc.1 deleted file mode 100644 index 588bc9f45..000000000 --- a/minix/man/man1/flexdoc.1 +++ /dev/null @@ -1,2442 +0,0 @@ -.TH FLEX 1 "26 May 1990" "Version 2.3" -.SH NAME -flexdoc - fast lexical analyzer generator -.SH SYNOPSIS -.B flex -.B [-bcdfinpstvFILT8 -C[efmF] -Sskeleton] -.I [filename ...] -.SH DESCRIPTION -.I flex -is a tool for generating -.I scanners: -programs which recognized lexical patterns in text. -.I flex -reads -the given input files, or its standard input if no file names are given, -for a description of a scanner to generate. The description is in -the form of pairs -of regular expressions and C code, called -.I rules. flex -generates as output a C source file, -.B lex.yy.c, -which defines a routine -.B yylex(). -This file is compiled and linked with the -.B -lfl -library to produce an executable. When the executable is run, -it analyzes its input for occurrences -of the regular expressions. Whenever it finds one, it executes -the corresponding C code. -.SH SOME SIMPLE EXAMPLES -.LP -First some simple examples to get the flavor of how one uses -.I flex. -The following -.I flex -input specifies a scanner which whenever it encounters the string -"username" will replace it with the user's login name: -.nf - - %% - username printf( "%s", getlogin() ); - -.fi -By default, any text not matched by a -.I flex -scanner -is copied to the output, so the net effect of this scanner is -to copy its input file to its output with each occurrence -of "username" expanded. -In this input, there is just one rule. "username" is the -.I pattern -and the "printf" is the -.I action. -The "%%" marks the beginning of the rules. -.LP -Here's another simple example: -.nf - - int num_lines = 0, num_chars = 0; - - %% - \\n ++num_lines; ++num_chars; - . ++num_chars; - - %% - main() - { - yylex(); - printf( "# of lines = %d, # of chars = %d\\n", - num_lines, num_chars ); - } - -.fi -This scanner counts the number of characters and the number -of lines in its input (it produces no output other than the -final report on the counts). The first line -declares two globals, "num_lines" and "num_chars", which are accessible -both inside -.B yylex() -and in the -.B main() -routine declared after the second "%%". There are two rules, one -which matches a newline ("\\n") and increments both the line count and -the character count, and one which matches any character other than -a newline (indicated by the "." regular expression). -.LP -A somewhat more complicated example: -.nf - - /* scanner for a toy Pascal-like language */ - - %{ - /* need this for the call to atof() below */ - #include - %} - - DIGIT [0-9] - ID [a-z][a-z0-9]* - - %% - - {DIGIT}+ { - printf( "An integer: %s (%d)\\n", yytext, - atoi( yytext ) ); - } - - {DIGIT}+"."{DIGIT}* { - printf( "A float: %s (%g)\\n", yytext, - atof( yytext ) ); - } - - if|then|begin|end|procedure|function { - printf( "A keyword: %s\\n", yytext ); - } - - {ID} printf( "An identifier: %s\\n", yytext ); - - "+"|"-"|"*"|"/" printf( "An operator: %s\\n", yytext ); - - "{"[^}\\n]*"}" /* eat up one-line comments */ - - [ \\t\\n]+ /* eat up whitespace */ - - . printf( "Unrecognized character: %s\\n", yytext ); - - %% - - main( argc, argv ) - int argc; - char **argv; - { - ++argv, --argc; /* skip over program name */ - if ( argc > 0 ) - yyin = fopen( argv[0], "r" ); - else - yyin = stdin; - - yylex(); - } - -.fi -This is the beginnings of a simple scanner for a language like -Pascal. It identifies different types of -.I tokens -and reports on what it has seen. -.LP -The details of this example will be explained in the following -sections. -.SH FORMAT OF THE INPUT FILE -The -.I flex -input file consists of three sections, separated by a line with just -.B %% -in it: -.nf - - definitions - %% - rules - %% - user code - -.fi -The -.I definitions -section contains declarations of simple -.I name -definitions to simplify the scanner specification, and declarations of -.I start conditions, -which are explained in a later section. -.LP -Name definitions have the form: -.nf - - name definition - -.fi -The "name" is a word beginning with a letter or an underscore ('_') -followed by zero or more letters, digits, '_', or '-' (dash). -The definition is taken to begin at the first non-white-space character -following the name and continuing to the end of the line. -The definition can subsequently be referred to using "{name}", which -will expand to "(definition)". For example, -.nf - - DIGIT [0-9] - ID [a-z][a-z0-9]* - -.fi -defines "DIGIT" to be a regular expression which matches a -single digit, and -"ID" to be a regular expression which matches a letter -followed by zero-or-more letters-or-digits. -A subsequent reference to -.nf - - {DIGIT}+"."{DIGIT}* - -.fi -is identical to -.nf - - ([0-9])+"."([0-9])* - -.fi -and matches one-or-more digits followed by a '.' followed -by zero-or-more digits. -.LP -The -.I rules -section of the -.I flex -input contains a series of rules of the form: -.nf - - pattern action - -.fi -where the pattern must be unindented and the action must begin -on the same line. -.LP -See below for a further description of patterns and actions. -.LP -Finally, the user code section is simply copied to -.B lex.yy.c -verbatim. -It is used for companion routines which call or are called -by the scanner. The presence of this section is optional; -if it is missing, the second -.B %% -in the input file may be skipped, too. -.LP -In the definitions and rules sections, any -.I indented -text or text enclosed in -.B %{ -and -.B %} -is copied verbatim to the output (with the %{}'s removed). -The %{}'s must appear unindented on lines by themselves. -.LP -In the rules section, -any indented or %{} text appearing before the -first rule may be used to declare variables -which are local to the scanning routine and (after the declarations) -code which is to be executed whenever the scanning routine is entered. -Other indented or %{} text in the rule section is still copied to the output, -but its meaning is not well-defined and it may well cause compile-time -errors (this feature is present for -.I POSIX -compliance; see below for other such features). -.LP -In the definitions section, an unindented comment (i.e., a line -beginning with "/*") is also copied verbatim to the output up -to the next "*/". Also, any line in the definitions section -beginning with '#' is ignored, though this style of comment is -deprecated and may go away in the future. -.SH PATTERNS -The patterns in the input are written using an extended set of regular -expressions. These are: -.nf - - x match the character 'x' - . any character except newline - [xyz] a "character class"; in this case, the pattern - matches either an 'x', a 'y', or a 'z' - [abj-oZ] a "character class" with a range in it; matches - an 'a', a 'b', any letter from 'j' through 'o', - or a 'Z' - [^A-Z] a "negated character class", i.e., any character - but those in the class. In this case, any - character EXCEPT an uppercase letter. - [^A-Z\\n] any character EXCEPT an uppercase letter or - a newline - r* zero or more r's, where r is any regular expression - r+ one or more r's - r? zero or one r's (that is, "an optional r") - r{2,5} anywhere from two to five r's - r{2,} two or more r's - r{4} exactly 4 r's - {name} the expansion of the "name" definition - (see above) - "[xyz]\\"foo" - the literal string: [xyz]"foo - \\X if X is an 'a', 'b', 'f', 'n', 'r', 't', or 'v', - then the ANSI-C interpretation of \\x. - Otherwise, a literal 'X' (used to escape - operators such as '*') - \\123 the character with octal value 123 - \\x2a the character with hexadecimal value 2a - (r) match an r; parentheses are used to override - precedence (see below) - - - rs the regular expression r followed by the - regular expression s; called "concatenation" - - - r|s either an r or an s - - - r/s an r but only if it is followed by an s. The - s is not part of the matched text. This type - of pattern is called as "trailing context". - ^r an r, but only at the beginning of a line - r$ an r, but only at the end of a line. Equivalent - to "r/\\n". - - - r an r, but only in start condition s (see - below for discussion of start conditions) - r - same, but in any of start conditions s1, - s2, or s3 - - - <> an end-of-file - <> - an end-of-file when in start condition s1 or s2 - -.fi -The regular expressions listed above are grouped according to -precedence, from highest precedence at the top to lowest at the bottom. -Those grouped together have equal precedence. For example, -.nf - - foo|bar* - -.fi -is the same as -.nf - - (foo)|(ba(r*)) - -.fi -since the '*' operator has higher precedence than concatenation, -and concatenation higher than alternation ('|'). This pattern -therefore matches -.I either -the string "foo" -.I or -the string "ba" followed by zero-or-more r's. -To match "foo" or zero-or-more "bar"'s, use: -.nf - - foo|(bar)* - -.fi -and to match zero-or-more "foo"'s-or-"bar"'s: -.nf - - (foo|bar)* - -.fi -.LP -Some notes on patterns: -.IP - -A negated character class such as the example "[^A-Z]" -above -.I will match a newline -unless "\\n" (or an equivalent escape sequence) is one of the -characters explicitly present in the negated character class -(e.g., "[^A-Z\\n]"). This is unlike how many other regular -expression tools treat negated character classes, but unfortunately -the inconsistency is historically entrenched. -Matching newlines means that a pattern like [^"]* can match an entire -input (overflowing the scanner's input buffer) unless there's another -quote in the input. -.IP - -A rule can have at most one instance of trailing context (the '/' operator -or the '$' operator). The start condition, '^', and "<>" patterns -can only occur at the beginning of a pattern, and, as well as with '/' and '$', -cannot be grouped inside parentheses. A '^' which does not occur at -the beginning of a rule or a '$' which does not occur at the end of -a rule loses its special properties and is treated as a normal character. -.IP -The following are illegal: -.nf - - foo/bar$ - foobar - -.fi -Note that the first of these, can be written "foo/bar\\n". -.IP -The following will result in '$' or '^' being treated as a normal character: -.nf - - foo|(bar$) - foo|^bar - -.fi -If what's wanted is a "foo" or a bar-followed-by-a-newline, the following -could be used (the special '|' action is explained below): -.nf - - foo | - bar$ /* action goes here */ - -.fi -A similar trick will work for matching a foo or a -bar-at-the-beginning-of-a-line. -.SH HOW THE INPUT IS MATCHED -When the generated scanner is run, it analyzes its input looking -for strings which match any of its patterns. If it finds more than -one match, it takes the one matching the most text (for trailing -context rules, this includes the length of the trailing part, even -though it will then be returned to the input). If it finds two -or more matches of the same length, the -rule listed first in the -.I flex -input file is chosen. -.LP -Once the match is determined, the text corresponding to the match -(called the -.I token) -is made available in the global character pointer -.B yytext, -and its length in the global integer -.B yyleng. -The -.I action -corresponding to the matched pattern is then executed (a more -detailed description of actions follows), and then the remaining -input is scanned for another match. -.LP -If no match is found, then the -.I default rule -is executed: the next character in the input is considered matched and -copied to the standard output. Thus, the simplest legal -.I flex -input is: -.nf - - %% - -.fi -which generates a scanner that simply copies its input (one character -at a time) to its output. -.SH ACTIONS -Each pattern in a rule has a corresponding action, which can be any -arbitrary C statement. The pattern ends at the first non-escaped -whitespace character; the remainder of the line is its action. If the -action is empty, then when the pattern is matched the input token -is simply discarded. For example, here is the specification for a program -which deletes all occurrences of "zap me" from its input: -.nf - - %% - "zap me" - -.fi -(It will copy all other characters in the input to the output since -they will be matched by the default rule.) -.LP -Here is a program which compresses multiple blanks and tabs down to -a single blank, and throws away whitespace found at the end of a line: -.nf - - %% - [ \\t]+ putchar( ' ' ); - [ \\t]+$ /* ignore this token */ - -.fi -.LP -If the action contains a '{', then the action spans till the balancing '}' -is found, and the action may cross multiple lines. -.I flex -knows about C strings and comments and won't be fooled by braces found -within them, but also allows actions to begin with -.B %{ -and will consider the action to be all the text up to the next -.B %} -(regardless of ordinary braces inside the action). -.LP -An action consisting solely of a vertical bar ('|') means "same as -the action for the next rule." See below for an illustration. -.LP -Actions can include arbitrary C code, including -.B return -statements to return a value to whatever routine called -.B yylex(). -Each time -.B yylex() -is called it continues processing tokens from where it last left -off until it either reaches -the end of the file or executes a return. Once it reaches an end-of-file, -however, then any subsequent call to -.B yylex() -will simply immediately return, unless -.B yyrestart() -is first called (see below). -.LP -Actions are not allowed to modify yytext or yyleng. -.LP -There are a number of special directives which can be included within -an action: -.IP - -.B ECHO -copies yytext to the scanner's output. -.IP - -.B BEGIN -followed by the name of a start condition places the scanner in the -corresponding start condition (see below). -.IP - -.B REJECT -directs the scanner to proceed on to the "second best" rule which matched the -input (or a prefix of the input). The rule is chosen as described -above in "How the Input is Matched", and -.B yytext -and -.B yyleng -set up appropriately. -It may either be one which matched as much text -as the originally chosen rule but came later in the -.I flex -input file, or one which matched less text. -For example, the following will both count the -words in the input and call the routine special() whenever "frob" is seen: -.nf - - int word_count = 0; - %% - - frob special(); REJECT; - [^ \\t\\n]+ ++word_count; - -.fi -Without the -.B REJECT, -any "frob"'s in the input would not be counted as words, since the -scanner normally executes only one action per token. -Multiple -.B REJECT's -are allowed, each one finding the next best choice to the currently -active rule. For example, when the following scanner scans the token -"abcd", it will write "abcdabcaba" to the output: -.nf - - %% - a | - ab | - abc | - abcd ECHO; REJECT; - .|\\n /* eat up any unmatched character */ - -.fi -(The first three rules share the fourth's action since they use -the special '|' action.) -.B REJECT -is a particularly expensive feature in terms scanner performance; -if it is used in -.I any -of the scanner's actions it will slow down -.I all -of the scanner's matching. Furthermore, -.B REJECT -cannot be used with the -.I -f -or -.I -F -options (see below). -.IP -Note also that unlike the other special actions, -.B REJECT -is a -.I branch; -code immediately following it in the action will -.I not -be executed. -.IP - -.B yymore() -tells the scanner that the next time it matches a rule, the corresponding -token should be -.I appended -onto the current value of -.B yytext -rather than replacing it. For example, given the input "mega-kludge" -the following will write "mega-mega-kludge" to the output: -.nf - - %% - mega- ECHO; yymore(); - kludge ECHO; - -.fi -First "mega-" is matched and echoed to the output. Then "kludge" -is matched, but the previous "mega-" is still hanging around at the -beginning of -.B yytext -so the -.B ECHO -for the "kludge" rule will actually write "mega-kludge". -The presence of -.B yymore() -in the scanner's action entails a minor performance penalty in the -scanner's matching speed. -.IP - -.B yyless(n) -returns all but the first -.I n -characters of the current token back to the input stream, where they -will be rescanned when the scanner looks for the next match. -.B yytext -and -.B yyleng -are adjusted appropriately (e.g., -.B yyleng -will now be equal to -.I n -). For example, on the input "foobar" the following will write out -"foobarbar": -.nf - - %% - foobar ECHO; yyless(3); - [a-z]+ ECHO; - -.fi -An argument of 0 to -.B yyless -will cause the entire current input string to be scanned again. Unless you've -changed how the scanner will subsequently process its input (using -.B BEGIN, -for example), this will result in an endless loop. -.IP - -.B unput(c) -puts the character -.I c -back onto the input stream. It will be the next character scanned. -The following action will take the current token and cause it -to be rescanned enclosed in parentheses. -.nf - - { - int i; - unput( ')' ); - for ( i = yyleng - 1; i >= 0; --i ) - unput( yytext[i] ); - unput( '(' ); - } - -.fi -Note that since each -.B unput() -puts the given character back at the -.I beginning -of the input stream, pushing back strings must be done back-to-front. -.IP - -.B input() -reads the next character from the input stream. For example, -the following is one way to eat up C comments: -.nf - - %% - "/*" { - register int c; - - for ( ; ; ) - { - while ( (c = input()) != '*' && - c != EOF ) - ; /* eat up text of comment */ - - if ( c == '*' ) - { - while ( (c = input()) == '*' ) - ; - if ( c == '/' ) - break; /* found the end */ - } - - if ( c == EOF ) - { - error( "EOF in comment" ); - break; - } - } - } - -.fi -(Note that if the scanner is compiled using -.B C++, -then -.B input() -is instead referred to as -.B yyinput(), -in order to avoid a name clash with the -.B C++ -stream by the name of -.I input.) -.IP - -.B yyterminate() -can be used in lieu of a return statement in an action. It terminates -the scanner and returns a 0 to the scanner's caller, indicating "all done". -Subsequent calls to the scanner will immediately return unless preceded -by a call to -.B yyrestart() -(see below). -By default, -.B yyterminate() -is also called when an end-of-file is encountered. It is a macro and -may be redefined. -.SH THE GENERATED SCANNER -The output of -.I flex -is the file -.B lex.yy.c, -which contains the scanning routine -.B yylex(), -a number of tables used by it for matching tokens, and a number -of auxiliary routines and macros. By default, -.B yylex() -is declared as follows: -.nf - - int yylex() - { - ... various definitions and the actions in here ... - } - -.fi -(If your environment supports function prototypes, then it will -be "int yylex( void )".) This definition may be changed by redefining -the "YY_DECL" macro. For example, you could use: -.nf - - #undef YY_DECL - #define YY_DECL float lexscan( a, b ) float a, b; - -.fi -to give the scanning routine the name -.I lexscan, -returning a float, and taking two floats as arguments. Note that -if you give arguments to the scanning routine using a -K&R-style/non-prototyped function declaration, you must terminate -the definition with a semi-colon (;). -.LP -Whenever -.B yylex() -is called, it scans tokens from the global input file -.I yyin -(which defaults to stdin). It continues until it either reaches -an end-of-file (at which point it returns the value 0) or -one of its actions executes a -.I return -statement. -In the former case, when called again the scanner will immediately -return unless -.B yyrestart() -is called to point -.I yyin -at the new input file. ( -.B yyrestart() -takes one argument, a -.B FILE * -pointer.) -In the latter case (i.e., when an action -executes a return), the scanner may then be called again and it -will resume scanning where it left off. -.LP -By default (and for purposes of efficiency), the scanner uses -block-reads rather than simple -.I getc() -calls to read characters from -.I yyin. -The nature of how it gets its input can be controlled by redefining the -.B YY_INPUT -macro. -YY_INPUT's calling sequence is "YY_INPUT(buf,result,max_size)". Its -action is to place up to -.I max_size -characters in the character array -.I buf -and return in the integer variable -.I result -either the -number of characters read or the constant YY_NULL (0 on Unix systems) -to indicate EOF. The default YY_INPUT reads from the -global file-pointer "yyin". -.LP -A sample redefinition of YY_INPUT (in the definitions -section of the input file): -.nf - - %{ - #undef YY_INPUT - #define YY_INPUT(buf,result,max_size) \\ - { \\ - int c = getchar(); \\ - result = (c == EOF) ? YY_NULL : (buf[0] = c, 1); \\ - } - %} - -.fi -This definition will change the input processing to occur -one character at a time. -.LP -You also can add in things like keeping track of the -input line number this way; but don't expect your scanner to -go very fast. -.LP -When the scanner receives an end-of-file indication from YY_INPUT, -it then checks the -.B yywrap() -function. If -.B yywrap() -returns false (zero), then it is assumed that the -function has gone ahead and set up -.I yyin -to point to another input file, and scanning continues. If it returns -true (non-zero), then the scanner terminates, returning 0 to its -caller. -.LP -The default -.B yywrap() -always returns 1. Presently, to redefine it you must first -"#undef yywrap", as it is currently implemented as a macro. As indicated -by the hedging in the previous sentence, it may be changed to -a true function in the near future. -.LP -The scanner writes its -.B ECHO -output to the -.I yyout -global (default, stdout), which may be redefined by the user simply -by assigning it to some other -.B FILE -pointer. -.SH START CONDITIONS -.I flex -provides a mechanism for conditionally activating rules. Any rule -whose pattern is prefixed with "" will only be active when -the scanner is in the start condition named "sc". For example, -.nf - - [^"]* { /* eat up the string body ... */ - ... - } - -.fi -will be active only when the scanner is in the "STRING" start -condition, and -.nf - - \\. { /* handle an escape ... */ - ... - } - -.fi -will be active only when the current start condition is -either "INITIAL", "STRING", or "QUOTE". -.LP -Start conditions -are declared in the definitions (first) section of the input -using unindented lines beginning with either -.B %s -or -.B %x -followed by a list of names. -The former declares -.I inclusive -start conditions, the latter -.I exclusive -start conditions. A start condition is activated using the -.B BEGIN -action. Until the next -.B BEGIN -action is executed, rules with the given start -condition will be active and -rules with other start conditions will be inactive. -If the start condition is -.I inclusive, -then rules with no start conditions at all will also be active. -If it is -.I exclusive, -then -.I only -rules qualified with the start condition will be active. -A set of rules contingent on the same exclusive start condition -describe a scanner which is independent of any of the other rules in the -.I flex -input. Because of this, -exclusive start conditions make it easy to specify "mini-scanners" -which scan portions of the input that are syntactically different -from the rest (e.g., comments). -.LP -If the distinction between inclusive and exclusive start conditions -is still a little vague, here's a simple example illustrating the -connection between the two. The set of rules: -.nf - - %s example - %% - foo /* do something */ - -.fi -is equivalent to -.nf - - %x example - %% - foo /* do something */ - -.fi -.LP -The default rule (to -.B ECHO -any unmatched character) remains active in start conditions. -.LP -.B BEGIN(0) -returns to the original state where only the rules with -no start conditions are active. This state can also be -referred to as the start-condition "INITIAL", so -.B BEGIN(INITIAL) -is equivalent to -.B BEGIN(0). -(The parentheses around the start condition name are not required but -are considered good style.) -.LP -.B BEGIN -actions can also be given as indented code at the beginning -of the rules section. For example, the following will cause -the scanner to enter the "SPECIAL" start condition whenever -.I yylex() -is called and the global variable -.I enter_special -is true: -.nf - - int enter_special; - - %x SPECIAL - %% - if ( enter_special ) - BEGIN(SPECIAL); - - blahblahblah - ...more rules follow... - -.fi -.LP -To illustrate the uses of start conditions, -here is a scanner which provides two different interpretations -of a string like "123.456". By default it will treat it as -as three tokens, the integer "123", a dot ('.'), and the integer "456". -But if the string is preceded earlier in the line by the string -"expect-floats" -it will treat it as a single token, the floating-point number -123.456: -.nf - - %{ - #include - %} - %s expect - - %% - expect-floats BEGIN(expect); - - [0-9]+"."[0-9]+ { - printf( "found a float, = %f\\n", - atof( yytext ) ); - } - \\n { - /* that's the end of the line, so - * we need another "expect-number" - * before we'll recognize any more - * numbers - */ - BEGIN(INITIAL); - } - - [0-9]+ { - printf( "found an integer, = %d\\n", - atoi( yytext ) ); - } - - "." printf( "found a dot\\n" ); - -.fi -Here is a scanner which recognizes (and discards) C comments while -maintaining a count of the current input line. -.nf - - %x comment - %% - int line_num = 1; - - "/*" BEGIN(comment); - - [^*\\n]* /* eat anything that's not a '*' */ - "*"+[^*/\\n]* /* eat up '*'s not followed by '/'s */ - \\n ++line_num; - "*"+"/" BEGIN(INITIAL); - -.fi -Note that start-conditions names are really integer values and -can be stored as such. Thus, the above could be extended in the -following fashion: -.nf - - %x comment foo - %% - int line_num = 1; - int comment_caller; - - "/*" { - comment_caller = INITIAL; - BEGIN(comment); - } - - ... - - "/*" { - comment_caller = foo; - BEGIN(comment); - } - - [^*\\n]* /* eat anything that's not a '*' */ - "*"+[^*/\\n]* /* eat up '*'s not followed by '/'s */ - \\n ++line_num; - "*"+"/" BEGIN(comment_caller); - -.fi -One can then implement a "stack" of start conditions using an -array of integers. (It is likely that such stacks will become -a full-fledged -.I flex -feature in the future.) Note, though, that -start conditions do not have their own name-space; %s's and %x's -declare names in the same fashion as #define's. -.SH MULTIPLE INPUT BUFFERS -Some scanners (such as those which support "include" files) -require reading from several input streams. As -.I flex -scanners do a large amount of buffering, one cannot control -where the next input will be read from by simply writing a -.B YY_INPUT -which is sensitive to the scanning context. -.B YY_INPUT -is only called when the scanner reaches the end of its buffer, which -may be a long time after scanning a statement such as an "include" -which requires switching the input source. -.LP -To negotiate these sorts of problems, -.I flex -provides a mechanism for creating and switching between multiple -input buffers. An input buffer is created by using: -.nf - - YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) - -.fi -which takes a -.I FILE -pointer and a size and creates a buffer associated with the given -file and large enough to hold -.I size -characters (when in doubt, use -.B YY_BUF_SIZE -for the size). It returns a -.B YY_BUFFER_STATE -handle, which may then be passed to other routines: -.nf - - void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) - -.fi -switches the scanner's input buffer so subsequent tokens will -come from -.I new_buffer. -Note that -.B yy_switch_to_buffer() -may be used by yywrap() to sets things up for continued scanning, instead -of opening a new file and pointing -.I yyin -at it. -.nf - - void yy_delete_buffer( YY_BUFFER_STATE buffer ) - -.fi -is used to reclaim the storage associated with a buffer. -.LP -.B yy_new_buffer() -is an alias for -.B yy_create_buffer(), -provided for compatibility with the C++ use of -.I new -and -.I delete -for creating and destroying dynamic objects. -.LP -Finally, the -.B YY_CURRENT_BUFFER -macro returns a -.B YY_BUFFER_STATE -handle to the current buffer. -.LP -Here is an example of using these features for writing a scanner -which expands include files (the -.B <> -feature is discussed below): -.nf - - /* the "incl" state is used for picking up the name - * of an include file - */ - %x incl - - %{ - #define MAX_INCLUDE_DEPTH 10 - YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH]; - int include_stack_ptr = 0; - %} - - %% - include BEGIN(incl); - - [a-z]+ ECHO; - [^a-z\\n]*\\n? ECHO; - - [ \\t]* /* eat the whitespace */ - [^ \\t\\n]+ { /* got the include file name */ - if ( include_stack_ptr >= MAX_INCLUDE_DEPTH ) - { - fprintf( stderr, "Includes nested too deeply" ); - exit( 1 ); - } - - include_stack[include_stack_ptr++] = - YY_CURRENT_BUFFER; - - yyin = fopen( yytext, "r" ); - - if ( ! yyin ) - error( ... ); - - yy_switch_to_buffer( - yy_create_buffer( yyin, YY_BUF_SIZE ) ); - - BEGIN(INITIAL); - } - - <> { - if ( --include_stack_ptr < 0 ) - { - yyterminate(); - } - - else - yy_switch_to_buffer( - include_stack[include_stack_ptr] ); - } - -.fi -.SH END-OF-FILE RULES -The special rule "<>" indicates -actions which are to be taken when an end-of-file is -encountered and yywrap() returns non-zero (i.e., indicates -no further files to process). The action must finish -by doing one of four things: -.IP - -the special -.B YY_NEW_FILE -action, if -.I yyin -has been pointed at a new file to process; -.IP - -a -.I return -statement; -.IP - -the special -.B yyterminate() -action; -.IP - -or, switching to a new buffer using -.B yy_switch_to_buffer() -as shown in the example above. -.LP -<> rules may not be used with other -patterns; they may only be qualified with a list of start -conditions. If an unqualified <> rule is given, it -applies to -.I all -start conditions which do not already have <> actions. To -specify an <> rule for only the initial start condition, use -.nf - - <> - -.fi -.LP -These rules are useful for catching things like unclosed comments. -An example: -.nf - - %x quote - %% - - ...other rules for dealing with quotes... - - <> { - error( "unterminated quote" ); - yyterminate(); - } - <> { - if ( *++filelist ) - { - yyin = fopen( *filelist, "r" ); - YY_NEW_FILE; - } - else - yyterminate(); - } - -.fi -.SH MISCELLANEOUS MACROS -The macro -.B YY_USER_ACTION -can be redefined to provide an action -which is always executed prior to the matched rule's action. For example, -it could be #define'd to call a routine to convert yytext to lower-case. -.LP -The macro -.B YY_USER_INIT -may be redefined to provide an action which is always executed before -the first scan (and before the scanner's internal initializations are done). -For example, it could be used to call a routine to read -in a data table or open a logging file. -.LP -In the generated scanner, the actions are all gathered in one large -switch statement and separated using -.B YY_BREAK, -which may be redefined. By default, it is simply a "break", to separate -each rule's action from the following rule's. -Redefining -.B YY_BREAK -allows, for example, C++ users to -#define YY_BREAK to do nothing (while being very careful that every -rule ends with a "break" or a "return"!) to avoid suffering from -unreachable statement warnings where because a rule's action ends with -"return", the -.B YY_BREAK -is inaccessible. -.SH INTERFACING WITH YACC -One of the main uses of -.I flex -is as a companion to the -.I yacc -parser-generator. -.I yacc -parsers expect to call a routine named -.B yylex() -to find the next input token. The routine is supposed to -return the type of the next token as well as putting any associated -value in the global -.B yylval. -To use -.I flex -with -.I yacc, -one specifies the -.B -d -option to -.I yacc -to instruct it to generate the file -.B y.tab.h -containing definitions of all the -.B %tokens -appearing in the -.I yacc -input. This file is then included in the -.I flex -scanner. For example, if one of the tokens is "TOK_NUMBER", -part of the scanner might look like: -.nf - - %{ - #include "y.tab.h" - %} - - %% - - [0-9]+ yylval = atoi( yytext ); return TOK_NUMBER; - -.fi -.SH TRANSLATION TABLE -In the name of POSIX compliance, -.I flex -supports a -.I translation table -for mapping input characters into groups. -The table is specified in the first section, and its format looks like: -.nf - - %t - 1 abcd - 2 ABCDEFGHIJKLMNOPQRSTUVWXYZ - 52 0123456789 - 6 \\t\\ \\n - %t - -.fi -This example specifies that the characters 'a', 'b', 'c', and 'd' -are to all be lumped into group #1, upper-case letters -in group #2, digits in group #52, tabs, blanks, and newlines into -group #6, and -.I -no other characters will appear in the patterns. -The group numbers are actually disregarded by -.I flex; -.B %t -serves, though, to lump characters together. Given the above -table, for example, the pattern "a(AA)*5" is equivalent to "d(ZQ)*0". -They both say, "match any character in group #1, followed by -zero-or-more pairs of characters -from group #2, followed by a character from group #52." Thus -.B %t -provides a crude way for introducing equivalence classes into -the scanner specification. -.LP -Note that the -.B -i -option (see below) coupled with the equivalence classes which -.I flex -automatically generates take care of virtually all the instances -when one might consider using -.B %t. -But what the hell, it's there if you want it. -.SH OPTIONS -.I flex -has the following options: -.TP -.B -b -Generate backtracking information to -.I lex.backtrack. -This is a list of scanner states which require backtracking -and the input characters on which they do so. By adding rules one -can remove backtracking states. If all backtracking states -are eliminated and -.B -f -or -.B -F -is used, the generated scanner will run faster (see the -.B -p -flag). Only users who wish to squeeze every last cycle out of their -scanners need worry about this option. (See the section on PERFORMANCE -CONSIDERATIONS below.) -.TP -.B -c -is a do-nothing, deprecated option included for POSIX compliance. -.IP -.B NOTE: -in previous releases of -.I flex -.B -c -specified table-compression options. This functionality is -now given by the -.B -C -flag. To ease the the impact of this change, when -.I flex -encounters -.B -c, -it currently issues a warning message and assumes that -.B -C -was desired instead. In the future this "promotion" of -.B -c -to -.B -C -will go away in the name of full POSIX compliance (unless -the POSIX meaning is removed first). -.TP -.B -d -makes the generated scanner run in -.I debug -mode. Whenever a pattern is recognized and the global -.B yy_flex_debug -is non-zero (which is the default), -the scanner will write to -.I stderr -a line of the form: -.nf - - --accepting rule at line 53 ("the matched text") - -.fi -The line number refers to the location of the rule in the file -defining the scanner (i.e., the file that was fed to flex). Messages -are also generated when the scanner backtracks, accepts the -default rule, reaches the end of its input buffer (or encounters -a NUL; at this point, the two look the same as far as the scanner's concerned), -or reaches an end-of-file. -.TP -.B -f -specifies (take your pick) -.I full table -or -.I fast scanner. -No table compression is done. The result is large but fast. -This option is equivalent to -.B -Cf -(see below). -.TP -.B -i -instructs -.I flex -to generate a -.I case-insensitive -scanner. The case of letters given in the -.I flex -input patterns will -be ignored, and tokens in the input will be matched regardless of case. The -matched text given in -.I yytext -will have the preserved case (i.e., it will not be folded). -.TP -.B -n -is another do-nothing, deprecated option included only for -POSIX compliance. -.TP -.B -p -generates a performance report to stderr. The report -consists of comments regarding features of the -.I flex -input file which will cause a loss of performance in the resulting scanner. -Note that the use of -.I REJECT -and variable trailing context (see the BUGS section in flex(1)) -entails a substantial performance penalty; use of -.I yymore(), -the -.B ^ -operator, -and the -.B -I -flag entail minor performance penalties. -.TP -.B -s -causes the -.I default rule -(that unmatched scanner input is echoed to -.I stdout) -to be suppressed. If the scanner encounters input that does not -match any of its rules, it aborts with an error. This option is -useful for finding holes in a scanner's rule set. -.TP -.B -t -instructs -.I flex -to write the scanner it generates to standard output instead -of -.B lex.yy.c. -.TP -.B -v -specifies that -.I flex -should write to -.I stderr -a summary of statistics regarding the scanner it generates. -Most of the statistics are meaningless to the casual -.I flex -user, but the -first line identifies the version of -.I flex, -which is useful for figuring -out where you stand with respect to patches and new releases, -and the next two lines give the date when the scanner was created -and a summary of the flags which were in effect. -.TP -.B -F -specifies that the -.I fast -scanner table representation should be used. This representation is -about as fast as the full table representation -.RB ( \-f ), -and for some sets of patterns will be considerably smaller (and for -others, larger). In general, if the pattern set contains both "keywords" -and a catch-all, "identifier" rule, such as in the set: -.nf - - "case" return TOK_CASE; - "switch" return TOK_SWITCH; - ... - "default" return TOK_DEFAULT; - [a-z]+ return TOK_ID; - -.fi -then you're better off using the full table representation. If only -the "identifier" rule is present and you then use a hash table or some such -to detect the keywords, you're better off using -.BR \-F . -.IP -This option is equivalent to -.B -CF -(see below). -.TP -.B -I -instructs -.I flex -to generate an -.I interactive -scanner. Normally, scanners generated by -.I flex -always look ahead one -character before deciding that a rule has been matched. At the cost of -some scanning overhead, -.I flex -will generate a scanner which only looks ahead -when needed. Such scanners are called -.I interactive -because if you want to write a scanner for an interactive system such as a -command shell, you will probably want the user's input to be terminated -with a newline, and without -.B -I -the user will have to type a character in addition to the newline in order -to have the newline recognized. This leads to dreadful interactive -performance. -.IP -If all this seems to confusing, here's the general rule: if a human will -be typing in input to your scanner, use -.B -I, -otherwise don't; if you don't care about squeezing the utmost performance -from your scanner and you -don't want to make any assumptions about the input to your scanner, -use -.B -I. -.IP -Note, -.B -I -cannot be used in conjunction with -.I full -or -.I fast tables, -i.e., the -.B -f, -F, -Cf, -or -.B -CF -flags. -.TP -.B -L -instructs -.I flex -not to generate -.B #line -directives. Without this option, -.I flex -peppers the generated scanner -with #line directives so error messages in the actions will be correctly -located with respect to the original -.I flex -input file, and not to -the fairly meaningless line numbers of -.B lex.yy.c. -(Unfortunately -.I flex -does not presently generate the necessary directives -to "retarget" the line numbers for those parts of -.B lex.yy.c -which it generated. So if there is an error in the generated code, -a meaningless line number is reported.) -.TP -.B -T -makes -.I flex -run in -.I trace -mode. It will generate a lot of messages to -.I stdout -concerning -the form of the input and the resultant non-deterministic and deterministic -finite automata. This option is mostly for use in maintaining -.I flex. -.TP -.B -8 -instructs -.I flex -to generate an 8-bit scanner, i.e., one which can recognize 8-bit -characters. On some sites, -.I flex -is installed with this option as the default. On others, the default -is 7-bit characters. To see which is the case, check the verbose -.B (-v) -output for "equivalence classes created". If the denominator of -the number shown is 128, then by default -.I flex -is generating 7-bit characters. If it is 256, then the default is -8-bit characters and the -.B -8 -flag is not required (but may be a good idea to keep the scanner -specification portable). Feeding a 7-bit scanner 8-bit characters -will result in infinite loops, bus errors, or other such fireworks, -so when in doubt, use the flag. Note that if equivalence classes -are used, 8-bit scanners take only slightly more table space than -7-bit scanners (128 bytes, to be exact); if equivalence classes are -not used, however, then the tables may grow up to twice their -7-bit size. -.TP -.B -C[efmF] -controls the degree of table compression. -.IP -.B -Ce -directs -.I flex -to construct -.I equivalence classes, -i.e., sets of characters -which have identical lexical properties (for example, if the only -appearance of digits in the -.I flex -input is in the character class -"[0-9]" then the digits '0', '1', ..., '9' will all be put -in the same equivalence class). Equivalence classes usually give -dramatic reductions in the final table/object file sizes (typically -a factor of 2-5) and are pretty cheap performance-wise (one array -look-up per character scanned). -.IP -.B -Cf -specifies that the -.I full -scanner tables should be generated - -.I flex -should not compress the -tables by taking advantages of similar transition functions for -different states. -.IP -.B -CF -specifies that the alternate fast scanner representation (described -above under the -.B -F -flag) -should be used. -.IP -.B -Cm -directs -.I flex -to construct -.I meta-equivalence classes, -which are sets of equivalence classes (or characters, if equivalence -classes are not being used) that are commonly used together. Meta-equivalence -classes are often a big win when using compressed tables, but they -have a moderate performance impact (one or two "if" tests and one -array look-up per character scanned). -.IP -A lone -.B -C -specifies that the scanner tables should be compressed but neither -equivalence classes nor meta-equivalence classes should be used. -.IP -The options -.B -Cf -or -.B -CF -and -.B -Cm -do not make sense together - there is no opportunity for meta-equivalence -classes if the table is not being compressed. Otherwise the options -may be freely mixed. -.IP -The default setting is -.B -Cem, -which specifies that -.I flex -should generate equivalence classes -and meta-equivalence classes. This setting provides the highest -degree of table compression. You can trade off -faster-executing scanners at the cost of larger tables with -the following generally being true: -.nf - - slowest & smallest - -Cem - -Cm - -Ce - -C - -C{f,F}e - -C{f,F} - fastest & largest - -.fi -Note that scanners with the smallest tables are usually generated and -compiled the quickest, so -during development you will usually want to use the default, maximal -compression. -.IP -.B -Cfe -is often a good compromise between speed and size for production -scanners. -.IP -.B -C -options are not cumulative; whenever the flag is encountered, the -previous -C settings are forgotten. -.TP -.B -Sskeleton_file -overrides the default skeleton file from which -.I flex -constructs its scanners. You'll never need this option unless you are doing -.I flex -maintenance or development. -.SH PERFORMANCE CONSIDERATIONS -The main design goal of -.I flex -is that it generate high-performance scanners. It has been optimized -for dealing well with large sets of rules. Aside from the effects -of table compression on scanner speed outlined above, -there are a number of options/actions which degrade performance. These -are, from most expensive to least: -.nf - - REJECT - - pattern sets that require backtracking - arbitrary trailing context - - '^' beginning-of-line operator - yymore() - -.fi -with the first three all being quite expensive and the last two -being quite cheap. -.LP -.B REJECT -should be avoided at all costs when performance is important. -It is a particularly expensive option. -.LP -Getting rid of backtracking is messy and often may be an enormous -amount of work for a complicated scanner. In principal, one begins -by using the -.B -b -flag to generate a -.I lex.backtrack -file. For example, on the input -.nf - - %% - foo return TOK_KEYWORD; - foobar return TOK_KEYWORD; - -.fi -the file looks like: -.nf - - State #6 is non-accepting - - associated rule line numbers: - 2 3 - out-transitions: [ o ] - jam-transitions: EOF [ \\001-n p-\\177 ] - - State #8 is non-accepting - - associated rule line numbers: - 3 - out-transitions: [ a ] - jam-transitions: EOF [ \\001-` b-\\177 ] - - State #9 is non-accepting - - associated rule line numbers: - 3 - out-transitions: [ r ] - jam-transitions: EOF [ \\001-q s-\\177 ] - - Compressed tables always backtrack. - -.fi -The first few lines tell us that there's a scanner state in -which it can make a transition on an 'o' but not on any other -character, and that in that state the currently scanned text does not match -any rule. The state occurs when trying to match the rules found -at lines 2 and 3 in the input file. -If the scanner is in that state and then reads -something other than an 'o', it will have to backtrack to find -a rule which is matched. With -a bit of headscratching one can see that this must be the -state it's in when it has seen "fo". When this has happened, -if anything other than another 'o' is seen, the scanner will -have to back up to simply match the 'f' (by the default rule). -.LP -The comment regarding State #8 indicates there's a problem -when "foob" has been scanned. Indeed, on any character other -than a 'b', the scanner will have to back up to accept "foo". -Similarly, the comment for State #9 concerns when "fooba" has -been scanned. -.LP -The final comment reminds us that there's no point going to -all the trouble of removing backtracking from the rules unless -we're using -.B -f -or -.B -F, -since there's no performance gain doing so with compressed scanners. -.LP -The way to remove the backtracking is to add "error" rules: -.nf - - %% - foo return TOK_KEYWORD; - foobar return TOK_KEYWORD; - - fooba | - foob | - fo { - /* false alarm, not really a keyword */ - return TOK_ID; - } - -.fi -.LP -Eliminating backtracking among a list of keywords can also be -done using a "catch-all" rule: -.nf - - %% - foo return TOK_KEYWORD; - foobar return TOK_KEYWORD; - - [a-z]+ return TOK_ID; - -.fi -This is usually the best solution when appropriate. -.LP -Backtracking messages tend to cascade. -With a complicated set of rules it's not uncommon to get hundreds -of messages. If one can decipher them, though, it often -only takes a dozen or so rules to eliminate the backtracking (though -it's easy to make a mistake and have an error rule accidentally match -a valid token. A possible future -.I flex -feature will be to automatically add rules to eliminate backtracking). -.LP -.I Variable -trailing context (where both the leading and trailing parts do not have -a fixed length) entails almost the same performance loss as -.I REJECT -(i.e., substantial). So when possible a rule like: -.nf - - %% - mouse|rat/(cat|dog) run(); - -.fi -is better written: -.nf - - %% - mouse/cat|dog run(); - rat/cat|dog run(); - -.fi -or as -.nf - - %% - mouse|rat/cat run(); - mouse|rat/dog run(); - -.fi -Note that here the special '|' action does -.I not -provide any savings, and can even make things worse (see -.B BUGS -in flex(1)). -.LP -Another area where the user can increase a scanner's performance -(and one that's easier to implement) arises from the fact that -the longer the tokens matched, the faster the scanner will run. -This is because with long tokens the processing of most input -characters takes place in the (short) inner scanning loop, and -does not often have to go through the additional work of setting up -the scanning environment (e.g., -.B yytext) -for the action. Recall the scanner for C comments: -.nf - - %x comment - %% - int line_num = 1; - - "/*" BEGIN(comment); - - [^*\\n]* - "*"+[^*/\\n]* - \\n ++line_num; - "*"+"/" BEGIN(INITIAL); - -.fi -This could be sped up by writing it as: -.nf - - %x comment - %% - int line_num = 1; - - "/*" BEGIN(comment); - - [^*\\n]* - [^*\\n]*\\n ++line_num; - "*"+[^*/\\n]* - "*"+[^*/\\n]*\\n ++line_num; - "*"+"/" BEGIN(INITIAL); - -.fi -Now instead of each newline requiring the processing of another -action, recognizing the newlines is "distributed" over the other rules -to keep the matched text as long as possible. Note that -.I adding -rules does -.I not -slow down the scanner! The speed of the scanner is independent -of the number of rules or (modulo the considerations given at the -beginning of this section) how complicated the rules are with -regard to operators such as '*' and '|'. -.LP -A final example in speeding up a scanner: suppose you want to scan -through a file containing identifiers and keywords, one per line -and with no other extraneous characters, and recognize all the -keywords. A natural first approach is: -.nf - - %% - asm | - auto | - break | - ... etc ... - volatile | - while /* it's a keyword */ - - .|\\n /* it's not a keyword */ - -.fi -To eliminate the back-tracking, introduce a catch-all rule: -.nf - - %% - asm | - auto | - break | - ... etc ... - volatile | - while /* it's a keyword */ - - [a-z]+ | - .|\\n /* it's not a keyword */ - -.fi -Now, if it's guaranteed that there's exactly one word per line, -then we can reduce the total number of matches by a half by -merging in the recognition of newlines with that of the other -tokens: -.nf - - %% - asm\\n | - auto\\n | - break\\n | - ... etc ... - volatile\\n | - while\\n /* it's a keyword */ - - [a-z]+\\n | - .|\\n /* it's not a keyword */ - -.fi -One has to be careful here, as we have now reintroduced backtracking -into the scanner. In particular, while -.I we -know that there will never be any characters in the input stream -other than letters or newlines, -.I flex -can't figure this out, and it will plan for possibly needing backtracking -when it has scanned a token like "auto" and then the next character -is something other than a newline or a letter. Previously it would -then just match the "auto" rule and be done, but now it has no "auto" -rule, only a "auto\\n" rule. To eliminate the possibility of backtracking, -we could either duplicate all rules but without final newlines, or, -since we never expect to encounter such an input and therefore don't -how it's classified, we can introduce one more catch-all rule, this -one which doesn't include a newline: -.nf - - %% - asm\\n | - auto\\n | - break\\n | - ... etc ... - volatile\\n | - while\\n /* it's a keyword */ - - [a-z]+\\n | - [a-z]+ | - .|\\n /* it's not a keyword */ - -.fi -Compiled with -.B -Cf, -this is about as fast as one can get a -.I flex -scanner to go for this particular problem. -.LP -A final note: -.I flex -is slow when matching NUL's, particularly when a token contains -multiple NUL's. -It's best to write rules which match -.I short -amounts of text if it's anticipated that the text will often include NUL's. -.SH INCOMPATIBILITIES WITH LEX AND POSIX -.I flex -is a rewrite of the Unix -.I lex -tool (the two implementations do not share any code, though), -with some extensions and incompatibilities, both of which -are of concern to those who wish to write scanners acceptable -to either implementation. At present, the POSIX -.I lex -draft is -very close to the original -.I lex -implementation, so some of these -incompatibilities are also in conflict with the POSIX draft. But -the intent is that except as noted below, -.I flex -as it presently stands will -ultimately be POSIX conformant (i.e., that those areas of conflict with -the POSIX draft will be resolved in -.I flex's -favor). Please bear in -mind that all the comments which follow are with regard to the POSIX -.I draft -standard of Summer 1989, and not the final document (or subsequent -drafts); they are included so -.I flex -users can be aware of the standardization issues and those areas where -.I flex -may in the near future undergo changes incompatible with -its current definition. -.LP -.I flex -is fully compatible with -.I lex -with the following exceptions: -.IP - -The undocumented -.I lex -scanner internal variable -.B yylineno -is not supported. It is difficult to support this option efficiently, -since it requires examining every character scanned and reexamining -the characters when the scanner backs up. -Things get more complicated when the end of buffer or file is reached or a -NUL is scanned (since the scan must then be restarted with the proper line -number count), or the user uses the yyless(), unput(), or REJECT actions, -or the multiple input buffer functions. -.IP -The fix is to add rules which, upon seeing a newline, increment -yylineno. This is usually an easy process, though it can be a drag if some -of the patterns can match multiple newlines along with other characters. -.IP -yylineno is not part of the POSIX draft. -.IP - -The -.B input() -routine is not redefinable, though it may be called to read characters -following whatever has been matched by a rule. If -.B input() -encounters an end-of-file the normal -.B yywrap() -processing is done. A ``real'' end-of-file is returned by -.B input() -as -.I EOF. -.IP -Input is instead controlled by redefining the -.B YY_INPUT -macro. -.IP -The -.I flex -restriction that -.B input() -cannot be redefined is in accordance with the POSIX draft, but -.B YY_INPUT -has not yet been accepted into the draft (and probably won't; it looks -like the draft will simply not specify any way of controlling the -scanner's input other than by making an initial assignment to -.I yyin). -.IP - -.I flex -scanners do not use stdio for input. Because of this, when writing an -interactive scanner one must explicitly call fflush() on the -stream associated with the terminal after writing out a prompt. -With -.I lex -such writes are automatically flushed since -.I lex -scanners use -.B getchar() -for their input. Also, when writing interactive scanners with -.I flex, -the -.B -I -flag must be used. -.IP - -.I flex -scanners are not as reentrant as -.I lex -scanners. In particular, if you have an interactive scanner and -an interrupt handler which long-jumps out of the scanner, and -the scanner is subsequently called again, you may get the following -message: -.nf - - fatal flex scanner internal error--end of buffer missed - -.fi -To reenter the scanner, first use -.nf - - yyrestart( yyin ); - -.fi -.IP - -.B output() -is not supported. -Output from the -.B ECHO -macro is done to the file-pointer -.I yyout -(default -.I stdout). -.IP -The POSIX draft mentions that an -.B output() -routine exists but currently gives no details as to what it does. -.IP - -.I lex -does not support exclusive start conditions (%x), though they -are in the current POSIX draft. -.IP - -When definitions are expanded, -.I flex -encloses them in parentheses. -With lex, the following: -.nf - - NAME [A-Z][A-Z0-9]* - %% - foo{NAME}? printf( "Found it\\n" ); - %% - -.fi -will not match the string "foo" because when the macro -is expanded the rule is equivalent to "foo[A-Z][A-Z0-9]*?" -and the precedence is such that the '?' is associated with -"[A-Z0-9]*". With -.I flex, -the rule will be expanded to -"foo([A-Z][A-Z0-9]*)?" and so the string "foo" will match. -Note that because of this, the -.B ^, $, , /, -and -.B <> -operators cannot be used in a -.I flex -definition. -.IP -The POSIX draft interpretation is the same as -.I flex's. -.IP - -To specify a character class which matches anything but a left bracket (']'), -in -.I lex -one can use "[^]]" but with -.I flex -one must use "[^\\]]". The latter works with -.I lex, -too. -.IP - -The -.I lex -.B %r -(generate a Ratfor scanner) option is not supported. It is not part -of the POSIX draft. -.IP - -If you are providing your own yywrap() routine, you must include a -"#undef yywrap" in the definitions section (section 1). Note that -the "#undef" will have to be enclosed in %{}'s. -.IP -The POSIX draft -specifies that yywrap() is a function and this is very unlikely to change; so -.I flex users are warned -that -.B yywrap() -is likely to be changed to a function in the near future. -.IP - -After a call to -.B unput(), -.I yytext -and -.I yyleng -are undefined until the next token is matched. This is not the case with -.I lex -or the present POSIX draft. -.IP - -The precedence of the -.B {} -(numeric range) operator is different. -.I lex -interprets "abc{1,3}" as "match one, two, or -three occurrences of 'abc'", whereas -.I flex -interprets it as "match 'ab' -followed by one, two, or three occurrences of 'c'". The latter is -in agreement with the current POSIX draft. -.IP - -The precedence of the -.B ^ -operator is different. -.I lex -interprets "^foo|bar" as "match either 'foo' at the beginning of a line, -or 'bar' anywhere", whereas -.I flex -interprets it as "match either 'foo' or 'bar' if they come at the beginning -of a line". The latter is in agreement with the current POSIX draft. -.IP - -To refer to yytext outside of the scanner source file, -the correct definition with -.I flex -is "extern char *yytext" rather than "extern char yytext[]". -This is contrary to the current POSIX draft but a point on which -.I flex -will not be changing, as the array representation entails a -serious performance penalty. It is hoped that the POSIX draft will -be emended to support the -.I flex -variety of declaration (as this is a fairly painless change to -require of -.I lex -users). -.IP - -.I yyin -is -.I initialized -by -.I lex -to be -.I stdin; -.I flex, -on the other hand, -initializes -.I yyin -to NULL -and then -.I assigns -it to -.I stdin -the first time the scanner is called, providing -.I yyin -has not already been assigned to a non-NULL value. The difference is -subtle, but the net effect is that with -.I flex -scanners, -.I yyin -does not have a valid value until the scanner has been called. -.IP - -The special table-size declarations such as -.B %a -supported by -.I lex -are not required by -.I flex -scanners; -.I flex -ignores them. -.IP - -The name -.B FLEX_SCANNER -is #define'd so scanners may be written for use with either -.I flex -or -.I lex. -.LP -The following -.I flex -features are not included in -.I lex -or the POSIX draft standard: -.nf - - yyterminate() - <> - YY_DECL - #line directives - %{}'s around actions - yyrestart() - comments beginning with '#' (deprecated) - multiple actions on a line - -.fi -This last feature refers to the fact that with -.I flex -you can put multiple actions on the same line, separated with -semi-colons, while with -.I lex, -the following -.nf - - foo handle_foo(); ++num_foos_seen; - -.fi -is (rather surprisingly) truncated to -.nf - - foo handle_foo(); - -.fi -.I flex -does not truncate the action. Actions that are not enclosed in -braces are simply terminated at the end of the line. -.SH DIAGNOSTICS -.I reject_used_but_not_detected undefined -or -.I yymore_used_but_not_detected undefined - -These errors can occur at compile time. They indicate that the -scanner uses -.B REJECT -or -.B yymore() -but that -.I flex -failed to notice the fact, meaning that -.I flex -scanned the first two sections looking for occurrences of these actions -and failed to find any, but somehow you snuck some in (via a #include -file, for example). Make an explicit reference to the action in your -.I flex -input file. (Note that previously -.I flex -supported a -.B %used/%unused -mechanism for dealing with this problem; this feature is still supported -but now deprecated, and will go away soon unless the author hears from -people who can argue compellingly that they need it.) -.LP -.I flex scanner jammed - -a scanner compiled with -.B -s -has encountered an input string which wasn't matched by -any of its rules. -.LP -.I flex input buffer overflowed - -a scanner rule matched a string long enough to overflow the -scanner's internal input buffer (16K bytes by default - controlled by -.B YY_BUF_SIZE -in "flex.skel". Note that to redefine this macro, you must first -.B #undefine -it). -.LP -.I scanner requires -8 flag - -Your scanner specification includes recognizing 8-bit characters and -you did not specify the -8 flag (and your site has not installed flex -with -8 as the default). -.LP -.I -fatal flex scanner internal error--end of buffer missed - -This can occur in an scanner which is reentered after a long-jump -has jumped out (or over) the scanner's activation frame. Before -reentering the scanner, use: -.nf - - yyrestart( yyin ); - -.fi -.LP -.I too many %t classes! - -You managed to put every single character into its own %t class. -.I flex -requires that at least one of the classes share characters. -.SH DEFICIENCIES / BUGS -See flex(1). -.SH "SEE ALSO" -.LP -flex(1), lex(1), yacc(1), sed(1), awk(1x). -.LP -M. E. Lesk and E. Schmidt, -.I LEX - Lexical Analyzer Generator -.SH AUTHOR -Vern Paxson, with the help of many ideas and much inspiration from -Van Jacobson. Original version by Jef Poskanzer. The fast table -representation is a partial implementation of a design done by Van -Jacobson. The implementation was done by Kevin Gong and Vern Paxson. -.LP -Thanks to the many -.I flex -beta-testers, feedbackers, and contributors, especially Casey -Leedom, benson@odi.com, Keith Bostic, -Frederic Brehm, Nick Christopher, Jason Coughlin, -Scott David Daniels, Leo Eskin, -Chris Faylor, Eric Goldman, Eric -Hughes, Jeffrey R. Jones, Kevin B. Kenny, Ronald Lamprecht, -Greg Lee, Craig Leres, Mohamed el Lozy, Jim Meyering, Marc Nozell, Esmond Pitt, -Jef Poskanzer, Jim Roskind, -Dave Tallman, Frank Whaley, Ken Yap, and those whose names -have slipped my marginal mail-archiving skills but whose contributions -are appreciated all the same. -.LP -Thanks to Keith Bostic, John Gilmore, Craig Leres, Bob -Mulcahy, Rich Salz, and Richard Stallman for help with various distribution -headaches. -.LP -Thanks to Esmond Pitt and Earle Horton for 8-bit character support; -to Benson Margulies and Fred -Burke for C++ support; to Ove Ewerlid for the basics of support for -NUL's; and to Eric Hughes for the basics of support for multiple buffers. -.LP -Work is being done on extending -.I flex -to generate scanners in which the -state machine is directly represented in C code rather than tables. -These scanners may well be substantially faster than those generated -using -f or -F. If you are working in this area and are interested -in comparing notes and seeing whether redundant work can be avoided, -contact Ove Ewerlid (ewerlid@mizar.DoCS.UU.SE). -.LP -This work was primarily done when I was at the Real Time Systems Group -at the Lawrence Berkeley Laboratory in Berkeley, CA. Many thanks to all there -for the support I received. -.LP -Send comments to: -.nf - - Vern Paxson - Computer Science Department - 4126 Upson Hall - Cornell University - Ithaca, NY 14853-7501 - - vern@cs.cornell.edu - decvax!cornell!vern - -.fi -.\" ref. to awk(9) man page corrected -- ASW 2005-01-15 diff --git a/minix/man/man1/linkfarm.1 b/minix/man/man1/linkfarm.1 deleted file mode 100644 index a219670bd..000000000 --- a/minix/man/man1/linkfarm.1 +++ /dev/null @@ -1,148 +0,0 @@ -.\" $NetBSD: linkfarm.1,v 1.6 2009/02/08 23:11:56 wiz Exp $ -.\" -.\" Copyright (c) 2003 The NetBSD Foundation, Inc. -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS -.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -.\" POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd September 2, 2003 -.Dt LINKFARM 1 -.Os -.Sh NAME -.Nm linkfarm -.Nd manage symbolic links to package files -.Sh SYNOPSIS -.Nm -.Op Fl cDnRVv -.Op Fl d Ar stowdir -.Op Fl s Ar subdir -.Op Fl t Ar target -.Ar package -.Sh DESCRIPTION -The -.Nm -command is used to manage a "linkfarm", a directory tree of symbolic links in -.Ar target -to the files in the -.Ar package -sub-directory of -.Ar stowdir . -The default action is to create a linkfarm to a package. -.Pp -The following command-line options are supported: -.Bl -tag -width indent -.It Fl c -Check whether a package contains a linkfarm in -.Ar target . -If -.Ar package -has no symbolic links in -.Ar target -that correspond to its files, then return 0, otherwise return 1. -.It Fl D -Delete the linkfarm for -.Ar package . -.It Fl d Ar stowdir -Set -.Ar stowdir -as the directory in which -.Ar package -can be found. -The default -.Ar stowdir -is the -.Pa packages -sub-directory in the default -.Ar target -directory. -.It Fl n -Don't actually execute the commands for removing and creating the symbolic -links and directories. -.It Fl R -Delete and re-create the linkfarm for -.Ar package . -.It Fl s Ar subdir -The root of the package hierarchy for the linkfarm is the -.Ar subdir -sub-directory in the package. -By default, assume the root of the package hierarchy is simply the -.Ar package -directory. -.It Fl t Ar target -Set -.Ar target -as the directory in which to create and delete the linkfarm for -.Ar package . -The default -.Ar target -directory is -.Pa /usr/pkg -but may be overridden by the -.Ev LOCALBASE -environment variable. -.It Fl V -Print version number and exit. -.It Fl v -Turn on verbose output. -Specifying -.Fl v -multiple times increases the level of verbosity. -.El -.Sh ENVIRONMENT -.Bl -tag -width indent -.It Ev LOCALBASE -The standard packages directory, -.Pa /usr/pkg , -can be overridden by specifying an alternative directory in the -.Ev LOCALBASE -environment variable. -This affects the default -.Ar target -and -.Ar stowdir -directories. -.It Ev PLIST_IGNORE_FILES -This can be used to specify files in -.Ar package -that should ignored when creating and deleting symbolic links in -.Ar target . -.Ev PLIST_IGNORE_FILES -is a space-separated list of shell glob patterns that match files relative -to the -.Ar package -directory, and it defaults to "info/dir *[~#] *.OLD *.orig *,v". -.El -.Sh SEE ALSO -.Xr lndir 1 , -.Xr pkg_view 1 -.Sh AUTHORS -The -.Nm -utility was written by -.An Alistair G. Crooks Aq agc@NetBSD.org . diff --git a/minix/man/man1/mixer.1 b/minix/man/man1/mixer.1 deleted file mode 100644 index e3c2297f9..000000000 --- a/minix/man/man1/mixer.1 +++ /dev/null @@ -1,24 +0,0 @@ -.TH MIXER 1 -.SH NAME -mixer \- manipulate mixer settings on a sound card -.SH SYNOPSIS -\fBmixer\fP [\-\fBr\fP] -.SH DESCRIPTION -\fBMixer\fP, invoked without arguments, turns the screen into a sound mixer. -Levels can be changed with the cursor-left and cursor-right keys. Input and -output settings can be toggled with the space bar. For every sound source -there are two, or one when mono, sliders. -The input controls have only effect when recording with the Dac. These -settings can also be used to switch the left and right channels or, when -both channels are enabled on both Dac channels, record in mono. -To exit the mixer use the 'e' key. - -Mixer settings can be stored and restored with the 's' (store) and 'r' keys. -When the store function is used \fBMixer\fP will write the settings to a file -in the user's home directory called \fI\.mixer\fP. The restore function reads -this file to restore saved settings. -.SH OPTIONS -.IP \-r -restore settings saved in \fI\.mixer\fP and exit immediately -.SH AUTHOR -Michel R. Prevenier (mrpreve@cs.vu.nl) diff --git a/minix/man/man1/pkg_view.1 b/minix/man/man1/pkg_view.1 deleted file mode 100644 index 376dd79a1..000000000 --- a/minix/man/man1/pkg_view.1 +++ /dev/null @@ -1,276 +0,0 @@ -.\" $NetBSD: pkg_view.1,v 1.13 2010/01/22 13:30:42 joerg Exp $ -.\" -.\" Copyright (c) 2003 The NetBSD Foundation, Inc. -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS -.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -.\" POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd September 8, 2003 -.Dt PKG_VIEW 1 -.Os -.Sh NAME -.Nm pkg_view -.Nd add and delete instances of depoted packages in views -.Sh SYNOPSIS -.Nm -.Op Fl nVv -.Op Fl d Ar stowdir -.Op Fl i Ar ignore -.Op Fl k Ar pkg_dbdir -.Op Fl W Ar viewbase -.Op Fl w Ar view -.Ar command -.Ar package ... -.Sh DESCRIPTION -The -.Nm -command is used to add and delete instances of depoted packages in -.Ar stowdir -in a -.Ar view -in the -.Ar viewbase -directory. -.Sh WARNING -.Bf -emphasis -Since the -.Nm -command may execute scripts or programs provided by a package file, -your system may be susceptible to -.Dq Trojan horses -or other subtle -attacks from miscreants who create dangerous package files. -.Pp -You are advised to verify the competence and identity of those who -provide installable package files. -For extra protection, examine all the package control files in the -package database directory -.Pa ( /usr/pkg/packages/\*[Lt]pkg-name\*[Gt]/ ) . -Pay particular attention to any -.Pa +INSTALL -or -.Pa +DEINSTALL -files, and inspect the -.Pa +CONTENTS -file for -.Cm @cwd , -.Cm @mode -(check for setuid), -.Cm @dirrm , -.Cm @exec , -and -.Cm @unexec -directives, and/or use the -.Xr pkg_info 1 -command to examine the installed package control files. -.Ef -.Sh OPTIONS -The following command-line options are supported: -.Bl -tag -width indent -.It Fl d Ar stowdir -Set -.Ar stowdir -as the directory in which the depoted packages can be found. -If this option isn't specified, then the -.Ar stowdir -is taken from the value of the environment variable -.Ev DEPOTBASE -if it's set, otherwise the default -.Ar stowdir -is the path to the -.Pa packages -directory under -.Ar viewbase . -.It Fl i Ar ignore -Add -.Ar ignore -to the list of files in -.Ar package -that should ignored when adding or removing the package instance from -.Ar view . -.It Fl k Ar pkg_dbdir -Override the value of the -.Dv PKG_DBDIR -configuration option with the value -.Ar pkg_dbdir . -This is used as as the package database directory for the -default (empty) view. -.It Fl n -Don't actually execute the commands for manipulating the package instances. -.It Fl V -Print the version number and exit. -.It Fl v -Turn on verbose output. -Specifying -.Fl v -multiple times increases the level of verbosity. -.It Fl W Ar viewbase -Set -.Ar viewbase -as the directory in which all the views are managed. -The default -.Ar viewbase -directory is -.Pa /usr/pkg -but may be overridden by the -.Ev LOCALBASE -environment variable. -.It Fl w Ar view -Set -.Ar view -as the directory in -.Ar viewbase -in which the package instances should be added or deleted. -The default -.Ar view -is the empty view but may be overridden by the -.Ev PKG_VIEW -environment variable. -.El -.Pp -The following commands are supported: -.Bl -tag -width indent -.It Cm add -Add the listed package instances into -.Ar view . -.It Cm check -Check whether the listed package instances are present in -.Ar view . -If they are not present, then return 0, otherwise return 1. -.It Cm delete -Delete the listed package instances from -.Ar view . -.El -.Sh ENVIRONMENT -.Bl -tag -width indent -.It Ev DEPOTBASE -This is the location of the -.Ar stowdir -directory inside which all depoted packages are kept. -The default -.Ar stowdir -is the -.Pa packages -directory under -.Ar viewbase . -.It Ev LOCALBASE -This is the location of the -.Ar viewbase -directory in which all the views are managed. -The default -.Ar viewbase -directory is -.Pa /usr/pkg . -.It Ev PKG_DBDIR -If the -.Fl k -flag isn't given, then the value of the environment variable -.Ev PKG_DBDIR -is the package database directory for the default view, -otherwise it defaults to -.Pa /var/db/pkg . -.It Ev PLIST_IGNORE_FILES -This can be used to specify files in -.Ar package -that should ignored when adding or removing the package instance from -.Ar view . -.Ev PLIST_IGNORE_FILES -is a space-separated list of shell glob patterns that match files relative -to the -.Ar package -depot directory, and it defaults to "info/dir *[~#] *.OLD *.orig *,v". -This is overridden by any -.Ev _PLIST_IGNORE_FILES -setting in a package's -.Ar build-info-file -(see -.Xr pkg_create 1 ) -if it exists. -.It Ev PKG_VIEW -The default view can be specified in the -.Ev PKG_VIEW -environment variable. -.El -.Sh FILES -.Bl -tag -width indent -.It Pa \*[Lt]pkg-dbdir\*[Gt]/\*[Lt]package\*[Gt]/+INSTALL -If the package contains an -.Ar install -script (see -.Xr pkg_create 1 ) , -then after the package instance is added into a view, the script is -executed with the following arguments: -.Bl -tag -width package -.It Ar package -The name of the package instance being added. -.It Cm VIEW-INSTALL -Keyword denoting that the script is to perform any actions needed after -the package instance is added to a view. -.El -.Pp -If the -.Ar install -script exits with a non-zero status code, the installation is terminated. -.It Pa \*[Lt]pkg-dbdir\*[Gt]/\*[Lt]package\*[Gt]/+DEINSTALL -If the package contains an -.Ar deinstall -script (see -.Xr pkg_create 1 ) , -then before the package instance is deleted from a view, the script is -executed with the following arguments: -.Bl -tag -width package -.It Ar package -The name of the package instance being deleted. -.It Cm VIEW-DEINSTALL -Keyword denoting that the script is to perform any actions needed before -the package instance is deleted from a view. -.El -.Pp -If the -.Ar deinstall -script exits with a non-zero status code, the de-installation is terminated. -.El -.Pp -The -.Ar install -and -.Ar deinstall -scripts are called with the environment variable -.Ev PKG_PREFIX -set to the path to the -.Ar view -directory. -.Sh SEE ALSO -.Xr linkfarm 1 , -.Xr pkg_delete 1 -.Sh AUTHORS -The -.Nm -utility was written by -.An Alistair G. Crooks Aq agc@NetBSD.org . diff --git a/minix/man/man1/template.1 b/minix/man/man1/template.1 deleted file mode 100644 index 23ac5da09..000000000 --- a/minix/man/man1/template.1 +++ /dev/null @@ -1,46 +0,0 @@ -.TH TEMPLATE 1 -.SH NAME -template, blueprint \- a blueprint for making manual pages -.SH SYNOPSIS -.B template -.RB [ \-az ] -.RI [ arguments " ...]" -.SH DESCRIPTION -.de SP -.if t .sp 0.4 -.if n .sp -.. -.B Template -shows what a manual page should look like. Options for instance: -.SH OPTIONS -.TP -.B \-a -Use boldface for characters that have to be typed as is. -.TP -.B \-z -Italics for variable -.IR arguments . -.SH ENVIRONMENT -.TP 15n -.B MANPATH -The path to knowledge. -.SH FILES -.TP 25n -.B /usr/man/template.1 -This file. -.SH "SEE ALSO" -.BR man (7). -.SH DIAGNOSTICS -man: No manual on template. -.SH NOTES -Use at your own risk. -.SH BUGS -A lot. The -.BR whatis (5) -database is usually generated automatically on most -systems. This fails if the "NAME" section has more n/troff fluff than just -an "\e" before the '\-', or is more than one line. Apply the KISS -principle, try to use a minimum of smart macros, match your .RS and .RE's, -etc. -.SH AUTHOR -Kees J. Bot diff --git a/minix/man/man1/yap.1 b/minix/man/man1/yap.1 deleted file mode 100644 index eb3e11536..000000000 --- a/minix/man/man1/yap.1 +++ /dev/null @@ -1,391 +0,0 @@ -.\" $Header$ -.\" nroff -man yap.1 -.tr ~ -.TH YAP 1 local -.SH NAME -yap, more \- yet another pager -.SH SYNOPSIS -.B yap -.RB [ \-cnuq ] -.RB [ \-\fIn\fP ] -.RB [ +\fIcommand\fP ] -.RI [ file " ...]" -.SH DESCRIPTION -.B Yap -is a program allowing the user to examine a continuous text one screenful at -a time on a video display terminal. -It does so by -pausing after each screenful, waiting for the user to type a command. -The commands are enumerated later. -.BR Yap 's -main feature is, that it can page both forwards and backwards, -even when reading from standard input. -.PP -The command line options are: -.TP -.I \-n -An integer which is the size (in lines) of a page (the initial -.IR page-size . -.TP -.B \-c -Normally, -.B yap -will display each page by beginning at the top of the screen and erasing -each line just before it displays on it. If your terminal cannot erase a line, -.B yap -will clear the screen before it displays a page. -.br -This avoids scrolling the screen, making it easier to read while -.B yap -is writing. -The -.B -c -option causes -.B yap -to scroll the screen instead of beginning at the top of the screen. -This is also done if your terminal cannot either erase a line or clear the -screen. -.TP -.B \-u -Normally, -.B yap -handles underlining such as produced by nroff in a manner appropriate -to the particular terminal: if the terminal can perform underlining well -(t.i., the escape sequences for underlining do not occupy space on the -screen), -.B yap -will underline underlined information in the input. The -.B -u -option supresses this underlining. -.TP -.B \-n -Normally, -.B yap -also recognises escape sequences for stand-out mode or underlining mode -in the input, and knows how much space these escape sequences will -occupy on the screen, so that -.B yap -will not fold lines erroneously. -The -.B -n -option supresses this pattern matching. -.TP -.B \-q -This option will cause -.B yap -to exit only on the "quit" command. -.TP -.BI + command -\fIcommand\fP is taken to be an initial command to -.BR yap . -.PP -.B Yap -looks in the -.B YAP -environment variable -to pre-set flags. -For instance, if you prefer the -.B -c -mode of operation, just set the -.B YAP -environment variable to -.BR -c . -.PP -The commands of -.B yap -can be bound to sequences of keystrokes. -The environment variable -.B YAPKEYS -may contain the bindings in the -form of a list of colon-separated `name=sequence' pairs. -The -.I name -is a short mnemonic for the command, the -.I sequence -is the sequence of keystrokes to be typed to invoke the command. -This sequence may contain a ^X escape, which means control-X, -and a \\X escape, which means X. The latter can be used to get -the characters `^', `\\' and `:' in the sequence. -There are two keymaps available, the default one and a user-defined one. -You can switch between one and the other with the -.I change keymap -command. -.PP -The -.B yap -commands are described below. -The mnemonics for the commands are given in parentheses. The default -key sequences (if any) are given after the mnemonic. -Every command takes an optional integer argument, which may be typed -before the command. Some commands just ignore it. The integer argument -is referred to as -.IR i . -Usually, if -.I i -is not given, it defaults to 1. -.de Nc -.PP -\&\\$1 -.RI ( \\$2 ) -.BR \\$3 -.br -.RS -.. -.de Ec -.RE -.. -.Nc "visit previous file" bf P -Visit the -.IR i -th -previous file given in the command line. -.Ec -.Nc "scroll one line up or go to line" bl "^K ~or~ k" -If -.I i -is not given, scroll one line up. Otherwise, -.I i -will be interpreted as a line number. A page starting with the line -indicated will then be displayed. -.Ec -.Nc "bottom" bot "l ~or~ $" -Go to the last line of the input. -.Ec -.Nc "display previous page" bp - -Display the previous page, consisting of -.I i -lines, (or -.I page-size -lines if no argument is given). -.Ec -.Nc "display previous page and set pagesize" bps Z -Display the previous page, consisting of -.I i -lines, (or -.I page-size -lines if no argument is given). -If -.I i -is given, the -.I page-size -is set to -.IR i . -.Ec -.Nc "scroll up" bs ^B -Scroll up -.I i -lines (or -.I scroll-size -lines if -.I i -is not given. Initially, the -.I scroll-size -is 11). -.Ec -.Nc "search backwards for pattern" bse ? -Search backwards for the -.IR i -th -occurrence of a regular expression which will be prompted for. -If there are less than -.I i -occurrences of the expression, the position in the file remains unchanged. -Otherwise, a page is displayed, starting two lines before the place where the -expression was found. The user's erase and kill characters may be used -to edit the expression. -Erasing back past the first character cancels the search command. -.br -Note: Some systems do not have -.BR regex (3). -On those systems, searches are still supported, but regular expressions -are not. -.Ec -.Nc "skip lines backwards" bsl S -Skip -.I i -lines backwards and display a page. -.Ec -.Nc "skip pages backwards" bsp F -Skip -.I i -pages backwards and display a page. -.Ec -.Nc "scroll up and set scrollsize" bss b -Scroll up -.I i -lines (or -.I scroll-size -lines if -.I i -is not given. -If -.I i -is given, the -.I scroll-size -is set to -.IR i . -.Ec -.Nc "change key map" chm X -Change from the current key map to the other (if there is one). -.Ec -.Nc "exchange current page and mark" exg x -Set the mark to the current page, and display the previously marked -page. -.Ec -.Nc "visit next file" ff N -Visit the -.IR i -th -next file given in the command line. -.Ec -.Nc "scroll one line down or go to line" fl "^J ~or~ ^M ~or~ j" -If -.I i -is not given, scroll one line down. Otherwise, -.I i -will be interpreted as a line number. A page starting with the line -indicated will then be displayed. -.Ec -.Nc "display next page" fp -Display the next page, consisting of -.I i -lines, (or -.I page-size -lines if no argument is given). -.Ec -.Nc "display next page and set pagesize" fps z -Display the next page, consisting of -.I i -lines, (or -.I page-size -lines if no argument is given). -If -.I i -is given, the -.I page-size -is set to -.IR i . -.Ec -.Nc "scroll down" fs ^D -Scroll down -.I i -lines (or -.I scroll-size -lines if no argument is given). -.Ec -.Nc "search forwards for pattern" fse / -Search forwards for the -.IR i -th -occurrence of a regular expression which will be prompted for. -If there are less than -.I i -occurrences of the expression, the position in the file remains unchanged. -Otherwise, a page is displayed, starting two lines before the place where the -expression was found. The user's erase and kill characters may be used -to edit the expression. -Erasing back past the first character cancels the search command. -.br -Note: Some systems do not have -.BR regex (3). -On those systems, searches are still supported, but regular expressions -are not. -.Ec -.Nc "skip lines forwards" fsl s -Skip -.I i -lines and display a page. -.Ec -.Nc "skip pages forwards" fsp f -Skip -.I i -pages and display a page. -.Ec -.Nc "scroll down and set scrollsize" fss d -Scroll down -.I i -lines (or -.I scroll-size -lines if -.I i -is not given. -If -.I i -is given, the -.I scroll-size -is set to -.IR i . -.Ec -.Nc "help" hlp h -Give a short description of all commands that are bound to a key sequence. -.Ec -.Nc "set a mark" mar m -Set a mark on the current page. -.Ec -.Nc "repeat last search" nse n -Search for the -.IR i -th -occurrence of the last regular expression entered, in the direction of the -last search. -.Ec -.Nc "repeat last search in other direction" nsr r -Search for the -.IR i -th -occurrence of the last regular expression entered, but in the other direction. -.Ec -.Nc "quit" qui "Q ~or~ q" -Exit from -.BR yap . -.Ec -.Nc "redraw" red ^L -Redraw the current page. -.Ec -.Nc "repeat" rep . -Repeat the last command. This does not always make sense, so not all -commands can be repeated. -.Ec -.Nc "shell escape" shl ! -Invoke the shell with a command that will be prompted for. -In the command, the characters `%' and `!' are replaced with the -current file name and the previous shell command respectively. -The sequences `\\%' and `\\!' are replaced by `%' and `!' respectively. -The user's erase and kill characters can be used to edit the command. -Erasing back past the first character cancels the command. -.Ec -.Nc "pipe to shell command" pip | -Pipe the current input file into a shell command that will be prompted for. -The comments given in the description of the shell escape command apply here -too. -.Ec -.Nc "go to mark" tom ' -Display the marked page. -.Ec -.Nc "top" top ^^ -Display a page starting with the first line of the input. -.Ec -.Nc "visit file" vis e -Visit a new file. The filename will be prompted for. If you just -type a return, the current file is revisited. -.Ec -.Nc "write input to a file" wrf w -Write the input to a file, whose name will be prompted for. -.Ec -.PP -The commands take effect immediately, i.e., it is not necessary to -type a carriage return. -Up to the time when the command sequence itself is given, -the user may give an interrupt to cancel the command -being formed. -.SH AUTHOR -Ceriel J.H. Jacobs -.SH SEE ALSO -.BR regex (3). -.SH BUGS -.B Yap -will find your terminal very stupid and act like it, -if it has no way of placing the -cursor on the home position, or cannot either -erase a line or -insert one. -.PP -In lines longer than about 2000 characters, a linefeed is silently inserted. -.PP -The percentage, given in the prompt when -.B yap -reads from a file (and knows it), is not always very accurate. diff --git a/minix/man/man4/Makefile b/minix/man/man4/Makefile index a2b1f0096..27a3f12f0 100644 --- a/minix/man/man4/Makefile +++ b/minix/man/man4/Makefile @@ -1,4 +1,4 @@ -MAN= console.4 controller.4 dev.4 fd.4 ip.4 lp.4 mtio.4 tty.4 uds.4 +MAN= console.4 controller.4 dev.4 fd.4 ip.4 lp.4 mtio.4 tty.4 MLINKS += console.4 keyboard.4 MLINKS += controller.4 disk.4 diff --git a/minix/man/man5/Makefile b/minix/man/man5/Makefile index 71ca4d652..8c34332c3 100644 --- a/minix/man/man5/Makefile +++ b/minix/man/man5/Makefile @@ -1,7 +1,7 @@ -MAN= boot.cfg.5 configfile.5 crontab.5 dhcp.conf.5 dir.5 ethers.5 \ - fstab.5 hosts.5 httpd.conf.5 http_status.5 keymap.5 \ +MAN= boot.cfg.5 configfile.5 crontab.5 ethers.5 \ + fstab.5 hosts.5 keymap.5 \ passwd.5 resolv.conf.5 resolver.5 rhosts.5 statvfs.5 serv.access.5 \ - system.conf.5 termcap.5 ttytab.5 TZ.5 utmp.5 \ + termcap.5 ttytab.5 TZ.5 utmp.5 \ pkg_install.conf.5 pkg_summary.5 MLINKS += passwd.5 group.5 diff --git a/minix/man/man5/dir.5 b/minix/man/man5/dir.5 deleted file mode 100644 index 49d0e9753..000000000 --- a/minix/man/man5/dir.5 +++ /dev/null @@ -1,43 +0,0 @@ -.TH DIR 5 -.SH NAME -dir \- directory layout -.SH SYNOPSIS -.nf -.ft B -#include -#include -.SH DESCRIPTION -The directories of the V1 and V2 file systems are arrays of the -following structure defined in : -.PP -.nf -.ta +5n +15n +15n -struct direct { - ino_t d_ino; /* I-node number */ - char d_name[14]; /* Name of up to 14 characters */ -}; -.fi -.DT -.PP -The -.B d_ino -field is the inode number of the file named by -.BR d_name . -.B D_ino -is zero if the directory slot isn't allocated. This number is the same as -.B st_ino -returned by -.BR stat (2) -unless the entry is mounted on. -.B D_name -is the name of up to 14 characters, null-terminated only if less then 14 -in length. Any character other than null or '\fB/\fP' is allowed. -.PP -See -.BR directory (3) -for a portable way to access directories, MINIX 3 is probably the last system -with these old V7 format directories. -.SH "SEE ALSO" -.BR directory (3). -.SH AUTHOR -Kees J. Bot (kjb@cs.vu.nl) diff --git a/minix/man/man5/http_status.5 b/minix/man/man5/http_status.5 deleted file mode 100644 index 5301a5793..000000000 --- a/minix/man/man5/http_status.5 +++ /dev/null @@ -1,72 +0,0 @@ -.TH HTTP_STATUS 5 -.SH NAME -http_status \- HTTP status numbers and their meanings -.SH DESCRIPTION -These are the HTTP status numbers defined in -.BI http.h -in the source directory, -.BI /usr/local/src/httpdxxx. -The message you see on your screen when a page cannot be accessed is -normally generated by your browser. -.P -HTTP_STATUS_OK 200 -.br -HTTP_STATUS_CREATED 201 -.br -HTTP_STATUS_ACCEPTED 202 -.br -HTTP_STATUS_NO_CONTENT 204 -.br -HTTP_STATUS_MOVED_PERM 301 -.br -HTTP_STATUS_MOVED_TEMP 302 -.br -HTTP_STATUS_NOT_MODIFIED 304 -.br -HTTP_STATUS_USE_PROXY 305 -.br -HTTP_STATUS_BAD_REQUEST 400 -.br -HTTP_STATUS_UNAUTHORIZED 401 -.br -HTTP_STATUS_FORBIDDEN 403 -.br -HTTP_STATUS_NOT_FOUND 404 -.br -HTTP_STATUS_METHOD_NOT_ALLOWED 405 -.br -HTTP_STATUS_PROXY_AUTH_REQRD 407 -.br -HTTP_STATUS_LENGTH_REQUIRED 411 -.br -HTTP_STATUS_SERVER_ERROR 500 -.br -HTTP_STATUS_NOT_IMPLEMENTED 501 -.br -HTTP_STATUS_BAD_GATEWAY 502 -.br -HTTP_STATUS_SERVICE_UNAVAILABLE 503 -.br -HTTP_STATUS_GATEWAY_TIMEOUT 504 -.br -HTTP_STATUS_UNSUPPORTED_VERSION 505 -.br - -.SH FILES -.TP 25n -.B /usr/local/src/httpdxxx/http.h -.SH "SEE ALSO" -The definitive source of information on the HTTP protocol is the -.B "World Wide Web Consortium" -web page at -.B http://www.w3c.org . -.P -A draft version of the HTTP 1.1 specification is available on the Minix1 -websites. For more information on status codes go to this URL: -.B http://minix1.woodhull.com/http11.html#Status-Codes -.SH AUTHOR -The Minix httpd server was created by and is maintained by Michael Temari - -.P -Man page compiled by Al Woodhull -.\"updated 2006-06-01 diff --git a/minix/man/man5/httpd.conf.5 b/minix/man/man5/httpd.conf.5 deleted file mode 100644 index c8b96c180..000000000 --- a/minix/man/man5/httpd.conf.5 +++ /dev/null @@ -1,334 +0,0 @@ -.TH HTTPD.CONF 5 -.SH NAME -httpd.conf httpd.mtype \- configuration files for the Minix httpd web server -.SH SYNOPSIS -.B /etc/httpd.conf -.B /etc/httpd.mtype -.SH DESCRIPTION -.B /etc/httpd.conf -is the configuration file for the Minix httpd web server written by -Michael Temari. A sample version is included with the distribution -archive and is unpacked in the source directory (normally -.BI /usr/local/src/httpdxxx). -Also provided is an example -.B httpd.mtype -file. This is an extension of the main configuration file which is normally -included when the main file is read. -.P -The makefile does not install -.B httpd.conf -and -.B httpd.mtype -automatically. The sample files included in the distribution are only -examples, you must copy and edit them for the needs of your own -installation. -.SH CONFIGURATION FILE FORMAT -.B httpd.conf -is an ascii file which consists of lines of the following form: -.P -.B directive LWS [parameters separated by LWS] -.br -NOTE: LWS denotes Linear White Space which is spaces and/or tabs -.SH CONFIGURATION FILE DIRECTIVES -The following are valid configuration file directives (listed in the order -they appear in the sample -.B httpd.conf -file provided in the distribution): -.P -.B serverroot redirect user chroot logfile dbgfile dirsend direxec -.B vhost auth proxyauth vpath include mtype -.P -To make the file more readable, for directives which occupy multiple -lines you may eliminate the directive on lines after the first and begin -these lines with LWS. - -.SH DESCRIPTIONS OF DIRECTIVES -.P -.B serverroot path - -The -.B serverroot -directive sets the translation for -.B // -to the given -.B path. - -.B redirect url - -The -.B redirect -directive will redirect the entire website via error code -"301 MOVED PERM" to specified url and original path of request. - -.B user username - -The -.B user -directive causes the server to run as the given -.B username -otherwise the server will run as whoever started it (normally root). - -.B chroot directory - -The -.B chroot -directive causes the server to chroot to the given directory after -the configuration and log files have been opened. Normally this will be the -home directory of the given username in the user directive. -.br -NOTE: -.B /~user -will be translated to the home directory of -.B user. -.br -NOTE: -.B // -will be translated to the serverroot directory. -.br -NOTE: if this directive is used then beware of the consequences. - -.B logfile filename - -The -.B logfile -directive tells the server where to log http transactions. -.br -NOTE: the log file must exist to enable logging. - -.B dbgfile filename - -The -.B dbgfile -directive tells the server where to log debugging of http transactions. -.br -NOTE: the debug log file must exist to enable debug logging. - -.B dirsend filelist - -The -.B dirsend -directive tells the server that when a directory is requested -that it should send the first file that it finds in the directory from the -.B filelist -for the request. - -.B direxec program - -The -.B direxec -directive tells the server that when a directory is requested -and no file is found from the -.B dirsend -directive that it should run the given -.B program. -.br -NOTE: the program normally generates a directory listing on the fly using -the -.B dir2html -program. -.br -NOTE: the program access is considered -.B X -with no access restrictions. - -.B vhost hostname vhostroot - -The -.B vhost -directive is for defining access for virtual hosts. If none are configured -then any host is accepted. If specified then access is only granted for -requests for hosts which are configured here. In the -.B vpath -section below the -.B /// -gets translated to the corresponding -.B vhostroot. - - -.B auth authname authdescription access [passwdfile [users]] - -The -.B auth -directive sets up different authorizations with the server. The -.B authname -is the name given to the authorization and is case insensitive. -The -.B authdescription -is the description of the authorization and is what -the user will see when asked to enter a username and password. The -access is one or more of -.B (RWX). -.B R -tells the server the URL can be read. -.B W -tells the server the URL can be overwritten. -.B X -tells the server -that the URL can and should be executed. Access is in addition to normal -Unix security considerations. For instance a file that can be written to -that does not have the -.B W -access will have an error returned. The -.B passwdfile -is the name of the password file to validate users against. If -.B passwdfile -is given as -.B '.' -then the system password file -.B (/etc/passwd) -will be used. If no -.B passwdfile -is given then no authorization is allowed for anyone. If no -.B users -are given then any validated user is authorized, otherwise only the given -.B users -are allowed. - -.B proxyauth authname authdescription access [passwdfile [users]] - -The -.B proxyauth -directive defines access authorization to be used for Proxy access. -.br -.B authname -= Same as auth above -.br -.B authdescription -= Same as auth above -.br -.B access -= Must be R to allow proxy -.br -.B passwdfile -= Same as auth above -.br -.B users -= Same as auth above - -.B vpath from to [auth [access]] - -The -.B vpath -directive sets up URL path translations and authorizations. A -requested URL that matches -.B from -will be translated to -.B to -with the given -.B auth -and -.B access. -If -.B auth -does not exist then the URL will have no -.B access. -If -.B access -is not given then the access is taken from the -.B auth -record (see above). A -.B '.' -in place of the -.B to -means that the server should use a translation from another -.B vpath -record, but associate the given -.B auth -and access with the requested URL. A -.B '*' -may be at the end only of the -.B from -to provide a wildcard match. For example if the -.B from -has -.B /AB* -then any of -.B /ABCDEF -or -.B /AB -or -.B /ABmichael -will match, but -.B /AD or -.B /a -will not. The requested URL is first checked against each -.B vpath -record until an exact match (meaning URL match -.B from -and -.B from -had no -.B '*') -is found or the end of the list. Therefore a wildcard match will match -the last -.B from in the list in which it matched. -.br -NOTE: if at the beginning of the to field -.br - /~user will get translated to the home directory of the given user -.br - // will get translated to the serverroot directory - -.B include filename - -The -.B include -directive tells the server to read configuration information -from the given filename. -.br -NOTE: normally you get -.B mtype -directives in an included file. - -.B mtype mimetype extensions - -The -.B mtype -directive tells the server what -.B mimetype -to associate with files which have any of the given -.B extensions. -If no match is found then the file will be treated as -.B application/octet-stream. - - -.SH FILES -.B /etc/httpd.conf -.B /etc/httpd.mtype -.B /etc/passwd -.SH "SEE ALSO" -.BR httpd (8) -.BR http_status (5) -.SH NOTES -The source directory contains a commented sample -.B httpd.conf -and -.B httpd.mtype -files. -.P -You can run the server as -.B httpd -t /etc/httpd.conf -to see whether the configuration file is being parsed correctly. -.P -Although standard Minix does not have a graphical interface to support -browsers such as Netscape and Microsoft Internet Explorer, the -.B lynx -browser can be used on 32-bit Minix systems with enough memory. You can point -lynx to your own site to browse your own pages. -When debugging a web server there is nothing quite like browsing your own -pages to see whether things are working right. That said, be aware that -different web browsers may vary in how they interpet standard web page -features, and will certainly vary in how they interpret "extensions" to -the HTML standards. So checking a page with several browsers on several -platforms is always a good idea. -.SH BUGS -Not really a bug, but you can get in trouble if a real directory you want -to access shares the first part of its name with a -.B vpath -definition. You just have to pay attention to the directory names you use. -.SH AUTHOR -The Minix httpd server was created by and is maintained by Michael Temari - -.P -Man page was compiled by Al Woodhull -.\" updated 2006-06-01 diff --git a/minix/man/man8/Makefile b/minix/man/man8/Makefile index 1ad83005c..af9563fd5 100644 --- a/minix/man/man8/Makefile +++ b/minix/man/man8/Makefile @@ -1,16 +1,5 @@ -MAN= add_route.8 backup.8 boot.8 \ - cdprobe.8 cleantmp.8 config.8 cron.8 \ - dhcpd.8 fdisk.8 \ - getty.8 halt.8 hgfs.8 httpd.8 ifconfig.8 inet.8 init.8 \ - intr.8 irdpd.8 loadramdisk.8 \ - netconf.8 newroot.8 nonamed.8 \ - ossdevlinks.8 part.8 partition.8 \ - printroot.8 pr_routes.8 pwdauth.8 rarpd.8 \ - readclock.8 repartition.8 \ - screendump.8 serial-ip.8 \ - setup.8 shutdown.8 slip.8 srccrc.8 tcpd.8 \ - unix.8 update.8 usage.8 vbfs.8 - -MLINKS += httpd.8 in.httpd.8 +MAN= boot.8 \ + config.8 \ + usage.8 .include diff --git a/minix/man/man8/getty.8 b/minix/man/man8/getty.8 deleted file mode 100644 index 84ea9d872..000000000 --- a/minix/man/man8/getty.8 +++ /dev/null @@ -1,40 +0,0 @@ -.TH GETTY 8 -.SH NAME -getty \- system login banner -.SH SYNOPSIS -.B getty -.RI [ banner " ...]" -.SH DESCRIPTION -.B Getty -displays a system identification banner, reads a user name from standard -input and executes -.B login -with that name as argument. -.PP -.B Getty -uses its arguments separated by spaces as a login banner. The character -sequences -.BR \en , -.BR \es -and -.BR \et -are printed as newline, space and tab. Any other -.BI \e x -prints that -.IR x . -The character sequences -.BR %s , -.BR %n , -etc. produce the same output as -.BR "uname \-s" , -.BR "uname \-n" , -etc. The default banner is -.PP -.RS -%s\es\esRelease\es%r\esVersion\es%v\en\en%n\eslogin:\es -.RE -.SH "SEE ALSO" -.BR ttytab (5), -.BR init (8). -.SH AUTHOR -Kees J. Bot diff --git a/minix/man/man8/halt.8 b/minix/man/man8/halt.8 deleted file mode 100644 index 5e91fb249..000000000 --- a/minix/man/man8/halt.8 +++ /dev/null @@ -1,33 +0,0 @@ -.TH HALT 8 -.SH NAME -halt \- abruptly stop the system -.SH SYNOPSIS -\fBhalt\fP [\fB\-f\fP] -.SH DESCRIPTION -.B Halt -stops the system almost immediately. The users are not informed about -the things to come. -.B Halt -is logged in -.B /usr/adm/wtmp -and in -.BR /usr/adm/log , -if these files exist. -.B Halt -should only be run by the super-user, any other caller will be refused. -.PP -.B Halt -is a rather rude program. -.BR Shutdown (8) -is preferred for it performs a more gentle halt routine. -.PP -.B Halt \-f -is even worse, it omits the terminate signals that are normally -sent first to all processes to give them a chance to die peacefully. -.SH "SEE ALSO" -.BR reboot (2), -.BR shutdown (8), -.BR reboot (8), -.BR boot (8). -.SH AUTHOR -Edvard Tuinder (v892231@si.hhs.NL) diff --git a/minix/man/man8/httpd.8 b/minix/man/man8/httpd.8 deleted file mode 100644 index afe1d3af3..000000000 --- a/minix/man/man8/httpd.8 +++ /dev/null @@ -1,124 +0,0 @@ -.TH HTTPD 8 -.SH NAME -httpd, in.httpd, dir2html \- a web server for Minix 2 and Minix 3 -.SH SYNOPSIS -.B httpd -.RB [\-t|\-v] -.RI [ config_file ] -.P -.B "tcpd http /usr/local/bin/in.httpd &" -.P -.B dir2html -.RB [directory] -.SH DESCRIPTION -.B Httpd -is a World Wide Web (WWW) server written by Michael Temari. It was -written from scratch so the setup and configuration will not be like -other web servers. -.P -.B In.httpd -is linked to -.B httpd. -This alternate name is used to indicate the program is a server that is -started by -.B tcpd (8), -a program which listens for incoming TCP connections on the passed -port (defined in -.BI /etc/services ). -When a connection comes in -.B tcpd -forks and starts the given daemon program, after possibly checking for access -restrictions and logging the connection. Therefore, to enable -.B in.httpd -to start you use (in a startup script): -.P -.B "tcpd http /usr/local/bin/in.httpd &" -.P -or -.P -.B "daemonize tcpd http /usr/local/bin/in.httpd" -.P -.B (daemonize -is a shell function defined in -.BI /usr/etc/rc -in Minix 2.0.3 and later releases which starts programs as daemons). -To enable or reenable -.B in.httpd -from the command line a user a system administrator should use -.B intr (8), -like this: -.P -.B "intr -d tcpd http /usr/local/bin/in.httpd &" -.P -to start -.B tcpd -as a daemon (getting input from /dev/null, writing output to /dev/log, -and not part of a process group). -.P -.B Dir2html -is an accessory program that produces a directory listing formatted as -web page for the current directory or for a directory specified as an -argument. It is called by -.B httpd -when a web client references a directory that includes no index.html -file (or whatever alternative to index.html that may be defined in -/etc/httpd.conf). Since it writes to standard output it may also be called -as a standalone program. -.P -Options for -.B httpd -are: -.SH OPTIONS -.TP -.B \-t -This tells the server to parse the configuration file so that you can -see if it is the way you want it. You may also pass the name of your -configuration file if it is not the default /etc/httpd.conf. -.TP -.B \-v -Shows the server version, then exits. -.TP -.B config_file -normally /etc/httpd.conf -.SH FILES -.TP 25n -.B /etc/httpd.conf -The configuration file. -.P -.B /etc/httpd.mtype -Extension to configuration file defining MIME types. -.P -.B /usr/adm/httpd.log -Log file. The file must exist for logging to begin. -.SH "SEE ALSO" -.BR httpd.conf (5), -.BR http_status (5), -.BR serv.access (5), -.BR intr (8), -.BR tcpd (8). -.SH NOTES -This server has been tested on both Minix 2 and Minix 3. -.P -Running a server exposed to the Internet is risky to the host system and -to the local network. Consult with the owner of your net before you go -public. Read the -.B SECURITY -document in the source directory. -.P -The -.B tcpd (8) -man page needs to be written. The important thing to know is that if -the access control file -.B /etc/serv.access -exists tcpd will exec its paranoid twin, tcpdp, which will deny access from -any IP for which a name cannot be found. -.SH BUGS -None are known, but there are surely some unknown ones. Be careful! -.SH AUTHOR -The Minix httpd server was created by and is maintained by Michael Temari - -.P -This man page was compiled by Al Woodhull -.P -.\" updated 2006-06-17 - diff --git a/minix/man/man8/init.8 b/minix/man/man8/init.8 deleted file mode 100644 index b30d5a42f..000000000 --- a/minix/man/man8/init.8 +++ /dev/null @@ -1,141 +0,0 @@ -.TH INIT 8 -.SH NAME -init \- grandparent of all processes -.SH DESCRIPTION -The first program started by MINIX 3 is -.BR init . -The actions performed by -.B init -can be summarized by this pseudo shell program: -.RS -.nf -.if t .ft C - -# Open 0, 1, 2. -exec /dev/log 2>&1 - -# Run the system initialization script. -sh /etc/rc $bootopts - ->/etc/utmp -echo reboot >>/usr/adm/wtmp - -while :; do - # Wait for a process to exit, but don't always block. - wait - - # Record logout. (Not in this dumb way, of course.) - if "pid is in my tables" $pid - then - echo "logout $pid" >/etc/utmp - echo "logout $pid" >>/usr/adm/wtmp - fi - - # Start a new session. - while read line type getty init - do - if idle $line - then - $init ... <$tty >$tty - $getty <$tty >$tty 2>&1 & - pid=$! - "add pid to tables" $pid - echo "login $line $pid" >/etc/utmp - echo "login $line $pid" >>/usr/adm/wtmp - fi - done < /dev/ttytab -done - -.if t .ft R -.fi -.RE -The first action of -.B init -is to run -.B /etc/rc -to initialize the system as described in -.BR boot (8). -.B Init -then enters its main loop where it waits for processes to exit, and starts -processes on each enabled terminal line. The file -.B /etc/ttytab -contains a list of terminal devices, their terminal types, the program to -execute on them to allow one to login (usually -.BR getty (8)), -and the program to execute first to initialize the line (usually -.BR stty (1)). -These fields may be left out to indicate that a line is disabled or that -initialization is not necessary. The commands are searched using the path -.BR /sbin:/bin:/usr/sbin:/usr/bin . -.PP -.B Init -accepts several signals that must be sent to process id 1. (It is the first -process, so natually its process id is 1.) The signals are: -.TP -.B SIGHUP -When receiving a hangup signal, -.B init -will forget about errors and rescan -.B ttytab -for processes to execute. -.B Init -normally rescans -.B ttytab -each time it feels the need to respawn a process, so the hangup signal is only -needed if a line has been shut down, or after a terminate signal. Note -that after turning a line off you will have to kill the process running on -that line manually, -.B init -doesn't do that for you. -.TP -.B SIGTERM -Normally sent by programs that halt or reboot MINIX 3. Causes -.B init -to stop spawning new processes. -.TP -.B SIGABRT -Sent by the keyboard driver when the -.B CTRL-ALT-DEL -key combination is typed. Causes -.B init -to run the -.B shutdown -command. A second abort signal makes -.B init -halt the system directly with a system call. The keyboard driver halts the -system, without a sync, after the third CTRL-ALT-DEL. -.SS "MINIX 3 vs. Minix-vmd" -There are a few differences between standard MINIX 3 and Minix-vmd on how -.B init -is run. The -.B /etc/rc -file is executed under standard MINIX 3 with input connected to -.BR /dev/console , -but under Minix-vmd this is still -.BR /dev/null . -This means that under Minix-vmd processes must be reconnected to -.B /dev/console -with the -.BR intr (8) -program if they need user interaction. -Minix-vmd passes the value of the -.B bootopts -boot variable to /etc/rc. Standard MINIX 3 does not. -.SH FILES -.TP 25n -.B /etc/ttytab -List of terminals devices. -.TP -.B /etc/utmp -List of currently logged in users. -.TP -.B /usr/adm/wtmp -Login/logout history. -.SH "SEE ALSO" -.BR ttytab (5), -.BR utmp (5), -.BR getty (8), -.BR stty (1), -.BR boot (8). -.SH AUTHOR -Kees J. Bot (kjb@cs.vu.nl) diff --git a/minix/man/man8/newroot.8 b/minix/man/man8/newroot.8 deleted file mode 100644 index 5598faf50..000000000 --- a/minix/man/man8/newroot.8 +++ /dev/null @@ -1,40 +0,0 @@ -.TH NEWROOT 8 "February 1st, 2010" -.SH NAME -newroot \- replace the current root with a new one -.SH SYNOPSIS -.B newroot -.RB [ \-i ] -.I block-special -.SH OPTIONS -.BR "\-i" " Copy mfs binary from boot image to memory" -.SH DESCRIPTION -.B Newroot -causes the present \fB/\fP file system to be discarded and -replaced by the one stored in the device indicated by -.IR block-special . -.PP -The -.B \-i -option may be used to prevent loading the file system -service for the new file system from disk. This is useful when -for some reason the \fImfs\fP binary on disk malfunctions, -rendering Minix unable to boot. -.PP -This command is normally used to replace the initial ramdisk -loaded as part of the operating system, with the operational -version stored on disk. As such, it should be invoked from the -.B /etc/rc -stored in the initial-ramdisk image. -.SH NOTES -.B Newroot -should be used before any "real" use of the -.IR mount (1) -command. -.SH "SEE ALSO" -.BR init (8), -.BR mount (1), -.BR mount (2). -.SH AUTHOR -.I Newroot.c -was written by Philip Homburg. -.\" This manual page by A. Leca, last revised 2010-02-01. diff --git a/minix/man/man8/ossdevlinks.8 b/minix/man/man8/ossdevlinks.8 deleted file mode 100644 index d9303d21c..000000000 --- a/minix/man/man8/ossdevlinks.8 +++ /dev/null @@ -1,38 +0,0 @@ -." Automatically generated text -.TH 8 "August 31, 2006" "OSS" "System Administration Commands" -.SH NAME -ossinfo - Open Sound System legacy device management utility. - -.SH DESCRIPTION -The ossdevlinks utility creates and manages old style (legacy) device files -for OSS audio, MIDI and mixer devices. - -In previous versioms OSS used "flat" device numbering for the device files -(for example /dev/dsp0 to /dev/dspN). OSS version 4.0 and later uses different -naming scheme. The ossdevlinks utility is used to manage the legacy device -names as symbolic links to the new style devices. - -.SH OPTIONS -Normally ossdevlinks is used without command line arguments. However -there are few command line options. - --v Verbose output --r Reset the legacy device numbering (do not use). - -The -r option will invalidate audio device selections in the setup files -of various applications. This is considered highly undesirable. Applications -using wrong audio devices may cause serious security and privacy problems. -For this reason the -r option should never be used unless there are no other -ways to recover from serious audio/sound related problems. After that users -should review the audio settings of all the audio applications they are using. -.SH - -.SH FILES -/usr/sbin/ossdevlinks -/usr/lib/oss/etc/legacy_devices -/dev/dspN -/dev/midiNN -/dev/mixerN - -.SH AUTHOR -4Front Technologies diff --git a/minix/man/man8/serial-ip.8 b/minix/man/man8/serial-ip.8 deleted file mode 100644 index aeb43fa1d..000000000 --- a/minix/man/man8/serial-ip.8 +++ /dev/null @@ -1,232 +0,0 @@ -.TH SERIAL-IP 8 -.SH NAME -serial-ip \- Serial IP (SLIP or PPP) setup -.SH DESCRIPTION -.de SP -.if t .sp 0.4 -.if n .sp -.. -\-\-\-\-\-\-\- -.br -.B Note: -This text and the serial IP code is not finished. Code needs to be added to -.B nonamed -to allow it to be used both with and without a connection to the Internet, -and by now there is a PPP program for standard MINIX 3 "out there" that will -change everything that is said in this text. So much to do, so little -time... -.br -\-\-\-\-\-\-\- -.PP -This manual page describes the MINIX 3 network setup to use serial line IP. -The serial IP protocol used can either be the older SLIP by means of the -.BR slip (8) -program, or PPP (Point-to-Point Protocol), the newer and better serial IP -protocol implemented by the -.BR ppp (8) -program. Alas standard MINIX 3 only supports SLIP. -.PP -In the following text all descriptions and examples will name SLIP or the -.BR slip -program, but one may just as well read PPP or -.BR ppp . -Where necessary the differences will be noted. -.PP -A typical use of the -.B slip -program is like this: -.PP -.RS -.B "slip /dev/psip2 /dev/tty01" -.RE -.PP -The argument of the program, the -.B /dev/psip2 -device, is one of the so-called "Pseudo IP" devices that the MINIX 3 TCP/IP -driver -.BR inet (8) -offers to implement a virtual network on. On an ethernet IP packets are -received or transmitted by the ethernet card, but packets on a pseudo IP -network are channeled back to or received from a program running in user -space, such as -.BR slip . -Standard input and output are used by -.B slip -to exchange packets with another SLIP implementation. This is normally -through an RS-232 serial line like the second serial line -.B /dev/tty01 -as used in the example above. -.PP -If we look at the flow of data over normal ethernet then this is what a TCP -connection between two MINIX 3 machines, -.B telnet -for instance, looks like: -.PP -.in 0 -.ce 13 -[telnet] -| -/dev/tcp0 -| -inet -| -[ethernet] -| -inet -| -/dev/tcp0 -| -[in.telnetd] -.PP -One-half (!) of a SLIP connection would look like this: -.PP -.in 0 -.ce 12 -[telnet] -| -/dev/tcp2 -| -inet -| -/dev/psip2 -| -slip -| -[serial line] -\&... -.SS "Configuration for a SLIP network only" -It is important to know that as far as -.B inet -is concerned the pseudo IP network is just another network, nothing special. -So you have to convince -.B inet -that it has to send packets out over that network. One does this by -setting a default route that makes -.B inet -believe that there is a router somewhere on the pseudo-IP network. -.PP -Assume your machine has been given the IP address -.B 192.168.0.13 -by your service provider. Let's choose another address on that network, -.B 192.168.0.1 -for instance. (You can use the address of the SLIP gateway if you want -to make it look pretty, but it doesn't really matter, anything "out there" -is ok.) -To make MINIX 3 aware of the situation you have to configure the pseudo IP -network. For Minix-vmd you need to look for the -.B if-then-else-fi -code in -.B /usr/etc/rc -that tests if -.B /etc/rc.net -should be run. Copy the lines in the -.B else -clause that starts network daemons to -.B /etc/rc.net -and add the following lines to make it look like this: -.PP -.RS -.nf -# My SLIP interface address. -ifconfig -h 192.168.0.13 -n 255.255.255.0 -.SP -# Standard network daemons. -daemonize rarpd $named irdpd rip inetd -.SP -# Default route to the outside world. -add_route -g 192.168.0.1 -.fi -.RE -.PP -For standard MINIX 3 one has to edit -.B /etc/rc -instead at the point of the XXX comments. The -.B ifconfig -goes at the first XXX, the -.B add_route -at the second XXX. The result is conceptually the same as the example -above. The important thing is the order: Configuration, Daemons, Routes. -(First give addresses to the networks, let the daemons meditate over the -results and possibly configure more networks (rarpd), then add routes to -the configured networks.) -.PP -Just one thing left to do. The system uses the first ethernet network -.RB ( eth0 , -.BR ip0 , -.BR tcp0 , -and -.BR udp0 ) -as the default network. With the program -.BR netdefault (8) -you have to change the links to the default devices -.RB ( eth / psip , -.BR ip , -.BR tcp , -and -.BR udp ) -to point to the first pseudo IP network -.RB ( psip2 , -.BR ip2 , -.BR tcp2 , -and -.BR udp2 ): -.PP -.RS -.B "netdefault psip2" -.RE -.PP -In -.B /etc/hosts -list at least -.B localhost -and the name of your machine with its SLIP address. This way your machine -will boot and know its own name. Now you need to find a way to let your -system know the addresses of other machines. There are three ways: -.PP -.RS -List the names and addresses of any other machine you wish to talk -to in -.BR /etc/hosts . -Drawback: This will quickly become a pretty long list. -.SP -Create an -.B /etc/resolv.conf -that lists a nameserver at your ISP and -.B 127.0.0.1 -(localhost). Drawback: With the SLIP link down it takes 5 to 10 seconds for -a name lookup to time out on the remote name server before the local name -server is tried. -.SP -Install the above -.B /etc/resolv.conf -when -.B slip -is started, and remove it when -.B slip -exits. Drawback: Long running programs only read -.B /etc/resolv.conf -at startup, so they don't notice it changing. -.SP -Run a real Internet name daemon from the -.B named -package. Drawback: Nontrivial to set up. -.SS "Configuration for a SLIP - Ethernet router (simple case)" -XXX -.SS "Configuration for a SLIP - Ethernet router (complex case)" -XXX -.SH FILES -.TP \w'/dev/psip*'u+5n -.B /dev/psip* -Pseudo-IP devices for use by -.BR slip -and -.BR ppp . -.SH "SEE ALSO" -.BR boot (8), -.BR inet (8), -.BR netdefault (8), -.BR term (1), -.BR chat (1). -.SH BUGS -.SH AUTHOR -Kees J. Bot (kjb@cs.vu.nl) diff --git a/minix/man/man8/shutdown.8 b/minix/man/man8/shutdown.8 deleted file mode 100644 index ec532123d..000000000 --- a/minix/man/man8/shutdown.8 +++ /dev/null @@ -1,86 +0,0 @@ -.TH SHUTDOWN 8 -.SH NAME -shutdown \- graciously close the system down -.SH SYNOPSIS -.B shutdown -.RB [ \-hrRmkpd ] -.RI [ time-specification -.RI [ message ]] -.SH DESCRIPTION -.B Shutdown -is a program which allows a system operator to close down the system -in an nice way. -.B Shutdown -informs the users why and when the system is going down. This warning -is issued 10 minutes before shutdown time and every minute in the last -5 minutes. At this time (5 minutes), -.B shutdown -creates a file -.B /etc/nologin -to prevent new users from logging in. -.PP -.B Shutdown -keeps a logfile of shutdowns. Every shutdown is registered in -.BR /usr/adm/wtmp , -if this file exists, and by -.BR syslog (3) -(level -.BR auth . notice ). -After these actions, a call is done to -.BR reboot (2) -which actually brings the system down. -.PP -.I Time-specification -may be something like -.BR 15:00 , -.BR 15.00 , -.BR +15 , -or -.B now -for a shutdown at 3pm (twice), 15 minutes from now, or immediately. -.PP -The message may be used to describe why the system is going down, it may -also be typed on standard input with the -.B \-m -option. -.SH OPTIONS -.TP -.B \-h -This flag prevents the system from rebooting after the shutdown. The -system can now be powered off. This is the default. -.TP -.B \-r -This flag indicates that the system should reboot after shutting down. -.TP -.B \-R -Reboot the system by resetting it. With -.B \-R -the system will receive a hardware reset. -.TP -.B \-p -Attempt to power off the machine after shutting down; reset if that -is not possible on the current hardware. -.TP -.B \-d -Default CTRL-ALT-DEL shutdown. -.TP -.B \-m -Allows the operator to type a shutdown message on standard input, that will -be added to the messages displayed on all terminals. -.TP -.B \-k -This option gives the possibility of terminating an already started -shutdown. This is only possible if shutdown time has not yet arrived. -.TP -.B \-C -Check if the system crashed. This option is not used at shutdown time, -but at reboot time. It tells if the file systems should be checked by -testing if the last entry in the wtmp file is a shutdown entry. (A -crude replacement for a file system clean flag.) -.SH "SEE ALSO" -.BR reboot (2), -.BR syslog (3), -.BR halt (8), -.BR boot (8). -.SH AUTHOR -Edvard Tuinder (v892231@si.hhs.NL) diff --git a/minix/net/inet/Makefile b/minix/net/inet/Makefile index 0adc1b379..b2ab09005 100644 --- a/minix/net/inet/Makefile +++ b/minix/net/inet/Makefile @@ -9,6 +9,7 @@ SRCS= buf.c clock.c inet.c inet_config.c \ tcp_recv.c tcp_send.c ip_eth.c \ ip_ps.c psip.c \ queryparam.c version.c +MAN= inet.8 .PATH: ${.CURDIR}/generic diff --git a/minix/man/man8/inet.8 b/minix/net/inet/inet.8 similarity index 100% rename from minix/man/man8/inet.8 rename to minix/net/inet/inet.8 diff --git a/minix/net/uds/Makefile b/minix/net/uds/Makefile index 5588b7de6..8ae35c943 100644 --- a/minix/net/uds/Makefile +++ b/minix/net/uds/Makefile @@ -1,6 +1,7 @@ # Makefile for the UNIX Domain Sockets driver (UDS) PROG= uds SRCS= uds.c ioc_uds.c +MAN= uds.8 unix.8 DPADD+= ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -lchardriver -lsys diff --git a/minix/man/man4/uds.4 b/minix/net/uds/uds.8 similarity index 97% rename from minix/man/man4/uds.4 rename to minix/net/uds/uds.8 index 025eb3d03..2484ea709 100644 --- a/minix/man/man4/uds.4 +++ b/minix/net/uds/uds.8 @@ -1,4 +1,4 @@ -.TH UDS 4 +.TH UDS 8 .SH NAME uds \- unix domain sockets device .SH DESCRIPTION diff --git a/minix/man/man8/unix.8 b/minix/net/uds/unix.8 similarity index 98% rename from minix/man/man8/unix.8 rename to minix/net/uds/unix.8 index 8d1f91c3c..131753e49 100644 --- a/minix/man/man8/unix.8 +++ b/minix/net/uds/unix.8 @@ -21,6 +21,6 @@ means of interprocess communication using the socket API. .BR socket(2), .BR socketpair(2), .BR getpeereid(2), -.BR uds(4) +.BR uds(8) .SH HISTORY This Unix Domain Sockets first appeared in Minix 3.1.8. diff --git a/minix/usr.sbin/mkproto/Makefile b/minix/usr.sbin/mkproto/Makefile index baa5da16c..a18d163ef 100644 --- a/minix/usr.sbin/mkproto/Makefile +++ b/minix/usr.sbin/mkproto/Makefile @@ -1,4 +1,4 @@ PROG= mkproto -MAN= +MAN= mkproto.1 .include diff --git a/minix/man/man1/mkproto.1 b/minix/usr.sbin/mkproto/mkproto.1 similarity index 100% rename from minix/man/man1/mkproto.1 rename to minix/usr.sbin/mkproto/mkproto.1