aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ObsoleteFiles.inc29
-rw-r--r--UPDATING11
-rw-r--r--cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c21
-rw-r--r--contrib/libarchive/cpio/test/main.c16
-rw-r--r--contrib/libarchive/cpio/test/test.h5
-rw-r--r--contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c1
-rw-r--r--contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c2
-rw-r--r--contrib/libarchive/libarchive/test/main.c61
-rw-r--r--contrib/libarchive/libarchive/test/test.h5
-rw-r--r--contrib/libarchive/libarchive/test/test_read_set_format.c18
-rw-r--r--contrib/libarchive/tar/test/main.c38
-rw-r--r--contrib/libarchive/tar/test/test.h6
-rw-r--r--contrib/libarchive/tar/test/test_missing_file.c6
-rw-r--r--contrib/mdocml/mandocdb.c36
-rw-r--r--contrib/netbsd-tests/fs/tmpfs/h_tools.c13
-rwxr-xr-xcontrib/netbsd-tests/fs/tmpfs/t_mount.sh15
-rwxr-xr-xcontrib/netbsd-tests/fs/tmpfs/t_remove.sh15
-rw-r--r--etc/defaults/rc.conf1
-rw-r--r--etc/mtree/BSD.usr.dist2
-rw-r--r--etc/rc.d/Makefile1
-rwxr-xr-xetc/rc.d/jail3
-rwxr-xr-xetc/rc.d/zfs2
-rwxr-xr-xetc/rc.d/zfsbe71
-rw-r--r--gnu/usr.bin/Makefile5
-rwxr-xr-xgnu/usr.bin/groff/mdate.sh3
-rw-r--r--gnu/usr.bin/rcs/CREDITS24
-rw-r--r--gnu/usr.bin/rcs/Makefile7
-rw-r--r--gnu/usr.bin/rcs/Makefile.inc3
-rw-r--r--gnu/usr.bin/rcs/NEWS548
-rw-r--r--gnu/usr.bin/rcs/REFS90
-rw-r--r--gnu/usr.bin/rcs/ci/Makefile8
-rw-r--r--gnu/usr.bin/rcs/ci/Makefile.depend19
-rw-r--r--gnu/usr.bin/rcs/ci/ci.1898
-rw-r--r--gnu/usr.bin/rcs/ci/ci.c1318
-rw-r--r--gnu/usr.bin/rcs/co/Makefile8
-rw-r--r--gnu/usr.bin/rcs/co/Makefile.depend19
-rw-r--r--gnu/usr.bin/rcs/co/co.1736
-rw-r--r--gnu/usr.bin/rcs/co/co.c826
-rw-r--r--gnu/usr.bin/rcs/doc/rcs.ms1518
-rw-r--r--gnu/usr.bin/rcs/doc/rcs_func.ms95
-rw-r--r--gnu/usr.bin/rcs/lib/Makefile14
-rw-r--r--gnu/usr.bin/rcs/lib/Makefile.depend13
-rw-r--r--gnu/usr.bin/rcs/lib/conf.h400
-rw-r--r--gnu/usr.bin/rcs/lib/maketime.c344
-rw-r--r--gnu/usr.bin/rcs/lib/maketime.h39
-rw-r--r--gnu/usr.bin/rcs/lib/merger.c148
-rw-r--r--gnu/usr.bin/rcs/lib/partime.c701
-rw-r--r--gnu/usr.bin/rcs/lib/partime.h71
-rw-r--r--gnu/usr.bin/rcs/lib/rcsbase.h762
-rw-r--r--gnu/usr.bin/rcs/lib/rcsedit.c1958
-rw-r--r--gnu/usr.bin/rcs/lib/rcsfcmp.c354
-rw-r--r--gnu/usr.bin/rcs/lib/rcsfnms.c1132
-rw-r--r--gnu/usr.bin/rcs/lib/rcsgen.c681
-rw-r--r--gnu/usr.bin/rcs/lib/rcskeep.c452
-rw-r--r--gnu/usr.bin/rcs/lib/rcskeys.c186
-rw-r--r--gnu/usr.bin/rcs/lib/rcslex.c1568
-rw-r--r--gnu/usr.bin/rcs/lib/rcsmap.c69
-rw-r--r--gnu/usr.bin/rcs/lib/rcsrev.c911
-rw-r--r--gnu/usr.bin/rcs/lib/rcssyn.c681
-rw-r--r--gnu/usr.bin/rcs/lib/rcstime.c191
-rw-r--r--gnu/usr.bin/rcs/lib/rcsutil.c1398
-rw-r--r--gnu/usr.bin/rcs/lib/version.c2
-rw-r--r--gnu/usr.bin/rcs/merge/Makefile8
-rw-r--r--gnu/usr.bin/rcs/merge/Makefile.depend19
-rw-r--r--gnu/usr.bin/rcs/merge/merge.1137
-rw-r--r--gnu/usr.bin/rcs/merge/merge.c113
-rw-r--r--gnu/usr.bin/rcs/rcs/Makefile10
-rw-r--r--gnu/usr.bin/rcs/rcs/Makefile.depend19
-rw-r--r--gnu/usr.bin/rcs/rcs/rcs.1454
-rw-r--r--gnu/usr.bin/rcs/rcs/rcs.c1629
-rw-r--r--gnu/usr.bin/rcs/rcs/rcsfile.5425
-rw-r--r--gnu/usr.bin/rcs/rcs/rcsintro.1302
-rw-r--r--gnu/usr.bin/rcs/rcsclean/Makefile8
-rw-r--r--gnu/usr.bin/rcs/rcsclean/Makefile.depend19
-rw-r--r--gnu/usr.bin/rcs/rcsclean/rcsclean.1203
-rw-r--r--gnu/usr.bin/rcs/rcsclean/rcsclean.c333
-rw-r--r--gnu/usr.bin/rcs/rcsdiff/Makefile8
-rw-r--r--gnu/usr.bin/rcs/rcsdiff/Makefile.depend19
-rw-r--r--gnu/usr.bin/rcs/rcsdiff/rcsdiff.1158
-rw-r--r--gnu/usr.bin/rcs/rcsdiff/rcsdiff.c480
-rw-r--r--gnu/usr.bin/rcs/rcsfreeze/Makefile7
-rw-r--r--gnu/usr.bin/rcs/rcsfreeze/Makefile.depend11
-rw-r--r--gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.168
-rw-r--r--gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh99
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/Makefile8
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/Makefile.depend19
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/rcsmerge.1189
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/rcsmerge.c286
-rwxr-xr-xgnu/usr.bin/rcs/rcstest454
-rw-r--r--gnu/usr.bin/rcs/rlog/Makefile8
-rw-r--r--gnu/usr.bin/rcs/rlog/Makefile.depend19
-rw-r--r--gnu/usr.bin/rcs/rlog/rlog.1318
-rw-r--r--gnu/usr.bin/rcs/rlog/rlog.c1290
-rw-r--r--include/Makefile11
-rw-r--r--include/search.h23
-rw-r--r--lib/Makefile202
-rw-r--r--lib/libc/Makefile4
-rw-r--r--lib/libc/gen/arc4random.c11
-rw-r--r--lib/libc/gen/recvmmsg.c9
-rw-r--r--lib/libc/libc_nossp.ldscript2
-rw-r--r--lib/libc/mips/string/strchr.S5
-rw-r--r--lib/libc/mips/string/strrchr.S5
-rw-r--r--lib/libc/stdlib/random.c9
-rw-r--r--lib/libc/stdlib/tdelete.c24
-rw-r--r--lib/libc/stdlib/tfind.c7
-rw-r--r--lib/libc/stdlib/tsearch.329
-rw-r--r--lib/libc/stdlib/tsearch.c37
-rw-r--r--lib/libc/stdlib/twalk.c9
-rw-r--r--lib/libc/tests/stdio/printbasic_test.c4
-rw-r--r--lib/libc/tests/stdlib/tsearch_test.c4
-rw-r--r--lib/libdevdctl/consumer.cc4
-rw-r--r--lib/libefi/Makefile23
-rw-r--r--lib/libefi/efi_getvar.c68
-rw-r--r--lib/libefi/efi_nextvarname.c66
-rw-r--r--lib/libefi/efi_setvar.c66
-rw-r--r--lib/libefi/libefi.3143
-rw-r--r--lib/libefi/libefi.h57
-rw-r--r--lib/libefivar/Makefile53
-rw-r--r--lib/libefivar/efivar.398
-rw-r--r--lib/libefivar/efivar.c380
-rw-r--r--lib/libefivar/efivar.h121
-rw-r--r--lib/libefivar/libefivar.c (renamed from lib/libefi/libefi.c)128
-rw-r--r--lib/libefivar/libefivar_int.h (renamed from lib/libefi/libefi_int.h)9
-rw-r--r--lib/libgcc_eh/Makefile12
-rw-r--r--lib/libgcc_eh/Makefile.inc30
-rw-r--r--lib/libgcc_s/Makefile32
-rw-r--r--lib/libgcc_s/Version.map123
-rw-r--r--lib/libucl/Makefile2
-rw-r--r--lib/msun/Makefile10
-rw-r--r--lib/msun/src/s_fmax.c5
-rw-r--r--lib/msun/src/s_fmin.c5
-rw-r--r--release/Makefile.vm1
-rw-r--r--release/arm/BANANAPI.conf2
-rw-r--r--release/arm/CUBIEBOARD2.conf2
-rw-r--r--release/arm/RPI2.conf2
-rw-r--r--release/doc/en_US.ISO8859-1/hardware/article.xml2
-rw-r--r--release/doc/share/xml/sponsor.ent1
-rwxr-xr-xrelease/picobsd/build/picobsd46
-rw-r--r--release/tools/vmimage.subr2
-rw-r--r--sbin/pfctl/parse.y73
-rw-r--r--share/doc/psd/13.rcs/Makefile6
-rw-r--r--share/doc/psd/13.rcs/Makefile.inc5
-rw-r--r--share/doc/psd/13.rcs/rcs/Makefile7
-rw-r--r--share/doc/psd/13.rcs/rcs_func/Makefile6
-rw-r--r--share/doc/psd/Makefile1
-rw-r--r--share/man/man5/pf.conf.517
-rw-r--r--share/man/man5/src.conf.520
-rw-r--r--share/man/man9/Makefile1
-rw-r--r--share/man/man9/mbuf.914
-rw-r--r--share/man/man9/mbuf_tags.92
-rw-r--r--share/misc/bsd-family-tree1
-rw-r--r--share/mk/Makefile2
-rw-r--r--share/mk/bsd.lib.mk8
-rw-r--r--share/mk/bsd.libnames.mk1
-rw-r--r--share/mk/bsd.suffixes-posix.mk56
-rw-r--r--share/mk/bsd.suffixes.mk99
-rw-r--r--share/mk/src.libnames.mk1
-rw-r--r--share/mk/src.opts.mk4
-rw-r--r--share/mk/sys.mk154
-rw-r--r--sys/amd64/amd64/efirt.c5
-rw-r--r--sys/amd64/amd64/mem.c7
-rw-r--r--sys/amd64/conf/GENERIC1
-rw-r--r--sys/arm/allwinner/axp209.c279
-rw-r--r--sys/arm/allwinner/axp209reg.h24
-rw-r--r--sys/arm/allwinner/clk/aw_gate.c2
-rw-r--r--sys/arm/allwinner/clk/aw_pll.c64
-rw-r--r--sys/arm/arm/mem.c9
-rw-r--r--sys/arm/arm/nexus.c6
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_bsc.c8
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_common.c3
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_dma.c8
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_fb.c10
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_fbd.c12
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_gpio.c14
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_intr.c39
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_mbox.c16
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_sdhci.c18
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_spi.c8
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_vcbus.h15
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_wdog.c30
-rw-r--r--sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c8
-rw-r--r--sys/arm/broadcom/bcm2835/files.bcm283x2
-rw-r--r--sys/arm/conf/ATMEL1
-rw-r--r--sys/arm/conf/AVILA1
-rw-r--r--sys/arm/conf/BWCT1
-rw-r--r--sys/arm/conf/CAMBRIA1
-rw-r--r--sys/arm/conf/CNS11XXNAS1
-rw-r--r--sys/arm/conf/CRB1
-rw-r--r--sys/arm/conf/DB-78XXX1
-rw-r--r--sys/arm/conf/DB-88F5XXX1
-rw-r--r--sys/arm/conf/DB-88F6XXX1
-rw-r--r--sys/arm/conf/DOCKSTAR1
-rw-r--r--sys/arm/conf/DREAMPLUG-10011
-rw-r--r--sys/arm/conf/EA32501
-rw-r--r--sys/arm/conf/EB92001
-rw-r--r--sys/arm/conf/ETHERNUT51
-rw-r--r--sys/arm/conf/EXYNOS5.common1
-rw-r--r--sys/arm/conf/GENERIC1
-rw-r--r--sys/arm/conf/GUMSTIX1
-rw-r--r--sys/arm/conf/HL2001
-rw-r--r--sys/arm/conf/HL2011
-rw-r--r--sys/arm/conf/KB920X1
-rw-r--r--sys/arm/conf/NSLU1
-rw-r--r--sys/arm/conf/QILA9G201
-rw-r--r--sys/arm/conf/SAM9260EK1
-rw-r--r--sys/arm/conf/SAM9G20EK1
-rw-r--r--sys/arm/conf/SAM9X25EK1
-rw-r--r--sys/arm/conf/SHEEVAPLUG1
-rw-r--r--sys/arm/conf/SN9G451
-rw-r--r--sys/arm/conf/TS78001
-rw-r--r--sys/arm/conf/std.armv61
-rw-r--r--sys/arm/include/efi.h27
-rw-r--r--sys/arm64/arm64/identcpu.c13
-rw-r--r--sys/arm64/arm64/locore.S6
-rw-r--r--sys/arm64/arm64/machdep.c34
-rw-r--r--sys/arm64/arm64/mem.c9
-rw-r--r--sys/arm64/arm64/mp_machdep.c10
-rw-r--r--sys/arm64/arm64/nexus.c6
-rw-r--r--sys/arm64/arm64/vfp.c130
-rw-r--r--sys/arm64/arm64/vm_machdep.c3
-rw-r--r--sys/arm64/conf/GENERIC1
-rw-r--r--sys/arm64/conf/RPI3157
-rw-r--r--sys/arm64/include/armreg.h4
-rw-r--r--sys/arm64/include/efi.h27
-rw-r--r--sys/arm64/include/pcb.h14
-rw-r--r--sys/arm64/include/vfp.h8
-rw-r--r--sys/boot/arm/uboot/Makefile2
-rw-r--r--sys/boot/common/bootstrap.h2
-rw-r--r--sys/boot/common/dev_net.c17
-rw-r--r--sys/boot/common/interp.c3
-rw-r--r--sys/boot/common/interp_forth.c6
-rw-r--r--sys/boot/common/loader.88
-rw-r--r--sys/boot/common/pnp.c47
-rw-r--r--sys/boot/efi/loader/Makefile1
-rw-r--r--sys/boot/efi/loader/arch/amd64/ldscript.amd645
-rw-r--r--sys/boot/efi/loader/arch/arm/ldscript.arm5
-rw-r--r--sys/boot/efi/loader/arch/arm64/ldscript.arm645
-rw-r--r--sys/boot/efi/loader/arch/i386/efimd.c5
-rw-r--r--sys/boot/efi/loader/arch/i386/elf32_freebsd.c10
-rw-r--r--sys/boot/efi/loader/arch/i386/exec.c6
-rw-r--r--sys/boot/efi/loader/arch/i386/ldscript.i3865
-rw-r--r--sys/boot/efi/loader/main.c7
-rw-r--r--sys/boot/ficl/ficl.h7
-rw-r--r--sys/boot/ficl/i386/sysdep.c18
-rw-r--r--sys/boot/ficl/loader.c195
-rw-r--r--sys/boot/i386/libi386/Makefile3
-rw-r--r--sys/boot/i386/libi386/biospci.c164
-rw-r--r--sys/boot/i386/libi386/libi386.h8
-rw-r--r--sys/boot/mips/beri/loader/loader.ldscript4
-rw-r--r--sys/boot/mips/uboot/Makefile2
-rw-r--r--sys/boot/pc98/libpc98/Makefile3
-rw-r--r--sys/boot/powerpc/kboot/Makefile5
-rw-r--r--sys/boot/powerpc/ofw/Makefile5
-rw-r--r--sys/boot/powerpc/ps3/Makefile5
-rw-r--r--sys/boot/sparc64/loader/Makefile4
-rw-r--r--sys/boot/userboot/userboot/Makefile3
-rw-r--r--sys/cam/cam_compat.c4
-rw-r--r--sys/cam/ctl/ctl.c25
-rw-r--r--sys/cam/ctl/ctl.h1
-rw-r--r--sys/cam/ctl/ctl_backend.c11
-rw-r--r--sys/cam/scsi/scsi_enc_ses.c4
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c106
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c7
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h1
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c16
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c11
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c4
-rw-r--r--sys/conf/NOTES3
-rw-r--r--sys/conf/files2
-rw-r--r--sys/conf/files.arm6437
-rw-r--r--sys/conf/kern.mk1
-rw-r--r--sys/conf/kern.opts.mk2
-rw-r--r--sys/conf/options1
-rw-r--r--sys/conf/options.arm641
-rw-r--r--sys/contrib/octeon-sdk/cvmx-dma-engine.h32
-rw-r--r--sys/contrib/octeon-sdk/cvmx-higig.h24
-rw-r--r--sys/contrib/octeon-sdk/cvmx-pcie.c10
-rw-r--r--sys/contrib/octeon-sdk/cvmx-raid.h2
-rw-r--r--sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c27
-rw-r--r--sys/dev/acpi_support/atk0110.c417
-rw-r--r--sys/dev/cxgbe/t4_main.c2
-rw-r--r--sys/dev/drm2/i915/i915_gem.c4
-rw-r--r--sys/dev/drm2/ttm/ttm_bo_vm.c2
-rw-r--r--sys/dev/efidev/efidev.c193
-rw-r--r--sys/dev/gpio/gpioregulator.c348
-rw-r--r--sys/dev/hyperv/include/vmbus.h3
-rw-r--r--sys/dev/hyperv/netvsc/hv_net_vsc.h7
-rw-r--r--sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c213
-rw-r--r--sys/dev/hyperv/netvsc/hv_rndis_filter.c322
-rw-r--r--sys/dev/hyperv/netvsc/if_hnvar.h3
-rw-r--r--sys/dev/hyperv/netvsc/ndis.h124
-rw-r--r--sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c2
-rw-r--r--sys/dev/hyperv/vmbus/vmbus_br.c3
-rw-r--r--sys/dev/hyperv/vmbus/vmbus_chan.c8
-rw-r--r--sys/dev/iicbus/iicsmb.c310
-rw-r--r--sys/dev/iwm/if_iwm.c6
-rw-r--r--sys/dev/kbd/kbd.c2
-rw-r--r--sys/dev/otus/if_otus.c9
-rw-r--r--sys/dev/sfxge/common/ef10_nic.c84
-rw-r--r--sys/dev/sfxge/common/ef10_tlv_layout.h32
-rw-r--r--sys/dev/smbus/smbconf.h4
-rw-r--r--sys/dev/smbus/smbus.c198
-rw-r--r--sys/dev/usb/controller/dwc_otg_fdt.c7
-rw-r--r--sys/dev/usb/net/if_smsc.c72
-rw-r--r--sys/dev/usb/wlan/if_rsu.c4
-rw-r--r--sys/fs/nandfs/nandfs_vnops.c2
-rw-r--r--sys/i386/conf/GENERIC1
-rw-r--r--sys/i386/i386/mem.c9
-rw-r--r--sys/i386/include/efi.h14
-rw-r--r--sys/kern/kern_linker.c38
-rw-r--r--sys/kern/subr_gtaskqueue.c6
-rw-r--r--sys/kern/subr_intr.c38
-rw-r--r--sys/kern/uipc_accf.c2
-rw-r--r--sys/kern/vfs_bio.c4
-rw-r--r--sys/mips/conf/ADM51201
-rw-r--r--sys/mips/conf/ALCHEMY1
-rw-r--r--sys/mips/conf/AR71XX_BASE1
-rw-r--r--sys/mips/conf/AR724X_BASE1
-rw-r--r--sys/mips/conf/BCM1
-rw-r--r--sys/mips/conf/BERI_TEMPLATE1
-rw-r--r--sys/mips/conf/ERL2
-rw-r--r--sys/mips/conf/GXEMUL1
-rw-r--r--sys/mips/conf/GXEMUL321
-rw-r--r--sys/mips/conf/IDT1
-rw-r--r--sys/mips/conf/MT76201
-rw-r--r--sys/mips/conf/OCTEON11
-rw-r--r--sys/mips/conf/PB921
-rw-r--r--sys/mips/conf/QCA953X_BASE1
-rw-r--r--sys/mips/conf/QEMU1
-rw-r--r--sys/mips/conf/RT305X1
-rw-r--r--sys/mips/conf/RT53501
-rw-r--r--sys/mips/conf/SENTRY51
-rw-r--r--sys/mips/conf/XLR1
-rw-r--r--sys/mips/conf/XLR641
-rw-r--r--sys/mips/conf/XLRN321
-rw-r--r--sys/mips/conf/std.AR53121
-rw-r--r--sys/mips/conf/std.AR53151
-rw-r--r--sys/mips/conf/std.AR91XX1
-rw-r--r--sys/mips/conf/std.AR933X1
-rw-r--r--sys/mips/conf/std.AR934X1
-rw-r--r--sys/mips/conf/std.MALTA1
-rw-r--r--sys/mips/conf/std.QCA955X1
-rw-r--r--sys/mips/conf/std.SWARM1
-rw-r--r--sys/mips/conf/std.XLP1
-rw-r--r--sys/mips/include/efi.h14
-rw-r--r--sys/mips/mips/nexus.c6
-rw-r--r--sys/modules/bwn/Makefile20
-rw-r--r--sys/modules/cc/Makefile17
-rw-r--r--sys/modules/dtb/allwinner/Makefile3
-rw-r--r--sys/modules/efirt/Makefile3
-rw-r--r--sys/modules/khelp/Makefile10
-rw-r--r--sys/net/if.c2
-rw-r--r--sys/net/if_llatbl.c35
-rw-r--r--sys/net/if_llatbl.h8
-rw-r--r--sys/net/rndis.h1
-rw-r--r--sys/net80211/ieee80211.h11
-rw-r--r--sys/net80211/ieee80211_ht.c3
-rw-r--r--sys/net80211/ieee80211_input.c35
-rw-r--r--sys/net80211/ieee80211_proto.h6
-rw-r--r--sys/netinet/in_pcb.c10
-rw-r--r--sys/netinet/ip_output.c6
-rw-r--r--sys/netinet/sctp_pcb.c129
-rw-r--r--sys/netinet/tcp_input.c39
-rw-r--r--sys/netinet/tcp_output.c16
-rw-r--r--sys/netinet/tcp_stacks/fastpath.c14
-rw-r--r--sys/netinet/tcp_subr.c21
-rw-r--r--sys/netinet/tcp_syncache.c36
-rw-r--r--sys/netinet/tcp_timer.c20
-rw-r--r--sys/netinet/tcp_usrreq.c6
-rw-r--r--sys/netinet/tcp_var.h10
-rw-r--r--sys/netinet6/ip6_output.c7
-rw-r--r--sys/netpfil/pf/pf.c2
-rw-r--r--sys/netpfil/pf/pf_norm.c2
-rw-r--r--sys/pc98/conf/GENERIC1
-rw-r--r--sys/pc98/include/efi.h14
-rw-r--r--sys/powerpc/conf/GENERIC1
-rw-r--r--sys/powerpc/conf/GENERIC641
-rw-r--r--sys/powerpc/conf/MPC85XX1
-rw-r--r--sys/powerpc/include/efi.h14
-rw-r--r--sys/powerpc/powerpc/mem.c2
-rw-r--r--sys/riscv/conf/GENERIC1
-rw-r--r--sys/riscv/include/efi.h14
-rw-r--r--sys/sparc64/conf/GENERIC1
-rw-r--r--sys/sparc64/include/efi.h14
-rw-r--r--sys/sys/efi.h3
-rw-r--r--sys/sys/efiio.h59
-rw-r--r--sys/sys/linker.h1
-rw-r--r--sys/sys/mbuf.h2
-rw-r--r--sys/sys/param.h12
-rw-r--r--sys/vm/vm_fault.c2
-rw-r--r--sys/vm/vm_object.c10
-rw-r--r--sys/vm/vm_page.c33
-rw-r--r--sys/vm/vm_page.h2
-rw-r--r--sys/x86/x86/io_apic.c9
-rw-r--r--targets/pseudo/userland/misc/Makefile.depend2
-rw-r--r--tests/sys/kern/kern_copyin.c5
-rw-r--r--tests/sys/kern/pipe/pipe_fstat_bug_test.c18
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc28
-rw-r--r--tools/build/options/WITHOUT_MANDOCDB11
-rw-r--r--tools/build/options/WITH_RCS4
-rw-r--r--usr.bin/sdiff/Makefile2
-rw-r--r--usr.bin/sdiff/common.c24
-rw-r--r--usr.bin/sdiff/common.h9
-rw-r--r--usr.bin/sdiff/edit.c12
-rw-r--r--usr.bin/sdiff/sdiff.c38
-rw-r--r--usr.bin/truss/syscalls.c4
-rw-r--r--usr.sbin/Makefile1
-rw-r--r--usr.sbin/chown/chown.c2
-rw-r--r--usr.sbin/ctladm/ctladm.817
-rw-r--r--usr.sbin/efivar/Makefile8
-rw-r--r--usr.sbin/efivar/efivar.8164
-rw-r--r--usr.sbin/efivar/efivar.c351
-rw-r--r--usr.sbin/freebsd-update/freebsd-update.sh2
413 files changed, 6221 insertions, 27716 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 3ab8f2c5e600..d57406ffaca7 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -130,6 +130,32 @@ OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_
OLD_DIRS+=usr/lib/clang/3.8.0/lib/freebsd
OLD_DIRS+=usr/lib/clang/3.8.0/lib
OLD_DIRS+=usr/lib/clang/3.8.0
+# 20161015: Remove GNU rcs
+OLD_FILES+=usr/bin/ci
+OLD_FILES+=usr/bin/co
+OLD_FILES+=usr/bin/merge
+OLD_FILES+=usr/bin/rcs
+OLD_FILES+=usr/bin/rcsclean
+OLD_FILES+=usr/bin/rcsdiff
+OLD_FILES+=usr/bin/rcsfreeze
+OLD_FILES+=usr/bin/rcsmerge
+OLD_FILES+=usr/bin/rlog
+OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
+OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/13.rcs
+OLD_FILES+=usr/share/man/man1/ci.1.gz
+OLD_FILES+=usr/share/man/man1/co.1.gz
+OLD_FILES+=usr/share/man/man1/merge.1.gz
+OLD_FILES+=usr/share/man/man1/rcs.1.gz
+OLD_FILES+=usr/share/man/man1/rcsclean.1.gz
+OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz
+OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz
+OLD_FILES+=usr/share/man/man1/rcsintro.1.gz
+OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz
+OLD_FILES+=usr/share/man/man1/rlog.1.gz
+OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
+# 20161010: remove link to removed m_getclr(9) macro
+OLD_FILES+=usr/share/man/man9/m_getclr.9.gz
# 20161003: MK_ELFCOPY_AS_OBJCOPY option retired
OLD_FILES+=usr/bin/elfcopy
OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
@@ -572,9 +598,6 @@ OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_
OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd
OLD_DIRS+=usr/lib/clang/3.7.0/lib
OLD_DIRS+=usr/lib/clang/3.7.0
-# 20151201: mqueue tests 3 and 4 disabled
-OLD_FILES+=usr/tests/sys/mqueue/mqtest3
-OLD_FILES+=usr/tests/sys/mqueue/mqtest4
# 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
OLD_LIBS+=usr/lib/libelf.so.2
# 20151115: Fox bad upgrade scheme
diff --git a/UPDATING b/UPDATING
index 970401bff532..3e4aa3d61976 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,6 +31,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20161015:
+ GNU rcs has been removed from base. It is available as packages:
+ - rcs: Latest GPLv3 GNU rcs version.
+ - rcs57: Copy of the latest version of GNU rcs (GPLv2) before it was
+ removed from base.
+
+20161008:
+ Use of the cc_cdg, cc_chd, cc_hd, or cc_vegas congestion control
+ modules now requires that the kernel configuration contain the
+ TCP_HHOOK option. (This option is included in the GENERIC kernel.)
+
20161003:
The WITHOUT_ELFCOPY_AS_OBJCOPY src.conf(5) knob has been retired.
ELF Tool Chain's elfcopy is always installed as /usr/bin/objcopy.
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
index 72fd08aee2c1..2d8c24a0a596 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
@@ -581,6 +581,7 @@ int
dt_printf(dtrace_hdl_t *dtp, FILE *fp, const char *format, ...)
{
va_list ap;
+ va_list ap2;
int n;
#ifndef illumos
@@ -605,11 +606,13 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, const char *format, ...)
len = dtp->dt_sprintf_buflen - len;
assert(len >= 0);
- if ((n = vsnprintf(buf, len, format, ap)) < 0)
+ va_copy(ap2, ap);
+ if ((n = vsnprintf(buf, len, format, ap2)) < 0)
n = dt_set_errno(dtp, errno);
+ va_end(ap2);
va_end(ap);
-
+
return (n);
}
@@ -640,11 +643,14 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, const char *format, ...)
dtp->dt_buffered_buf[0] = '\0';
}
- if ((needed = vsnprintf(NULL, 0, format, ap)) < 0) {
+ va_copy(ap2, ap);
+ if ((needed = vsnprintf(NULL, 0, format, ap2)) < 0) {
rval = dt_set_errno(dtp, errno);
+ va_end(ap2);
va_end(ap);
return (rval);
}
+ va_end(ap2);
if (needed == 0) {
va_end(ap);
@@ -670,12 +676,15 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, const char *format, ...)
dtp->dt_buffered_size <<= 1;
}
+ va_copy(ap2, ap);
if (vsnprintf(&dtp->dt_buffered_buf[dtp->dt_buffered_offs],
- avail, format, ap) < 0) {
+ avail, format, ap2) < 0) {
rval = dt_set_errno(dtp, errno);
+ va_end(ap2);
va_end(ap);
return (rval);
}
+ va_end(ap2);
dtp->dt_buffered_offs += needed;
assert(dtp->dt_buffered_buf[dtp->dt_buffered_offs] == '\0');
@@ -683,8 +692,10 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, const char *format, ...)
return (0);
}
- n = vfprintf(fp, format, ap);
+ va_copy(ap2, ap);
+ n = vfprintf(fp, format, ap2);
fflush(fp);
+ va_end(ap2);
va_end(ap);
if (n < 0) {
diff --git a/contrib/libarchive/cpio/test/main.c b/contrib/libarchive/cpio/test/main.c
index 541a55030a53..77bf60613c1d 100644
--- a/contrib/libarchive/cpio/test/main.c
+++ b/contrib/libarchive/cpio/test/main.c
@@ -130,6 +130,13 @@ __FBSDID("$FreeBSD$");
# include <crtdbg.h>
#endif
+mode_t umasked(mode_t expected_mode)
+{
+ mode_t mode = umask(0);
+ umask(mode);
+ return expected_mode & ~mode;
+}
+
/* Path to working directory for current test */
const char *testworkdir;
#ifdef PROGRAM
@@ -1294,6 +1301,11 @@ assertion_file_time(const char *file, int line,
switch (type) {
case 'a': filet_nsec = st.st_atimespec.tv_nsec; break;
case 'b': filet = st.st_birthtime;
+ /* FreeBSD filesystems that don't support birthtime
+ * (e.g., UFS1) always return -1 here. */
+ if (filet == -1) {
+ return (1);
+ }
filet_nsec = st.st_birthtimespec.tv_nsec; break;
case 'm': filet_nsec = st.st_mtimespec.tv_nsec; break;
default: fprintf(stderr, "INTERNAL: Bad type %c for file time", type);
@@ -1425,7 +1437,7 @@ assertion_file_nlinks(const char *file, int line,
assertion_count(file, line);
r = lstat(pathname, &st);
if (r == 0 && (int)st.st_nlink == nlinks)
- return (1);
+ return (1);
failure_start(file, line, "File %s has %d links, expected %d",
pathname, st.st_nlink, nlinks);
failure_finish(NULL);
@@ -1661,6 +1673,7 @@ assertion_make_file(const char *file, int line,
if (0 != chmod(path, mode)) {
failure_start(file, line, "Could not chmod %s", path);
failure_finish(NULL);
+ close(fd);
return (0);
}
if (contents != NULL) {
@@ -1675,6 +1688,7 @@ assertion_make_file(const char *file, int line,
failure_start(file, line,
"Could not write to %s", path);
failure_finish(NULL);
+ close(fd);
return (0);
}
}
diff --git a/contrib/libarchive/cpio/test/test.h b/contrib/libarchive/cpio/test/test.h
index 1d219647560f..e42840083db5 100644
--- a/contrib/libarchive/cpio/test/test.h
+++ b/contrib/libarchive/cpio/test/test.h
@@ -182,6 +182,8 @@
assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks)
#define assertFileSize(pathname, size) \
assertion_file_size(__FILE__, __LINE__, pathname, size)
+#define assertFileMode(pathname, mode) \
+ assertion_file_mode(__FILE__, __LINE__, pathname, mode)
#define assertTextFileContents(text, pathname) \
assertion_text_file_contents(__FILE__, __LINE__, text, pathname)
#define assertFileContainsLinesAnyOrder(pathname, lines) \
@@ -327,6 +329,9 @@ void copy_reference_file(const char *);
*/
void extract_reference_files(const char **);
+/* Subtract umask from mode */
+mode_t umasked(mode_t expected_mode);
+
/* Path to working directory for current test */
extern const char *testworkdir;
diff --git a/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c b/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
index 4cffdeb95eb1..f4a861cf29f7 100644
--- a/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
+++ b/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
@@ -627,7 +627,6 @@ translate_acl(struct archive_read_disk *a,
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
"Unknown ACL brand");
return (ARCHIVE_WARN);
- break;
}
#endif
diff --git a/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c b/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c
index 60a9376bf5d9..719196985878 100644
--- a/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c
+++ b/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c
@@ -232,6 +232,7 @@ static const char *
lookup_uname_helper(struct name_cache *cache, id_t id)
{
struct passwd *result;
+ (void)cache; /* UNUSED */
result = getpwuid((uid_t)id);
@@ -298,6 +299,7 @@ static const char *
lookup_gname_helper(struct name_cache *cache, id_t id)
{
struct group *result;
+ (void)cache; /* UNUSED */
result = getgrgid((gid_t)id);
diff --git a/contrib/libarchive/libarchive/test/main.c b/contrib/libarchive/libarchive/test/main.c
index 0f9c64b69adb..cb3810e548c3 100644
--- a/contrib/libarchive/libarchive/test/main.c
+++ b/contrib/libarchive/libarchive/test/main.c
@@ -128,6 +128,13 @@ __FBSDID("$FreeBSD$");
# include <crtdbg.h>
#endif
+mode_t umasked(mode_t expected_mode)
+{
+ mode_t mode = umask(0);
+ umask(mode);
+ return expected_mode & ~mode;
+}
+
/* Path to working directory for current test */
const char *testworkdir;
#ifdef PROGRAM
@@ -1364,6 +1371,31 @@ assertion_file_birthtime_recent(const char *file, int line,
return assertion_file_time(file, line, pathname, 0, 0, 'b', 1);
}
+/* Verify mode of 'pathname'. */
+int
+assertion_file_mode(const char *file, int line, const char *pathname, int expected_mode)
+{
+ int mode;
+ int r;
+
+ assertion_count(file, line);
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ failure_start(file, line, "assertFileMode not yet implemented for Windows");
+#else
+ {
+ struct stat st;
+ r = lstat(pathname, &st);
+ mode = (int)(st.st_mode & 0777);
+ }
+ if (r == 0 && mode == expected_mode)
+ return (1);
+ failure_start(file, line, "File %s has mode %o, expected %o",
+ pathname, mode, expected_mode);
+#endif
+ failure_finish(NULL);
+ return (0);
+}
+
/* Verify mtime of 'pathname'. */
int
assertion_file_mtime(const char *file, int line,
@@ -1403,7 +1435,7 @@ assertion_file_nlinks(const char *file, int line,
assertion_count(file, line);
r = lstat(pathname, &st);
if (r == 0 && (int)st.st_nlink == nlinks)
- return (1);
+ return (1);
failure_start(file, line, "File %s has %d links, expected %d",
pathname, st.st_nlink, nlinks);
failure_finish(NULL);
@@ -1440,31 +1472,6 @@ assertion_file_size(const char *file, int line, const char *pathname, long size)
return (0);
}
-/* Verify mode of 'pathname'. */
-int
-assertion_file_mode(const char *file, int line, const char *pathname, int expected_mode)
-{
- int mode;
- int r;
-
- assertion_count(file, line);
-#if defined(_WIN32) && !defined(__CYGWIN__)
- failure_start(file, line, "assertFileMode not yet implemented for Windows");
-#else
- {
- struct stat st;
- r = lstat(pathname, &st);
- mode = (int)(st.st_mode & 0777);
- }
- if (r == 0 && mode == expected_mode)
- return (1);
- failure_start(file, line, "File %s has mode %o, expected %o",
- pathname, mode, expected_mode);
-#endif
- failure_finish(NULL);
- return (0);
-}
-
/* Assert that 'pathname' is a dir. If mode >= 0, verify that too. */
int
assertion_is_dir(const char *file, int line, const char *pathname, int mode)
@@ -1664,6 +1671,7 @@ assertion_make_file(const char *file, int line,
if (0 != chmod(path, mode)) {
failure_start(file, line, "Could not chmod %s", path);
failure_finish(NULL);
+ close(fd);
return (0);
}
if (contents != NULL) {
@@ -1678,6 +1686,7 @@ assertion_make_file(const char *file, int line,
failure_start(file, line,
"Could not write to %s", path);
failure_finish(NULL);
+ close(fd);
return (0);
}
}
diff --git a/contrib/libarchive/libarchive/test/test.h b/contrib/libarchive/libarchive/test/test.h
index bcf68690c405..6b61778c4a35 100644
--- a/contrib/libarchive/libarchive/test/test.h
+++ b/contrib/libarchive/libarchive/test/test.h
@@ -243,12 +243,12 @@ int assertion_file_birthtime_recent(const char *, int, const char *);
int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **);
int assertion_file_contents(const char *, int, const void *, int, const char *);
int assertion_file_exists(const char *, int, const char *);
+int assertion_file_mode(const char *, int, const char *, int);
int assertion_file_mtime(const char *, int, const char *, long, long);
int assertion_file_mtime_recent(const char *, int, const char *);
int assertion_file_nlinks(const char *, int, const char *, int);
int assertion_file_not_exists(const char *, int, const char *);
int assertion_file_size(const char *, int, const char *, long);
-int assertion_file_mode(const char *, int, const char *, int);
int assertion_is_dir(const char *, int, const char *, int);
int assertion_is_hardlink(const char *, int, const char *, const char *);
int assertion_is_not_hardlink(const char *, int, const char *, const char *);
@@ -329,6 +329,9 @@ void copy_reference_file(const char *);
*/
void extract_reference_files(const char **);
+/* Subtract umask from mode */
+mode_t umasked(mode_t expected_mode);
+
/* Path to working directory for current test */
extern const char *testworkdir;
diff --git a/contrib/libarchive/libarchive/test/test_read_set_format.c b/contrib/libarchive/libarchive/test/test_read_set_format.c
index f9be978351c4..d333269c2ee9 100644
--- a/contrib/libarchive/libarchive/test/test_read_set_format.c
+++ b/contrib/libarchive/libarchive/test/test_read_set_format.c
@@ -200,6 +200,8 @@ DEFINE_TEST(test_read_append_filter_wrong_program)
{
struct archive_entry *ae;
struct archive *a;
+ int fd;
+ fpos_t pos;
/*
* If we have "bunzip2 -q", try using that.
@@ -208,6 +210,13 @@ DEFINE_TEST(test_read_append_filter_wrong_program)
skipping("Can't run bunzip2 program on this platform");
return;
}
+
+ /* bunzip2 will write to stderr, redirect it to a file */
+ fflush(stderr);
+ fgetpos(stderr, &pos);
+ fd = dup(fileno(stderr));
+ freopen("stderr1", "w", stderr);
+
assert((a = archive_read_new()) != NULL);
assertA(0 == archive_read_set_format(a, ARCHIVE_FORMAT_TAR));
assertEqualIntA(a, ARCHIVE_OK,
@@ -217,4 +226,13 @@ DEFINE_TEST(test_read_append_filter_wrong_program)
assertA(archive_read_next_header(a, &ae) < (ARCHIVE_WARN));
assertEqualIntA(a, ARCHIVE_WARN, archive_read_close(a));
assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+
+ /* restore stderr */
+ fflush(stderr);
+ dup2(fd, fileno(stderr));
+ close(fd);
+ clearerr(stderr);
+ fsetpos(stderr, &pos);
+
+ assertTextFileContents("bunzip2: (stdin) is not a bzip2 file.\n", "stderr1");
}
diff --git a/contrib/libarchive/tar/test/main.c b/contrib/libarchive/tar/test/main.c
index 8bf1d36b3413..7a035fe2c94a 100644
--- a/contrib/libarchive/tar/test/main.c
+++ b/contrib/libarchive/tar/test/main.c
@@ -1164,6 +1164,35 @@ assertion_file_contains_lines_any_order(const char *file, int line,
return (0);
}
+/* Verify that a text file does not contains the specified strings */
+int
+assertion_file_contains_no_invalid_strings(const char *file, int line,
+ const char *pathname, const char *strings[])
+{
+ char *buff;
+ int i;
+
+ buff = slurpfile(NULL, "%s", pathname);
+ if (buff == NULL) {
+ failure_start(file, line, "Can't read file: %s", pathname);
+ failure_finish(NULL);
+ return (0);
+ }
+
+ for (i = 0; strings[i] != NULL; ++i) {
+ if (strstr(buff, strings[i]) != NULL) {
+ failure_start(file, line, "Invalid string in %s: %s", pathname,
+ strings[i]);
+ failure_finish(NULL);
+ free(buff);
+ return(0);
+ }
+ }
+
+ free(buff);
+ return (0);
+}
+
/* Test that two paths point to the same file. */
/* As a side-effect, asserts that both files exist. */
static int
@@ -1301,6 +1330,11 @@ assertion_file_time(const char *file, int line,
switch (type) {
case 'a': filet_nsec = st.st_atimespec.tv_nsec; break;
case 'b': filet = st.st_birthtime;
+ /* FreeBSD filesystems that don't support birthtime
+ * (e.g., UFS1) always return -1 here. */
+ if (filet == -1) {
+ return (1);
+ }
filet_nsec = st.st_birthtimespec.tv_nsec; break;
case 'm': filet_nsec = st.st_mtimespec.tv_nsec; break;
default: fprintf(stderr, "INTERNAL: Bad type %c for file time", type);
@@ -1432,7 +1466,7 @@ assertion_file_nlinks(const char *file, int line,
assertion_count(file, line);
r = lstat(pathname, &st);
if (r == 0 && (int)st.st_nlink == nlinks)
- return (1);
+ return (1);
failure_start(file, line, "File %s has %d links, expected %d",
pathname, st.st_nlink, nlinks);
failure_finish(NULL);
@@ -1668,6 +1702,7 @@ assertion_make_file(const char *file, int line,
if (0 != chmod(path, mode)) {
failure_start(file, line, "Could not chmod %s", path);
failure_finish(NULL);
+ close(fd);
return (0);
}
if (contents != NULL) {
@@ -1682,6 +1717,7 @@ assertion_make_file(const char *file, int line,
failure_start(file, line,
"Could not write to %s", path);
failure_finish(NULL);
+ close(fd);
return (0);
}
}
diff --git a/contrib/libarchive/tar/test/test.h b/contrib/libarchive/tar/test/test.h
index 340eadcd1b32..d8bdf2804643 100644
--- a/contrib/libarchive/tar/test/test.h
+++ b/contrib/libarchive/tar/test/test.h
@@ -174,6 +174,9 @@
/* Assert that file contents match a string. */
#define assertFileContents(data, data_size, pathname) \
assertion_file_contents(__FILE__, __LINE__, data, data_size, pathname)
+/* Verify that a file does not contain invalid strings */
+#define assertFileContainsNoInvalidStrings(pathname, strings) \
+ assertion_file_contains_no_invalid_strings(__FILE__, __LINE__, pathname, strings)
#define assertFileMtime(pathname, sec, nsec) \
assertion_file_mtime(__FILE__, __LINE__, pathname, sec, nsec)
#define assertFileMtimeRecent(pathname) \
@@ -182,6 +185,8 @@
assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks)
#define assertFileSize(pathname, size) \
assertion_file_size(__FILE__, __LINE__, pathname, size)
+#define assertFileMode(pathname, mode) \
+ assertion_file_mode(__FILE__, __LINE__, pathname, mode)
#define assertTextFileContents(text, pathname) \
assertion_text_file_contents(__FILE__, __LINE__, text, pathname)
#define assertFileContainsLinesAnyOrder(pathname, lines) \
@@ -239,6 +244,7 @@ int assertion_file_atime_recent(const char *, int, const char *);
int assertion_file_birthtime(const char *, int, const char *, long, long);
int assertion_file_birthtime_recent(const char *, int, const char *);
int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **);
+int assertion_file_contains_no_invalid_strings(const char *, int, const char *, const char **);
int assertion_file_contents(const char *, int, const void *, int, const char *);
int assertion_file_exists(const char *, int, const char *);
int assertion_file_mode(const char *, int, const char *, int);
diff --git a/contrib/libarchive/tar/test/test_missing_file.c b/contrib/libarchive/tar/test/test_missing_file.c
index e2e5da5bddf7..808e384e10b0 100644
--- a/contrib/libarchive/tar/test/test_missing_file.c
+++ b/contrib/libarchive/tar/test/test_missing_file.c
@@ -27,11 +27,15 @@ __FBSDID("$FreeBSD$");
DEFINE_TEST(test_missing_file)
{
+ const char * invalid_stderr[] = { "INTERNAL ERROR", NULL };
assertMakeFile("file1", 0644, "file1");
assertMakeFile("file2", 0644, "file2");
assert(0 == systemf("%s -cf archive.tar file1 file2 2>stderr1", testprog));
assertEmptyFile("stderr1");
assert(0 != systemf("%s -cf archive.tar file1 file2 file3 2>stderr2", testprog));
+ assertFileContainsNoInvalidStrings("stderr2", invalid_stderr);
assert(0 != systemf("%s -cf archive.tar 2>stderr3", testprog));
- assert(0 != systemf("%s -cf archive.tar file3 2>stderr4", testprog));
+ assertFileContainsNoInvalidStrings("stderr3", invalid_stderr);
+ assert(0 != systemf("%s -cf archive.tar file3 file4 2>stderr4", testprog));
+ assertFileContainsNoInvalidStrings("stderr4", invalid_stderr);
}
diff --git a/contrib/mdocml/mandocdb.c b/contrib/mdocml/mandocdb.c
index 6c04cb05256c..d727ce0e9a37 100644
--- a/contrib/mdocml/mandocdb.c
+++ b/contrib/mdocml/mandocdb.c
@@ -103,6 +103,7 @@ struct mpage {
char *arch; /* architecture from file content */
char *title; /* title from file content */
char *desc; /* description from file content */
+ struct mpage *next; /* singly linked list */
struct mlink *mlinks; /* singly linked list */
int form; /* format from file content */
int name_head_done;
@@ -146,6 +147,7 @@ static void dbadd_mlink_name(const struct mlink *mlink);
static int dbopen(int);
static void dbprune(void);
static void filescan(const char *);
+static int fts_compare(const FTSENT *const *, const FTSENT *const *);
static void mlink_add(struct mlink *, const struct stat *);
static void mlink_check(struct mpage *, struct mlink *);
static void mlink_free(struct mlink *);
@@ -204,6 +206,7 @@ static struct ohash strings; /* table of all strings */
static sqlite3 *db = NULL; /* current database */
static sqlite3_stmt *stmts[STMT__MAX]; /* current statements */
static uint64_t name_mask;
+static struct mpage *mpage_head;
static const struct mdoc_handler mdocs[MDOC_MAX] = {
{ NULL, 0 }, /* Ap */
@@ -571,6 +574,20 @@ usage:
return (int)MANDOCLEVEL_BADARG;
}
+static int
+fts_compare(const FTSENT *const *a, const FTSENT *const *b)
+{
+
+ /*
+ * The mpage list is processed in the opposite order to which pages are
+ * added, so traverse the hierarchy in reverse alpha order, resulting
+ * in database inserts in alpha order. This is not required for correct
+ * operation, but is helpful when inspecting the database during
+ * development.
+ */
+ return -strcmp((*a)->fts_name, (*b)->fts_name);
+}
+
/*
* Scan a directory tree rooted at "basedir" for manpages.
* We use fts(), scanning directory parts along the way for clues to our
@@ -600,8 +617,8 @@ treescan(void)
argv[0] = ".";
argv[1] = (char *)NULL;
- f = fts_open((char * const *)argv,
- FTS_PHYSICAL | FTS_NOCHDIR, NULL);
+ f = fts_open((char * const *)argv, FTS_PHYSICAL | FTS_NOCHDIR,
+ fts_compare);
if (f == NULL) {
exitcode = (int)MANDOCLEVEL_SYSERR;
say("", "&fts_open");
@@ -966,6 +983,8 @@ mlink_add(struct mlink *mlink, const struct stat *st)
mpage = mandoc_calloc(1, sizeof(struct mpage));
mpage->inodev.st_ino = inodev.st_ino;
mpage->inodev.st_dev = inodev.st_dev;
+ mpage->next = mpage_head;
+ mpage_head = mpage;
ohash_insert(&mpages, slot, mpage);
} else
mlink->next = mpage->mlinks;
@@ -989,20 +1008,18 @@ mpages_free(void)
{
struct mpage *mpage;
struct mlink *mlink;
- unsigned int slot;
- mpage = ohash_first(&mpages, &slot);
- while (NULL != mpage) {
+ while (NULL != (mpage = mpage_head)) {
while (NULL != (mlink = mpage->mlinks)) {
mpage->mlinks = mlink->next;
mlink_free(mlink);
}
+ mpage_head = mpage->next;
free(mpage->sec);
free(mpage->arch);
free(mpage->title);
free(mpage->desc);
free(mpage);
- mpage = ohash_next(&mpages, &slot);
}
}
@@ -1123,16 +1140,14 @@ mpages_merge(struct mparse *mp)
char *sodest;
char *cp;
int fd;
- unsigned int pslot;
if ( ! nodb)
SQL_EXEC("BEGIN TRANSACTION");
- mpage = ohash_first(&mpages, &pslot);
- while (mpage != NULL) {
+ for (mpage = mpage_head; mpage != NULL; mpage = mpage->next) {
mlinks_undupe(mpage);
if ((mlink = mpage->mlinks) == NULL) {
- mpage = ohash_next(&mpages, &pslot);
+ mpage = mpage->next;
continue;
}
@@ -1256,7 +1271,6 @@ mpages_merge(struct mparse *mp)
nextpage:
ohash_delete(&strings);
ohash_delete(&names);
- mpage = ohash_next(&mpages, &pslot);
}
if (0 == nodb)
diff --git a/contrib/netbsd-tests/fs/tmpfs/h_tools.c b/contrib/netbsd-tests/fs/tmpfs/h_tools.c
index 6a7b8fd38c46..64abe7b1b989 100644
--- a/contrib/netbsd-tests/fs/tmpfs/h_tools.c
+++ b/contrib/netbsd-tests/fs/tmpfs/h_tools.c
@@ -50,6 +50,10 @@
#include <string.h>
#include <unistd.h>
+#ifdef __FreeBSD__
+#include <inttypes.h>
+#endif
+
/* --------------------------------------------------------------------- */
static int getfh_main(int, char **);
@@ -70,7 +74,12 @@ getfh_main(int argc, char **argv)
if (argc < 2)
return EXIT_FAILURE;
+#ifdef __FreeBSD__
+ fh_size = sizeof(fhandle_t);
+#else
fh_size = 0;
+#endif
+
fh = NULL;
for (;;) {
if (fh_size) {
@@ -85,7 +94,11 @@ getfh_main(int argc, char **argv)
* but it may change if someone moves things around,
* so retry untill we have enough memory.
*/
+#ifdef __FreeBSD__
+ error = getfh(argv[1], fh);
+#else
error = getfh(argv[1], fh, &fh_size);
+#endif
if (error == 0) {
break;
} else {
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_mount.sh b/contrib/netbsd-tests/fs/tmpfs/t_mount.sh
index 11a77d49c24a..ec9d42f0f279 100755
--- a/contrib/netbsd-tests/fs/tmpfs/t_mount.sh
+++ b/contrib/netbsd-tests/fs/tmpfs/t_mount.sh
@@ -93,7 +93,18 @@ negative_body() {
test_unmount
}
+# Begin FreeBSD
+if true; then
+atf_test_case large cleanup
+large_cleanup() {
+ umount -f tmp 2>/dev/null
+}
+else
+# End FreeBSD
atf_test_case large
+# Begin FreeBSD
+fi
+# End FreeBSD
large_head() {
atf_set "descr" "Tests that extremely long values passed to -s" \
"are handled correctly"
@@ -103,6 +114,10 @@ large_body() {
test_mount -o -s9223372036854775807
test_unmount
+ # Begin FreeBSD
+ atf_expect_fail "-o -s<large-size> succeeds unexpectedly on FreeBSD - bug 212862"
+ # End FreeBSD
+
mkdir tmp
atf_check -s eq:1 -o empty -e ignore \
mount -t tmpfs -o -s9223372036854775808 tmpfs tmp
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_remove.sh b/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
index df868f9ccf52..78a6e2221aff 100755
--- a/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
+++ b/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
@@ -46,13 +46,28 @@ single_body() {
test_unmount
}
+# Begin FreeBSD
+if true; then
+atf_test_case uchg cleanup
+uchg_cleanup() {
+ Mount_Point=$(pwd)/mntpt test_unmount || :
+}
+else
+# End FreeBSD
atf_test_case uchg
+# Begin FreeBSD
+fi
+# End FreeBSD
uchg_head() {
atf_set "descr" "Checks that files with the uchg flag set cannot" \
"be removed"
atf_set "require.user" "root"
}
uchg_body() {
+ # Begin FreeBSD
+ atf_expect_fail "this fails on FreeBSD with root - bug 212861"
+ # End FreeBSD
+
test_mount
atf_check -s eq:0 -o empty -e empty touch a
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 0d6e7a69fc4c..de11e7229148 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -695,6 +695,7 @@ iovctl_files="" # Config files for iovctl(8)
### Jail Configuration (see rc.conf(5) manual page) ##########
##############################################################
jail_enable="NO" # Set to NO to disable starting of any jails
+jail_confwarn="YES" # Prevent warning about obsolete per-jail configuration
jail_parallel_start="NO" # Start jails in the background
jail_list="" # Space separated list of names of jails
jail_reverse_stop="NO" # Stop jails in reverse order
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 481675c7395c..feaed8ee6d10 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -228,8 +228,6 @@
..
12.make
..
- 13.rcs
- ..
15.yacc
..
16.lex
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 9ad9f91ee756..ad43a20a268f 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -314,6 +314,7 @@ FILES+= wpa_supplicant
.if ${MK_ZFS} != "no"
FILESGROUPS+= ZFS
ZFS+= zfs
+ZFS+= zfsbe
ZFS+= zfsd
ZFS+= zvol
ZFSPACKAGE= zfs
diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index 216c80e7fca3..8cf830a139a3 100755
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -147,7 +147,8 @@ parse_options()
#
# To relieve confusion, show a warning message.
#
- _confwarn=1
+ : ${jail_confwarn:=YES}
+ checkyesno jail_confwarn && _confwarn=1
if [ -r "$jail_conf" -o -r "$_jconf" ]; then
if ! checkyesno jail_parallel_start; then
warn "$_conf is created and used for jail $_j."
diff --git a/etc/rc.d/zfs b/etc/rc.d/zfs
index a98487c1393c..2d35f9b54642 100755
--- a/etc/rc.d/zfs
+++ b/etc/rc.d/zfs
@@ -4,7 +4,7 @@
#
# PROVIDE: zfs
-# REQUIRE: mountcritlocal
+# REQUIRE: zfsbe
# BEFORE: FILESYSTEMS var
. /etc/rc.subr
diff --git a/etc/rc.d/zfsbe b/etc/rc.d/zfsbe
new file mode 100755
index 000000000000..3c852017aa41
--- /dev/null
+++ b/etc/rc.d/zfsbe
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: zfsbe
+# REQUIRE: mountcritlocal
+
+# Handle boot environment subordinate filesystems
+# that may have canmount property set to noauto.
+# For these filesystems mountpoint relative to /
+# must be the same as their dataset name relative
+# to BE root dataset.
+
+. /etc/rc.subr
+
+name="zfsbe"
+rcvar="zfs_enable"
+start_cmd="be_start"
+stop_cmd="be_stop"
+required_modules="zfs"
+
+mount_subordinate()
+{
+ local _be
+
+ _be=$1
+ zfs list -rH -o mountpoint,name,canmount,mounted -s mountpoint -t filesystem $_be | \
+ while read _mp _name _canmount _mounted ; do
+ # skip filesystems that must not be mounted
+ [ "$_canmount" = "off" ] && continue
+ # skip filesystems that are already mounted
+ [ "$_mounted" = "yes" ] && continue
+ case "$_mp" in
+ "none" | "legacy" | "/" | "/$_be")
+ # do nothing for filesystems with unset or legacy mountpoint
+ # or those that would be mounted over /
+ ;;
+ "/$_be/"*)
+ # filesystems with mountpoint relative to BE
+ mount -t zfs $_name ${_mp#/$_be}
+ ;;
+ *)
+ # filesystems with mountpoint elsewhere
+ zfs mount $_name
+ ;;
+ esac
+ done
+}
+
+be_start()
+{
+ if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then
+ :
+ else
+ mount -p | while read _dev _mp _type _rest; do
+ [ $_mp = "/" ] || continue
+ if [ $_type = "zfs" ] ; then
+ mount_subordinate $_dev
+ fi
+ break
+ done
+ fi
+}
+
+be_stop()
+{
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 6ba9ef2e1fe3..8e42053c08ab 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -11,7 +11,6 @@ SUBDIR= ${_binutils} \
${_gperf} \
grep \
${_groff} \
- ${_rcs} \
${_tests}
SUBDIR_DEPEND_gdb= ${_binutils}
@@ -29,10 +28,6 @@ _groff= groff
_dtc= dtc
.endif
-.if ${MK_RCS} != "no"
-_rcs= rcs
-.endif
-
.if ${MK_TESTS} != "no"
_tests= tests
.endif
diff --git a/gnu/usr.bin/groff/mdate.sh b/gnu/usr.bin/groff/mdate.sh
index 70a052abc046..03a4a090685e 100755
--- a/gnu/usr.bin/groff/mdate.sh
+++ b/gnu/usr.bin/groff/mdate.sh
@@ -4,6 +4,5 @@
set -e
test -r "$1"
export LC_ALL=C
-changelog_date=$(sed -E -n 's/^([0-9]{4}-[0-9]{2}-[0-9]{2}).*$/\1/p' "$1" |\
- head -n 1)
+changelog_date=$(sed -E -n '1s/^([0-9]{4}-[0-9]{2}-[0-9]{2}).*$/\1/p' "$1")
echo $(date -j -f %Y-%m-%d +"%e %B %Y" $changelog_date)
diff --git a/gnu/usr.bin/rcs/CREDITS b/gnu/usr.bin/rcs/CREDITS
deleted file mode 100644
index 589e8b685091..000000000000
--- a/gnu/usr.bin/rcs/CREDITS
+++ /dev/null
@@ -1,24 +0,0 @@
-RCS was designed and built by Walter F. Tichy of Purdue University.
-RCS version 3 was released in 1983.
-
-Adam Hammer, Thomas Narten, and Daniel Trinkle of Purdue supported RCS through
-version 4.3, released in 1990. Guy Harris of Sun contributed many porting
-fixes. Paul Eggert of System Development Corporation contributed bug fixes
-and tuneups. Jay Lepreau contributed 4.3BSD support.
-
-Paul Eggert of Twin Sun wrote the changes for RCS versions 5.5 and 5.6 (1991).
-Rich Braun of Kronos and Andy Glew of Intel contributed ideas for new options.
-Bill Hahn of Stratus contributed ideas for setuid support.
-Ideas for piece tables came from Joe Berkovitz of Stratus and Walter F. Tichy.
-Matt Cross of Stratus contributed test case ideas.
-Adam Hammer of Purdue QAed.
-
-Paul Eggert wrote most of the changes for this version of RCS,
-currently in beta test. K. Richard Pixley of Cygnus Support
-contributed several bug fixes. Robert Lupton of Princeton
-and Daniel Trinkle contributed ideas for $Name expansion.
-Brendan Kehoe of Cygnus Support suggested rlog's -N option.
-Paul D. Smith of Data General suggested improvements in option
-and error processing. Adam Hammer of Purdue QAed.
-
-$FreeBSD$
diff --git a/gnu/usr.bin/rcs/Makefile b/gnu/usr.bin/rcs/Makefile
deleted file mode 100644
index 6b2bd1c3a8f1..000000000000
--- a/gnu/usr.bin/rcs/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= lib .WAIT \
- ci co merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze
-SUBDIR_PARALLEL=
-
-.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/rcs/Makefile.inc b/gnu/usr.bin/rcs/Makefile.inc
deleted file mode 100644
index a46437ad8c82..000000000000
--- a/gnu/usr.bin/rcs/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-LIBRCS= ${.OBJDIR}/../lib/librcs.a
diff --git a/gnu/usr.bin/rcs/NEWS b/gnu/usr.bin/rcs/NEWS
deleted file mode 100644
index 99208064bd32..000000000000
--- a/gnu/usr.bin/rcs/NEWS
+++ /dev/null
@@ -1,548 +0,0 @@
-Recent changes to RCS (and possible future changes)
-
- $FreeBSD$
-
- Copyright 1991, 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
- This file is part of RCS.
-
- RCS is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- RCS is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with RCS; see the file COPYING.
- If not, write to the Free Software Foundation,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-
-Here is a brief summary of user-visible changes since 5.6.
-
- New options:
- `-kb' supports binary files.
- `-T' preserves the modification time of RCS files.
- `-V' prints the version number.
- `-zLT' causes RCS to use local time in working files and logs.
- `rcsclean -n' outputs what rcsclean would do, without actually doing it.
- `rlog -N' omits symbolic names.
- There is a new keyword `Name'.
- Inserted log lines now have the same prefix as the preceding `$Log' line.
-
-Most changes for RCS version 5.7 are to fix bugs and improve portability.
-RCS now conforms to GNU configuration standards and to Posix 1003.1b-1993.
-
-
-Features new to RCS version 5.7, and possibly incompatible
-in minor ways with previous practice, include:
-
- Inserted log lines now have the same prefix as the preceding `$Log' line.
- E.g. if a $Log line starts with `// $Log', log lines are prefixed with `// '.
- RCS still records the (now obsolescent) comment leader inside RCS files,
- but it ignores the comment leader unless it is emulating older RCS versions.
- If you plan to access a file with both old and new versions of RCS,
- make sure its comment leader matches its `$Log' line prefix.
- For backwards compatibility with older versions of RCS,
- if the log prefix is `/*' or `(*' surrounded by optional white space,
- inserted log lines contain ` *' instead of `/*' or `(*';
- however, this usage is obsolescent and should not be relied on.
-
- $Log string `Revision' times now use the same format as other times.
-
- Log lines are now inserted even if -kk is specified; this simplifies merging.
-
- ci's -rR option (with a nonempty R) now just specifies a revision number R.
- In some beta versions, it also reestablished the default behavior of
- releasing a lock and removing the working file.
- Now, only the bare -r option does this.
-
- With an empty extension, any appearance of a directory named `RCS'
- in a pathname identifies the pathname as being that of an RCS file.
- For example, `a/RCS/b/c' is now an RCS file with an empty extension.
- Formerly, `RCS' had to be the last directory in the pathname.
-
- rlog's -d option by default now uses exclusive time ranges.
- E.g. `rlog -d"<T"' now excludes revisions whose times equal T exactly.
- Use `rlog -d"<=T"' to get the old behavior.
-
- merge now takes up to three -L options, one for each input file.
- Formerly, it took at most two -L options, for the 1st and 3rd input files.
-
- `rcs' now requires at least one option; this is for future expansion.
-
-Other features new to RCS version 5.7 include:
-
- merge and rcsmerge now pass -A, -E, and -e options to the subsidiary diff3.
-
- rcs -kb acts like rcs -ko, except it uses binary I/O on working files.
- This makes no difference under Posix or Unix, but it does matter elsewhere.
- With -kb in effect, rcsmerge refuses to merge;
- this avoids common problems with CVS merging.
-
- The following is for future use by GNU Emacs 19's version control package:
-
- rcs's new -M option causes it to not send mail when you break somebody
- else's lock. This is not meant for casual use; see rcs(1).
-
- ci's new -i option causes an error if the RCS file already exists.
- Similarly, -j causes an error if the RCS file does not already exist.
-
- The new keyword `Name' is supported; its value is the name, if any,
- used to check out the revision. E.g. `co -rN foo' causes foo's
- $Name...$ keyword strings to end in `: N $'.
-
- The new -zZONE option causes RCS to output dates and times using ISO 8601
- format with ZONE as the time zone, and to use ZONE as the default time
- zone for input. Its most common use is the -zLT option, which causes RCS
- to use local time externally. You can also specify foreign time zones;
- e.g. -z+05:30 causes RCS to use India time (5 hours 30 minutes east of UTC).
- This option does not affect RCS files themselves, which always use UTC;
- it affects only output (e.g. rlog output, keyword expansion, diff -c times)
- and interpretation of options (e.g. the -d option of ci, co, and rlog).
- Bare -z restores the default behavior of UTC with no time zone indication,
- and the traditional RCS date separator `/' instead of the ISO 8601 `-'.
- RCSINIT may contain a -z option. ci -k parses UTC offsets.
-
- The new -T option of ci, co, rcs, and rcsclean preserves the modification
- time of the RCS file unless a revision is added or removed.
- ci -T sets the RCS file's modification time to the new revision's time
- if the former precedes the latter and there is a new revision;
- otherwise, it preserves the RCS file's modification time.
- Use this option with care, as it can confuse `make'; see ci(1).
-
- The new -N option of rlog omits symbolic names from the output.
-
- A revision number that starts with `.' is considered to be relative to
- the default branch (normally the trunk). A branch number followed by `.'
- stands for the last revision on that branch.
-
- If someone else already holds the lock, rcs -l now asks whether you want
- to break it, instead of immediately reporting an error.
-
- ci now always unlocks a revision like 3.5 if you check in a revision
- like 3.5.2.1 that is the first of a new branch of that revision.
- Formerly it was inconsistent.
-
- File names may now contain tab, newline, space, and '$'.
- They are represented in keyword strings with \t, \n, \040, and \044.
- \ in a file name is now represented by \\ in a keyword string.
-
- Identifiers may now start with a digit and (unless they are symbolic names)
- may contain `.'. This permits author names like `john.doe' and `4tran'.
-
- A bare -V option now prints the current version number.
-
- rcsdiff outputs more readable context diff headers if diff -L works.
-
- rcsdiff -rN -rN now suppresses needless checkout and comparison
- of identical revisions.
-
- Error messages now contain the names of files to which they apply.
-
- Mach style memory mapping is now supported.
-
- The installation procedure now conforms to the GNU coding standards.
-
- When properly configured, RCS now strictly conforms to Posix 1003.1b-1993.
-
-
-Features new to RCS version 5.6 include:
-
- Security holes have been plugged; setgid use is no longer supported.
-
- co can retrieve old revisions much more efficiently.
- To generate the Nth youngest revision on the trunk,
- the old method used up to N passes through copies of the working file;
- the new method uses a piece table to generate the working file in one pass.
-
- When ci finds no changes in the working file,
- it automatically reverts to the previous revision unless -f is given.
-
- RCS follows symbolic links to RCS files instead of breaking them,
- and warns when it breaks hard links to RCS files.
-
- `$' stands for the revision number taken from working file keyword strings.
- E.g. if F contains an Id keyword string,
- `rcsdiff -r$ F' compares F to its checked-in revision, and
- `rcs -nL:$ F' gives the symbolic name L to F's revision.
-
- co and ci's new -M option sets the modification time
- of the working file to be that of the revision.
- Without -M, ci now tries to avoid changing the working file's
- modification time if its contents are unchanged.
-
- rcs's new -m option changes the log message of an old revision.
-
- RCS is portable to hosts that do not permit `,' in filenames.
- (`,' is not part of the Posix portable filename character set.)
- A new -x option specifies extensions other than `,v' for RCS files.
- The Unix default is `-x,v/', so that the working file `w' corresponds
- to the first file in the list `RCS/w,v', `w,v', `RCS/w' that works.
- The non-Unix default is `-x', so that only `RCS/w' is tried.
- Eventually, the Unix default should change to `-x/,v'
- to encourage interoperability among all Posix hosts.
-
- A new RCSINIT environment variable specifies defaults for options like -x.
-
- The separator for revision ranges has been changed from `-' to `:', because
- the range `A-B' is ambiguous if `A', `B' and `A-B' are all symbolic names.
- E.g. the old `rlog -r1.5-1.7' is now `rlog -r1.5:1.7'; ditto for `rcs -o'.
- For a while RCS will still support (but warn about) the old `-' separator.
-
- RCS manipulates its lock files using a method that is more reliable under NFS.
-
-
-Features new to RCS version 5 include:
-
- RCS can check in arbitrary files, not just text files, if diff -a works.
- RCS can merge lines containing just a single `.' if diff3 -m works.
- GNU diff supports the -a and -m options.
-
- RCS can now be used as a setuid program.
- See ci(1) for how users can employ setuid copies of ci, co, and rcsclean.
- Setuid privileges yield extra security if the effective user owns RCS files
- and directories, and if only the effective user can write RCS directories.
- RCS uses the real user for all accesses other than writing RCS directories.
- As described in ci(1), there are three levels of setuid support.
-
- 1. Setuid works fully if the seteuid() system call lets any
- process switch back and forth between real and effective users,
- as specified in Posix 1003.1a Draft 5.
-
- 2. On hosts with saved setuids (a Posix 1003.1-1990 option) and without
- a modern seteuid(), setuid works unless the real or effective user is root.
-
- 3. On hosts that lack both modern seteuid() and saved setuids,
- setuid does not work, and RCS uses the effective user for all accesses;
- formerly it was inconsistent.
-
- New options to co, rcsdiff, and rcsmerge give more flexibility to keyword
- substitution.
-
- -kkv substitutes the default `$Keyword: value $' for keyword strings.
- However, a locker's name is inserted only as a file is being locked,
- i.e. by `ci -l' and `co -l'. This is normally the default.
-
- -kkvl acts like -kkv, except that a locker's name is always inserted
- if the given revision is currently locked. This was the default in
- version 4. It is now the default only with when using rcsdiff to
- compare a revision to a working file whose mode is that of a file
- checked out for changes.
-
- -kk substitutes just `$Keyword$', which helps to ignore keyword values
- when comparing revisions.
-
- -ko retrieves the old revision's keyword string, thus bypassing keyword
- substitution.
-
- -kv retrieves just `value'. This can ease the use of keyword values, but
- it is dangerous because it causes RCS to lose track of where the keywords
- are, so for safety the owner write permission of the working file is
- turned off when -kv is used; to edit the file later, check it out again
- without -kv.
-
- rcs -ko sets the default keyword substitution to be in the style of co -ko,
- and similarly for the other -k options. This can be useful with file
- formats that cannot tolerate changing the lengths of keyword strings.
- However it also renders a RCS file readable only by RCS version 5 or later.
- Use rcs -kkv to restore the usual default substitution.
-
- RCS can now be used by development groups that span time zone boundaries.
- All times are now displayed in UTC, and UTC is the default time zone.
- To use local time with co -d, append ` LT' to the time.
- When interchanging RCS files with sites running older versions of RCS,
- time stamp discrepancies may prevent checkins; to work around this,
- use `ci -d' with a time slightly in the future.
-
- Dates are now displayed using four-digit years, not two-digit years.
- Years given in -d options must now have four digits.
- This change is required for RCS to continue to work after 1999/12/31.
- The form of dates in version 5 RCS files will not change until 2000/01/01,
- so in the meantime RCS files can still be interchanged with sites
- running older versions of RCS. To make room for the longer dates,
- rlog now outputs `lines: +A -D' instead of `lines added/del: A/D'.
-
- To help prevent diff programs that are broken or have run out of memory
- from trashing an RCS file, ci now checks diff output more carefully.
-
- ci -k now handles the Log keyword, so that checking in a file
- with -k does not normally alter the file's contents.
-
- RCS no longer outputs white space at the ends of lines
- unless the original working file had it.
- For consistency with other keywords,
- a space, not a tab, is now output after `$Log:'.
- Rlog now puts lockers and symbolic names on separate lines in the output
- to avoid generating lines that are too long.
- A similar fix has been made to lists in the RCS files themselves.
-
- RCS no longer outputs the string `Locker: ' when expanding Header or Id
- keywords. This saves space and reverts back to version 3 behavior.
-
- The default branch is not put into the RCS file unless it is nonempty.
- Therefore, files generated by RCS version 5 can be read by RCS version 3
- unless they use the default branch feature introduced in version 4.
- This fixes a compatibility problem introduced by version 4.
-
- RCS can now emulate older versions of RCS; see `co -V'.
- This may be useful to overcome compatibility problems
- due to the above changes.
-
- Programs like Emacs can now interact with RCS commands via a pipe:
- the new -I option causes ci, co, and rcs to run interactively,
- even if standard input is not a terminal.
- These commands now accept multiple inputs from stdin separated by `.' lines.
-
- ci now silently ignores the -t option if the RCS file already exists.
- This simplifies some shell scripts and improves security in setuid sites.
-
- Descriptive text may be given directly in an argument of the form -t-string.
-
- The character set for symbolic names has been upgraded
- from Ascii to ISO 8859.
-
- rcsdiff now passes through all options used by GNU diff;
- this is a longer list than 4.3BSD diff.
-
- merge's new -L option gives tags for merge's overlap report lines.
- This ability used to be present in a different, undocumented form;
- the new form is chosen for compatibility with GNU diff3's -L option.
-
- rcsmerge and merge now have a -q option, just like their siblings do.
-
- rcsclean's new -n option outputs what rcsclean would do,
- without actually doing it.
-
- RCS now attempts to ignore parts of an RCS file that look like they come
- from a future version of RCS.
-
- When properly configured, RCS now strictly conforms with Posix 1003.1-1990.
- RCS can still be compiled in non-Posix traditional Unix environments,
- and can use common BSD and USG extensions to Posix.
- RCS is a conforming Standard C program, and also compiles under traditional C.
-
- Arbitrary limits on internal table sizes have been removed.
- The only limit now is the amount of memory available via malloc().
-
- File temporaries, lock files, signals, and system call return codes
- are now handled more cleanly, portably, and quickly.
- Some race conditions have been removed.
-
- A new compile-time option RCSPREFIX lets administrators avoid absolute path
- names for subsidiary programs, trading speed for flexibility.
-
- The configuration procedure is now more automatic.
-
- Snooping has been removed.
-
-
-Version 4 was the first version distributed by FSF.
-Beside bug fixes, features new to RCS version 4 include:
-
- The notion of default branch has been added; see rcs -b.
-
-
-Version 3 was included in the 4.3BSD distribution.
-
-
-Here are some possible future changes for RCS:
-
- Bring back sccstorcs.
-
- Add an option to `rcsmerge' so that it can use an arbitrary program
- to do the 3-way merge, instead of the default `merge'.
- Likewise for `rcsdiff' and `diff'. It should be possible to pass
- arbitrary options to these programs, and to the subsidiary `co's.
-
- Add format options for finer control over the output of ident and rlog.
- E.g. there should be an easy way for rlog to output lines like
- `src/main.c 2.4 wft', one for each locked revision.
- rlog options should have three orthogonal types: selecting files,
- selecting revisions, and selecting rlog format.
-
- Add format options for finer control over the output of keyword strings.
- E.g. there should be some way to prepend @(#), and there should be some
- way to change $ to some other character to disable further substitution.
- These options should make the resulting files uneditable, like -kv.
-
- Add long options, e.g. `--version'. Unfortunately RCS's option syntax
- is incompatible with getopt. Perhaps the best way is to overload `rcs', e.g.
- `rcs diff --keyword-substitution=old file' instead of `rcsdiff -ko file'.
-
- Add a way to put only the interesting part of the path into the $Header
- keyword expansion.
-
- rlog -rM:N should work even if M and N have different numbers of fields,
- so long as M is an ancestor of N or vice versa.
-
- rcs should evaluate options in order; this allows rcs -oS -nS.
-
- rcs should be able to fix minor mistakes in checkin dates and authors.
-
- Be able to redo your most recent checkin with minor changes.
-
- co -u shouldn't complain about a writable working file if it won't change
- its contents.
-
- Configure the Makefile automatically, as well as conf.h.
-
- Add a new option to rcs that behaves like -o, but that doesn't lose the
- nonempty log messages, but instead merges them with the next revision
- if it exists, perhaps with a 1-line header containing author, date, etc.
-
- Add a `-' option to take the list of pathnames from standard input.
- Perhaps the pathnames should be null-terminated, not newline-terminated,
- so that pathnames that contain newlines are handled properly.
-
- Permit multiple option-pathname pairs, e.g. co -r1.4 a -r1.5 b.
-
- Add options to allow arbitrary combinations of working file names
- with RCS file names -- they shouldn't have to match.
-
- Add an option to break a symbolic link to an RCS file,
- instead of breaking the hard link that it points to.
-
- Add ways to specify the earliest revision, the most recent revision,
- the earliest or latest revision on a particular branch, and
- the parent or child of some other revision.
-
- If a user has multiple locks, perhaps ci should fall back on ci -k's
- method to figure out which revision to use.
-
- Symbolic names need not refer to existing branches and revisions.
- rcs(1)'s BUGS section says this is a bug. Is it? If so, it should be fixed.
-
- Add an option to rcs -o so that old log messages are not deleted if
- the next undeleted revision exists, but are merely appended to the log
- message of that revision.
-
- ci -k should be able to get keyword values from the first `$Log' entry.
-
- Add an option to rcsclean to clean directories recursively.
-
- Write an rcsck program that repairs corrupted RCS files,
- much as fsck repairs corrupted file systems.
- For example, it should remove stale lock files.
-
- Clean up the source code with a consistent indenting style.
-
- Update the date parser to use the more modern getdate.y by Bellovin,
- Salz, and Berets, or the even more modern getdate by Moraes. None of
- these getdate implementations are as robust as RCS's old warhorse in
- avoiding problems like arithmetic overflow, so they'll have to be
- fixed first.
-
- Break up the code into a library so that it's easier to write new programs
- that manipulate RCS files, and so that useless code is removed from the
- existing programs. For example, the rcs command contains unnecessary
- keyword substitution baggage, and the merge command can be greatly pruned.
-
- Make it easier to use your favorite text editor to edit log messages,
- etc. instead of having to type them in irretrievably at the terminal.
-
- Let the user specify a search path for default branches,
- e.g. to use L as the default branch if it works, and M otherwise.
- Let the user require that at least one entry in the default branch path works.
- Let the user say that later entries in the default branch path are read only,
- i.e. one cannot check in changes to them.
- This should be an option settable by RCSINIT.
-
- Add a way for a user to see which revisions affected which lines.
-
- Have `rlog -nN F' print just the revision number that N translates to.
- E.g. `rlog -nB. F' would print the highest revision on the branch B.
- Use this to add an option -bB to rcsbranch, to freeze the named branch.
- This should interact well with default branches.
-
- Add a co option that prints the revision number before each line,
- as SCCS's `get -m' does.
-
-The following projects require a change to RCS file format.
-
- Allow keyword expansion to be changed on a per-revision basis,
- not on a per-file basis as now. This would allow -ko to be used
- on imported revisions, with the default -kkv otherwise.
-
- When two or more branches are merged, record all the ancestors
- of the new revision. The hard part of this is keeping track of all
- the ancestors of a working file while it's checked out.
-
- Add loose locking, which is like non-strict but applies to all users,
- not just the owner of the RCS file.
-
- Be able to store RCS files in compressed format.
- Don't bother to use a .Z extension that would exceed file name length limits;
- just look at the magic number.
-
- Add locker commentary, e.g. `co -l -m"checkout to fix merge bug" foo'
- to tell others why you checked out `foo'.
- Also record the time when the revision was locked,
- and perhaps the working pathname (if applicable).
-
- Let the user mark an RCS revision as deleted; checking out such a revision
- would result in no working file. Similarly, using `co -d' with a date either
- before the initial revision or after the file was marked deleted should
- remove the working file. For extra credit, extend the notion of `deleted' to
- include `renamed'. RCS should support arbitrary combinations of renaming and
- deletion, e.g. renaming A to B and B to A, checking in new revisions to both
- files, and then renaming them back.
-
- Be able to check in an entire directory structure into a single RCS file.
-
- Use a better scheme for locking revisions; the current scheme requires
- changing the RCS file just to lock or unlock a revision.
- The new scheme should coexist as well as possible with older versions of RCS,
- and should avoid the rare NFS bugs mentioned in rcsedit.c.
- E.g. if there's a reliable lockd running, RCS should use it
- instead of relying on NFS.
-
- Add rcs options for changing keyword names, e.g. XConsortium instead of Id.
-
- Add a `$Description' keyword; but this may be tricky, since descriptions can
- contain newlines and $s.
-
- Add a `$Copyright' keyword that expands to a copyright notice.
-
- Add frozen branches a la SCCS. In general, be able to emulate all of
- SCCS, so that an SCCS-to-RCS program can be practical. For example,
- there should be an equivalent to the SCCS prt command.
-
- Add support for distributed RCS, where widely separated
- users cannot easily access each others' RCS files,
- and must periodically distribute and reconcile new revisions.
-
- Be able to create empty branches.
-
- Be able to store just deltas from a read-only principal copy,
- e.g. from source on CD-ROM.
-
- Improve RCS's method for storing binary files.
- Although it is more efficient than SCCS's,
- the diff algorithm is still line oriented,
- and often generates long output for minor changes to an executable file.
-
- From the user's point of view, it would be best if
- RCS detected and handled binary files without human intervention,
- switching expansion methods as needed from revision to revision.
-
- Allow RCS to determine automagically whether -ko or -kb should be the default
- by inspecting the file's contents or name. The magic should be optional
- and user-programmable.
-
- Extend the grammar of RCS files so that keywords need not be in a fixed order.
-
- Internationalize messages; unfortunately, there's no common standard yet.
- This requires a change in RCS file format because of the
- `empty log message' and `checked in with -k' hacks inside RCS files.
-
- Add documentation in texinfo format.
diff --git a/gnu/usr.bin/rcs/REFS b/gnu/usr.bin/rcs/REFS
deleted file mode 100644
index 89fc823525ee..000000000000
--- a/gnu/usr.bin/rcs/REFS
+++ /dev/null
@@ -1,90 +0,0 @@
-Here are references to RCS and related free software and documentation.
-Some of this information changes often; see the Frequently Asked Questions
-for more up-to-date references.
-
- $FreeBSD$
-
-
-Frequently Asked Questions (FAQs)
-
-<http://www.qucis.queensu.ca/Software-Engineering/>
-<ftp://rtfm.mit.edu//pub/usenet-by-hierarchy/comp/software-eng/>
- for software engineering; e.g. see
- <http://www.qucis.queensu.ca/Software-Engineering/blurb/rcs>.
-
-<http://www.iac.honeywell.com/Pub/Tech/CM/CMFAQ.html>
-<ftp://rtfm.mit.edu//pub/usenet-by-hierarchy/comp/software/config-mgmt/>
- for configuration management
-
-<http://www.winternet.com/~zoo/cvs/FAQ.txt>
-<ftp://ftp.odi.com/pub/users/dgg/FAQ.gz>
- for CVS (see below)
-
-
-RCS and related GNU project software
-
-<ftp://ftp.cs.purdue.edu/pub/RCS/>
- The RCS project distribution directory also contains beta versions,
- ports, and prebuilt documentation.
-
-<ftp://prep.ai.mit.edu/pub/gnu/>
- The GNU project distribution directory contains:
- diffutils-N-tar.gz
- the latest diffutils release; recommended for RCS
- emacs-N-tar.gz
- The latest Emacs release contains VC, a version-control package
- that makes RCS easier to use.
- make-N-tar.gz
- GNU Make, which can automatically build from RCS files.
- rcs-N-tar.gz
- the latest RCS release
- cvs-N-tar.gz
- the latest official CVS release (see below)
-
-<ftp://ftp.leo.org/pub/comp/os/os2/gnu/devtools/> DOS, OS/2 ports
-<ftp://ftp.cc.utexas.edu/microlib/nt/gnu/> NT port
-
-
-CVS
-
-CVS, the Concurrent Versions System, keeps tracks of source changes
-made by groups of developers working on the same files concurrently,
-allowing them to resync as needed.
-
-<http://www.winternet.com/~zoo/cvs/>
-<http://www.loria.fr/~molli/cvs-index.html>
- These pages have useful information about CVS.
-
-<ftp://prep.ai.mit.edu/pub/gnu/cvs-1.3.tar.gz>
- CVS 1.3 is the latest released version.
-
-<ftp://ftp.delos.com/pub/cvs/alpha/cvs-1.4A2.tar.gz>
- CVS 1.4 is in alpha test, but it is recommended if you are installing CVS
- for the first time, or on a recent operating system.
-
-<ftp://ftp-os2.cdrom.com/pub/os2/unix/> DOS, OS/2 ports
-<ftp://ftp.cc.utexas.edu/microlib/nt/gnu/> NT port
-
-<ftp://ftp.cyclic.com/pub/cvs/>
- Cyclic CVS adds network transparency to CVS; it supports efficient,
- reliable, and authenticated repository access via TCP/IP.
-
-
-Other software that uses RCS
-
-<ftp://ftp.nau.edu/pub/Aegis/>
- Aegis manages revisions, baselines, mandatory reviews, and mandatory testing.
-
-<ftp://ftp.vix.com/pub/patches/csu/>
- BCS, the Baseline Configuration System,
- manages revisions, baselines, and staging areas.
-
-<ftp://riftp.osf.org/pub/ode/>
- ODE, the Open Software Foundation Development Environment,
- manages revisions, builds, and sandboxes.
- OSF uses it for their own development.
-
-<ftp://bellcore.com/pub/Odin/>
- Odin, a `make' replacement, can build directly from arbitrary revisions
- without requiring checkouts of working copies. It also handles
- parallel builds on multiple remote hosts and of multiple variants.
diff --git a/gnu/usr.bin/rcs/ci/Makefile b/gnu/usr.bin/rcs/ci/Makefile
deleted file mode 100644
index 2fbb74f4238d..000000000000
--- a/gnu/usr.bin/rcs/ci/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-PROG= ci
-SRCS= ci.c
-CFLAGS+= -I${.CURDIR}/../lib
-LDADD= ${LIBRCS}
-DPADD= ${LIBRCS}
-
-.include "../../Makefile.inc"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/ci/Makefile.depend b/gnu/usr.bin/rcs/ci/Makefile.depend
deleted file mode 100644
index cab8f8fe15db..000000000000
--- a/gnu/usr.bin/rcs/ci/Makefile.depend
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
- gnu/lib/csu \
- gnu/lib/libgcc \
- gnu/usr.bin/rcs/lib \
- include \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcompiler_rt \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/gnu/usr.bin/rcs/ci/ci.1 b/gnu/usr.bin/rcs/ci/ci.1
deleted file mode 100644
index 1378af222cb8..000000000000
--- a/gnu/usr.bin/rcs/ci/ci.1
+++ /dev/null
@@ -1,898 +0,0 @@
-.de Id
-.ds Rv \\$3
-.ds Dt \\$4
-..
-.Id $FreeBSD$
-.ds i \&\s-1ISO\s0
-.ds r \&\s-1RCS\s0
-.ds u \&\s-1UTC\s0
-.if n .ds - \%--
-.if t .ds - \(em
-.TH CI 1 \*(Dt GNU
-.SH NAME
-ci \- check in RCS revisions
-.SH SYNOPSIS
-.B ci
-.RI [ options ] " file " .\|.\|.
-.SH DESCRIPTION
-.B ci
-stores new revisions into \*r files.
-Each pathname matching an \*r suffix
-is taken to be an \*r file.
-All others
-are assumed to be working files containing new revisions.
-.B ci
-deposits the contents of each working file
-into the corresponding \*r file.
-If only a working file is given,
-.B ci
-tries to find the corresponding \*r file in an \*r subdirectory
-and then in the working file's directory.
-For more details, see
-.SM "FILE NAMING"
-below.
-.PP
-For
-.B ci
-to work, the caller's login must be on the access list,
-except if the access list is empty or the caller is the superuser or the
-owner of the file.
-To append a new revision to an existing branch, the tip revision on
-that branch must be locked by the caller. Otherwise, only a
-new branch can be created. This restriction is not enforced
-for the owner of the file if non-strict locking is used
-(see
-.BR rcs (1)).
-A lock held by someone else can be broken with the
-.B rcs
-command.
-.PP
-Unless the
-.B \-f
-option is given,
-.B ci
-checks whether the revision to be deposited differs from the preceding one.
-If not, instead of creating a new revision
-.B ci
-reverts to the preceding one.
-To revert, ordinary
-.B ci
-removes the working file and any lock;
-.B "ci\ \-l"
-keeps and
-.B "ci\ \-u"
-removes any lock, and then they both generate a new working file much as if
-.B "co\ \-l"
-or
-.B "co\ \-u"
-had been applied to the preceding revision.
-When reverting, any
-.B \-n
-and
-.B \-s
-options apply to the preceding revision.
-.PP
-For each revision deposited,
-.B ci
-prompts for a log message.
-The log message should summarize the change and must be terminated by
-end-of-file or by a line containing
-.BR \&. "\ by"
-itself.
-If several files are checked in
-.B ci
-asks whether to reuse the
-previous log message.
-If the standard input is not a terminal,
-.B ci
-suppresses the prompt
-and uses the same log message for all files.
-See also
-.BR \-m .
-.PP
-If the \*r file does not exist,
-.B ci
-creates it and
-deposits the contents of the working file as the initial revision
-(default number:
-.BR 1.1 ).
-The access list is initialized to empty.
-Instead of the log message,
-.B ci
-requests descriptive text (see
-.B \-t
-below).
-.PP
-The number
-.I rev
-of the deposited revision can be given by any of the options
-.BR \-f ,
-.BR \-i ,
-.BR \-I ,
-.BR \-j ,
-.BR \-k ,
-.BR \-l ,
-.BR \-M ,
-.BR \-q ,
-.BR \-r ,
-or
-.BR \-u .
-.I rev
-can be symbolic, numeric, or mixed.
-Symbolic names in
-.I rev
-must already be defined;
-see the
-.B \-n
-and
-.B \-N
-options for assigning names during checkin.
-If
-.I rev
-is
-.BR $ ,
-.B ci
-determines the revision number from keyword values in the working file.
-.PP
-If
-.I rev
-begins with a period,
-then the default branch (normally the trunk) is prepended to it.
-If
-.I rev
-is a branch number followed by a period,
-then the latest revision on that branch is used.
-.PP
-If
-.I rev
-is a revision number, it must be higher than the latest
-one on the branch to which
-.I rev
-belongs, or must start a new branch.
-.PP
-If
-.I rev
-is a branch rather than a revision number,
-the new revision is appended to that branch. The level number is obtained
-by incrementing the tip revision number of that branch.
-If
-.I rev
-indicates a non-existing branch,
-that branch is created with the initial revision numbered
-.IB rev .1\f1.\fP
-.br
-.ne 8
-.PP
-If
-.I rev
-is omitted,
-.B ci
-tries to derive the new revision number from
-the caller's last lock. If the caller has locked the tip revision of a branch,
-the new revision is appended to that branch.
-The new revision number is obtained
-by incrementing the tip revision number.
-If the caller locked a non-tip revision, a new branch is started at
-that revision by incrementing the highest branch number at that revision.
-The default initial branch and level numbers are
-.BR 1 .
-.PP
-If
-.I rev
-is omitted and the caller has no lock, but owns
-the file and locking
-is not set to
-.IR strict ,
-then the revision is appended to the
-default branch (normally the trunk; see the
-.B \-b
-option of
-.BR rcs (1)).
-.PP
-Exception: On the trunk, revisions can be appended to the end, but
-not inserted.
-.SH OPTIONS
-.TP
-.BI \-r rev
-Check in revision
-.IR rev .
-.TP
-.BR \-r
-The bare
-.B \-r
-option (without any revision) has an unusual meaning in
-.BR ci .
-With other \*r commands, a bare
-.B \-r
-option specifies the most recent revision on the default branch,
-but with
-.BR ci ,
-a bare
-.B \-r
-option reestablishes the default behavior of releasing a lock and
-removing the working file, and is used to override any default
-.B \-l
-or
-.B \-u
-options established by shell aliases or scripts.
-.TP
-.BR \-l [\f2rev\fP]
-works like
-.BR \-r ,
-except it performs an additional
-.B "co\ \-l"
-for the
-deposited revision. Thus, the deposited revision is immediately
-checked out again and locked.
-This is useful for saving a revision although one wants to continue
-editing it after the checkin.
-.TP
-.BR \-u [\f2rev\fP]
-works like
-.BR \-l ,
-except that the deposited revision is not locked.
-This lets one read the working file
-immediately after checkin.
-.RS
-.PP
-The
-.BR \-l ,
-bare
-.BR \-r ,
-and
-.B \-u
-options are mutually exclusive and silently override each other.
-For example,
-.B "ci\ \-u\ \-r"
-is equivalent to
-.B "ci\ \-r"
-because bare
-.B \-r
-overrides
-.BR \-u .
-.RE
-.TP
-.BR \-f [\f2rev\fP]
-forces a deposit; the new revision is deposited even it is not different
-from the preceding one.
-.TP
-.BR \-k [\f2rev\fP]
-searches the working file for keyword values to determine its revision number,
-creation date, state, and author (see
-.BR co (1)),
-and assigns these
-values to the deposited revision, rather than computing them locally.
-It also generates a default login message noting the login of the caller
-and the actual checkin date.
-This option is useful for software distribution. A revision that is sent to
-several sites should be checked in with the
-.B \-k
-option at these sites to
-preserve the original number, date, author, and state.
-The extracted keyword values and the default log message can be overridden
-with the options
-.BR \-d ,
-.BR \-m ,
-.BR \-s ,
-.BR \-w ,
-and any option that carries a revision number.
-.TP
-.BR \-q [\f2rev\fP]
-quiet mode; diagnostic output is not printed.
-A revision that is not different from the preceding one is not deposited,
-unless
-.B \-f
-is given.
-.TP
-.BR \-i [\f2rev\fP]
-initial checkin; report an error if the \*r file already exists.
-This avoids race conditions in certain applications.
-.TP
-.BR \-j [\f2rev\fP]
-just checkin and do not initialize;
-report an error if the \*r file does not already exist.
-.TP
-.BR \-I [\f2rev\fP]
-interactive mode;
-the user is prompted and questioned
-even if the standard input is not a terminal.
-.TP
-.BR \-d "[\f2date\fP]"
-uses
-.I date
-for the checkin date and time.
-The
-.I date
-is specified in free format as explained in
-.BR co (1).
-This is useful for lying about the checkin date, and for
-.B \-k
-if no date is available.
-If
-.I date
-is empty, the working file's time of last modification is used.
-.TP
-.BR \-M [\f2rev\fP]
-Set the modification time on any new working file
-to be the date of the retrieved revision.
-For example,
-.BI "ci\ \-d\ \-M\ \-u" "\ f"
-does not alter
-.IR f 's
-modification time, even if
-.IR f 's
-contents change due to keyword substitution.
-Use this option with care; it can confuse
-.BR make (1).
-.TP
-.BI \-m "msg"
-uses the string
-.I msg
-as the log message for all revisions checked in.
-By convention, log messages that start with
-.B #
-are comments and are ignored by programs like GNU Emacs's
-.B vc
-package.
-Also, log messages that start with
-.BI { clumpname }
-(followed by white space) are meant to be clumped together if possible,
-even if they are associated with different files; the
-.BI { clumpname }
-label is used only for clumping,
-and is not considered to be part of the log message itself.
-.TP
-.BI \-n "name"
-assigns the symbolic name
-.I name
-to the number of the checked-in revision.
-.B ci
-prints an error message if
-.I name
-is already assigned to another
-number.
-.TP
-.BI \-N "name"
-same as
-.BR \-n ,
-except that it overrides a previous assignment of
-.IR name .
-.TP
-.BI \-s "state"
-sets the state of the checked-in revision to the identifier
-.IR state .
-The default state is
-.BR Exp .
-.TP
-.BI \-t file
-writes descriptive text from the contents of the named
-.I file
-into the \*r file,
-deleting the existing text.
-The
-.I file
-cannot begin with
-.BR \- .
-.TP
-.BI \-t\- string
-Write descriptive text from the
-.I string
-into the \*r file, deleting the existing text.
-.RS
-.PP
-The
-.B \-t
-option, in both its forms, has effect only during an initial checkin;
-it is silently ignored otherwise.
-.PP
-During the initial checkin, if
-.B \-t
-is not given,
-.B ci
-obtains the text from standard input,
-terminated by end-of-file or by a line containing
-.BR \&. "\ by"
-itself.
-The user is prompted for the text if interaction is possible; see
-.BR \-I .
-.PP
-For backward compatibility with older versions of \*r, a bare
-.B \-t
-option is ignored.
-.RE
-.TP
-.B \-T
-Set the \*r file's modification time to the new revision's time
-if the former precedes the latter and there is a new revision;
-preserve the \*r file's modification time otherwise.
-If you have locked a revision,
-.B ci
-usually updates the \*r file's modification time to the current time,
-because the lock is stored in the \*r file
-and removing the lock requires changing the \*r file.
-This can create an \*r file newer than the working file in one of two ways:
-first,
-.B "ci\ \-M"
-can create a working file with a date before the current time;
-second, when reverting to the previous revision
-the \*r file can change while the working file remains unchanged.
-These two cases can cause excessive recompilation caused by a
-.BR make (1)
-dependency of the working file on the \*r file.
-The
-.B \-T
-option inhibits this recompilation by lying about the \*r file's date.
-Use this option with care; it can suppress recompilation even when
-a checkin of one working file should affect
-another working file associated with the same \*r file.
-For example, suppose the \*r file's time is 01:00,
-the (changed) working file's time is 02:00,
-some other copy of the working file has a time of 03:00,
-and the current time is 04:00.
-Then
-.B "ci\ \-d\ \-T"
-sets the \*r file's time to 02:00 instead of the usual 04:00;
-this causes
-.BR make (1)
-to think (incorrectly) that the other copy is newer than the \*r file.
-.TP
-.BI \-w "login"
-uses
-.I login
-for the author field of the deposited revision.
-Useful for lying about the author, and for
-.B \-k
-if no author is available.
-.TP
-.BI \-V
-Print \*r's version number.
-.TP
-.BI \-V n
-Emulate \*r version
-.IR n .
-See
-.BR co (1)
-for details.
-.TP
-.BI \-x "suffixes"
-specifies the suffixes for \*r files.
-A nonempty suffix matches any pathname ending in the suffix.
-An empty suffix matches any pathname of the form
-.BI RCS/ path
-or
-.IB path1 /RCS/ path2.
-The
-.B \-x
-option can specify a list of suffixes
-separated by
-.BR / .
-For example,
-.B \-x,v/
-specifies two suffixes:
-.B ,v
-and the empty suffix.
-If two or more suffixes are specified,
-they are tried in order when looking for an \*r file;
-the first one that works is used for that file.
-If no \*r file is found but an \*r file can be created,
-the suffixes are tried in order
-to determine the new \*r file's name.
-The default for
-.IR suffixes
-is installation-dependent; normally it is
-.B ,v/
-for hosts like Unix that permit commas in filenames,
-and is empty (i.e. just the empty suffix) for other hosts.
-.TP
-.BI \-z zone
-specifies the date output format in keyword substitution,
-and specifies the default time zone for
-.I date
-in the
-.BI \-d date
-option.
-The
-.I zone
-should be empty, a numeric \*u offset, or the special string
-.B LT
-for local time.
-The default is an empty
-.IR zone ,
-which uses the traditional \*r format of \*u without any time zone indication
-and with slashes separating the parts of the date;
-otherwise, times are output in \*i 8601 format with time zone indication.
-For example, if local time is January 11, 1990, 8pm Pacific Standard Time,
-eight hours west of \*u,
-then the time is output as follows:
-.RS
-.LP
-.RS
-.nf
-.ta \w'\f3\-z+05:30\fP 'u +\w'\f31990-01-11 09:30:00+05:30\fP 'u
-.ne 4
-\f2option\fP \f2time output\fP
-\f3\-z\fP \f31990/01/12 04:00:00\fP \f2(default)\fP
-\f3\-zLT\fP \f31990-01-11 20:00:00\-08\fP
-\f3\-z+05:30\fP \f31990-01-12 09:30:00+05:30\fP
-.ta 4n +4n +4n +4n
-.fi
-.RE
-.LP
-The
-.B \-z
-option does not affect dates stored in \*r files,
-which are always \*u.
-.SH "FILE NAMING"
-Pairs of \*r files and working files can be specified in three ways
-(see also the
-example section).
-.PP
-1) Both the \*r file and the working file are given. The \*r pathname is of
-the form
-.IB path1 / workfileX
-and the working pathname is of the form
-.IB path2 / workfile
-where
-.IB path1 /
-and
-.IB path2 /
-are (possibly different or empty) paths,
-.I workfile
-is a filename, and
-.I X
-is an \*r suffix.
-If
-.I X
-is empty,
-.IB path1 /
-must start with
-.B RCS/
-or must contain
-.BR /RCS/ .
-.PP
-2) Only the \*r file is given. Then the working file is created in the current
-directory and its name is derived from the name of the \*r file
-by removing
-.IB path1 /
-and the suffix
-.IR X .
-.PP
-3) Only the working file is given.
-Then
-.B ci
-considers each \*r suffix
-.I X
-in turn, looking for an \*r file of the form
-.IB path2 /RCS/ workfileX
-or (if the former is not found and
-.I X
-is nonempty)
-.IB path2 / workfileX.
-.PP
-If the \*r file is specified without a path in 1) and 2),
-.B ci
-looks for the \*r file first in the directory
-.B ./RCS
-and then in the current
-directory.
-.PP
-.B ci
-reports an error if an attempt to open an \*r file fails for an unusual reason,
-even if the \*r file's pathname is just one of several possibilities.
-For example, to suppress use of \*r commands in a directory
-.IR d ,
-create a regular file named
-.IB d /RCS
-so that casual attempts to use \*r commands in
-.I d
-fail because
-.IB d /RCS
-is not a directory.
-.SH EXAMPLES
-Suppose
-.B ,v
-is an \*r suffix and the current directory contains a subdirectory
-.B RCS
-with an \*r file
-.BR io.c,v .
-Then each of the following commands check in a copy of
-.B io.c
-into
-.B RCS/io.c,v
-as the latest revision, removing
-.BR io.c .
-.LP
-.RS
-.nf
-.ft 3
-ci io.c; ci RCS/io.c,v; ci io.c,v;
-ci io.c RCS/io.c,v; ci io.c io.c,v;
-ci RCS/io.c,v io.c; ci io.c,v io.c;
-.ft
-.fi
-.RE
-.PP
-Suppose instead that the empty suffix
-is an \*r suffix and the current directory contains a subdirectory
-.B RCS
-with an \*r file
-.BR io.c .
-The each of the following commands checks in a new revision.
-.LP
-.RS
-.nf
-.ft 3
-ci io.c; ci RCS/io.c;
-ci io.c RCS/io.c;
-ci RCS/io.c io.c;
-.ft
-.fi
-.RE
-.SH "FILE MODES"
-An \*r file created by
-.B ci
-inherits the read and execute permissions
-from the working file. If the \*r file exists already,
-.B ci
-preserves its read and execute permissions.
-.B ci
-always turns off all write permissions of \*r files.
-.SH FILES
-Temporary files are created in the directory containing
-the working file, and also in the temporary directory (see
-.B \s-1TMPDIR\s0
-under
-.BR \s-1ENVIRONMENT\s0 ).
-A semaphore file or files are created in the directory containing the \*r file.
-With a nonempty suffix, the semaphore names begin with
-the first character of the suffix; therefore, do not specify an suffix
-whose first character could be that of a working filename.
-With an empty suffix, the semaphore names end with
-.B _
-so working filenames should not end in
-.BR _ .
-.PP
-.B ci
-never changes an \*r or working file.
-Normally,
-.B ci
-unlinks the file and creates a new one;
-but instead of breaking a chain of one or more symbolic links to an \*r file,
-it unlinks the destination file instead.
-Therefore,
-.B ci
-breaks any hard or symbolic links to any working file it changes;
-and hard links to \*r files are ineffective,
-but symbolic links to \*r files are preserved.
-.PP
-The effective user must be able to
-search and write the directory containing the \*r file.
-Normally, the real user must be able to
-read the \*r and working files
-and to search and write the directory containing the working file;
-however, some older hosts
-cannot easily switch between real and effective users,
-so on these hosts the effective user is used for all accesses.
-The effective user is the same as the real user
-unless your copies of
-.B ci
-and
-.B co
-have setuid privileges.
-As described in the next section,
-these privileges yield extra security if
-the effective user owns all \*r files and directories,
-and if only the effective user can write \*r directories.
-.PP
-Users can control access to \*r files by setting the permissions
-of the directory containing the files; only users with write access
-to the directory can use \*r commands to change its \*r files.
-For example, in hosts that allow a user to belong to several groups,
-one can make a group's \*r directories writable to that group only.
-This approach suffices for informal projects,
-but it means that any group member can arbitrarily change the group's \*r files,
-and can even remove them entirely.
-Hence more formal projects sometimes distinguish between an \*r administrator,
-who can change the \*r files at will, and other project members,
-who can check in new revisions but cannot otherwise change the \*r files.
-.SH "SETUID USE"
-To prevent anybody but their \*r administrator from deleting revisions,
-a set of users can employ setuid privileges as follows.
-.nr n \w'\(bu'+2n-1/1n
-.ds n \nn
-.if \n(.g .if r an-tag-sep .ds n \w'\(bu'u+\n[an-tag-sep]u
-.IP \(bu \*n
-Check that the host supports \*r setuid use.
-Consult a trustworthy expert if there are any doubts.
-It is best if the
-.B seteuid
-system call works as described in Posix 1003.1a Draft 5,
-because \*r can switch back and forth easily
-between real and effective users, even if the real user is
-.BR root .
-If not, the second best is if the
-.B setuid
-system call supports saved setuid
-(the {\s-1_POSIX_SAVED_IDS\s0} behavior of Posix 1003.1-1990);
-this fails only if the real or effective user is
-.BR root .
-If \*r detects any failure in setuid, it quits immediately.
-.IP \(bu \nn
-Choose a user
-.I A
-to serve as \*r administrator for the set of users.
-Only
-.I A
-can invoke the
-.B rcs
-command on the users' \*r files.
-.I A
-should not be
-.B root
-or any other user with special powers.
-Mutually suspicious sets of users should use different administrators.
-.IP \(bu \nn
-Choose a pathname
-.I B
-to be a directory of files to be executed by the users.
-.IP \(bu \nn
-Have
-.I A
-set up
-.I B
-to contain copies of
-.B ci
-and
-.B co
-that are setuid to
-.I A
-by copying the commands from their standard installation directory
-.I D
-as follows:
-.LP
-.RS
-.nf
-.ne 3
-\f3mkdir\fP \f2B\fP
-\f3cp\fP \f2D\fP\^\f3/c[io]\fP \f2B\fP
-\f3chmod go\-w,u+s\fP \f2B\fP\f3/c[io]\fP
-.fi
-.RE
-.IP \(bu \nn
-Have each user prepend
-.I B
-to their path as follows:
-.LP
-.RS
-.nf
-.ne 2
-\f3PATH=\fP\f2B\fP\f3:$PATH; export PATH\fP # ordinary shell
-\f3set path=(\fP\f2B\fP \f3$path)\fP # C shell
-.fi
-.RE
-.IP \(bu \nn
-Have
-.I A
-create each \*r directory
-.I R
-with write access only to
-.I A
-as follows:
-.LP
-.RS
-.nf
-.ne 2
-\f3mkdir\fP \f2R\fP
-\f3chmod go\-w\fP \f2R\fP
-.fi
-.RE
-.IP \(bu \nn
-If you want to let only certain users read the \*r files,
-put the users into a group
-.IR G ,
-and have
-.I A
-further protect the \*r directory as follows:
-.LP
-.RS
-.nf
-.ne 2
-\f3chgrp\fP \f2G R\fP
-\f3chmod g\-w,o\-rwx\fP \f2R\fP
-.fi
-.RE
-.IP \(bu \nn
-Have
-.I A
-copy old \*r files (if any) into
-.IR R ,
-to ensure that
-.I A
-owns them.
-.IP \(bu \nn
-An \*r file's access list limits who can check in and lock revisions.
-The default access list is empty,
-which grants checkin access to anyone who can read the \*r file.
-If you want limit checkin access,
-have
-.I A
-invoke
-.B "rcs\ \-a"
-on the file; see
-.BR rcs (1).
-In particular,
-.BI "rcs\ \-e\ \-a" A
-limits access to just
-.IR A .
-.IP \(bu \nn
-Have
-.I A
-initialize any new \*r files with
-.B "rcs\ \-i"
-before initial checkin, adding the
-.B \-a
-option if you want to limit checkin access.
-.IP \(bu \nn
-Give setuid privileges only to
-.BR ci ,
-.BR co ,
-and
-.BR rcsclean ;
-do not give them to
-.B rcs
-or to any other command.
-.IP \(bu \nn
-Do not use other setuid commands to invoke \*r commands;
-setuid is trickier than you think!
-.SH ENVIRONMENT
-.TP
-.B \s-1RCSINIT\s0
-options prepended to the argument list, separated by spaces.
-A backslash escapes spaces within an option.
-The
-.B \s-1RCSINIT\s0
-options are prepended to the argument lists of most \*r commands.
-Useful
-.B \s-1RCSINIT\s0
-options include
-.BR \-q ,
-.BR \-V ,
-.BR \-x ,
-and
-.BR \-z .
-.TP
-.B \s-1TMPDIR\s0
-Name of the temporary directory.
-If not set, the environment variables
-.B \s-1TMP\s0
-and
-.B \s-1TEMP\s0
-are inspected instead and the first value found is taken;
-if none of them are set,
-a host-dependent default is used, typically
-.BR /tmp .
-.SH DIAGNOSTICS
-For each revision,
-.B ci
-prints the \*r file, the working file, and the number
-of both the deposited and the preceding revision.
-The exit status is zero if and only if all operations were successful.
-.SH IDENTIFICATION
-Author: Walter F. Tichy.
-.br
-Manual Page Revision: \*(Rv; Release Date: \*(Dt.
-.br
-Copyright \(co 1982, 1988, 1989 Walter F. Tichy.
-.br
-Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
-.SH "SEE ALSO"
-co(1),
-ident(1), make(1), rcs(1), rcsclean(1), rcsdiff(1),
-rcsintro(1), rcsmerge(1), rlog(1), setuid(2), rcsfile(5)
-.br
-Walter F. Tichy,
-\*r\*-A System for Version Control,
-.I "Software\*-Practice & Experience"
-.BR 15 ,
-7 (July 1985), 637-654.
-.br
diff --git a/gnu/usr.bin/rcs/ci/ci.c b/gnu/usr.bin/rcs/ci/ci.c
deleted file mode 100644
index 749a4cf6dbe9..000000000000
--- a/gnu/usr.bin/rcs/ci/ci.c
+++ /dev/null
@@ -1,1318 +0,0 @@
-/* Check in revisions of RCS files from working files. */
-
-/* Copyright 1982, 1988, 1989 Walter Tichy
- Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-/*
- * Revision 5.30 1995/06/16 06:19:24 eggert
- * Update FSF address.
- *
- * Revision 5.29 1995/06/01 16:23:43 eggert
- * (main): Add -kb.
- * Use `cmpdate', not `cmpnum', to compare dates.
- * This is for MKS RCS's incompatible 20th-century date format.
- * Don't worry about errno after ftruncate fails.
- * Fix input file rewinding bug when large_memory && !maps_memory
- * and checking in a branch tip.
- *
- * (fixwork): Fall back on chmod if fchmod fails, since it might be ENOSYS.
- *
- * Revision 5.28 1994/03/20 04:52:58 eggert
- * Do not generate a corrupted RCS file if the user modifies the working file
- * while `ci' is running.
- * Do not remove the lock when `ci -l' reverts.
- * Move buffer-flushes out of critical sections, since they aren't critical.
- * Use ORCSerror to clean up after a fatal error.
- * Specify subprocess input via file descriptor, not file name.
- *
- * Revision 5.27 1993/11/09 17:40:15 eggert
- * -V now prints version on stdout and exits. Don't print usage twice.
- *
- * Revision 5.26 1993/11/03 17:42:27 eggert
- * Add -z. Don't subtract from RCS file timestamp even if -T.
- * Scan for and use Name keyword if -k.
- * Don't discard ignored phrases. Improve quality of diagnostics.
- *
- * Revision 5.25 1992/07/28 16:12:44 eggert
- * Add -i, -j, -V. Check that working and RCS files are distinct.
- *
- * Revision 5.24 1992/02/17 23:02:06 eggert
- * `-rREV' now just specifies a revision REV; only bare `-r' reverts to default.
- * Add -T.
- *
- * Revision 5.23 1992/01/27 16:42:51 eggert
- * Always unlock branchpoint if caller has a lock.
- * Add support for bad_chmod_close, bad_creat0. lint -> RCS_lint
- *
- * Revision 5.22 1992/01/06 02:42:34 eggert
- * Invoke utime() before chmod() to keep some buggy systems happy.
- *
- * Revision 5.21 1991/11/20 17:58:07 eggert
- * Don't read the delta tree from a nonexistent RCS file.
- *
- * Revision 5.20 1991/10/07 17:32:46 eggert
- * Fix log bugs. Remove lint.
- *
- * Revision 5.19 1991/09/26 23:10:30 eggert
- * Plug file descriptor leak.
- *
- * Revision 5.18 1991/09/18 07:29:10 eggert
- * Work around a common ftruncate() bug.
- *
- * Revision 5.17 1991/09/10 22:15:46 eggert
- * Fix test for redirected stdin.
- *
- * Revision 5.16 1991/08/19 23:17:54 eggert
- * When there are no changes, revert to previous revision instead of aborting.
- * Add piece tables, -M, -r$. Tune.
- *
- * Revision 5.15 1991/04/21 11:58:14 eggert
- * Ensure that working file is newer than RCS file after ci -[lu].
- * Add -x, RCSINIT, MS-DOS support.
- *
- * Revision 5.14 1991/02/28 19:18:47 eggert
- * Don't let a setuid ci create a new RCS file; rcs -i -a must be run first.
- * Fix ci -ko -l mode bug. Open work file at most once.
- *
- * Revision 5.13 1991/02/25 07:12:33 eggert
- * getdate -> getcurdate (SVR4 name clash)
- *
- * Revision 5.12 1990/12/31 01:00:12 eggert
- * Don't use uninitialized storage when handling -{N,n}.
- *
- * Revision 5.11 1990/12/04 05:18:36 eggert
- * Use -I for prompts and -q for diagnostics.
- *
- * Revision 5.10 1990/11/05 20:30:10 eggert
- * Don't remove working file when aborting due to no changes.
- *
- * Revision 5.9 1990/11/01 05:03:23 eggert
- * Add -I and new -t behavior. Permit arbitrary data in logs.
- *
- * Revision 5.8 1990/10/04 06:30:09 eggert
- * Accumulate exit status across files.
- *
- * Revision 5.7 1990/09/25 20:11:46 hammer
- * fixed another small typo
- *
- * Revision 5.6 1990/09/24 21:48:50 hammer
- * added cleanups from Paul Eggert.
- *
- * Revision 5.5 1990/09/21 06:16:38 hammer
- * made it handle multiple -{N,n}'s. Also, made it treat re-directed stdin
- * the same as the terminal
- *
- * Revision 5.4 1990/09/20 02:38:51 eggert
- * ci -k now checks dates more thoroughly.
- *
- * Revision 5.3 1990/09/11 02:41:07 eggert
- * Fix revision bug with `ci -k file1 file2'.
- *
- * Revision 5.2 1990/09/04 08:02:10 eggert
- * Permit adjacent revisions with identical time stamps (possible on fast hosts).
- * Improve incomplete line handling. Standardize yes-or-no procedure.
- *
- * Revision 5.1 1990/08/29 07:13:44 eggert
- * Expand locker value like co. Clean old log messages too.
- *
- * Revision 5.0 1990/08/22 08:10:00 eggert
- * Don't require a final newline.
- * Make lock and temp files faster and safer.
- * Remove compile-time limits; use malloc instead.
- * Permit dates past 1999/12/31. Switch to GMT.
- * Add setuid support. Don't pass +args to diff. Check diff's output.
- * Ansify and Posixate. Add -k, -V. Remove snooping. Tune.
- * Check diff's output.
- *
- * Revision 4.9 89/05/01 15:10:54 narten
- * changed copyright header to reflect current distribution rules
- *
- * Revision 4.8 88/11/08 13:38:23 narten
- * changes from root@seismo.CSS.GOV (Super User)
- * -d with no arguments uses the mod time of the file it is checking in
- *
- * Revision 4.7 88/08/09 19:12:07 eggert
- * Make sure workfile is a regular file; use its mode if RCSfile doesn't have one.
- * Use execv(), not system(); allow cc -R; remove lint.
- * isatty(fileno(stdin)) -> ttystdin()
- *
- * Revision 4.6 87/12/18 11:34:41 narten
- * lint cleanups (from Guy Harris)
- *
- * Revision 4.5 87/10/18 10:18:48 narten
- * Updating version numbers. Changes relative to revision 1.1 are actually
- * relative to 4.3
- *
- * Revision 1.3 87/09/24 13:57:19 narten
- * Sources now pass through lint (if you ignore printf/sprintf/fprintf
- * warnings)
- *
- * Revision 1.2 87/03/27 14:21:33 jenkins
- * Port to suns
- *
- * Revision 4.3 83/12/15 12:28:54 wft
- * ci -u and ci -l now set mode of working file properly.
- *
- * Revision 4.2 83/12/05 13:40:54 wft
- * Merged with 3.9.1.1: added calls to clearerr(stdin).
- * made rewriteflag external.
- *
- * Revision 4.1 83/05/10 17:03:06 wft
- * Added option -d and -w, and updated assingment of date, etc. to new delta.
- * Added handling of default branches.
- * Option -k generates std. log message; fixed undef. pointer in reading of log.
- * Replaced getlock() with findlock(), link--unlink with rename(),
- * getpwuid() with getcaller().
- * Moved all revision number generation to new routine addelta().
- * Removed calls to stat(); now done by pairfilenames().
- * Changed most calls to catchints() with restoreints().
- * Directed all interactive messages to stderr.
- *
- * Revision 3.9.1.1 83/10/19 04:21:03 lepreau
- * Added clearerr(stdin) to getlogmsg() for re-reading stdin.
- *
- * Revision 3.9 83/02/15 15:25:44 wft
- * 4.2 prerelease
- *
- * Revision 3.9 83/02/15 15:25:44 wft
- * Added call to fastcopy() to copy remainder of RCS file.
- *
- * Revision 3.8 83/01/14 15:34:05 wft
- * Added ignoring of interrupts while new RCS file is renamed;
- * Avoids deletion of RCS files by interrupts.
- *
- * Revision 3.7 82/12/10 16:09:20 wft
- * Corrected checking of return code from diff.
- *
- * Revision 3.6 82/12/08 21:34:49 wft
- * Using DATEFORM to prepare date of checked-in revision;
- * Fixed return from addbranch().
- *
- * Revision 3.5 82/12/04 18:32:42 wft
- * Replaced getdelta() with gettree(), SNOOPDIR with SNOOPFILE. Updated
- * field lockedby in removelock(), moved getlogmsg() before calling diff.
- *
- * Revision 3.4 82/12/02 13:27:13 wft
- * added option -k.
- *
- * Revision 3.3 82/11/28 20:53:31 wft
- * Added mustcheckin() to check for redundant checkins.
- * Added xpandfile() to do keyword expansion for -u and -l;
- * -m appends linefeed to log message if necessary.
- * getlogmsg() suppresses prompt if stdin is not a terminal.
- * Replaced keeplock with lockflag, fclose() with ffclose(),
- * %02d with %.2d, getlogin() with getpwuid().
- *
- * Revision 3.2 82/10/18 20:57:23 wft
- * An RCS file inherits its mode during the first ci from the working file,
- * otherwise it stays the same, except that write permission is removed.
- * Fixed ci -l, added ci -u (both do an implicit co after the ci).
- * Fixed call to getlogin(), added call to getfullRCSname(), added check
- * for write error.
- * Changed conflicting identifiers.
- *
- * Revision 3.1 82/10/13 16:04:59 wft
- * fixed type of variables receiving from getc() (char -> int).
- * added include file dbm.h for getting BYTESIZ. This is used
- * to check the return code from diff portably.
- */
-
-#include "rcsbase.h"
-
-struct Symrev {
- char const *ssymbol;
- int override;
- struct Symrev * nextsym;
-};
-
-static char const *getcurdate P((void));
-static int addbranch P((struct hshentry*,struct buf*,int));
-static int addelta P((void));
-static int addsyms P((char const*));
-static int fixwork P((mode_t,time_t));
-static int removelock P((struct hshentry*));
-static int xpandfile P((RILE*,struct hshentry const*,char const**,int));
-static struct cbuf getlogmsg P((void));
-static void cleanup P((void));
-static void incnum P((char const*,struct buf*));
-static void addassoclst P((int,char const*));
-
-static FILE *exfile;
-static RILE *workptr; /* working file pointer */
-static struct buf newdelnum; /* new revision number */
-static struct cbuf msg;
-static int exitstatus;
-static int forceciflag; /* forces check in */
-static int keepflag, keepworkingfile, rcsinitflag;
-static struct hshentries *gendeltas; /* deltas to be generated */
-static struct hshentry *targetdelta; /* old delta to be generated */
-static struct hshentry newdelta; /* new delta to be inserted */
-static struct stat workstat;
-static struct Symrev *assoclst, **nextassoc;
-
-mainProg(ciId, "ci", "$FreeBSD$")
-{
- static char const cmdusage[] =
- "\nci usage: ci -{fIklMqru}[rev] -d[date] -mmsg -{nN}name -sstate -ttext -T -Vn -wwho -xsuff -zzone file ...";
- static char const default_state[] = DEFAULTSTATE;
-
- char altdate[datesize];
- char olddate[datesize];
- char newdatebuf[datesize + zonelenmax];
- char targetdatebuf[datesize + zonelenmax];
- char *a, **newargv, *textfile;
- char const *author, *krev, *rev, *state;
- char const *diffname, *expname;
- char const *newworkname;
- int initflag, mustread;
- int lockflag, lockthis, mtimeflag, removedlock, Ttimeflag;
- int r;
- int changedRCS, changework, dolog, newhead;
- int usestatdate; /* Use mod time of file for -d. */
- mode_t newworkmode; /* mode for working file */
- time_t mtime, wtime;
- struct hshentry *workdelta;
-
- setrid();
-
- author = rev = state = textfile = 0;
- initflag = lockflag = mustread = false;
- mtimeflag = false;
- Ttimeflag = false;
- altdate[0]= '\0'; /* empty alternate date for -d */
- usestatdate=false;
- suffixes = X_DEFAULT;
- nextassoc = &assoclst;
-
- argc = getRCSINIT(argc, argv, &newargv);
- argv = newargv;
- while (a = *++argv, 0<--argc && *a++=='-') {
- switch (*a++) {
-
- case 'r':
- if (*a)
- goto revno;
- keepworkingfile = lockflag = false;
- break;
-
- case 'l':
- keepworkingfile = lockflag = true;
- revno:
- if (*a) {
- if (rev) warn("redefinition of revision number");
- rev = a;
- }
- break;
-
- case 'u':
- keepworkingfile=true; lockflag=false;
- goto revno;
-
- case 'i':
- initflag = true;
- goto revno;
-
- case 'j':
- mustread = true;
- goto revno;
-
- case 'I':
- interactiveflag = true;
- goto revno;
-
- case 'q':
- quietflag=true;
- goto revno;
-
- case 'f':
- forceciflag=true;
- goto revno;
-
- case 'k':
- keepflag=true;
- goto revno;
-
- case 'm':
- if (msg.size) redefined('m');
- msg = cleanlogmsg(a, strlen(a));
- if (!msg.size)
- error("missing message for -m option");
- break;
-
- case 'n':
- if (!*a) {
- error("missing symbolic name after -n");
- break;
- }
- checkssym(a);
- addassoclst(false, a);
- break;
-
- case 'N':
- if (!*a) {
- error("missing symbolic name after -N");
- break;
- }
- checkssym(a);
- addassoclst(true, a);
- break;
-
- case 's':
- if (*a) {
- if (state) redefined('s');
- checksid(a);
- state = a;
- } else
- error("missing state for -s option");
- break;
-
- case 't':
- if (*a) {
- if (textfile) redefined('t');
- textfile = a;
- }
- break;
-
- case 'd':
- if (altdate[0] || usestatdate)
- redefined('d');
- altdate[0] = '\0';
- if (!(usestatdate = !*a))
- str2date(a, altdate);
- break;
-
- case 'M':
- mtimeflag = true;
- goto revno;
-
- case 'w':
- if (*a) {
- if (author) redefined('w');
- checksid(a);
- author = a;
- } else
- error("missing author for -w option");
- break;
-
- case 'x':
- suffixes = a;
- break;
-
- case 'V':
- setRCSversion(*argv);
- break;
-
- case 'z':
- zone_set(a);
- break;
-
- case 'T':
- if (!*a) {
- Ttimeflag = true;
- break;
- }
- /* fall into */
- default:
- error("unknown option: %s%s", *argv, cmdusage);
- };
- } /* end processing of options */
-
- /* Handle all pathnames. */
- if (nerror) cleanup();
- else if (argc < 1) faterror("no input file%s", cmdusage);
- else for (; 0 < argc; cleanup(), ++argv, --argc) {
- targetdelta = 0;
- ffree();
-
- switch (pairnames(argc, argv, rcswriteopen, mustread, false)) {
-
- case -1: /* New RCS file */
-# if has_setuid && has_getuid
- if (euid() != ruid()) {
- workerror("setuid initial checkin prohibited; use `rcs -i -a' first");
- continue;
- }
-# endif
- rcsinitflag = true;
- break;
-
- case 0: /* Error */
- continue;
-
- case 1: /* Normal checkin with prev . RCS file */
- if (initflag) {
- rcserror("already exists");
- continue;
- }
- rcsinitflag = !Head;
- }
-
- /*
- * RCSname contains the name of the RCS file, and
- * workname contains the name of the working file.
- * If the RCS file exists, finptr contains the file descriptor for the
- * RCS file, and RCSstat is set. The admin node is initialized.
- */
-
- diagnose("%s <-- %s\n", RCSname, workname);
-
- if (!(workptr = Iopen(workname, FOPEN_R_WORK, &workstat))) {
- eerror(workname);
- continue;
- }
-
- if (finptr) {
- if (same_file(RCSstat, workstat, 0)) {
- rcserror("RCS file is the same as working file %s.",
- workname
- );
- continue;
- }
- if (!checkaccesslist())
- continue;
- }
-
- krev = rev;
- if (keepflag) {
- /* get keyword values from working file */
- if (!getoldkeys(workptr)) continue;
- if (!rev && !*(krev = prevrev.string)) {
- workerror("can't find a revision number");
- continue;
- }
- if (!*prevdate.string && *altdate=='\0' && usestatdate==false)
- workwarn("can't find a date");
- if (!*prevauthor.string && !author)
- workwarn("can't find an author");
- if (!*prevstate.string && !state)
- workwarn("can't find a state");
- } /* end processing keepflag */
-
- /* Read the delta tree. */
- if (finptr)
- gettree();
-
- /* expand symbolic revision number */
- if (!fexpandsym(krev, &newdelnum, workptr))
- continue;
-
- /* splice new delta into tree */
- if ((removedlock = addelta()) < 0)
- continue;
-
- newdelta.num = newdelnum.string;
- newdelta.branches = 0;
- newdelta.lockedby = 0; /* This might be changed by addlock(). */
- newdelta.selector = true;
- newdelta.name = 0;
- clear_buf(&newdelta.ig);
- clear_buf(&newdelta.igtext);
- /* set author */
- if (author)
- newdelta.author=author; /* set author given by -w */
- else if (keepflag && *prevauthor.string)
- newdelta.author=prevauthor.string; /* preserve old author if possible*/
- else newdelta.author=getcaller();/* otherwise use caller's id */
- newdelta.state = default_state;
- if (state)
- newdelta.state=state; /* set state given by -s */
- else if (keepflag && *prevstate.string)
- newdelta.state=prevstate.string; /* preserve old state if possible */
- if (usestatdate) {
- time2date(workstat.st_mtime, altdate);
- }
- if (*altdate!='\0')
- newdelta.date=altdate; /* set date given by -d */
- else if (keepflag && *prevdate.string) {
- /* Preserve old date if possible. */
- str2date(prevdate.string, olddate);
- newdelta.date = olddate;
- } else
- newdelta.date = getcurdate(); /* use current date */
- /* now check validity of date -- needed because of -d and -k */
- if (targetdelta &&
- cmpdate(newdelta.date,targetdelta->date) < 0) {
- rcserror("Date %s precedes %s in revision %s.",
- date2str(newdelta.date, newdatebuf),
- date2str(targetdelta->date, targetdatebuf),
- targetdelta->num
- );
- continue;
- }
-
-
- if (lockflag && addlock(&newdelta, true) < 0) continue;
-
- if (keepflag && *prevname.string)
- if (addsymbol(newdelta.num, prevname.string, false) < 0)
- continue;
- if (!addsyms(newdelta.num))
- continue;
-
-
- putadmin();
- puttree(Head,frewrite);
- putdesc(false,textfile);
-
- changework = Expand < MIN_UNCHANGED_EXPAND;
- dolog = true;
- lockthis = lockflag;
- workdelta = &newdelta;
-
- /* build rest of file */
- if (rcsinitflag) {
- diagnose("initial revision: %s\n", newdelta.num);
- /* get logmessage */
- newdelta.log=getlogmsg();
- putdftext(&newdelta, workptr, frewrite, false);
- RCSstat.st_mode = workstat.st_mode;
- RCSstat.st_nlink = 0;
- changedRCS = true;
- } else {
- diffname = maketemp(0);
- newhead = Head == &newdelta;
- if (!newhead)
- foutptr = frewrite;
- expname = buildrevision(
- gendeltas, targetdelta, (FILE*)0, false
- );
- if (
- !forceciflag &&
- strcmp(newdelta.state, targetdelta->state) == 0 &&
- (changework = rcsfcmp(
- workptr, &workstat, expname, targetdelta
- )) <= 0
- ) {
- diagnose("file is unchanged; reverting to previous revision %s\n",
- targetdelta->num
- );
- if (removedlock < lockflag) {
- diagnose("previous revision was not locked; ignoring -l option\n");
- lockthis = 0;
- }
- dolog = false;
- if (! (changedRCS = lockflag<removedlock || assoclst))
- workdelta = targetdelta;
- else {
- /*
- * We have started to build the wrong new RCS file.
- * Start over from the beginning.
- */
- long hwm = ftell(frewrite);
- int bad_truncate;
- Orewind(frewrite);
-
- /*
- * Work around a common ftruncate() bug:
- * NFS won't let you truncate a file that you
- * currently lack permissions for, even if you
- * had permissions when you opened it.
- * Also, Posix 1003.1b-1993 sec 5.6.7.2 p 128 l 1022
- * says ftruncate might fail because it's not supported.
- */
-# if !has_ftruncate
-# undef ftruncate
-# define ftruncate(fd,length) (-1)
-# endif
- bad_truncate = ftruncate(fileno(frewrite), (off_t)0);
-
- Irewind(finptr);
- Lexinit();
- getadmin();
- gettree();
- if (!(workdelta = genrevs(
- targetdelta->num, (char*)0, (char*)0, (char*)0,
- &gendeltas
- )))
- continue;
- workdelta->log = targetdelta->log;
- if (newdelta.state != default_state)
- workdelta->state = newdelta.state;
- if (lockthis<removedlock && removelock(workdelta)<0)
- continue;
- if (!addsyms(workdelta->num))
- continue;
- if (dorewrite(true, true) != 0)
- continue;
- fastcopy(finptr, frewrite);
- if (bad_truncate)
- while (ftell(frewrite) < hwm)
- /* White out any earlier mistake with '\n's. */
- /* This is unlikely. */
- afputc('\n', frewrite);
- }
- } else {
- int wfd = Ifileno(workptr);
- struct stat checkworkstat;
- char const *diffv[6 + !!OPEN_O_BINARY], **diffp;
-# if large_memory && !maps_memory
- FILE *wfile = workptr->stream;
- long wfile_off;
-# endif
-# if !has_fflush_input && !(large_memory && maps_memory)
- off_t wfd_off;
-# endif
-
- diagnose("new revision: %s; previous revision: %s\n",
- newdelta.num, targetdelta->num
- );
- newdelta.log = getlogmsg();
-# if !large_memory
- Irewind(workptr);
-# if has_fflush_input
- if (fflush(workptr) != 0)
- Ierror();
-# endif
-# else
-# if !maps_memory
- if (
- (wfile_off = ftell(wfile)) == -1
- || fseek(wfile, 0L, SEEK_SET) != 0
-# if has_fflush_input
- || fflush(wfile) != 0
-# endif
- )
- Ierror();
-# endif
-# endif
-# if !has_fflush_input && !(large_memory && maps_memory)
- wfd_off = lseek(wfd, (off_t)0, SEEK_CUR);
- if (wfd_off == -1
- || (wfd_off != 0
- && lseek(wfd, (off_t)0, SEEK_SET) != 0))
- Ierror();
-# endif
- diffp = diffv;
- *++diffp = DIFF;
- *++diffp = DIFFFLAGS;
-# if OPEN_O_BINARY
- if (Expand == BINARY_EXPAND)
- *++diffp = "--binary";
-# endif
- *++diffp = newhead ? "-" : expname;
- *++diffp = newhead ? expname : "-";
- *++diffp = 0;
- switch (runv(wfd, diffname, diffv)) {
- case DIFF_FAILURE: case DIFF_SUCCESS: break;
- default: rcsfaterror("diff failed");
- }
-# if !has_fflush_input && !(large_memory && maps_memory)
- if (lseek(wfd, wfd_off, SEEK_CUR) == -1)
- Ierror();
-# endif
-# if large_memory && !maps_memory
- if (fseek(wfile, wfile_off, SEEK_SET) != 0)
- Ierror();
-# endif
- if (newhead) {
- Irewind(workptr);
- putdftext(&newdelta, workptr, frewrite, false);
- if (!putdtext(targetdelta,diffname,frewrite,true)) continue;
- } else
- if (!putdtext(&newdelta,diffname,frewrite,true)) continue;
-
- /*
- * Check whether the working file changed during checkin,
- * to avoid producing an inconsistent RCS file.
- */
- if (
- fstat(wfd, &checkworkstat) != 0
- || workstat.st_mtime != checkworkstat.st_mtime
- || workstat.st_size != checkworkstat.st_size
- ) {
- workerror("file changed during checkin");
- continue;
- }
-
- changedRCS = true;
- }
- }
-
- /* Deduce time_t of new revision if it is needed later. */
- wtime = (time_t)-1;
- if (mtimeflag | Ttimeflag)
- wtime = date2time(workdelta->date);
-
- if (donerewrite(changedRCS,
- !Ttimeflag ? (time_t)-1
- : finptr && wtime < RCSstat.st_mtime ? RCSstat.st_mtime
- : wtime
- ) != 0)
- continue;
-
- if (!keepworkingfile) {
- Izclose(&workptr);
- r = un_link(workname); /* Get rid of old file */
- } else {
- newworkmode = WORKMODE(RCSstat.st_mode,
- ! (Expand==VAL_EXPAND || lockthis < StrictLocks)
- );
- mtime = mtimeflag ? wtime : (time_t)-1;
-
- /* Expand if it might change or if we can't fix mode, time. */
- if (changework || (r=fixwork(newworkmode,mtime)) != 0) {
- Irewind(workptr);
- /* Expand keywords in file. */
- locker_expansion = lockthis;
- workdelta->name =
- namedrev(
- assoclst ? assoclst->ssymbol
- : keepflag && *prevname.string ? prevname.string
- : rev,
- workdelta
- );
- switch (xpandfile(
- workptr, workdelta, &newworkname, dolog
- )) {
- default:
- continue;
-
- case 0:
- /*
- * No expansion occurred; try to reuse working file
- * unless we already tried and failed.
- */
- if (changework)
- if ((r=fixwork(newworkmode,mtime)) == 0)
- break;
- /* fall into */
- case 1:
- Izclose(&workptr);
- aflush(exfile);
- ignoreints();
- r = chnamemod(&exfile, newworkname,
- workname, 1, newworkmode, mtime
- );
- keepdirtemp(newworkname);
- restoreints();
- }
- }
- }
- if (r != 0) {
- eerror(workname);
- continue;
- }
- diagnose("done\n");
-
- }
-
- tempunlink();
- exitmain(exitstatus);
-} /* end of main (ci) */
-
- static void
-cleanup()
-{
- if (nerror) exitstatus = EXIT_FAILURE;
- Izclose(&finptr);
- Izclose(&workptr);
- Ozclose(&exfile);
- Ozclose(&fcopy);
- ORCSclose();
- dirtempunlink();
-}
-
-#if RCS_lint
-# define exiterr ciExit
-#endif
- void
-exiterr()
-{
- ORCSerror();
- dirtempunlink();
- tempunlink();
- _exit(EXIT_FAILURE);
-}
-
-/*****************************************************************/
-/* the rest are auxiliary routines */
-
-
- static int
-addelta()
-/* Function: Appends a delta to the delta tree, whose number is
- * given by newdelnum. Updates Head, newdelnum, newdelnumlength,
- * and the links in newdelta.
- * Return -1 on error, 1 if a lock is removed, 0 otherwise.
- */
-{
- register char *tp;
- register int i;
- int removedlock;
- int newdnumlength; /* actual length of new rev. num. */
-
- newdnumlength = countnumflds(newdelnum.string);
-
- if (rcsinitflag) {
- /* this covers non-existing RCS file and a file initialized with rcs -i */
- if (newdnumlength==0 && Dbranch) {
- bufscpy(&newdelnum, Dbranch);
- newdnumlength = countnumflds(Dbranch);
- }
- if (newdnumlength==0) bufscpy(&newdelnum, "1.1");
- else if (newdnumlength==1) bufscat(&newdelnum, ".1");
- else if (newdnumlength>2) {
- rcserror("Branch point doesn't exist for revision %s.",
- newdelnum.string
- );
- return -1;
- } /* newdnumlength == 2 is OK; */
- Head = &newdelta;
- newdelta.next = 0;
- return 0;
- }
- if (newdnumlength==0) {
- /* derive new revision number from locks */
- switch (findlock(true, &targetdelta)) {
-
- default:
- /* found two or more old locks */
- return -1;
-
- case 1:
- /* found an old lock */
- /* check whether locked revision exists */
- if (!genrevs(targetdelta->num,(char*)0,(char*)0,(char*)0,&gendeltas))
- return -1;
- if (targetdelta==Head) {
- /* make new head */
- newdelta.next=Head;
- Head= &newdelta;
- } else if (!targetdelta->next && countnumflds(targetdelta->num)>2) {
- /* new tip revision on side branch */
- targetdelta->next= &newdelta;
- newdelta.next = 0;
- } else {
- /* middle revision; start a new branch */
- bufscpy(&newdelnum, "");
- return addbranch(targetdelta, &newdelnum, 1);
- }
- incnum(targetdelta->num, &newdelnum);
- return 1; /* successful use of existing lock */
-
- case 0:
- /* no existing lock; try Dbranch */
- /* update newdelnum */
- if (StrictLocks || !myself(RCSstat.st_uid)) {
- rcserror("no lock set by %s", getcaller());
- return -1;
- }
- if (Dbranch) {
- bufscpy(&newdelnum, Dbranch);
- } else {
- incnum(Head->num, &newdelnum);
- }
- newdnumlength = countnumflds(newdelnum.string);
- /* now fall into next statement */
- }
- }
- if (newdnumlength<=2) {
- /* add new head per given number */
- if(newdnumlength==1) {
- /* make a two-field number out of it*/
- if (cmpnumfld(newdelnum.string,Head->num,1)==0)
- incnum(Head->num, &newdelnum);
- else
- bufscat(&newdelnum, ".1");
- }
- if (cmpnum(newdelnum.string,Head->num) <= 0) {
- rcserror("revision %s too low; must be higher than %s",
- newdelnum.string, Head->num
- );
- return -1;
- }
- targetdelta = Head;
- if (0 <= (removedlock = removelock(Head))) {
- if (!genrevs(Head->num,(char*)0,(char*)0,(char*)0,&gendeltas))
- return -1;
- newdelta.next = Head;
- Head = &newdelta;
- }
- return removedlock;
- } else {
- /* put new revision on side branch */
- /*first, get branch point */
- tp = newdelnum.string;
- for (i = newdnumlength - ((newdnumlength&1) ^ 1); --i; )
- while (*tp++ != '.')
- continue;
- *--tp = 0; /* Kill final dot to get old delta temporarily. */
- if (!(targetdelta=genrevs(newdelnum.string,(char*)0,(char*)0,(char*)0,&gendeltas)))
- return -1;
- if (cmpnum(targetdelta->num, newdelnum.string) != 0) {
- rcserror("can't find branch point %s", newdelnum.string);
- return -1;
- }
- *tp = '.'; /* Restore final dot. */
- return addbranch(targetdelta, &newdelnum, 0);
- }
-}
-
-
-
- static int
-addbranch(branchpoint, num, removedlock)
- struct hshentry *branchpoint;
- struct buf *num;
- int removedlock;
-/* adds a new branch and branch delta at branchpoint.
- * If num is the null string, appends the new branch, incrementing
- * the highest branch number (initially 1), and setting the level number to 1.
- * the new delta and branchhead are in globals newdelta and newbranch, resp.
- * the new number is placed into num.
- * Return -1 on error, 1 if a lock is removed, 0 otherwise.
- * If REMOVEDLOCK is 1, a lock was already removed.
- */
-{
- struct branchhead *bhead, **btrail;
- struct buf branchnum;
- int result;
- int field, numlength;
- static struct branchhead newbranch; /* new branch to be inserted */
-
- numlength = countnumflds(num->string);
-
- if (!branchpoint->branches) {
- /* start first branch */
- branchpoint->branches = &newbranch;
- if (numlength==0) {
- bufscpy(num, branchpoint->num);
- bufscat(num, ".1.1");
- } else if (numlength&1)
- bufscat(num, ".1");
- newbranch.nextbranch = 0;
-
- } else if (numlength==0) {
- /* append new branch to the end */
- bhead=branchpoint->branches;
- while (bhead->nextbranch) bhead=bhead->nextbranch;
- bhead->nextbranch = &newbranch;
- bufautobegin(&branchnum);
- getbranchno(bhead->hsh->num, &branchnum);
- incnum(branchnum.string, num);
- bufautoend(&branchnum);
- bufscat(num, ".1");
- newbranch.nextbranch = 0;
- } else {
- /* place the branch properly */
- field = numlength - ((numlength&1) ^ 1);
- /* field of branch number */
- btrail = &branchpoint->branches;
- while (0 < (result=cmpnumfld(num->string,(*btrail)->hsh->num,field))) {
- btrail = &(*btrail)->nextbranch;
- if (!*btrail) {
- result = -1;
- break;
- }
- }
- if (result < 0) {
- /* insert/append new branchhead */
- newbranch.nextbranch = *btrail;
- *btrail = &newbranch;
- if (numlength&1) bufscat(num, ".1");
- } else {
- /* branch exists; append to end */
- bufautobegin(&branchnum);
- getbranchno(num->string, &branchnum);
- targetdelta = genrevs(
- branchnum.string, (char*)0, (char*)0, (char*)0,
- &gendeltas
- );
- bufautoend(&branchnum);
- if (!targetdelta)
- return -1;
- if (cmpnum(num->string,targetdelta->num) <= 0) {
- rcserror("revision %s too low; must be higher than %s",
- num->string, targetdelta->num
- );
- return -1;
- }
- if (!removedlock
- && 0 <= (removedlock = removelock(targetdelta))
- ) {
- if (numlength&1)
- incnum(targetdelta->num,num);
- targetdelta->next = &newdelta;
- newdelta.next = 0;
- }
- return removedlock;
- /* Don't do anything to newbranch. */
- }
- }
- newbranch.hsh = &newdelta;
- newdelta.next = 0;
- if (branchpoint->lockedby)
- if (strcmp(branchpoint->lockedby, getcaller()) == 0)
- return removelock(branchpoint); /* This returns 1. */
- return removedlock;
-}
-
- static int
-addsyms(num)
- char const *num;
-{
- register struct Symrev *p;
-
- for (p = assoclst; p; p = p->nextsym)
- if (addsymbol(num, p->ssymbol, p->override) < 0)
- return false;
- return true;
-}
-
-
- static void
-incnum(onum,nnum)
- char const *onum;
- struct buf *nnum;
-/* Increment the last field of revision number onum by one and
- * place the result into nnum.
- */
-{
- register char *tp, *np;
- register size_t l;
-
- l = strlen(onum);
- bufalloc(nnum, l+2);
- np = tp = nnum->string;
- VOID strcpy(np, onum);
- for (tp = np + l; np != tp; )
- if (isdigit(*--tp)) {
- if (*tp != '9') {
- ++*tp;
- return;
- }
- *tp = '0';
- } else {
- tp++;
- break;
- }
- /* We changed 999 to 000; now change it to 1000. */
- *tp = '1';
- tp = np + l;
- *tp++ = '0';
- *tp = 0;
-}
-
-
-
- static int
-removelock(delta)
-struct hshentry * delta;
-/* function: Finds the lock held by caller on delta,
- * removes it, and returns nonzero if successful.
- * Print an error message and return -1 if there is no such lock.
- * An exception is if !StrictLocks, and caller is the owner of
- * the RCS file. If caller does not have a lock in this case,
- * return 0; return 1 if a lock is actually removed.
- */
-{
- register struct rcslock *next, **trail;
- char const *num;
-
- num=delta->num;
- for (trail = &Locks; (next = *trail); trail = &next->nextlock)
- if (next->delta == delta)
- if (strcmp(getcaller(), next->login) == 0) {
- /* We found a lock on delta by caller; delete it. */
- *trail = next->nextlock;
- delta->lockedby = 0;
- return 1;
- } else {
- rcserror("revision %s locked by %s", num, next->login);
- return -1;
- }
- if (!StrictLocks && myself(RCSstat.st_uid))
- return 0;
- rcserror("no lock set by %s for revision %s", getcaller(), num);
- return -1;
-}
-
-
-
- static char const *
-getcurdate()
-/* Return a pointer to the current date. */
-{
- static char buffer[datesize]; /* date buffer */
-
- if (!buffer[0])
- time2date(now(), buffer);
- return buffer;
-}
-
- static int
-#if has_prototypes
-fixwork(mode_t newworkmode, time_t mtime)
- /* The `#if has_prototypes' is needed because mode_t might promote to int. */
-#else
- fixwork(newworkmode, mtime)
- mode_t newworkmode;
- time_t mtime;
-#endif
-{
- return
- 1 < workstat.st_nlink
- || (newworkmode&S_IWUSR && !myself(workstat.st_uid))
- || setmtime(workname, mtime) != 0
- ? -1
- : workstat.st_mode == newworkmode ? 0
-#if has_fchmod
- : fchmod(Ifileno(workptr), newworkmode) == 0 ? 0
-#endif
-#if bad_chmod_close
- : -1
-#else
- : chmod(workname, newworkmode)
-#endif
- ;
-}
-
- static int
-xpandfile(unexfile, delta, exname, dolog)
- RILE *unexfile;
- struct hshentry const *delta;
- char const **exname;
- int dolog;
-/*
- * Read unexfile and copy it to a
- * file, performing keyword substitution with data from delta.
- * Return -1 if unsuccessful, 1 if expansion occurred, 0 otherwise.
- * If successful, stores the stream descriptor into *EXFILEP
- * and its name into *EXNAME.
- */
-{
- char const *targetname;
- int e, r;
-
- targetname = makedirtemp(1);
- if (!(exfile = fopenSafer(targetname, FOPEN_W_WORK))) {
- eerror(targetname);
- workerror("can't build working file");
- return -1;
- }
- r = 0;
- if (MIN_UNEXPAND <= Expand)
- fastcopy(unexfile,exfile);
- else {
- for (;;) {
- e = expandline(
- unexfile, exfile, delta, false, (FILE*)0, dolog
- );
- if (e < 0)
- break;
- r |= e;
- if (e <= 1)
- break;
- }
- }
- *exname = targetname;
- return r & 1;
-}
-
-
-
-
-/* --------------------- G E T L O G M S G --------------------------------*/
-
-
- static struct cbuf
-getlogmsg()
-/* Obtain and yield a log message.
- * If a log message is given with -m, yield that message.
- * If this is the initial revision, yield a standard log message.
- * Otherwise, reads a character string from the terminal.
- * Stops after reading EOF or a single '.' on a
- * line. getlogmsg prompts the first time it is called for the
- * log message; during all later calls it asks whether the previous
- * log message can be reused.
- */
-{
- static char const
- emptych[] = EMPTYLOG,
- initialch[] = "Initial revision";
- static struct cbuf const
- emptylog = { emptych, sizeof(emptych)-sizeof(char) },
- initiallog = { initialch, sizeof(initialch)-sizeof(char) };
- static struct buf logbuf;
- static struct cbuf logmsg;
-
- register char *tp;
- register size_t i;
- char const *caller;
-
- if (msg.size) return msg;
-
- if (keepflag) {
- /* generate std. log message */
- caller = getcaller();
- i = sizeof(ciklog)+strlen(caller)+3;
- bufalloc(&logbuf, i + datesize + zonelenmax);
- tp = logbuf.string;
- VOID sprintf(tp, "%s%s at ", ciklog, caller);
- VOID date2str(getcurdate(), tp+i);
- logmsg.string = tp;
- logmsg.size = strlen(tp);
- return logmsg;
- }
-
- if (!targetdelta && (
- cmpnum(newdelnum.string,"1.1")==0 ||
- cmpnum(newdelnum.string,"1.0")==0
- ))
- return initiallog;
-
- if (logmsg.size) {
- /*previous log available*/
- if (yesorno(true, "reuse log message of previous file? [yn](y): "))
- return logmsg;
- }
-
- /* now read string from stdin */
- logmsg = getsstdin("m", "log message", "", &logbuf);
-
- /* now check whether the log message is not empty */
- if (logmsg.size)
- return logmsg;
- return emptylog;
-}
-
-/* Make a linked list of Symbolic names */
-
- static void
-addassoclst(flag, sp)
- int flag;
- char const *sp;
-{
- struct Symrev *pt;
-
- pt = talloc(struct Symrev);
- pt->ssymbol = sp;
- pt->override = flag;
- pt->nextsym = 0;
- *nextassoc = pt;
- nextassoc = &pt->nextsym;
-}
diff --git a/gnu/usr.bin/rcs/co/Makefile b/gnu/usr.bin/rcs/co/Makefile
deleted file mode 100644
index 0c73865d09fc..000000000000
--- a/gnu/usr.bin/rcs/co/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-PROG= co
-SRCS= co.c
-CFLAGS+= -I${.CURDIR}/../lib
-LDADD= ${LIBRCS}
-DPADD= ${LIBRCS}
-
-.include "../../Makefile.inc"
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/co/Makefile.depend b/gnu/usr.bin/rcs/co/Makefile.depend
deleted file mode 100644
index cab8f8fe15db..000000000000
--- a/gnu/usr.bin/rcs/co/Makefile.depend
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
- gnu/lib/csu \
- gnu/lib/libgcc \
- gnu/usr.bin/rcs/lib \
- include \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcompiler_rt \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/gnu/usr.bin/rcs/co/co.1 b/gnu/usr.bin/rcs/co/co.1
deleted file mode 100644
index 2aea3ad1b40d..000000000000
--- a/gnu/usr.bin/rcs/co/co.1
+++ /dev/null
@@ -1,736 +0,0 @@
-.de Id
-.ds Rv \\$3
-.ds Dt \\$4
-..
-.Id $FreeBSD$
-.ds i \&\s-1ISO\s0
-.ds r \&\s-1RCS\s0
-.ds u \&\s-1UTC\s0
-.if n .ds - \%--
-.if t .ds - \(em
-.TH CO 1 \*(Dt GNU
-.SH NAME
-co \- check out RCS revisions
-.SH SYNOPSIS
-.B co
-.RI [ options ] " file " .\|.\|.
-.SH DESCRIPTION
-.B co
-retrieves a revision from each \*r file and stores it into
-the corresponding working file.
-.PP
-Pathnames matching an \*r suffix denote \*r files;
-all others denote working files.
-Names are paired as explained in
-.BR ci (1).
-.PP
-Revisions of an \*r file can be checked out locked or unlocked. Locking a
-revision prevents overlapping updates. A revision checked out for reading or
-processing (e.g., compiling) need not be locked. A revision checked out
-for editing and later checkin must normally be locked. Checkout with locking
-fails if the revision to be checked out is currently locked by another user.
-(A lock can be broken with
-.BR rcs "(1).)\ \&"
-Checkout with locking also requires the caller to be on the access list of
-the \*r file, unless he is the owner of the
-file or the superuser, or the access list is empty.
-Checkout without locking is not subject to accesslist restrictions, and is
-not affected by the presence of locks.
-.PP
-A revision is selected by options for revision or branch number,
-checkin date/time, author, or state.
-When the selection options
-are applied in combination,
-.B co
-retrieves the latest revision
-that satisfies all of them.
-If none of the selection options
-is specified,
-.B co
-retrieves the latest revision
-on the default branch (normally the trunk, see the
-.B \-b
-option of
-.BR rcs (1)).
-A revision or branch number can be attached
-to any of the options
-.BR \-f ,
-.BR \-I ,
-.BR \-l ,
-.BR \-M ,
-.BR \-p ,
-.BR \-q ,
-.BR \-r ,
-or
-.BR \-u .
-The options
-.B \-d
-(date),
-.B \-s
-(state), and
-.B \-w
-(author)
-retrieve from a single branch, the
-.I selected
-branch,
-which is either specified by one of
-.BR \-f ,
-\&.\|.\|.,
-.BR \-u ,
-or the default branch.
-.PP
-A
-.B co
-command applied to an \*r
-file with no revisions creates a zero-length working file.
-.B co
-always performs keyword substitution (see below).
-.SH OPTIONS
-.TP
-.BR \-r [\f2rev\fP]
-retrieves the latest revision whose number is less than or equal to
-.IR rev .
-If
-.I rev
-indicates a branch rather than a revision,
-the latest revision on that branch is retrieved.
-If
-.I rev
-is omitted, the latest revision on the default branch
-(see the
-.B \-b
-option of
-.BR rcs (1))
-is retrieved.
-If
-.I rev
-is
-.BR $ ,
-.B co
-determines the revision number from keyword values in the working file.
-Otherwise, a revision is composed of one or more numeric or symbolic fields
-separated by periods.
-If
-.I rev
-begins with a period,
-then the default branch (normally the trunk) is prepended to it.
-If
-.I rev
-is a branch number followed by a period,
-then the latest revision on that branch is used.
-The numeric equivalent of a symbolic field
-is specified with the
-.B \-n
-option of the commands
-.BR ci (1)
-and
-.BR rcs (1).
-.TP
-.BR \-l [\f2rev\fP]
-same as
-.BR \-r ,
-except that it also locks the retrieved revision for
-the caller.
-.TP
-.BR \-u [\f2rev\fP]
-same as
-.BR \-r ,
-except that it unlocks the retrieved revision if it was
-locked by the caller. If
-.I rev
-is omitted,
-.B \-u
-retrieves the revision locked by the caller, if there is one; otherwise,
-it retrieves the latest revision on the default branch.
-.TP
-.BR \-f [\f2rev\fP]
-forces the overwriting of the working file;
-useful in connection with
-.BR \-q .
-See also
-.SM "FILE MODES"
-below.
-.TP
-.B \-kkv
-Generate keyword strings using the default form, e.g.\&
-.B "$\&Revision: \*(Rv $"
-for the
-.B Revision
-keyword.
-A locker's name is inserted in the value of the
-.BR Header ,
-.BR Id ,
-and
-.B Locker
-keyword strings
-only as a file is being locked,
-i.e. by
-.B "ci\ \-l"
-and
-.BR "co\ \-l".
-This is the default.
-.TP
-.B \-kkvl
-Like
-.BR \-kkv ,
-except that a locker's name is always inserted
-if the given revision is currently locked.
-.TP
-.B \-kk
-Generate only keyword names in keyword strings; omit their values.
-See
-.SM "KEYWORD SUBSTITUTION"
-below.
-For example, for the
-.B Revision
-keyword, generate the string
-.B $\&Revision$
-instead of
-.BR "$\&Revision: \*(Rv $" .
-This option is useful to ignore differences due to keyword substitution
-when comparing different revisions of a file.
-Log messages are inserted after
-.B $\&Log$
-keywords even if
-.B \-kk
-is specified,
-since this tends to be more useful when merging changes.
-.TP
-.B \-ko
-Generate the old keyword string,
-present in the working file just before it was checked in.
-For example, for the
-.B Revision
-keyword, generate the string
-.B "$\&Revision: 1.1 $"
-instead of
-.B "$\&Revision: \*(Rv $"
-if that is how the string appeared when the file was checked in.
-This can be useful for file formats
-that cannot tolerate any changes to substrings
-that happen to take the form of keyword strings.
-.TP
-.B \-kb
-Generate a binary image of the old keyword string.
-This acts like
-.BR \-ko ,
-except it performs all working file input and output in binary mode.
-This makes little difference on Posix and Unix hosts,
-but on DOS-like hosts one should use
-.B "rcs\ \-i\ \-kb"
-to initialize an \*r file intended to be used for binary files.
-Also, on all hosts,
-.BR rcsmerge (1)
-normally refuses to merge files when
-.B \-kb
-is in effect.
-.TP
-.B \-kv
-Generate only keyword values for keyword strings.
-For example, for the
-.B Revision
-keyword, generate the string
-.B \*(Rv
-instead of
-.BR "$\&Revision: \*(Rv $" .
-This can help generate files in programming languages where it is hard to
-strip keyword delimiters like
-.B "$\&Revision:\ $"
-from a string.
-However, further keyword substitution cannot be performed once the
-keyword names are removed, so this option should be used with care.
-Because of this danger of losing keywords,
-this option cannot be combined with
-.BR \-l ,
-and the owner write permission of the working file is turned off;
-to edit the file later, check it out again without
-.BR \-kv .
-.TP
-.BR \-p [\f2rev\fP]
-prints the retrieved revision on the standard output rather than storing it
-in the working file.
-This option is useful when
-.B co
-is part of a pipe.
-.TP
-.BR \-q [\f2rev\fP]
-quiet mode; diagnostics are not printed.
-.TP
-.BR \-I [\f2rev\fP]
-interactive mode;
-the user is prompted and questioned
-even if the standard input is not a terminal.
-.TP
-.BI \-d date
-retrieves the latest revision on the selected branch whose checkin date/time is
-less than or equal to
-.IR date .
-The date and time can be given in free format.
-The time zone
-.B LT
-stands for local time;
-other common time zone names are understood.
-For example, the following
-.IR date s
-are equivalent
-if local time is January 11, 1990, 8pm Pacific Standard Time,
-eight hours west of Coordinated Universal Time (\*u):
-.RS
-.LP
-.RS
-.nf
-.ta \w'\f3Thu, 11 Jan 1990 20:00:00 \-0800\fP 'u
-.ne 10
-\f38:00 pm lt\fP
-\f34:00 AM, Jan. 12, 1990\fP default is \*u
-\f31990-01-12 04:00:00+00\fP \*i 8601 (\*u)
-\f31990-01-11 20:00:00\-08\fP \*i 8601 (local time)
-\f31990/01/12 04:00:00\fP traditional \*r format
-\f3Thu Jan 11 20:00:00 1990 LT\fP output of \f3ctime\fP(3) + \f3LT\fP
-\f3Thu Jan 11 20:00:00 PST 1990\fP output of \f3date\fP(1)
-\f3Fri Jan 12 04:00:00 GMT 1990\fP
-\f3Thu, 11 Jan 1990 20:00:00 \-0800\fP Internet RFC 822
-\f312-January-1990, 04:00 WET\fP
-.ta 4n +4n +4n +4n
-.fi
-.RE
-.LP
-Most fields in the date and time can be defaulted.
-The default time zone is normally \*u, but this can be overridden by the
-.B \-z
-option.
-The other defaults are determined in the order year, month, day,
-hour, minute, and second (most to least significant). At least one of these
-fields must be provided. For omitted fields that are of higher significance
-than the highest provided field, the time zone's current values are assumed.
-For all other omitted fields,
-the lowest possible values are assumed.
-For example, without
-.BR \-z ,
-the date
-.B "20, 10:30"
-defaults to
-10:30:00 \*u of the 20th of the \*u time zone's current month and year.
-The date/time must be quoted if it contains spaces.
-.RE
-.TP
-.BR \-M [\f2rev\fP]
-Set the modification time on the new working file
-to be the date of the retrieved revision.
-Use this option with care; it can confuse
-.BR make (1).
-.TP
-.BI \-s state
-retrieves the latest revision on the selected branch whose state is set to
-.IR state .
-.TP
-.B \-T
-Preserve the modification time on the \*r file
-even if the \*r file changes because a lock is added or removed.
-This option can suppress extensive recompilation caused by a
-.BR make (1)
-dependency of some other copy of the working file on the \*r file.
-Use this option with care; it can suppress recompilation even when it is needed,
-i.e. when the change of lock
-would mean a change to keyword strings in the other working file.
-.TP
-.BR \-w [\f2login\fP]
-retrieves the latest revision on the selected branch which was checked in
-by the user with login name
-.IR login .
-If the argument
-.I login
-is
-omitted, the caller's login is assumed.
-.TP
-.BI \-j joinlist
-generates a new revision which is the join of the revisions on
-.IR joinlist .
-This option is largely obsoleted by
-.BR rcsmerge (1)
-but is retained for backwards compatibility.
-.RS
-.PP
-The
-.I joinlist
-is a comma-separated list of pairs of the form
-.IB rev2 : rev3,
-where
-.I rev2
-and
-.I rev3
-are (symbolic or numeric)
-revision numbers.
-For the initial such pair,
-.I rev1
-denotes the revision selected
-by the above options
-.BR \-f ,
-\&.\|.\|.,
-.BR \-w .
-For all other pairs,
-.I rev1
-denotes the revision generated by the previous pair.
-(Thus, the output
-of one join becomes the input to the next.)
-.PP
-For each pair,
-.B co
-joins revisions
-.I rev1
-and
-.I rev3
-with respect to
-.IR rev2 .
-This means that all changes that transform
-.I rev2
-into
-.I rev1
-are applied to a copy of
-.IR rev3 .
-This is particularly useful if
-.I rev1
-and
-.I rev3
-are the ends of two branches that have
-.I rev2
-as a common ancestor. If
-.IR rev1 < rev2 < rev3
-on the same branch,
-joining generates a new revision which is like
-.I rev3,
-but with all changes that lead from
-.I rev1
-to
-.I rev2
-undone.
-If changes from
-.I rev2
-to
-.I rev1
-overlap with changes from
-.I rev2
-to
-.I rev3,
-.B co
-reports overlaps as described in
-.BR merge (1).
-.PP
-For the initial pair,
-.I rev2
-can be omitted. The default is the common
-ancestor.
-If any of the arguments indicate branches, the latest revisions
-on those branches are assumed.
-The options
-.B \-l
-and
-.B \-u
-lock or unlock
-.IR rev1 .
-.RE
-.TP
-.BI \-V
-Print \*r's version number.
-.TP
-.BI \-V n
-Emulate \*r version
-.I n,
-where
-.I n
-can be
-.BR 3 ,
-.BR 4 ,
-or
-.BR 5 .
-This can be useful when interchanging \*r files with others who are
-running older versions of \*r.
-To see which version of \*r your correspondents are running, have them invoke
-.BR "rcs \-V" ;
-this works with newer versions of \*r.
-If it doesn't work, have them invoke
-.B rlog
-on an \*r file;
-if none of the first few lines of output contain the string
-.B branch:
-it is version 3;
-if the dates' years have just two digits, it is version 4;
-otherwise, it is version 5.
-An \*r file generated while emulating version 3 loses its default branch.
-An \*r revision generated while emulating version 4 or earlier has
-a time stamp that is off by up to 13 hours.
-A revision extracted while emulating version 4 or earlier contains
-abbreviated dates of the form
-.IB yy / mm / dd
-and can also contain different white space and line prefixes
-in the substitution for
-.BR $\&Log$ .
-.TP
-.BI \-x "suffixes"
-Use
-.I suffixes
-to characterize \*r files.
-See
-.BR ci (1)
-for details.
-.TP
-.BI \-z zone
-specifies the date output format in keyword substitution,
-and specifies the default time zone for
-.I date
-in the
-.BI \-d date
-option.
-The
-.I zone
-should be empty, a numeric \*u offset, or the special string
-.B LT
-for local time.
-The default is an empty
-.IR zone ,
-which uses the traditional \*r format of \*u without any time zone indication
-and with slashes separating the parts of the date;
-otherwise, times are output in \*i 8601 format with time zone indication.
-For example, if local time is January 11, 1990, 8pm Pacific Standard Time,
-eight hours west of \*u,
-then the time is output as follows:
-.RS
-.LP
-.RS
-.nf
-.ta \w'\f3\-z+05:30\fP 'u +\w'\f31990-01-11 09:30:00+05:30\fP 'u
-.ne 4
-\f2option\fP \f2time output\fP
-\f3\-z\fP \f31990/01/12 04:00:00\fP \f2(default)\fP
-\f3\-zLT\fP \f31990-01-11 20:00:00\-08\fP
-\f3\-z+05:30\fP \f31990-01-12 09:30:00+05:30\fP
-.ta 4n +4n +4n +4n
-.fi
-.RE
-.LP
-The
-.B \-z
-option does not affect dates stored in \*r files,
-which are always \*u.
-.RE
-.SH "KEYWORD SUBSTITUTION"
-Strings of the form
-.BI $ keyword $
-and
-.BI $ keyword : .\|.\|. $
-embedded in
-the text are replaced
-with strings of the form
-.BI $ keyword : value $
-where
-.I keyword
-and
-.I value
-are pairs listed below.
-Keywords can be embedded in literal strings
-or comments to identify a revision.
-.PP
-Initially, the user enters strings of the form
-.BI $ keyword $ .
-On checkout,
-.B co
-replaces these strings with strings of the form
-.BI $ keyword : value $ .
-If a revision containing strings of the latter form
-is checked back in, the value fields will be replaced during the next
-checkout.
-Thus, the keyword values are automatically updated on checkout.
-This automatic substitution can be modified by the
-.B \-k
-options.
-.PP
-Keywords and their corresponding values:
-.TP
-.B $\&Author$
-The login name of the user who checked in the revision.
-.TP
-.B $\&Date$
-The date and time the revision was checked in.
-With
-.BI \-z zone
-a numeric time zone offset is appended; otherwise, the date is \*u.
-.TP
-.B $\&Header$
-A standard header containing the full pathname of the \*r file, the
-revision number, the date and time, the author, the state,
-and the locker (if locked).
-With
-.BI \-z zone
-a numeric time zone offset is appended to the date; otherwise, the date is \*u.
-.TP
-.B $\&Id$
-Same as
-.BR $\&Header$ ,
-except that the \*r filename is without a path.
-.TP
-.B $\&Locker$
-The login name of the user who locked the revision (empty if not locked).
-.TP
-.B $\&Log$
-The log message supplied during checkin, preceded by a header
-containing the \*r filename, the revision number, the author, and the date
-and time.
-With
-.BI \-z zone
-a numeric time zone offset is appended; otherwise, the date is \*u.
-Existing log messages are
-.I not
-replaced.
-Instead, the new log message is inserted after
-.BR $\&Log: .\|.\|. $ .
-This is useful for
-accumulating a complete change log in a source file.
-.RS
-.LP
-Each inserted line is prefixed by the string that prefixes the
-.B $\&Log$
-line. For example, if the
-.B $\&Log$
-line is
-.RB \*(lq "//\ $\&Log: tan.cc\ $" \*(rq,
-\*r prefixes each line of the log with
-.RB \*(lq "//\ " \*(rq.
-This is useful for languages with comments that go to the end of the line.
-The convention for other languages is to use a
-.RB \*(lq " \(** " \(rq
-prefix inside a multiline comment.
-For example, the initial log comment of a C program
-conventionally is of the following form:
-.RS
-.LP
-.nf
-.ft 3
-.ne 3
-/\(**
-.in +\w'/'u
-\(** $\&Log$
-\(**/
-.in
-.ft
-.fi
-.RE
-.LP
-For backwards compatibility with older versions of \*r, if the log prefix is
-.B /\(**
-or
-.B (\(**
-surrounded by optional white space, inserted log lines contain a space
-instead of
-.B /
-or
-.BR ( ;
-however, this usage is obsolescent and should not be relied on.
-.RE
-.TP
-.B $\&Name$
-The symbolic name used to check out the revision, if any.
-For example,
-.B "co\ \-rJoe"
-generates
-.BR "$\&Name:\ Joe\ $" .
-Plain
-.B co
-generates just
-.BR "$\&Name:\ \ $" .
-.TP
-.B $\&RCSfile$
-The name of the \*r file without a path.
-.TP
-.B $\&Revision$
-The revision number assigned to the revision.
-.TP
-.B $\&Source$
-The full pathname of the \*r file.
-.TP
-.B $\&State$
-The state assigned to the revision with the
-.B \-s
-option of
-.BR rcs (1)
-or
-.BR ci (1).
-.PP
-The following characters in keyword values are represented by escape sequences
-to keep keyword strings well-formed.
-.LP
-.RS
-.nf
-.ne 6
-.ta \w'newline 'u
-\f2char escape sequence\fP
-tab \f3\et\fP
-newline \f3\en\fP
-space \f3\e040
-$ \e044
-\e \e\e\fP
-.fi
-.RE
-.SH "FILE MODES"
-The working file inherits the read and execute permissions from the \*r
-file. In addition, the owner write permission is turned on, unless
-.B \-kv
-is set or the file
-is checked out unlocked and locking is set to strict (see
-.BR rcs (1)).
-.PP
-If a file with the name of the working file exists already and has write
-permission,
-.B co
-aborts the checkout,
-asking beforehand if possible.
-If the existing working file is
-not writable or
-.B \-f
-is given, the working file is deleted without asking.
-.SH FILES
-.B co
-accesses files much as
-.BR ci (1)
-does, except that it does not need to read the working file
-unless a revision number of
-.B $
-is specified.
-.SH ENVIRONMENT
-.TP
-.B \s-1RCSINIT\s0
-options prepended to the argument list, separated by spaces.
-See
-.BR ci (1)
-for details.
-.SH DIAGNOSTICS
-The \*r pathname, the working pathname,
-and the revision number retrieved are
-written to the diagnostic output.
-The exit status is zero if and only if all operations were successful.
-.SH IDENTIFICATION
-Author: Walter F. Tichy.
-.br
-Manual Page Revision: \*(Rv; Release Date: \*(Dt.
-.br
-Copyright \(co 1982, 1988, 1989 Walter F. Tichy.
-.br
-Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
-.SH "SEE ALSO"
-rcsintro(1), ci(1), ctime(3), date(1), ident(1), make(1),
-rcs(1), rcsclean(1), rcsdiff(1), rcsmerge(1), rlog(1),
-rcsfile(5)
-.br
-Walter F. Tichy,
-\*r\*-A System for Version Control,
-.I "Software\*-Practice & Experience"
-.BR 15 ,
-7 (July 1985), 637-654.
-.SH LIMITS
-Links to the \*r and working files are not preserved.
-.PP
-There is no way to selectively suppress the expansion of keywords, except
-by writing them differently. In nroff and troff, this is done by embedding the
-null-character
-.B \e&
-into the keyword.
-.br
diff --git a/gnu/usr.bin/rcs/co/co.c b/gnu/usr.bin/rcs/co/co.c
deleted file mode 100644
index 51cb2b277927..000000000000
--- a/gnu/usr.bin/rcs/co/co.c
+++ /dev/null
@@ -1,826 +0,0 @@
-/* Check out working files from revisions of RCS files. */
-
-/* Copyright 1982, 1988, 1989 Walter Tichy
- Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-/*
- * Revision 5.18 1995/06/16 06:19:24 eggert
- * Update FSF address.
- *
- * Revision 5.17 1995/06/01 16:23:43 eggert
- * (main, preparejoin): Pass argument instead of using `join' static variable.
- * (main): Add -kb.
- *
- * Revision 5.16 1994/03/17 14:05:48 eggert
- * Move buffer-flushes out of critical sections, since they aren't critical.
- * Use ORCSerror to clean up after a fatal error. Remove lint.
- * Specify subprocess input via file descriptor, not file name.
- *
- * Revision 5.15 1993/11/09 17:40:15 eggert
- * -V now prints version on stdout and exits. Don't print usage twice.
- *
- * Revision 5.14 1993/11/03 17:42:27 eggert
- * Add -z. Generate a value for the Name keyword.
- * Don't arbitrarily limit the number of joins.
- * Improve quality of diagnostics.
- *
- * Revision 5.13 1992/07/28 16:12:44 eggert
- * Add -V. Check that working and RCS files are distinct.
- *
- * Revision 5.12 1992/02/17 23:02:08 eggert
- * Add -T.
- *
- * Revision 5.11 1992/01/24 18:44:19 eggert
- * Add support for bad_creat0. lint -> RCS_lint
- *
- * Revision 5.10 1992/01/06 02:42:34 eggert
- * Update usage string.
- *
- * Revision 5.9 1991/10/07 17:32:46 eggert
- * -k affects just working file, not RCS file.
- *
- * Revision 5.8 1991/08/19 03:13:55 eggert
- * Warn before removing somebody else's file.
- * Add -M. Fix co -j bugs. Tune.
- *
- * Revision 5.7 1991/04/21 11:58:15 eggert
- * Ensure that working file is newer than RCS file after co -[lu].
- * Add -x, RCSINIT, MS-DOS support.
- *
- * Revision 5.6 1990/12/04 05:18:38 eggert
- * Don't checkaccesslist() unless necessary.
- * Use -I for prompts and -q for diagnostics.
- *
- * Revision 5.5 1990/11/01 05:03:26 eggert
- * Fix -j. Add -I.
- *
- * Revision 5.4 1990/10/04 06:30:11 eggert
- * Accumulate exit status across files.
- *
- * Revision 5.3 1990/09/11 02:41:09 eggert
- * co -kv yields a readonly working file.
- *
- * Revision 5.2 1990/09/04 08:02:13 eggert
- * Standardize yes-or-no procedure.
- *
- * Revision 5.0 1990/08/22 08:10:02 eggert
- * Permit multiple locks by same user. Add setuid support.
- * Remove compile-time limits; use malloc instead.
- * Permit dates past 1999/12/31. Switch to GMT.
- * Make lock and temp files faster and safer.
- * Ansify and Posixate. Add -k, -V. Remove snooping. Tune.
- *
- * Revision 4.7 89/05/01 15:11:41 narten
- * changed copyright header to reflect current distribution rules
- *
- * Revision 4.6 88/08/09 19:12:15 eggert
- * Fix "co -d" core dump; rawdate wasn't always initialized.
- * Use execv(), not system(); fix putchar('\0') and diagnose() botches; remove lint
- *
- * Revision 4.5 87/12/18 11:35:40 narten
- * lint cleanups (from Guy Harris)
- *
- * Revision 4.4 87/10/18 10:20:53 narten
- * Updating version numbers changes relative to 1.1, are actually
- * relative to 4.2
- *
- * Revision 1.3 87/09/24 13:58:30 narten
- * Sources now pass through lint (if you ignore printf/sprintf/fprintf
- * warnings)
- *
- * Revision 1.2 87/03/27 14:21:38 jenkins
- * Port to suns
- *
- * Revision 4.2 83/12/05 13:39:48 wft
- * made rewriteflag external.
- *
- * Revision 4.1 83/05/10 16:52:55 wft
- * Added option -u and -f.
- * Added handling of default branch.
- * Replaced getpwuid() with getcaller().
- * Removed calls to stat(); now done by pairfilenames().
- * Changed and renamed rmoldfile() to rmworkfile().
- * Replaced catchints() calls with restoreints(), unlink()--link() with rename();
- *
- * Revision 3.7 83/02/15 15:27:07 wft
- * Added call to fastcopy() to copy remainder of RCS file.
- *
- * Revision 3.6 83/01/15 14:37:50 wft
- * Added ignoring of interrupts while RCS file is renamed; this avoids
- * deletion of RCS files during the unlink/link window.
- *
- * Revision 3.5 82/12/08 21:40:11 wft
- * changed processing of -d to use DATEFORM; removed actual from
- * call to preparejoin; re-fixed printing of done at the end.
- *
- * Revision 3.4 82/12/04 18:40:00 wft
- * Replaced getdelta() with gettree(), SNOOPDIR with SNOOPFILE.
- * Fixed printing of "done".
- *
- * Revision 3.3 82/11/28 22:23:11 wft
- * Replaced getlogin() with getpwuid(), flcose() with ffclose(),
- * %02d with %.2d, mode generation for working file with WORKMODE.
- * Fixed nil printing. Fixed -j combined with -l and -p, and exit
- * for non-existing revisions in preparejoin().
- *
- * Revision 3.2 82/10/18 20:47:21 wft
- * Mode of working file is now maintained even for co -l, but write permission
- * is removed.
- * The working file inherits its mode from the RCS file, plus write permission
- * for the owner. The write permission is not given if locking is strict and
- * co does not lock.
- * An existing working file without write permission is deleted automatically.
- * Otherwise, co asks (empty answer: abort co).
- * Call to getfullRCSname() added, check for write error added, call
- * for getlogin() fixed.
- *
- * Revision 3.1 82/10/13 16:01:30 wft
- * fixed type of variables receiving from getc() (char -> int).
- * removed unused variables.
- */
-
-
-
-
-#include "rcsbase.h"
-
-static char *addjoin P((char*));
-static char const *getancestor P((char const*,char const*));
-static int buildjoin P((char const*));
-static int preparejoin P((char*));
-static int rmlock P((struct hshentry const*));
-static int rmworkfile P((void));
-static void cleanup P((void));
-
-static char const quietarg[] = "-q";
-
-static char const *expandarg, *suffixarg, *versionarg, *zonearg;
-static char const **joinlist; /* revisions to be joined */
-static int joinlength;
-static FILE *neworkptr;
-static int exitstatus;
-static int forceflag;
-static int lastjoin; /* index of last element in joinlist */
-static int lockflag; /* -1 -> unlock, 0 -> do nothing, 1 -> lock */
-static int mtimeflag;
-static struct hshentries *gendeltas; /* deltas to be generated */
-static struct hshentry *targetdelta; /* final delta to be generated */
-static struct stat workstat;
-
-mainProg(coId, "co", "$FreeBSD$")
-{
- static char const cmdusage[] =
- "\nco usage: co -{fIlMpqru}[rev] -ddate -jjoins -ksubst -sstate -T -w[who] -Vn -xsuff -zzone file ...";
-
- char *a, *joinflag, **newargv;
- char const *author, *date, *rev, *state;
- char const *joinname, *newdate, *neworkname;
- int changelock; /* 1 if a lock has been changed, -1 if error */
- int expmode, r, tostdout, workstatstat;
- int Ttimeflag;
- struct buf numericrev; /* expanded revision number */
- char finaldate[datesize];
-# if OPEN_O_BINARY
- int stdout_mode = 0;
-# endif
-
- setrid();
- author = date = rev = state = 0;
- joinflag = 0;
- bufautobegin(&numericrev);
- expmode = -1;
- suffixes = X_DEFAULT;
- tostdout = false;
- Ttimeflag = false;
-
- argc = getRCSINIT(argc, argv, &newargv);
- argv = newargv;
- while (a = *++argv, 0<--argc && *a++=='-') {
- switch (*a++) {
-
- case 'r':
- revno:
- if (*a) {
- if (rev) warn("redefinition of revision number");
- rev = a;
- }
- break;
-
- case 'f':
- forceflag=true;
- goto revno;
-
- case 'l':
- if (lockflag < 0) {
- warn("-u overridden by -l.");
- }
- lockflag = 1;
- goto revno;
-
- case 'u':
- if (0 < lockflag) {
- warn("-l overridden by -u.");
- }
- lockflag = -1;
- goto revno;
-
- case 'p':
- tostdout = true;
- goto revno;
-
- case 'I':
- interactiveflag = true;
- goto revno;
-
- case 'q':
- quietflag=true;
- goto revno;
-
- case 'd':
- if (date)
- redefined('d');
- str2date(a, finaldate);
- date=finaldate;
- break;
-
- case 'j':
- if (*a) {
- if (joinflag) redefined('j');
- joinflag = a;
- }
- break;
-
- case 'M':
- mtimeflag = true;
- goto revno;
-
- case 's':
- if (*a) {
- if (state) redefined('s');
- state = a;
- }
- break;
-
- case 'T':
- if (*a)
- goto unknown;
- Ttimeflag = true;
- break;
-
- case 'w':
- if (author) redefined('w');
- if (*a)
- author = a;
- else
- author = getcaller();
- break;
-
- case 'x':
- suffixarg = *argv;
- suffixes = a;
- break;
-
- case 'V':
- versionarg = *argv;
- setRCSversion(versionarg);
- break;
-
- case 'z':
- zonearg = *argv;
- zone_set(a);
- break;
-
- case 'k': /* set keyword expand mode */
- expandarg = *argv;
- if (0 <= expmode) redefined('k');
- if (0 <= (expmode = str2expmode(a)))
- break;
- /* fall into */
- default:
- unknown:
- error("unknown option: %s%s", *argv, cmdusage);
-
- };
- } /* end of option processing */
-
- /* Now handle all pathnames. */
- if (nerror) cleanup();
- else if (argc < 1) faterror("no input file%s", cmdusage);
- else for (; 0 < argc; cleanup(), ++argv, --argc) {
- ffree();
-
- if (pairnames(argc, argv, lockflag?rcswriteopen:rcsreadopen, true, false) <= 0)
- continue;
-
- /*
- * RCSname contains the name of the RCS file, and finptr
- * points at it. workname contains the name of the working file.
- * Also, RCSstat has been set.
- */
- diagnose("%s --> %s\n", RCSname, tostdout?"standard output":workname);
-
- workstatstat = -1;
- if (tostdout) {
-# if OPEN_O_BINARY
- int newmode = Expand==BINARY_EXPAND ? OPEN_O_BINARY : 0;
- if (stdout_mode != newmode) {
- stdout_mode = newmode;
- oflush();
- VOID setmode(STDOUT_FILENO, newmode);
- }
-# endif
- neworkname = 0;
- neworkptr = workstdout = stdout;
- } else {
- workstatstat = stat(workname, &workstat);
- if (workstatstat == 0 && same_file(RCSstat, workstat, 0)) {
- rcserror("RCS file is the same as working file %s.",
- workname
- );
- continue;
- }
- neworkname = makedirtemp(1);
- if (!(neworkptr = fopenSafer(neworkname, FOPEN_W_WORK))) {
- if (errno == EACCES)
- workerror("permission denied on parent directory");
- else
- eerror(neworkname);
- continue;
- }
- }
-
- gettree(); /* reads in the delta tree */
-
- if (!Head) {
- /* no revisions; create empty file */
- diagnose("no revisions present; generating empty revision 0.0\n");
- if (lockflag)
- warn(
- "no revisions, so nothing can be %slocked",
- lockflag < 0 ? "un" : ""
- );
- Ozclose(&fcopy);
- if (workstatstat == 0)
- if (!rmworkfile()) continue;
- changelock = 0;
- newdate = 0;
- } else {
- int locks = lockflag ? findlock(false, &targetdelta) : 0;
- if (rev) {
- /* expand symbolic revision number */
- if (!expandsym(rev, &numericrev))
- continue;
- } else {
- switch (locks) {
- default:
- continue;
- case 0:
- bufscpy(&numericrev, Dbranch?Dbranch:"");
- break;
- case 1:
- bufscpy(&numericrev, targetdelta->num);
- break;
- }
- }
- /* get numbers of deltas to be generated */
- if (!(targetdelta=genrevs(numericrev.string,date,author,state,&gendeltas)))
- continue;
- /* check reservations */
- changelock =
- lockflag < 0 ?
- rmlock(targetdelta)
- : lockflag == 0 ?
- 0
- :
- addlock(targetdelta, true);
-
- if (
- changelock < 0
- || (changelock && !checkaccesslist())
- || dorewrite(lockflag, changelock) != 0
- )
- continue;
-
- if (0 <= expmode)
- Expand = expmode;
- if (0 < lockflag && Expand == VAL_EXPAND) {
- rcserror("cannot combine -kv and -l");
- continue;
- }
-
- if (joinflag && !preparejoin(joinflag))
- continue;
-
- diagnose("revision %s%s\n",targetdelta->num,
- 0<lockflag ? " (locked)" :
- lockflag<0 ? " (unlocked)" : "");
-
- /* Prepare to remove old working file if necessary. */
- if (workstatstat == 0)
- if (!rmworkfile()) continue;
-
- /* skip description */
- getdesc(false); /* don't echo*/
-
- locker_expansion = 0 < lockflag;
- targetdelta->name = namedrev(rev, targetdelta);
- joinname = buildrevision(
- gendeltas, targetdelta,
- joinflag&&tostdout ? (FILE*)0 : neworkptr,
- Expand < MIN_UNEXPAND
- );
-# if !large_memory
- if (fcopy == neworkptr)
- fcopy = 0; /* Don't close it twice. */
-# endif
- if_advise_access(changelock && gendeltas->first!=targetdelta,
- finptr, MADV_SEQUENTIAL
- );
-
- if (donerewrite(changelock,
- Ttimeflag ? RCSstat.st_mtime : (time_t)-1
- ) != 0)
- continue;
-
- if (changelock) {
- locks += lockflag;
- if (1 < locks)
- rcswarn("You now have %d locks.", locks);
- }
-
- newdate = targetdelta->date;
- if (joinflag) {
- newdate = 0;
- if (!joinname) {
- aflush(neworkptr);
- joinname = neworkname;
- }
- if (Expand == BINARY_EXPAND)
- workerror("merging binary files");
- if (!buildjoin(joinname))
- continue;
- }
- }
- if (!tostdout) {
- mode_t m = WORKMODE(RCSstat.st_mode,
- ! (Expand==VAL_EXPAND || (lockflag<=0 && StrictLocks))
- );
- time_t t = mtimeflag&&newdate ? date2time(newdate) : (time_t)-1;
- aflush(neworkptr);
- ignoreints();
- r = chnamemod(&neworkptr, neworkname, workname, 1, m, t);
- keepdirtemp(neworkname);
- restoreints();
- if (r != 0) {
- eerror(workname);
- error("see %s", neworkname);
- continue;
- }
- diagnose("done\n");
- }
- }
-
- tempunlink();
- Ofclose(workstdout);
- exitmain(exitstatus);
-
-} /* end of main (co) */
-
- static void
-cleanup()
-{
- if (nerror) exitstatus = EXIT_FAILURE;
- Izclose(&finptr);
- ORCSclose();
-# if !large_memory
- if (fcopy!=workstdout) Ozclose(&fcopy);
-# endif
- if (neworkptr!=workstdout) Ozclose(&neworkptr);
- dirtempunlink();
-}
-
-#if RCS_lint
-# define exiterr coExit
-#endif
- void
-exiterr()
-{
- ORCSerror();
- dirtempunlink();
- tempunlink();
- _exit(EXIT_FAILURE);
-}
-
-
-/*****************************************************************
- * The following routines are auxiliary routines
- *****************************************************************/
-
- static int
-rmworkfile()
-/*
- * Prepare to remove workname, if it exists, and if
- * it is read-only.
- * Otherwise (file writable):
- * if !quietmode asks the user whether to really delete it (default: fail);
- * otherwise failure.
- * Returns true if permission is gotten.
- */
-{
- if (workstat.st_mode&(S_IWUSR|S_IWGRP|S_IWOTH) && !forceflag) {
- /* File is writable */
- if (!yesorno(false, "writable %s exists%s; remove it? [ny](n): ",
- workname,
- myself(workstat.st_uid) ? "" : ", and you do not own it"
- )) {
- error(!quietflag && ttystdin()
- ? "checkout aborted"
- : "writable %s exists; checkout aborted", workname);
- return false;
- }
- }
- /* Actual unlink is done later by caller. */
- return true;
-}
-
-
- static int
-rmlock(delta)
- struct hshentry const *delta;
-/* Function: removes the lock held by caller on delta.
- * Returns -1 if someone else holds the lock,
- * 0 if there is no lock on delta,
- * and 1 if a lock was found and removed.
- */
-{ register struct rcslock * next, * trail;
- char const *num;
- struct rcslock dummy;
- int whomatch, nummatch;
-
- num=delta->num;
- dummy.nextlock=next=Locks;
- trail = &dummy;
- while (next) {
- whomatch = strcmp(getcaller(), next->login);
- nummatch=strcmp(num,next->delta->num);
- if ((whomatch==0) && (nummatch==0)) break;
- /*found a lock on delta by caller*/
- if ((whomatch!=0)&&(nummatch==0)) {
- rcserror("revision %s locked by %s; use co -r or rcs -u",
- num, next->login
- );
- return -1;
- }
- trail=next;
- next=next->nextlock;
- }
- if (next) {
- /*found one; delete it */
- trail->nextlock=next->nextlock;
- Locks=dummy.nextlock;
- next->delta->lockedby = 0;
- return 1; /*success*/
- } else return 0; /*no lock on delta*/
-}
-
-
-
-
-/*****************************************************************
- * The rest of the routines are for handling joins
- *****************************************************************/
-
-
- static char *
-addjoin(joinrev)
- char *joinrev;
-/* Add joinrev's number to joinlist, yielding address of char past joinrev,
- * or 0 if no such revision exists.
- */
-{
- register char *j;
- register struct hshentry *d;
- char terminator;
- struct buf numrev;
- struct hshentries *joindeltas;
-
- j = joinrev;
- for (;;) {
- switch (*j++) {
- default:
- continue;
- case 0:
- case ' ': case '\t': case '\n':
- case ':': case ',': case ';':
- break;
- }
- break;
- }
- terminator = *--j;
- *j = 0;
- bufautobegin(&numrev);
- d = 0;
- if (expandsym(joinrev, &numrev))
- d = genrevs(numrev.string,(char*)0,(char*)0,(char*)0,&joindeltas);
- bufautoend(&numrev);
- *j = terminator;
- if (d) {
- joinlist[++lastjoin] = d->num;
- return j;
- }
- return 0;
-}
-
- static int
-preparejoin(j)
- register char *j;
-/* Parse join list J and place pointers to the
- * revision numbers into joinlist.
- */
-{
- lastjoin= -1;
- for (;;) {
- while ((*j==' ')||(*j=='\t')||(*j==',')) j++;
- if (*j=='\0') break;
- if (lastjoin>=joinlength-2) {
- joinlist =
- (joinlength *= 2) == 0
- ? tnalloc(char const *, joinlength = 16)
- : trealloc(char const *, joinlist, joinlength);
- }
- if (!(j = addjoin(j))) return false;
- while ((*j==' ') || (*j=='\t')) j++;
- if (*j == ':') {
- j++;
- while((*j==' ') || (*j=='\t')) j++;
- if (*j!='\0') {
- if (!(j = addjoin(j))) return false;
- } else {
- rcsfaterror("join pair incomplete");
- }
- } else {
- if (lastjoin==0) { /* first pair */
- /* common ancestor missing */
- joinlist[1]=joinlist[0];
- lastjoin=1;
- /*derive common ancestor*/
- if (!(joinlist[0] = getancestor(targetdelta->num,joinlist[1])))
- return false;
- } else {
- rcsfaterror("join pair incomplete");
- }
- }
- }
- if (lastjoin < 1)
- rcsfaterror("empty join");
- return true;
-}
-
-
-
- static char const *
-getancestor(r1, r2)
- char const *r1, *r2;
-/* Yield the common ancestor of r1 and r2 if successful, 0 otherwise.
- * Work reliably only if r1 and r2 are not branch numbers.
- */
-{
- static struct buf t1, t2;
-
- int l1, l2, l3;
- char const *r;
-
- l1 = countnumflds(r1);
- l2 = countnumflds(r2);
- if ((2<l1 || 2<l2) && cmpnum(r1,r2)!=0) {
- /* not on main trunk or identical */
- l3 = 0;
- while (cmpnumfld(r1, r2, l3+1)==0 && cmpnumfld(r1, r2, l3+2)==0)
- l3 += 2;
- /* This will terminate since r1 and r2 are not the same; see above. */
- if (l3==0) {
- /* no common prefix; common ancestor on main trunk */
- VOID partialno(&t1, r1, l1>2 ? 2 : l1);
- VOID partialno(&t2, r2, l2>2 ? 2 : l2);
- r = cmpnum(t1.string,t2.string)<0 ? t1.string : t2.string;
- if (cmpnum(r,r1)!=0 && cmpnum(r,r2)!=0)
- return r;
- } else if (cmpnumfld(r1, r2, l3+1)!=0)
- return partialno(&t1,r1,l3);
- }
- rcserror("common ancestor of %s and %s undefined", r1, r2);
- return 0;
-}
-
-
-
- static int
-buildjoin(initialfile)
- char const *initialfile;
-/* Function: merge pairs of elements in joinlist into initialfile
- * If workstdout is set, copy result to stdout.
- * All unlinking of initialfile, rev2, and rev3 should be done by tempunlink().
- */
-{
- struct buf commarg;
- struct buf subs;
- char const *rev2, *rev3;
- int i;
- char const *cov[10], *mergev[11];
- char const **p;
-
- bufautobegin(&commarg);
- bufautobegin(&subs);
- rev2 = maketemp(0);
- rev3 = maketemp(3); /* buildrevision() may use 1 and 2 */
-
- cov[1] = CO;
- /* cov[2] setup below */
- p = &cov[3];
- if (expandarg) *p++ = expandarg;
- if (suffixarg) *p++ = suffixarg;
- if (versionarg) *p++ = versionarg;
- if (zonearg) *p++ = zonearg;
- *p++ = quietarg;
- *p++ = RCSname;
- *p = 0;
-
- mergev[1] = MERGE;
- mergev[2] = mergev[4] = "-L";
- /* rest of mergev setup below */
-
- i=0;
- while (i<lastjoin) {
- /*prepare marker for merge*/
- if (i==0)
- bufscpy(&subs, targetdelta->num);
- else {
- bufscat(&subs, ",");
- bufscat(&subs, joinlist[i-2]);
- bufscat(&subs, ":");
- bufscat(&subs, joinlist[i-1]);
- }
- diagnose("revision %s\n",joinlist[i]);
- bufscpy(&commarg, "-p");
- bufscat(&commarg, joinlist[i]);
- cov[2] = commarg.string;
- if (runv(-1, rev2, cov))
- goto badmerge;
- diagnose("revision %s\n",joinlist[i+1]);
- bufscpy(&commarg, "-p");
- bufscat(&commarg, joinlist[i+1]);
- cov[2] = commarg.string;
- if (runv(-1, rev3, cov))
- goto badmerge;
- diagnose("merging...\n");
- mergev[3] = subs.string;
- mergev[5] = joinlist[i+1];
- p = &mergev[6];
- if (quietflag) *p++ = quietarg;
- if (lastjoin<=i+2 && workstdout) *p++ = "-p";
- *p++ = initialfile;
- *p++ = rev2;
- *p++ = rev3;
- *p = 0;
- switch (runv(-1, (char*)0, mergev)) {
- case DIFF_FAILURE: case DIFF_SUCCESS:
- break;
- default:
- goto badmerge;
- }
- i=i+2;
- }
- bufautoend(&commarg);
- bufautoend(&subs);
- return true;
-
- badmerge:
- nerror++;
- bufautoend(&commarg);
- bufautoend(&subs);
- return false;
-}
diff --git a/gnu/usr.bin/rcs/doc/rcs.ms b/gnu/usr.bin/rcs/doc/rcs.ms
deleted file mode 100644
index 20f7defa03c1..000000000000
--- a/gnu/usr.bin/rcs/doc/rcs.ms
+++ /dev/null
@@ -1,1518 +0,0 @@
-.\" Format this file with:
-.\" pic file | tbl | troff -ms
-.\"
-.\" \*s stands for $, and avoids problems when this file is checked in.
-.ds s $
-.de D(
-.DS
-.nr VS 12p
-.vs 12p
-.I
-..
-.de D)
-.DE
-.nr VS 18p
-.vs 18p
-.R
-..
-.de Id
-.ND 1 June 1995
-..
-.Id $FreeBSD$
-.RP
-.TL
-RCS\*-A System for Version Control
-.sp
-.AU
-Walter F. Tichy
-.AI
-Department of Computer Sciences
-Purdue University
-West Lafayette, Indiana 47907
-.sp
-.AB
-An important problem in program development and maintenance is version control,
-i.e., the task of keeping a software system consisting of many versions and
-configurations well organized.
-The Revision Control System (RCS)
-is a software tool that assists with that task.
-RCS manages revisions of text documents, in particular source programs,
-documentation, and test data.
-It automates the storing, retrieval, logging and identification of revisions,
-and it provides selection mechanisms for composing configurations.
-This paper introduces basic version control concepts and
-discusses the practice of version control
-using RCS.
-For conserving space, RCS stores deltas, i.e., differences between
-successive revisions. Several delta storage methods are discussed.
-Usage statistics show that RCS's delta storage method is
-space and time efficient.
-The paper concludes with a detailed survey of version control tools.
-.sp
-\fBKeywords\fR: configuration management, history management,
-version control, revisions, deltas.
-.AE
-.FS
-An earlier version of this paper was published in
-.I "Software\*-Practice & Experience"
-.B 15 ,
-7 (July 1985), 637-654.
-.FE
-.nr VS 18p
-.LP
-.NH
-Introduction
-.PP
-Version control is the task of keeping software
-systems consisting of many versions and configurations well organized.
-The Revision Control System (RCS) is a set of UNIX
-commands that assist with that task.
-.PP
-RCS' primary function is to manage \fIrevision groups\fR.
-A revision group is a set of text documents, called \fIrevisions\fR,
-that evolved from each other. A new revision is
-created by manually editing an existing one.
-RCS organizes the revisions into an ancestral tree. The initial revision
-is the root of the tree, and the tree edges indicate
-from which revision a given one evolved.
-Besides managing individual revision groups, RCS provides
-flexible selection functions for composing configurations.
-RCS may be combined with MAKE\u1\d,
-resulting in a powerful package for version control.
-.PP
-RCS also offers facilities for
-merging updates with customer modifications,
-for distributed software development, and
-for automatic identification.
-Identification is the `stamping'
-of revisions and configurations with unique markers.
-These markers are akin to serial numbers,
-telling software maintainers unambiguously which configuration
-is before them.
-.PP
-RCS is designed for both production and experimental
-environments.
-In production environments,
-access controls detect update conflicts and prevent overlapping changes.
-In experimental environments, where strong controls are
-counterproductive, it is possible to loosen the controls.
-.PP
-Although RCS was originally intended for programs, it is useful for any
-text that is revised frequently and whose previous revisions must be
-preserved. RCS has been applied successfully to store the source
-text for drawings, VLSI layouts, documentation, specifications,
-test data, form letters and articles.
-.PP
-This paper discusses the practice of
-version control using RCS.
-It also introduces basic version control concepts,
-useful for clarifying current practice and designing similar systems.
-Revision groups of individual components are treated in the next three sections,
-and the extensions to configurations follow.
-Because of its size, a survey of version control tools
-appears at the end of the paper.
-.NH
-Getting started with RCS
-.PP
-Suppose a text file \fIf.c\fR is to be placed under control of RCS.
-Invoking the check-in command
-.D(
-ci f.c
-.D)
-creates a new revision group with the contents of
-\fIf.c\fR as the initial
-revision (numbered 1.1)
-and stores the group into the file \fIf.c,v\fR.
-Unless told otherwise, the command deletes \fIf.c\fR.
-It also asks for a description of the group.
-The description should state the common purpose of all revisions in the group,
-and becomes part of the group's documentation.
-All later check-in commands will ask for a log entry,
-which should summarize the changes made.
-(The first revision is assigned a default log message,
-which just records the fact that it is the initial revision.)
-.PP
-Files ending in \fI,v\fR
-are called \fIRCS files\fR (\fIv\fR stands for \fIv\fRersions);
-the others are called working files.
-To get back the working file \fIf.c\fR in the previous example,
-execute the check-out command:
-.D(
-co f.c
-.D)
-.R
-This command extracts the latest revision from
-the revision group \fIf.c,v\fR and writes
-it into \fIf.c\fR.
-The file \fIf.c\fR can now be edited and, when finished,
-checked back in with \fIci\fR:
-.D(
-ci f.c
-.D)
-\fICi\fR assigns number 1.2 to
-the new revision.
-If \fIci\fR complains with the message
-.D(
-ci error: no lock set by <login>
-.D)
-then the system administrator has decided to configure RCS for a
-production environment by enabling the `strict locking feature'.
-If this feature is enabled, all RCS files are initialized
-such that check-in operations require a lock on the previous revision
-(the one from which the current one evolved).
-Locking prevents overlapping modifications if several people work on the same file.
-If locking is required, the revision should
-have been locked during the check-out by using
-the option \fI\-l\fR:
-.D(
-co \-l f.c
-.D)
-Of course it is too late now for the check-out with locking, because
-\fIf.c\fR has already been changed; checking out the file again
-would overwrite the modifications.
-(To prevent accidental overwrites, \fIco\fR senses the presence
-of a working file and asks whether the user really intended to overwrite it.
-The overwriting check-out is sometimes useful for
-backing up to the previous revision.)
-To be able to proceed with the check-in in the present case, first execute
-.D(
-rcs \-l f.c
-.D)
-This command retroactively locks the latest revision, unless someone
-else locked it in the meantime. In this case, the two programmers
-involved have to negotiate whose
-modifications should take precedence.
-.PP
-If an RCS file is private, i.e., if only the owner of the file is expected
-to deposit revisions into it, the strict locking feature is unnecessary and
-may be disabled.
-If strict locking is disabled,
-the owner of the RCS file need not have a lock for check-in.
-For safety reasons, all others
-still do. Turning strict locking off and on is done with the commands:
-.D(
-rcs \-U f.c \fRand\fP rcs \-L f.c
-.D)
-These commands enable or disable the strict locking feature for each RCS file
-individually.
-The system administrator only decides whether strict locking is
-enabled initially.
-.PP
-To reduce the clutter in a working directory, all RCS files can be moved
-to a subdirectory with the name \fIRCS\fR.
-RCS commands look first into that directory for RCS files.
-All the commands presented above work
-with the \fIRCS\fR subdirectory without change.\(dg
-.FS \(dg
-Pairs of RCS and working files can actually be specified in 3 ways:
-a) both are given, b) only the working file is given, c) only the
-RCS file is given.
-If a pair is given, both files may have arbitrary path prefixes;
-RCS commands pair them up intelligently.
-.FE
-.PP
-It may be undesirable that \fIci\fR deletes the working file.
-For instance, sometimes one would like to save the current revision,
-but continue editing.
-Invoking
-.D(
-ci \-l f.c
-.D)
-checks in \fIf.c\fR as usual, but performs an additional
-check-out with locking afterwards. Thus, the working file does
-not disappear after the check-in.
-Similarly, the option
-\fI\-u\fR does a check-in followed by a check-out without
-locking. This option is useful if the file is needed for compilation after the check-in.
-Both options update the identification markers in the working file
-(see below).
-.PP
-Besides the operations \fIci\fR and \fIco\fR, RCS provides the following
-commands:
-.sp 0
-.nr VS 12p
-.vs 12p
-.TS
-tab(%);
-li l.
-ident%extract identification markers
-rcs%change RCS file attributes
-rcsclean%remove unchanged working files (optional)
-rcsdiff%compare revisions
-rcsfreeze%record a configuration (optional)
-rcsmerge%merge revisions
-rlog%read log messages and other information in RCS files
-.TE
-A synopsis of these commands appears in the Appendix.
-.NH 2
-Automatic Identification
-.PP
-RCS can stamp source and object code with special identification strings,
-similar to product and serial numbers.
-To obtain such identification, place the marker
-.D(
-\*sId\*s
-.D)
-into the text of a revision, for instance inside a comment.
-The check-out operation will replace this marker with a string of the form
-.D(
-\*sId: filename revisionnumber date time author state locker \*s
-.D)
-This string need never be touched, because \fIco\fR keeps it
-up to date automatically.
-To propagate the marker into object code, simply put
-it into a literal character string. In C, this is done as follows:
-.D(
-static char rcsid[] = \&"\*sId\*s\&";
-.D)
-The command \fIident\fR extracts such markers from any file, in particular from
-object code.
-\fIIdent\fR helps to find out
-which revisions of which modules were used in a given program.
-It returns a complete and unambiguous component list,
-from which a copy of the program can be reconstructed.
-This facility is invaluable for program maintenance.
-.PP
-There are several additional identification markers, one for each component
-of \*sId\*s.
-The marker
-.D(
-\*sLog\*s
-.D)
-has a similar function. It accumulates
-the log messages that are requested during check-in.
-Thus, one can maintain the complete history of a revision directly inside it,
-by enclosing it in a comment.
-Figure 1 is an edited version of a log contained in revision 4.1 of
-the file \fIci.c\fR. The log appears at the beginning of the file,
-and makes it easy to determine what the recent modifications were.
-.sp
-.nr VS 12p
-.vs 12p
-.ne 18
-.nf
-.in +0.5i
-/*
-.in +\w'/'u
-* \*sLog: ci.c,v \*s
-* Revision 4.1 1983/05/10 17:03:06 wft
-* Added option \-d and \-w, and updated assignment of date, etc. to new delta.
-* Added handling of default branches.
-*
-* Revision 3.9 1983/02/15 15:25:44 wft
-* Added call to fastcopy() to copy remainder of RCS file.
-*
-* Revision 3.8 1983/01/14 15:34:05 wft
-* Added ignoring of interrupts while new RCS file is renamed;
-* avoids deletion of RCS files by interrupts.
-*
-* Revision 3.7 1982/12/10 16:09:20 wft
-* Corrected checking of return code from diff.
-* An RCS file now inherits its mode during the first ci from the working file,
-* except that write permission is removed.
-*/
-.in 0
-.ce 1
-Figure 1. Log entries produced by the marker \*sLog\*s.
-.fi
-.nr VS 18p
-.vs 18p
-.sp 0
-.LP
-Since revisions are stored in the form of differences,
-each log message is
-physically stored once,
-independent of the number of revisions present.
-Thus, the \*sLog\*s marker incurs negligible space overhead.
-.NH
-The RCS Revision Tree
-.PP
-RCS arranges revisions in an ancestral tree.
-The \fIci\fR command builds this tree; the auxiliary command \fIrcs\fR
-prunes it.
-The tree has a root revision, normally numbered 1.1, and successive revisions
-are numbered 1.2, 1.3, etc. The first field of a revision number
-is called the \fIrelease number\fR and the second one
-the \fIlevel number\fR. Unless given explicitly,
-the \fIci\fR command assigns a new revision number
-by incrementing the level number of the previous revision.
-The release number must be incremented explicitly, using the
-\fI\-r\fR option of \fIci\fR.
-Assuming there are revisions 1.1, 1.2, and 1.3 in the RCS file f.c,v, the command
-.D(
-ci \-r2.1 f.c \fRor\fP ci \-r2 f.c
-.D)
-assigns the number 2.1 to the new revision.
-Later check-ins without the \fI\-r\fR option will assign the numbers 2.2, 2.3,
-and so on.
-The release number should be incremented only at major transition points
-in the development, for instance when a new release of a software product has
-been completed.
-.NH 2
-When are branches needed?
-.PP
-A young revision tree is slender:
-It consists of only one branch, called the trunk.
-As the tree ages, side branches may form.
-Branches are needed in the following 4 situations.
-.IP "\fITemporary fixes\fR"
-.sp 0
-Suppose a tree has 5 revisions grouped in 2 releases,
-as illustrated in Figure 2.
-Revision 1.3, the last one of release 1, is in operation at customer sites,
-while release 2 is in active development.
-.ne 4
-.PS 4i
-.ps -2
-box "1.1"
-arrow
-box "1.2"
-arrow
-box "1.3"
-arrow
-box "2.1"
-arrow
-box "2.2"
-arrow dashed
-.ps +2
-.PE
-.ce 1
-Figure 2. A slender revision tree.
-.sp 0
-Now imagine a customer requesting a fix of
-a problem in revision 1.3, although actual development has moved on
-to release 2. RCS does not permit an extra
-revision to be spliced in between 1.3 and 2.1, since that would not reflect
-the actual development history. Instead, create a branch
-at revision 1.3, and check in the fix on that branch.
-The first branch starting at 1.3 has number 1.3.1, and
-the revisions on that branch are numbered 1.3.1.1, 1.3.1.2, etc.
-The double numbering is needed to allow for another
-branch at 1.3, say 1.3.2.
-Revisions on the second branch would be numbered
-1.3.2.1, 1.3.2.2, and so on.
-The following steps create
-branch 1.3.1 and add revision 1.3.1.1:
-.sp 0
-.I
-.nr VS 12p
-.vs 12p
-.TS
-tab(%);
-l l l.
- %co \-r1.3 f.c% \*- check out revision 1.3
- %edit f.c% \*- change it
- %ci \-r1.3.1 f.c% \*- check it in on branch 1.3.1
-.TE
-.nr VS 18p
-.vs 18p
-.R
-This sequence of commands transforms the tree of Figure 2 into
-the one in Figure 3.
-Note that it may be necessary to incorporate the differences
-between 1.3 and 1.3.1.1
-into a revision at level 2. The operation \fIrcsmerge\fR automates this
-process (see the Appendix).
-.ne 7
-.PS 4i
-.ps -2
- box "1.1"
- arrow
- box "1.2"
- arrow
-R13: box "1.3"
- arrow
-R21: box "2.1"
- arrow
-R22: box "2.2"
- arrow dashed
- line invis down from R21.s
-RB1: box "1.3.1.1"
- arrow dashed right from RB1.e
- arrow from R13.s to RB1.w
-.ps +2
-.PE
-.ce 1
-Figure 3. A revision tree with one side branch
-.sp
-.IP "\fIDistributed development and customer modifications\fR"
-.sp 0
-Assume a situation as in Figure 2, where revision 1.3 is in operation
-at several customer sites,
-while release 2 is in development.
-Customer sites should use RCS to store the distributed software.
-However, customer modifications should not be placed on the same branch
-as the distributed source; instead, they should be placed on a side branch.
-When the next software distribution arrives,
-it should be appended to the trunk of
-the customer's RCS file, and the customer
-can then merge the local modifications back into the new release.
-In the above example, a
-customer's RCS file would contain the following tree, assuming
-that the customer has received revision 1.3, added his local modifications
-as revision 1.3.1.1, then received revision 2.4, and merged
-2.4 and 1.3.1.1, resulting in 2.4.1.1.
-.ne 7
-.PS 4i
-.ps -2
-R13: box "1.3"
- line invis
-R21: box invis
- line invis
-R22: box invis
- line invis
-R24: box "2.4"
- line invis
-R25: box invis
- line invis
- arrow from R13.e to R24.w
- line invis down from R21.s
-RB1: box "1.3.1.1"
- arrow from R13.s to RB1.w
- right
- line invis down from R25.s
-RB2: box "2.4.1.1"
- arrow from R24.s to RB2.w
-.ps +2
-.PE
-.ce 1
-Figure 4. A customer's revision tree with local modifications.
-.sp 1
-This approach is actually practiced in the CSNET project,
-where several universities and a company cooperate
-in developing a national computer network.
-.IP "\fIParallel development\fR"
-.sp 0
-Sometimes it is desirable to explore an alternate design or
-a different implementation technique in parallel with the
-main line development. Such development
-should be carried out on a side branch.
-The experimental changes may later be moved into the main line, or abandoned.
-.IP "\fIConflicting updates\fR"
-.sp 0
-A common occurrence is that one programmer
-has checked out a revision, but cannot complete the assignment
-for some reason. In the meantime, another person
-must perform another modification
-immediately. In that case, the second person should check-out the same revision,
-modify it, and check it in on a side branch, for later merging.
-.PP
-Every node in a revision tree consists of the following attributes:
-a revision number, a check-in date and time, the author's identification,
-a log entry, a state and the actual text. All these attributes
-are determined at the time the revision is checked in.
-The state attribute indicates the status of a revision.
-It is set automatically to `experimental' during check-in.
-A revision can later be promoted to a higher status, for example
-`stable' or `released'. The set of states is user-defined.
-.NH 2
-Revisions are represented as deltas
-.PP
-For conserving space, RCS stores revisions in the form
-of deltas, i.e., as differences between revisions.
-The user interface completely hides this fact.
-.PP
-A delta is a sequence of edit commands that transforms one string
-into another. The deltas employed by RCS are line-based, which means
-that the only edit commands allowed are insertion and deletion of lines.
-If a single character in a line is changed, the
-edit scripts consider the entire line changed.
-The program \fIdiff\fR\u2\d
-produces a small, line-based delta between pairs of text files.
-A character-based edit script would take much longer to compute,
-and would not be significantly shorter.
-.PP
-Using deltas is a classical space-time tradeoff: deltas reduce the
-space consumed, but increase access time.
-However, a version control tool should impose as little delay
-as possible on programmers.
-Excessive delays discourage the use of version controls,
-or induce programmers to take shortcuts that compromise system integrity.
-To gain reasonably fast access time for both editing and compiling,
-RCS arranges deltas in the following way.
-The most recent revision on the trunk is stored intact.
-All other revisions on the trunk are stored as reverse deltas.
-A reverse delta describes how to go backward in the development history:
-it produces the desired revision if applied to the successor of that revision.
-This implementation has the advantage
-that extraction of the latest revision is a simple and fast copy
-operation.
-Adding a new revision to the trunk is also fast: \fIci\fR simply
-adds the new revision intact, replaces the previous
-revision with a reverse delta, and keeps the rest of the old deltas.
-Thus, \fIci\fR requires the computation
-of only one new delta.
-.PP
-Branches need special treatment. The naive solution would be to
-store complete copies for the tips of all branches.
-Clearly, this approach would cost too much space. Instead,
-RCS uses \fIforward\fR deltas for branches. Regenerating a revision
-on a side branch proceeds as follows. First, extract the latest revision
-on the trunk; secondly, apply reverse deltas until the fork revision for
-the branch is obtained; thirdly, apply forward deltas until the desired
-branch revision is reached. Figure 5 illustrates a tree with
-one side branch. Triangles pointing to the left and right represent
-reverse and forward deltas, respectively.
-.ne 8
-.PS 4i
-.ps -2
-define BD X [line invis $1 right .5;
-line up .3 then left .5 down .3 then right .5 down .3 then up .3] X
-
-define FD X [line invis $1 right .5;
-line left .5 down .3 then up .6 then right .5 down .3;] X
-
-right
-D11: BD(" 1.1")
- arrow right from D11.e
-D12: BD(" 1.2")
- arrow right from D12.e
-D13: BD(" 1.3")
- arrow right from D13.e
-D21: BD(" 2.1")
- arrow right from D21.e
-D22: box "2.2"
- line invis down from D21.s
-F1: FD("1.3.1.1 ")
- arrow from D13.se to F1.w
- arrow from F1.e right
- right
-F2: FD("1.3.1.2 ")
-.ps +2
-.PE
-.ce 1
-Figure 5. A revision tree with reverse and forward deltas.
-.sp 0
-.PP
-Although implementing fast check-out for the latest trunk revision,
-this arrangement has the disadvantage that generation of other revisions
-takes time proportional to the number of deltas applied. For example,
-regenerating the branch tip in Figure 5 requires application of five
-deltas (including the initial one). Since usage statistics show that
-the latest trunk revision is the one that is retrieved in 95 per cent
-of all cases (see the section on usage statistics), biasing check-out time
-in favor of that revision results in significant savings.
-However, careful implementation of the delta application process is
-necessary to provide low retrieval overhead for other revisions, in
-particular for branch tips.
-.PP
-There are several techniques for delta application.
-The naive one is to pass each delta to a general-purpose text editor.
-A prototype of RCS invoked the UNIX editor \fIed\fR both
-for applying deltas and for expanding the identification markers.
-Although easy to implement, performance was poor, owing to the
-high start-up costs and excess generality of \fIed\fR. An intermediate
-version of RCS used a special-purpose, stream-oriented editor.
-This technique reduced the cost of applying a delta to the cost of
-checking out the latest trunk revision. The reason for this behavior
-is that each delta application involves a complete pass over
-the preceding revision.
-.PP
-However, there is a much better algorithm. Note that the deltas are
-line oriented and that most of the work of a stream editor involves
-copying unchanged lines from one revision to the next. A faster
-algorithm avoids unnecessary copying of character strings by using
-a \fIpiece table\fR.
-A piece table is a one-dimensional array, specifying how a given
-revision is `pieced together' from lines in the RCS file.
-Suppose piece table \fIPT\dr\u\fR represents revision \fIr\fR.
-Then \fIPT\dr\u[i]\fR contains the starting position of line \fIi\fR
-of revision \fIr\fR.
-Application of the next delta transforms piece table \fIPT\dr\u\fR
-into \fIPT\dr+1\u\fR. For instance, a delete command removes a
-series of entries from the piece table. An insertion command inserts
-new entries, moving the entries following the insertion point further down the
-array. The inserted entries point to the text lines in the delta.
-Thus, no I/O is involved except for reading the delta itself. When all
-deltas have been applied to the piece table, a sequential pass
-through the table looks up each line in the RCS file and copies it to
-the output file, updating identification markers at the same time.
-Of course, the RCS file must permit random access, since the copied
-lines are scattered throughout that file. Figure 6 illustrates an
-RCS file with two revisions and the corresponding piece tables.
-.ne 13
-.sp 6
-.ce 1
-\fIFigure 6 is not available.\fP
-.sp 5
-.ce 1
-Figure 6. An RCS file and its piece tables
-.sp 0
-.PP
-The piece table approach has the property that the time for applying a single
-delta is roughly determined by the size of the delta, and not by the
-size of the revision. For example, if a delta is
-10 per cent of the size of a revision, then applying it takes only
-10 per cent of the time to generate the latest trunk revision. (The stream
-editor would take 100 per cent.)
-.PP
-There is an important alternative for representing deltas that affects
-performance. SCCS\u3\d,
-a precursor of RCS, uses \fIinterleaved\fR deltas.
-A file containing interleaved deltas is partitioned into blocks of lines.
-Each block has a header that specifies to which revision(s) the block
-belongs. The blocks are sorted out in such a way that a single
-pass over the file can pick up all the lines belonging to a given
-revision. Thus, the regeneration time for all revisions is the same:
-all headers must be inspected, and the associated blocks either copied
-or skipped. As the number of revisions increases, the cost of retrieving
-any revision is much higher than the cost of checking out the
-latest trunk revision with reverse deltas. A detailed comparison
-of SCCS's interleaved deltas and RCS's reverse deltas can be found
-in Reference 4.
-This reference considers the version of RCS with the
-stream editor only. The piece table method improves performance
-further, so that RCS is always faster than SCCS, except if 10
-or more deltas are applied.
-.PP
-Additional speed-up for both delta methods can be obtained by caching
-the most recently generated revision, as has been implemented in DSEE.\u5\d
-With caching, access time to frequently used revisions can approach normal file
-access time, at the cost of some additional space.
-.NH
-Locking: A Controversial Issue
-.PP
-The locking mechanism for RCS was difficult to design.
-The problem and its solution are first presented in their `pure' form,
-followed by a discussion of the complications
-caused by `real-world' considerations.
-.PP
-RCS must prevent two or more persons from depositing competing changes of the
-same revision.
-Suppose two programmers check out revision 2.4 and
-modify it. Programmer A checks in a revision before programmer B\&.
-Unfortunately, programmer B has not seen A's
-changes, so the effect is that A's changes are covered up by B's deposit.
-A's changes are not lost since all revisions
-are saved, but they are confined to a single revision.\(dd
-.FS \(dd
-Note that this problem is entirely different from the atomicity problem.
-Atomicity means that
-concurrent update operations on the same RCS file cannot be permitted,
-because that may result in inconsistent data.
-Atomic updates are essential (and implemented in RCS),
-but do not solve the conflict discussed here.
-.FE
-.PP
-This conflict is prevented in RCS by locking.
-Whenever someone intends to edit a revision (as opposed
-to reading or compiling it), the revision should be checked out
-and locked,
-using the \fI\-l\fR option on \fIco\fR. On subsequent check-in,
-\fIci\fR tests the lock and then removes it.
-At most one programmer at a time may
-lock a particular revision, and only this programmer may check in
-the succeeding revision.
-Thus, while a revision is locked, it is the exclusive responsibility
-of the locker.
-.PP
-An important maxim for software tools like RCS is that they must
-not stand in the way of making progress with a project.
-This consideration leads to several weakenings of the locking mechanism.
-First of all, even if a revision is locked, it can
-still be checked out. This is necessary if other people
-wish to compile or inspect the locked revision
-while the next one is in preparation. The only operations they
-cannot do are to lock the revision or to check in the succeeding one. Secondly,
-check-in operations on other branches in the RCS file are still possible; the
-locking of one revision does not affect any other revision.
-Thirdly, revisions are occasionally locked for a long period of time
-because a programmer is absent or otherwise unable to complete
-the assignment. If another programmer has to make a pressing change,
-there are the following three alternatives for making progress:
-a) find out who is holding the lock and ask that person to release it;
-b) check out the locked revision, modify it, check it
-in on a branch, and merge the changes later;
-c) break the lock. Breaking a lock leaves a highly visible
-trace, namely an electronic mail message that is sent automatically to the
-holder of the lock, recording the breaker and a commentary requested from him.
-Thus, breaking locks is tolerated under certain circumstances,
-but will not go unnoticed.
-Experience has shown that the automatic mail message attaches a high enough
-stigma to lock breaking,
-such that programmers break locks only in real emergencies,
-or when a co-worker resigns and leaves locked revisions behind.
-.PP
-If an RCS file is private, i.e., when a programmer owns an RCS file
-and does not expect anyone else to perform check-in operations,
-locking is an unnecessary nuisance.
-In this case,
-the `strict locking feature' discussed earlier may be disabled,
-provided that file protection
-is set such that only the owner may write the RCS file.
-This has the effect that only the owner can check-in revisions,
-and that no lock is needed for doing so.
-.PP
-As added protection,
-each RCS file contains an access list that specifies the users
-who may execute update operations. If an access list is empty,
-only normal UNIX file protection applies. Thus, the access list is
-useful for restricting the set of people who would otherwise have update
-permission. Just as with locking, the access list
-has no effect on read-only operations such as \fIco\fR. This approach
-is consistent with the UNIX philosophy of openness, which contributes
-to a productive software development environment.
-.NH
-Configuration Management
-.PP
-The preceding sections described how RCS deals with revisions of individual
-components; this section discusses how to handle configurations.
-A configuration is a set of revisions, where each revision comes
-from a different revision group, and the revisions are selected
-according to a certain criterion.
-For example,
-in order to build a functioning compiler, the `right'
-revisions from the scanner, the parser, the optimizer
-and the code generator must be combined.
-RCS, in conjunction with MAKE,
-provides a number of facilities to effect a smooth selection.
-.NH 2
-RCS Selection Functions
-.PP
-.IP "\fIDefault selection\fR"
-.sp 0
-During development, the usual selection criterion is to choose
-the latest revision of all components. The \fIco\fR command
-makes this selection by default. For example, the command
-.D(
-co *,v
-.D)
-retrieves the latest revision on the default branch of each RCS file
-in the current directory.
-The default branch is usually the trunk, but may be
-set to be a side branch.
-Side branches as defaults are needed in distributed software development,
-as discussed in the section on the RCS revision tree.
-.sp
-.IP "\fIRelease based selection\fR"
-.sp 0
-Specifying a release or branch number selects the latest revision in
-that release or branch.
-For instance,
-.D(
-co \-r2 *,v
-.D)
-retrieves the latest revision with release number 2 from each RCS file.
-This selection is convenient if a release has been completed and
-development has moved on to the next release.
-.sp
-.IP "\fIState and author based selection\fR"
-.sp 0
-If the highest level number within a given release number
-is not the desired one,
-the state attribute can help. For example,
-.D(
-co \-r2 \-sReleased *,v
-.D)
-retrieves the latest revision with release number 2 whose state attribute
-is `Released'.
-Of course, the state attribute has to be set appropriately, using the
-\fIci\fR or \fIrcs\fR commands.
-Another alternative is to select a revision by its author,
-using the \fI\-w\fR option.
-.sp
-.IP "\fIDate based selection\fR"
-.sp 0
-Revisions may also be selected by date.
-Suppose a release of an entire system was
-completed and current on March 4, at 1:00 p.m. local time. Then the command
-.D(
-co \-d'March 4, 1:00 pm LT' *,v
-.D)
-checks out all the components of that release, independent of the numbering.
-The \fI\-d\fR option specifies a `cutoff date', i.e.,
-the revision selected has a check-in date that
-is closest to, but not after the date given.
-.IP "\fIName based selection\fR"
-.sp 0
-The most powerful selection function is based on assigning symbolic
-names to revisions and branches.
-In large systems, a single release number or date is not sufficient
-to collect the appropriate revisions from all groups.
-For example, suppose one wishes to combine release 2
-of one subsystem and release 15 of another.
-Most likely, the creation dates of those releases differ also.
-Thus, a single revision number or date passed to the \fIco\fR command
-will not suffice to select the right revisions.
-Symbolic revision numbers solve this problem.
-Each RCS file may contain a set of symbolic names that are mapped
-to numeric revision numbers. For example, assume
-the symbol \fIV3\fR is bound to release number 2 in file \fIs,v\fR, and to
-revision number 15.9 in \fIt,v\fR.
-Then the single command
-.D(
-co \-rV3 s,v t,v
-.D)
-retrieves the latest revision of release 2 from \fIs,v\fR,
-and revision 15.9 from \fIt,v\fR.
-In a large system with many modules, checking out all
-revisions with one command greatly simplifies configuration management.
-.PP
-Judicious use of symbolic revision numbers helps with organizing
-large configurations.
-A special command, \fIrcsfreeze\fR,
-assigns a symbolic revision number to a selected revision
-in every RCS file.
-\fIRcsfreeze\fR effectively freezes a configuration.
-The assigned symbolic revision number selects all components
-of the configuration.
-If necessary, symbolic numbers
-may even be intermixed with numeric ones. Thus, \fIV3.5\fR in the
-above example
-would select revision 2.5 in \fIs,v\fR and branch 15.9.5 in \fIt,v\fR.
-.PP
-The options \fI\-r\fR, \fI\-s\fR, \fI\-w\fR and \fI\-d\fR
-may be combined. If a branch is given, the latest revision
-on that branch satisfying all conditions is retrieved;
-otherwise, the default branch is used.
-.NH 2
-Combining MAKE and RCS
-.PP
-MAKE\u1\d
-is a program that processes configurations.
-It is driven by configuration specifications
-recorded in a special file, called a `Makefile'.
-MAKE avoids redundant processing steps
-by comparing creation dates of source and processed objects.
-For example, when instructed to compile all
-modules of a given system, it only recompiles
-those source modules that were changed
-since they were processed last.
-.PP
-MAKE has been extended with an auto-checkout feature for RCS.*
-.FS *
-This auto-checkout extension is available only in some versions of MAKE,
-e.g. GNU MAKE.
-.FE
-When a certain file to be processed is not present,
-MAKE attempts a check-out operation.
-If successful, MAKE performs the required processing, and then deletes
-the checked out file to conserve space.
-The selection parameters discussed above can be passed to MAKE
-either as parameters, or directly embedded in the Makefile.
-MAKE has also been extended to search the subdirectory named \fIRCS\fR
-for needed files, rather than just the current working directory.
-However, if a working file is present, MAKE totally ignores the corresponding
-RCS file and uses the working file.
-(In newer versions of MAKE distributed by AT&T and others,
-auto-checkout can be
-achieved with the rule DEFAULT, instead of a special extension of MAKE.
-However, a file checked out by the rule DEFAULT
-will not be deleted after processing. \fIRcsclean\fR can be
-used for that purpose.)
-.PP
-With auto-checkout, RCS/MAKE can effect a selection rule
-especially tuned for multi-person software development and maintenance.
-In these situations,
-programmers should obtain configurations that consist of
-the revisions they have personally checked out plus the latest
-checked in revision of all other revision groups.
-This schema can be set up as follows.
-.PP
-Each programmer chooses a working directory
-and places into it a symbolic link, named \fIRCS\fR,
-to the directory containing the relevant RCS files.
-The symbolic link makes sure that \fIco\fR and \fIci\fR
-operations need only specify the working files, and that
-the Makefile need not be changed.
-The programmer then checks out the needed files and modifies them.
-If MAKE is invoked,
-it composes configurations by selecting those
-revisions that are checked out, and the rest from the
-subdirectory \fIRCS\fR.
-The latter selection may be controlled by a symbolic
-revision number or any of the other selection criteria.
-If there are several programmers editing in separate working directories,
-they are insulated from each other's changes until checking in their
-modifications.
-.PP
-Similarly, a maintainer can recreate an older configuration
-by starting to work in an empty working directory.
-During the initial MAKE invocation, all revisions are selected from RCS files.
-As the maintainer checks out files and modifies them,
-a new configuration is gradually built up.
-Every time MAKE is invoked, it substitutes the modified revisions
-into the configuration being manipulated.
-.PP
-A final application of RCS is to use it for storing Makefiles.
-Revision groups of Makefiles represent
-multiple versions of configurations.
-Whenever a configuration is baselined or distributed,
-the best approach is to unambiguously fix
-the configuration with a symbolic revision number by calling
-\fIrcsfreeze\fR,
-to embed that symbol into the Makefile, and to
-check in the Makefile (using the same symbolic revision number).
-With this approach, old configurations
-can be regenerated easily and reliably.
-.NH
-Usage Statistics
-.PP
-The following usage statistics were collected on two DEC VAX-11/780
-computers of the Purdue Computer Science Department. Both machines
-are mainly used for research purposes. Thus, the data
-reflect an environment in which the majority of projects
-involve prototyping and advanced software development,
-but relatively little long-term maintenance.
-.PP
-For the first experiment,
-the \fIci\fR and \fIco\fR operations were instrumented
-to log the number of backward and forward deltas applied.
-The data were collected during a 13 month period
-from Dec. 1982 to Dec. 1983.
-Table I summarizes the results.
-.sp 0
-.nr VS 12p
-.vs 12p
-.TS
-center,box,tab(#);
-c|c|c|c|c s|c s
-c|c|c|c|c s|c s
-l|n|n|n|n n|n n.
-Operation#Total#Total deltas#Mean deltas#Operations#Branch
- #operations #applied#applied#with >1 delta#operations
-_
-co # 7867# 9320#1.18#509#(6%)#203#(3%)
-ci # 3468# 2207#0.64# 85#(2%)# 75#(2%)
-ci & co#11335#11527#1.02#594#(5%)#278#(2%)
-.TE
-.ce 1
-Table I. Statistics for \fIco\fR and \fIci\fR operations.
-.nr VS 18p
-.vs 18p
-.PP
-The first two lines show statistics for check-out and check-in;
-the third line shows the combination.
-Recall that \fIci\fR performs an implicit check-out to obtain
-a revision for computing the delta.
-In all measures presented, the most recent revision (stored intact)
-counts as one delta. The number of deltas applied represents
-the number of passes necessary, where the first `pass' is a copying step.
-.PP
-Note that the check-out operation is executed more than
-twice as frequently as the check-in operation.
-The fourth column gives the mean number of deltas
-applied in all three cases.
-For \fIci\fR, the mean number of deltas applied is less
-than one.
-The reasons are that the initial check-in requires no delta at all, and that
-the only time \fIci\fR requires more than one delta is for branches.
-Column 5 shows the actual number of operations that applied more than one
-delta.
-The last column indicates that branches were not used often.
-.PP
-The last three columns demonstrate that the most recent trunk revision
-is by far the most frequently accessed.
-For RCS, check-out of
-this revision is a simple copy operation, which is the absolute minimum
-given the copy-semantics of \fIco\fR.
-Access to older revisions and branches
-is more common in non-academic environments,
-yet even if access to older deltas were an order
-of magnitude more frequent,
-the combined average number of deltas applied would still be below 1.2.
-Since RCS is faster than SCCS until up to 10 delta applications,
-reverse deltas are clearly the method of choice.
-.PP
-The second experiment, conducted in March of 1984,
-involved surveying the existing RCS files
-on our two machines. The goal was to determine the mean number of
-revisions per RCS file, as well as the space consumed by them.
-Table II shows the results. (Tables I and II were produced at different
-times and are unrelated.)
-.sp 0
-.nr VS 12p
-.vs 12p
-.TS
-center,box,tab(#);
-c | c | c | c | c | c | c
-c | c | c | c | c | c | c
-l | n | n | n | n | n | n.
- #Total RCS#Total#Mean#Mean size of#Mean size of#Overhead
- #files#revisions#revisions#RCS files#revisions
-_
-All files #8033#11133#1.39#6156#5585#1.10
-Files with#1477# 4578#3.10#8074#6041#1.34
-\(>= 2 deltas
-.TE
-.ce 1
-Table II. Statistics for RCS files.
-.nr VS 18p
-.vs 18p
-.PP
-The mean number of revisions per RCS file is 1.39.
-Columns 5 and 6 show the mean sizes (in bytes) of an RCS file
-and of the latest revision of each RCS file, respectively.
-The `overhead' column contains the ratio of the mean sizes.
-Assuming that all revisions in an RCS file are approximately the same size,
-this ratio gives a measure of the space consumed by the extra revisions.
-.PP
-In our sample, over 80 per cent of the RCS files contained only a single revision.
-The reason is that our
-systems programmers routinely check in all source files
-on the distribution tapes, even though they may never touch them again.
-To get a better indication of how much space savings are possible
-with deltas, all measures with those files
-that contained 2 or more revisions were recomputed. Only for those files
-is RCS necessary.
-As shown in the second line, the average number of revisions for those files is
-3.10, with an overhead of 1.34. This means that the extra 2.10 deltas
-require 34 per cent extra space, or
-16 per cent per extra revision.
-Rochkind\u3\d
-measured the space consumed by SCCS, and
-reported an average of 5 revisions per group
-and an overhead of 1.37 (or about 9 per cent per extra revision).
-In a later paper, Glasser\u6\d
-observed an average of 7 revisions per group in a single, large project,
-but provided no overhead figure.
-In his paper on DSEE\u5\d,
-Leblang reported that delta storage combined with blank compression
-results in an overhead of a mere 1\-2 per cent per revision.
-Since leading blanks accounted for about 20 per cent of the surveyed Pascal
-programs, a revision group with 5\-10 members was smaller
-than a single cleartext copy.
-.PP
-The above observations demonstrate clearly that the space needed
-for extra revisions is small. With delta storage, the luxury of
-keeping multiple revisions online is certainly affordable.
-In fact, introducing a system with delta storage may reduce
-storage requirements, because programmers often save back-up copies
-anyway. Since back-up copies are stored much more efficiently with deltas,
-introducing a system such as RCS may
-actually free a considerable amount of space.
-.NH
-Survey of Version Control Tools
-.PP
-The need to keep back-up copies of software arose when
-programs and data were no longer stored on paper media, but were entered
-from terminals and stored on disk.
-Back-up copies are desirable for reliability, and many modern editors
-automatically save a back-up copy for every file touched.
-This strategy
-is valuable for short-term back-ups, but not suitable for long-term
-version control, since an existing back-up copy is overwritten whenever the
-corresponding file is edited.
-.PP
-Tape archives are suitable for long-term, offline storage.
-If all changed files are dumped on a back-up tape once per day, old revisions
-remain accessible. However, tape archives are unsatisfactory
-for version control in several ways. First, backing up the file
-system every 24 hours does not capture intermediate revisions.
-Secondly, the old revisions are not online,
-and accessing them is tedious and time-consuming.
-In particular, it is impractical to
-compare several old revisions of a group,
-because that may require mounting and searching several tapes.
-Tape archives are important fail-safe tools in the
-event of catastrophic disk failures or accidental deletions,
-but they are ill-suited for version control.
-Conversely, version control tools do not obviate the
-need for tape archives.
-.PP
-A natural technique for keeping several old revisions online is
-to never delete a file.
-Editing a file
-simply creates a new file with the same
-name, but with a different sequence number.
-This technique, available as an option in DEC's VMS operating system,
-turns out to be inadequate for version control.
-First, it is prohibitively expensive in terms of storage costs,
-especially since no data compression techniques are employed.
-Secondly, indiscriminately storing every change produces too many
-revisions, and programmers have difficulties distinguishing them.
-The proliferation of revisions forces programmers to spend much time on
-finding and deleting useless files.
-Thirdly, most of the support functions like locking, logging,
-revision selection,
-and identification described in this paper are not available.
-.PP
-An alternative approach is to separate editing from revision control.
-The user may repeatedly edit a given revision,
-until freezing it with an explicit command.
-Once a revision is frozen, it is stored permanently and can no longer be modified.
-(In RCS, freezing a revisions is done with \fIci\fR.)
-Editing a frozen revision implicitly creates a new one, which
-can again be changed repeatedly until it is frozen itself.
-This approach saves exactly those revisions that the user
-considers important, and keeps the number of revisions manageable.
-IBM's CLEAR/CASTER\u7\d,
-AT&T's SCCS\u3\d,
-CMU's SDC\u8\d
-and DEC's CMS\u9\d,
-are examples of version control systems using this approach.
-CLEAR/CASTER maintains a data base of programs, specifications,
-documentation and messages, using deltas.
-Its goal is to provide control over the development process from a
-management viewpoint.
-SCCS stores multiple revisions of source text in an ancestral tree,
-records a log entry for each revision,
-provides access control, and has facilities
-for uniquely identifying each revision.
-An efficient delta technique
-reduces the space consumed by each revision group.
-SDC is much simpler than SCCS because it stores not more than
-two revisions. However, it maintains a complete log for all old
-revisions, some of which may be on back-up tape.
-CMS, like SCCS, manages tree-structured revision groups,
-but offers no identification mechanism.
-.PP
-Tools for dealing with configurations are still in a state of flux.
-SCCS, SDC and CMS can be combined with MAKE or MAKE-like programs.
-Since flexible selection rules are missing from all these tools,
-it is sometimes difficult
-to specify precisely which revision of each group
-should be passed to MAKE for building a desired configuration.
-The Xerox Cedar system\u10\d
-provides a `System Modeller' that can rebuild
-a configuration from an arbitrary set of module revisions.
-The revisions of a module are only distinguished by creation time,
-and there is no tool for managing groups.
-Since the selection rules are primitive,
-the System Modeller appears to be somewhat tedious to use.
-Apollo's DSEE\u5\d
-is a sophisticated software engineering environment.
-It manages revision groups in a way similar to SCCS and CMS. Configurations
-are built using `configuration threads'.
-A configuration thread states which revision of each group
-named in a configuration should be chosen.
-A configuration thread may contain dynamic specifiers
-(e.g., `choose the revisions I am currently working on,
-and the most recent revisions otherwise'), which are bound
-automatically at build time.
-It also provides a notification mechanism for alerting
-maintainers about the need to rebuild a system after a change.
-.PP
-RCS is based on a general model for describing
-multi-version/multi-configuration systems\u11\d.
-The model describes systems using AND/OR graphs, where AND nodes represent
-configurations, and OR nodes represent version groups.
-The model gives rise to a suit of selection rules for
-composing configurations, almost all of which are implemented in RCS.
-The revisions selected by RCS are passed to MAKE for configuration building.
-Revision group management is modelled after SCCS.
-RCS retains SCCS's best features,
-but offers a significantly simpler user interface,
-flexible selection rules, adequate integration with MAKE
-and improved identification.
-A detailed comparison of RCS and SCCS appears in Reference 4.
-.PP
-An important component of all revision control systems
-is a program for computing deltas.
-SCCS and RCS use the program \fIdiff\fR\u2\d,
-which first computes the longest common substring of two
-revisions, and then produces the delta from that substring.
-The delta is simply an edit script consisting of deletion and
-insertion commands that generate one revision from the other.
-.PP
-A delta based on a longest common substring is not necessarily minimal,
-because it does not take advantage of crossing block moves.
-Crossing block moves arise if two or more blocks of lines
-(e.g., procedures)
-appear in a different order in two revisions.
-An edit script derived from a longest common substring
-first deletes the shorter of the two blocks, and then reinserts it.
-Heckel\u12\d
-proposed an algorithm for detecting block moves, but
-since the algorithm is based on heuristics,
-there are conditions
-under which the generated delta is far from minimal.
-DSEE uses this algorithm combined with blank compression,
-apparently with satisfactory overall results.
-A new algorithm that is guaranteed to produce a minimal delta based on
-block moves appears in Reference 13.
-A future release of RCS will use this algorithm.
-.PP
-\fIAcknowledgements\fR:
-Many people have helped make RCS a success by contributed criticisms, suggestions,
-corrections, and even whole new commands (including manual pages).
-The list of people is too long to be
-reproduced here, but my sincere thanks for their help and
-goodwill goes to all of them.
-.sp
-.nr VS 12p
-.vs 12p
-.SH
-Appendix: Synopsis of RCS Operations
-.LP
-.IP "\fIci\fP \fB\- check in revisions\fP"
-.sp 0
-\fICi\fR stores the contents of a working file into the
-corresponding RCS file as a new revision.
-If the RCS file doesn't exist, \fIci\fR creates it.
-\fICi\fR removes the working file, unless one of the options
-\fI\-u\fR or \fI\-l\fR is present.
-For each check-in, \fIci\fR asks for a commentary
-describing the changes relative to the previous revision.
-.sp 1
-\fICi\fR assigns the revision number given by the \fI\-r\fR option;
-if that option is missing, it derives the number from the
-lock held by the user; if there is no lock and locking is not strict,
-\fIci\fR increments the number of the latest revision on the trunk.
-A side branch can only be started by explicitly specifying its
-number with the \fI\-r\fR option during check-in.
-.sp 1
-\fICi\fR also determines
-whether the revision to be checked in is different from the
-previous one, and asks whether to proceed if not.
-This facility simplifies check-in operations for large systems,
-because one need not remember which files were changed.
-.sp 1
-The option \fI\-k\fR searches the checked in file for identification
-markers containing
-the attributes
-revision number, check-in date, author and state, and assigns these
-to the new revision rather than computing them. This option is
-useful for software distribution: Recipients of distributed software
-using RCS should check in updates with the \fI\-k\fR option.
-This convention guarantees that revision numbers, check-in dates,
-etc., are the same at all sites.
-.IP "\fIco\fP \fB\- check out revisions\fP"
-.sp 0
-\fICo\fR retrieves revisions according to revision number,
-date, author and state attributes. It either places the revision
-into the working file, or prints it on the standard output.
-\fICo\fR always expands the identification markers.
-.IP "\fIident\fP \fB\- extract identification markers\fP"
-.sp 0
-\fIIdent\fR extracts the identification markers expanded by \fIco\fR
-from any file and prints them.
-.IP "\fIrcs\fP \fB\- change RCS file attributes\fP"
-.sp 0
-\fIRcs\fR is an administrative operation that changes access lists,
-locks, unlocks, breaks locks, toggles the strict-locking feature,
-sets state attributes and symbolic revision numbers, changes the
-description, and deletes revisions. A revision can
-only be deleted if it is not the fork of a side branch.
-.br
-.ne 10
-.IP "\fIrcsclean\fP \fB\- clean working directory\fP"
-.sp 0
-\fIRcsclean\fR removes working files that were checked out but never changed.*
-.FS *
-The \fIrcsclean\fP and \fIrcsfreeze\fP commands
-are optional and are not always installed.
-.FE
-.IP "\fIrcsdiff\fP \fB\- compare revisions\fP"
-.sp 0
-\fIRcsdiff\fR compares two revisions and prints their
-difference, using the UNIX tool \fIdiff\fR.
-One of the revisions compared may be checked out.
-This command is useful for finding out about changes.
-.IP "\fIrcsfreeze\fP \fB\- freeze a configuration\fP"
-.sp 0
-\fIRcsfreeze\fR assigns the same symbolic revision number
-to a given revision in all RCS files.
-This command is useful for accurately recording a configuration.*
-.IP "\fIrcsmerge\fP \fB\- merge revisions\fP"
-.sp 0
-\fIRcsmerge\fR merges two revisions, \fIrev1\fR and \fIrev2\fR,
-with respect to a common ancestor.
-A 3-way file comparison determines the segments of lines that
-are (a) the same in all three revisions, or (b) the same in 2 revisions,
-or (c) different in all three. For all segments of type (b) where
-\fIrev1\fR is the differing revision,
-the segment in \fIrev1\fR replaces the corresponding segment of \fIrev2\fR.
-Type (c) indicates an overlapping change, is flagged as an error, and requires user
-intervention to select the correct alternative.
-.IP "\fIrlog\fP \fB\- read log messages\fP"
-.sp 0
-\fIRlog\fR prints the log messages and other information in an RCS file.
-.bp
-.LP
-.nr VS 12p
-.vs 12p
-.]<
-.ds [F 1
-.]-
-.ds [K FELD02
-.ds [K MakeArticle
-.ds [A Feldman, Stuart I.
-.ds [D March 1979
-.ds [T Make\*-A Program for Maintaining Computer Programs
-.ds [J Software\*-Practice & Experience
-.ds [V 9
-.ds [N 3
-.ds [P 255-265
-.nr [P 1
-.nr [T 0
-.nr [A 1
-.nr [O 0
-.][ 1 journal-article
-.ds [F 2
-.]-
-.ds [K HUNT01
-.ds [T An Algorithm for Differential File Comparison
-.ds [A Hunt, James W.
-.as [A " and McIlroy, M. D.
-.ds [I Computing Science Technical Report, Bell Laboratories
-.ds [R 41
-.ds [D June 1976
-.nr [T 0
-.nr [A 1
-.nr [O 0
-.][ 4 tech-report
-.ds [F 3
-.]-
-.ds [K SCCS
-.ds [A Rochkind, Marc J.
-.ds [D Dec. 1975
-.ds [T The Source Code Control System
-.ds [J IEEE Transactions on Software Engineering
-.ds [V SE-1
-.ds [N 4
-.ds [P 364-370
-.nr [P 1
-.nr [T 0
-.nr [A 1
-.nr [O 0
-.][ 1 journal-article
-.ds [F 4
-.]-
-.ds [K TICH08
-.ds [T Design, Implementation, and Evaluation of a Revision Control System
-.ds [A Tichy, Walter F.
-.ds [B Proceedings of the 6th International Conference on Software Engineering
-.ds [I ACM, IEEE, IPS, NBS
-.ds [D September 1982
-.ds [P 58-67
-.nr [P 1
-.nr [T 0
-.nr [A 1
-.nr [O 0
-.][ 3 article-in-book
-.ds [F 5
-.]-
-.ds [K LEBL01
-.ds [A Leblang, David B.
-.as [A " and Chase, Robert P.
-.ds [T Computer-Aided Software Engineering in a Distributed Workstation Environment
-.ds [O Proceedings of the ACM SIGSOFT/SIGPLAN Software Engineering Symposium
-.as [O " on Practical Software Development Environments.
-.ds [J SIGPLAN Notices
-.ds [V 19
-.ds [N 5
-.ds [D May 1984
-.ds [P 104-112
-.nr [P 1
-.nr [T 0
-.nr [A 1
-.nr [O 0
-.][ 1 journal-article
-.ds [F 1
-.ds [F 3
-.ds [F 6
-.]-
-.ds [K SCCSEval
-.ds [A Glasser, Alan L.
-.ds [D Nov. 1978
-.ds [T The Evolution of a Source Code Control System
-.ds [J Software Engineering Notes
-.ds [V 3
-.ds [N 5
-.ds [P 122-125
-.nr [P 1
-.ds [O Proceedings of the Software Quality and Assurance Workshop.
-.nr [T 0
-.nr [A 1
-.nr [O 1
-.][ 1 journal-article
-.ds [F 5
-.ds [F 7
-.]-
-.ds [K IBMClearCaster
-.ds [A Brown, H.B.
-.ds [D 1970
-.ds [T The Clear/Caster System
-.ds [J Nato Conference on Software Engineering, Rome
-.nr [T 0
-.nr [A 1
-.nr [O 0
-.][ 1 journal-article
-.ds [F 3
-.ds [F 8
-.]-
-.ds [K HabermannSDC
-.ds [A Habermann, A. Nico
-.ds [D Jan. 1979
-.ds [T A Software Development Control System
-.ds [I Technical Report, Carnegie-Mellon University, Department of Computer Science
-.nr [T 0
-.nr [A 0
-.nr [O 0
-.][ 2 book
-.ds [F 9
-.]-
-.ds [K CMS
-.ds [A DEC
-.ds [T Code Management System
-.ds [I Digital Equipment Corporation
-.ds [O Document No.\ EA-23134-82
-.ds [D 1982
-.nr [T 0
-.nr [A 0
-.nr [O 0
-.][ 2 book
-.ds [F 10
-.]-
-.ds [K LAMP01
-.ds [A Lampson, Butler W.
-.as [A " and Schmidt, Eric E.
-.ds [T Practical Use of a Polymorphic Applicative Language
-.ds [B Proceedings of the 10th Symposium on Principles of Programming Languages
-.ds [I ACM
-.ds [P 237-255
-.nr [P 1
-.ds [D January 1983
-.nr [T 0
-.nr [A 1
-.nr [O 0
-.][ 3 article-in-book
-.ds [F 5
-.ds [F 11
-.]-
-.ds [K TICH07
-.ds [T A Data Model for Programming Support Environments and its Application
-.ds [A Tichy, Walter F.
-.ds [B Automated Tools for Information System Design and Development
-.ds [E Hans-Jochen Schneider and Anthony I. Wasserman
-.ds [C Amsterdam
-.ds [I North-Holland Publishing Company
-.ds [D 1982
-.nr [T 0
-.nr [A 1
-.nr [O 0
-.][ 3 article-in-book
-.ds [F 4
-.ds [F 2
-.ds [F 12
-.]-
-.ds [K HECK01
-.ds [T A Technique for Isolating Differences Between Files
-.ds [A Heckel, Paul
-.ds [J Communications of the ACM
-.ds [D April 1978
-.ds [V 21
-.ds [N 4
-.ds [P 264-268
-.nr [P 1
-.nr [T 0
-.nr [A 0
-.nr [O 0
-.][ 1 journal-article
-.ds [F 13
-.]-
-.ds [K TICH11
-.ds [T The String-to-String Correction Problem with Block Moves
-.ds [A Tichy, Walter F.
-.ds [D Nov. 1984
-.ds [J ACM Transactions on Computer Systems
-.ds [V 2
-.ds [N 4
-.ds [P 309-321
-.nr [P 1
-.nr [T 0
-.nr [A 1
-.nr [O 0
-.][ 1 journal-article
-.]>
diff --git a/gnu/usr.bin/rcs/doc/rcs_func.ms b/gnu/usr.bin/rcs/doc/rcs_func.ms
deleted file mode 100644
index 9818086c3de4..000000000000
--- a/gnu/usr.bin/rcs/doc/rcs_func.ms
+++ /dev/null
@@ -1,95 +0,0 @@
-.SH
-Functions of RCS (Revision Control System)
-.PP
-RCS manages software libraries. It greatly increases programmer productivity
-by providing the following functions.
-.IP 1.
-RCS stores and retrieves multiple revisions of program and other text.
-Thus, one can maintain one or more releases while developing the next
-release, with a minimum of space overhead. Changes no longer destroy the
-original -- previous revisions remain accessible.
-.RS
-.IP a.
-Maintains each module as a tree of revisions.
-.IP b.
-Project libraries can
-be organized centrally, decentralized, or any way you like.
-.IP c.
-RCS works for any type of text: programs, documentation, memos, papers,
-graphics, VLSI layouts, form letters, etc.
-.RE
-.IP 2.
-RCS maintains a complete history of changes.
-Thus, one can find out what happened to a module easily
-and quickly, without having to compare source listings or
-having to track down colleagues.
-.RS
-.IP a.
-RCS performs automatic record keeping.
-.IP b.
-RCS logs all changes automatically.
-.IP c.
-RCS guarantees project continuity.
-.RE
-.IP 3.
-RCS manages multiple lines of development.
-.IP 4.
-RCS can merge multiple lines of development.
-Thus, when several parallel lines of development must be consolidated
-into one line, the merging of changes is automatic.
-.IP 5.
-RCS flags coding conflicts.
-If two or more lines of development modify the same section of code,
-RCS can alert programmers about overlapping changes.
-.IP 6.
-RCS resolves access conflicts.
-When two or more programmers wish to modify the same revision,
-RCS alerts the programmers and makes sure that one modification won't wipe
-out the other one.
-.IP 7.
-RCS provides high-level retrieval functions.
-Revisions can be retrieved according to ranges of revision numbers,
-symbolic names, dates, authors, and states.
-.IP 8.
-RCS provides release and configuration control.
-Revisions can be marked as released, stable, experimental, etc.
-Configurations of modules can be described simply and directly.
-.IP 9.
-RCS performs automatic identification of modules with name, revision
-number, creation time, author, etc.
-Thus, it is always possible to determine which revisions of which
-modules make up a given configuration.
-.IP 10.
-Provides high-level management visibility.
-Thus, it is easy to track the status of a software project.
-.RS
-.IP a.
-RCS provides a complete change history.
-.IP b.
-RCS records who did what when to which revision of which module.
-.RE
-.IP 11.
-RCS is fully compatible with existing software development tools.
-RCS is unobtrusive -- its interface to the file system is such that
-all your existing software tools can be used as before.
-.IP 12.
-RCS' basic user interface is extremely simple. The novice need to learn
-only two commands. Its more sophisticated features have been
-tuned towards advanced software development environments and the
-experienced software professional.
-.IP 13.
-RCS simplifies software distribution if customers
-maintain sources with RCS also. This technique assures proper
-identification of versions and configurations, and tracking of customer
-modifications. Customer modifications can be merged into distributed
-versions locally or by the development group.
-.IP 14.
-RCS needs little extra space for the revisions (only the differences).
-If intermediate revisions are deleted, the corresponding
-differences are compressed into the shortest possible form.
-.IP 15.
-RCS is implemented with reverse deltas. This means that
-the latest revision, which is the one that is accessed most often,
-is stored intact. All others are regenerated from the latest one
-by applying reverse deltas (backward differences). This
-results in fast access time for the revision needed most often.
diff --git a/gnu/usr.bin/rcs/lib/Makefile b/gnu/usr.bin/rcs/lib/Makefile
deleted file mode 100644
index f21fda1e8100..000000000000
--- a/gnu/usr.bin/rcs/lib/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-# Define FSYNC_ALL to get slower but safer writes in case of crashes in
-# the middle of CVS/RCS changes
-#CFLAGS += -DFSYNC_ALL
-
-LIB = rcs
-SRCS = maketime.c partime.c rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c \
- rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsrev.c rcssyn.c rcstime.c \
- rcsutil.c merger.c version.c
-
-INTERNALLIB=
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/rcs/lib/Makefile.depend b/gnu/usr.bin/rcs/lib/Makefile.depend
deleted file mode 100644
index 18be76b0cb6f..000000000000
--- a/gnu/usr.bin/rcs/lib/Makefile.depend
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
- include \
- include/xlocale \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/gnu/usr.bin/rcs/lib/conf.h b/gnu/usr.bin/rcs/lib/conf.h
deleted file mode 100644
index 96ec07d6c875..000000000000
--- a/gnu/usr.bin/rcs/lib/conf.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/* RCS compile-time configuration */
-
- /* $FreeBSD$ */
-
-/*
- * This file is generated automatically.
- * If you edit it by hand your changes may be lost.
- * Instead, please try to fix conf.sh,
- * and send your fixes to rcs-bugs@cs.purdue.edu.
- */
-
-#define exitmain(n) return n /* how to exit from main() */
-/* #define _POSIX_C_SOURCE 2147483647L */ /* if strict C + Posix 1003.1b-1993 or later */
-/* #define _POSIX_SOURCE */ /* if strict C + Posix 1003.1-1990 */
-
-#include <errno.h>
-#include <stdio.h>
-#include <time.h>
-
-/* Comment out #include lines below that do not work. */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <limits.h>
-/* #include <mach/mach.h> */
-/* #include <net/errno.h> */
-#include <pwd.h>
-/* #include <siginfo.h> */
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-/* #include <ucontext.h> */
-#include <unistd.h>
-#include <utime.h>
-/* #include <vfork.h> */
-
-/* Define boolean symbols to be 0 (false, the default), or 1 (true). */
-#define has_sys_param_h 1 /* Does #include <sys/param.h> work? */
-/* extern int errno; */ /* Uncomment if <errno.h> doesn't declare errno. */
-#define has_readlink 1 /* Does readlink() work? */
-#define readlink_isreg_errno EINVAL /* errno after readlink on regular file */
-
-#if has_readlink && !defined(MAXSYMLINKS)
-# if has_sys_param_h
-# include <sys/param.h>
-# endif
-# ifndef MAXSYMLINKS
-# define MAXSYMLINKS 20 /* BSD; not standard yet */
-# endif
-#endif
-
-/* Comment out the typedefs below if the types are already declared. */
-/* Fix any uncommented typedefs that are wrong. */
-/* typedef int mode_t; */
-/* typedef long off_t; */
-/* typedef int pid_t; */
-/* typedef int sig_atomic_t; */
-/* typedef unsigned size_t; */
-/* typedef int ssize_t; */
-/* typedef long time_t; */
-/* typedef int uid_t; */
-
-/* Comment out the keyword definitions below if the keywords work. */
-/* #define const */
-/* #define volatile */
-
-/* Define boolean symbols to be 0 (false, the default), or 1 (true). */
-#define has_prototypes 1 /* Do function prototypes work? */
-#define has_stdarg 1 /* Does <stdarg.h> work? */
-/* #define has_varargs ? */ /* Does <varargs.h> work? */
-#define va_start_args 2 /* How many args does va_start() take? */
-
-#if O_BINARY
- /* Text and binary i/o behave differently. */
- /* This is incompatible with Posix and Unix. */
-# define FOPEN_RB "rb"
-# define FOPEN_R_WORK (Expand==BINARY_EXPAND ? "r" : "rb")
-# define FOPEN_WB "wb"
-# define FOPEN_W_WORK (Expand==BINARY_EXPAND ? "w" : "wb")
-# define FOPEN_WPLUS_WORK (Expand==BINARY_EXPAND ? "w+" : "w+b")
-# define OPEN_O_BINARY O_BINARY
-#else
- /*
- * Text and binary i/o behave the same.
- * Omit "b", since some nonstandard hosts reject it.
- */
-# define FOPEN_RB "r"
-# define FOPEN_R_WORK "r"
-# define FOPEN_WB "w"
-# define FOPEN_W_WORK "w"
-# define FOPEN_WPLUS_WORK "w+"
-# define OPEN_O_BINARY 0
-#endif
-
-/* This may need changing on non-Unix systems (notably DOS). */
-#define OPEN_CREAT_READONLY (S_IRUSR|S_IRGRP|S_IROTH) /* lock file mode */
-#define OPEN_O_LOCK 0 /* extra open flags for creating lock file */
-#define OPEN_O_WRONLY O_WRONLY /* main open flag for creating a lock file */
-
-/* Define or comment out the following symbols as needed. */
-#if has_prototypes
-# define P(params) params
-#else
-# define P(params) ()
-#endif
-#if has_stdarg
-# include <stdarg.h>
-#else
-# if has_varargs
-# include <varargs.h>
-# else
- typedef char *va_list;
-# define va_dcl int va_alist;
-# define va_start(ap) ((ap) = (va_list)&va_alist)
-# define va_arg(ap,t) (((t*) ((ap)+=sizeof(t))) [-1])
-# define va_end(ap)
-# endif
-#endif
-#if va_start_args == 2
-# define vararg_start va_start
-#else
-# define vararg_start(ap,p) va_start(ap)
-#endif
-#define bad_chmod_close 0 /* Can chmod() close file descriptors? */
-#define bad_creat0 0 /* Do writes fail after creat(f,0)? */
-#define bad_fopen_wplus 0 /* Does fopen(f,"w+") fail to truncate f? */
-#define getlogin_is_secure 0 /* Is getlogin() secure? Usually it's not. */
-#define has_attribute_noreturn 1 /* Does __attribute__((noreturn)) work? */
-#if has_attribute_noreturn
-# define exiting __attribute__((noreturn))
-#else
-# define exiting
-#endif
-#define has_dirent 1 /* Do opendir(), readdir(), closedir() work? */
-#define void_closedir 0 /* Does closedir() yield void? */
-#define has_fchmod 1 /* Does fchmod() work? */
-#define has_fflush_input 0 /* Does fflush() work on input files? */
-#define has_fputs 1 /* Does fputs() work? */
-#define has_ftruncate 1 /* Does ftruncate() work? */
-#define has_getuid 1 /* Does getuid() work? */
-#define has_getpwuid 1 /* Does getpwuid() work? */
-#define has_memcmp 1 /* Does memcmp() work? */
-#define has_memcpy 1 /* Does memcpy() work? */
-#define has_memmove 1 /* Does memmove() work? */
-#define has_map_fd 0 /* Does map_fd() work? */
-#define has_mmap 1 /* Does mmap() work on regular files? */
-#define has_madvise 0 /* Does madvise() work? */
-#define mmap_signal SIGBUS /* signal received if you reference nonexistent part of mmapped file */
-#define has_rename 1 /* Does rename() work? */
-#define bad_a_rename 0 /* Does rename(A,B) fail if A is unwritable? */
-#define bad_b_rename 0 /* Does rename(A,B) fail if B is unwritable? */
-#define bad_NFS_rename 0 /* Can rename(A,B) falsely report success? */
-/* typedef int void; */ /* Some ancient compilers need this. */
-#define VOID (void) /* 'VOID e;' discards the value of an expression 'e'. */
-#define has_seteuid 1 /* Does seteuid() work? See ../INSTALL.RCS. */
-#define has_setreuid 0 /* Does setreuid() work? See ../INSTALL.RCS. */
-#define has_setuid 1 /* Does setuid() exist? */
-#define has_sigaction 1 /* Does struct sigaction work? */
-#define has_sa_sigaction 1 /* Does struct sigaction have sa_sigaction? */
-#define has_signal 1 /* Does signal() work? */
-#define signal_type void /* type returned by signal handlers */
-#define sig_zaps_handler 0 /* Must a signal handler reinvoke signal()? */
-/* #define has_sigblock ? */ /* Does sigblock() work? */
-/* #define sigmask(s) (1 << ((s)-1)) */ /* Yield mask for signal number. */
-typedef size_t fread_type; /* type returned by fread() and fwrite() */
-typedef size_t freadarg_type; /* type of their size arguments */
-typedef void *malloc_type; /* type returned by malloc() */
-#define has_getcwd 1 /* Does getcwd() work? */
-/* #define has_getwd ? */ /* Does getwd() work? */
-#define needs_getabsname 0 /* Must we define getabsname? */
-#define has_mktemp 1 /* Does mktemp() work? */
-#define has_mkstemp 1 /* Does mkstemp() work? */
-#define has_NFS 1 /* Might NFS be used? */
-#define has_psiginfo 0 /* Does psiginfo() work? */
-#define has_psignal 1 /* Does psignal() work? */
-/* #define has_si_errno ? */ /* Does siginfo_t have si_errno? */
-/* #define has_sys_siglist ? */ /* Does sys_siglist[] work? */
-/* #define strchr index */ /* Use old-fashioned name for strchr()? */
-/* #define strrchr rindex */ /* Use old-fashioned name for strrchr()? */
-#define bad_unlink 0 /* Does unlink() fail on unwritable files? */
-#define has_vfork 1 /* Does vfork() work? */
-#define has_fork 1 /* Does fork() work? */
-#define has_spawn 0 /* Does spawn*() work? */
-#define has_waitpid 1 /* Does waitpid() work? */
-#define bad_wait_if_SIGCHLD_ignored 0 /* Does ignoring SIGCHLD break wait()? */
-#define RCS_SHELL "/bin/sh" /* shell to run RCS subprograms */
-#define has_printf_dot 1 /* Does "%.2d" print leading 0? */
-#define has_vfprintf 1 /* Does vfprintf() work? */
-#define has_attribute_format_printf 1 /* Does __attribute__((format(printf,N,N+1))) work? */
-#if has_attribute_format_printf
-# define printf_string(m, n) __attribute__((format(printf, m, n)))
-#else
-# define printf_string(m, n)
-#endif
-#if has_attribute_format_printf && has_attribute_noreturn
- /* Work around a bug in GCC 2.5.x. */
-# define printf_string_exiting(m, n) __attribute__((format(printf, m, n), noreturn))
-#else
-# define printf_string_exiting(m, n) printf_string(m, n) exiting
-#endif
-/* #define has__doprintf ? */ /* Does _doprintf() work? */
-/* #define has__doprnt ? */ /* Does _doprnt() work? */
-/* #undef EXIT_FAILURE */ /* Uncomment this if EXIT_FAILURE is broken. */
-#define large_memory 1 /* Can main memory hold entire RCS files? */
-#ifndef LONG_MAX
-#define LONG_MAX 2147483647L /* long maximum */
-#endif
-/* Do struct stat s and t describe the same file? Answer d if unknown. */
-#define same_file(s,t,d) ((s).st_ino==(t).st_ino && (s).st_dev==(t).st_dev)
-#define has_utimbuf 1 /* Does struct utimbuf work? */
-#define CO "/usr/bin/co" /* name of 'co' program */
-#define COMPAT2 0 /* Are version 2 files supported? */
-#define DIFF "/usr/bin/diff" /* name of 'diff' program */
-#define DIFF3 "/usr/bin/diff3" /* name of 'diff3' program */
-#define DIFF3_BIN 1 /* Is diff3 user-visible (not the /usr/lib auxiliary)? */
-#define DIFFFLAGS "-an" /* Make diff output suitable for RCS. */
-#define DIFF_L 1 /* Does diff -L work? */
-#define DIFF_SUCCESS 0 /* DIFF status if no differences are found */
-#define DIFF_FAILURE 1 /* DIFF status if differences are found */
-#define DIFF_TROUBLE 2 /* DIFF status if trouble */
-#define ED "/bin/ed" /* name of 'ed' program (used only if !DIFF3_BIN) */
-#define MERGE "/usr/bin/merge" /* name of 'merge' program */
-#define TMPDIR "/tmp" /* default directory for temporary files */
-#define SLASH '/' /* principal filename separator */
-#define SLASHes '/' /* `case SLASHes:' labels all filename separators */
-#define isSLASH(c) ((c) == SLASH) /* Is arg a filename separator? */
-#define ROOTPATH(p) isSLASH((p)[0]) /* Is p an absolute pathname? */
-#define X_DEFAULT ",v/" /* default value for -x option */
-#define SLASHSLASH_is_SLASH 1 /* Are // and / the same directory? */
-#define ALL_ABSOLUTE 1 /* Do all subprograms satisfy ROOTPATH? */
-#define DIFF_ABSOLUTE 1 /* Is ROOTPATH(DIFF) true? */
-#define SENDMAIL "/usr/sbin/sendmail" /* how to send mail */
-#define TZ_must_be_set 0 /* Must TZ be set for gmtime() to work? */
-
-
-
-/* Adjust the following declarations as needed. */
-
-
-/* The rest is for the benefit of non-standard, traditional hosts. */
-/* Don't bother to declare functions that in traditional hosts do not appear, */
-/* or are declared in .h files, or return int or void. */
-
-
-/* traditional BSD */
-
-#if has_sys_siglist && !defined(sys_siglist)
- extern char const * const sys_siglist[];
-#endif
-
-
-/* Posix (ISO/IEC 9945-1: 1990 / IEEE Std 1003.1-1990) */
-
-/* <fcntl.h> */
-#ifdef O_CREAT
-# define open_can_creat 1
-#else
-# define open_can_creat 0
-# define O_RDONLY 0
-# define O_WRONLY 1
-# define O_RDWR 2
-# define O_CREAT 01000
-# define O_TRUNC 02000
-#endif
-#ifndef O_EXCL
-#define O_EXCL 0
-#endif
-
-/* <sys/stat.h> */
-#ifndef S_IRUSR
-# ifdef S_IREAD
-# define S_IRUSR S_IREAD
-# else
-# define S_IRUSR 0400
-# endif
-# ifdef S_IWRITE
-# define S_IWUSR S_IWRITE
-# else
-# define S_IWUSR (S_IRUSR/2)
-# endif
-#endif
-#ifndef S_IRGRP
-# if has_getuid
-# define S_IRGRP (S_IRUSR / 0010)
-# define S_IWGRP (S_IWUSR / 0010)
-# define S_IROTH (S_IRUSR / 0100)
-# define S_IWOTH (S_IWUSR / 0100)
-# else
- /* single user OS -- not Posix or Unix */
-# define S_IRGRP 0
-# define S_IWGRP 0
-# define S_IROTH 0
-# define S_IWOTH 0
-# endif
-#endif
-#ifndef S_ISREG
-#define S_ISREG(n) (((n) & S_IFMT) == S_IFREG)
-#endif
-
-/* <sys/wait.h> */
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-#undef WIFEXITED /* Avoid 4.3BSD incompatibility with Posix. */
-#endif
-#ifndef WIFEXITED
-#define WIFEXITED(stat_val) (((stat_val) & 0377) == 0)
-#endif
-#ifndef WTERMSIG
-#define WTERMSIG(stat_val) ((stat_val) & 0177)
-#undef WIFSIGNALED /* Avoid 4.3BSD incompatibility with Posix. */
-#endif
-#ifndef WIFSIGNALED
-#define WIFSIGNALED(stat_val) ((unsigned)(stat_val) - 1 < 0377)
-#endif
-
-/* <unistd.h> */
-char *getlogin P((void));
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-# define STDOUT_FILENO 1
-# define STDERR_FILENO 2
-#endif
-#if has_fork && !has_vfork
-# undef vfork
-# define vfork fork
-#endif
-#if has_getcwd || !has_getwd
- char *getcwd P((char*,size_t));
-#else
- char *getwd P((char*));
-#endif
-#if has_setuid && !has_seteuid
-# undef seteuid
-# define seteuid setuid
-#endif
-#if has_spawn
-# if ALL_ABSOLUTE
-# define spawn_RCS spawnv
-# else
-# define spawn_RCS spawnvp
-# endif
-#else
-# if ALL_ABSOLUTE
-# define exec_RCS execv
-# else
-# define exec_RCS execvp
-# endif
-#endif
-
-/* utime.h */
-#if !has_utimbuf
- struct utimbuf { time_t actime, modtime; };
-#endif
-
-
-/* Standard C library */
-
-/* <stdio.h> */
-#ifndef L_tmpnam
-#define L_tmpnam 32 /* power of 2 > sizeof("/usr/tmp/xxxxxxxxxxxxxxx") */
-#endif
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
-#if has_mktemp
- char *mktemp P((char*)); /* traditional */
-#else
- char *tmpnam P((char*));
-#endif
-
-/* <stdlib.h> */
-char *getenv P((char const*));
-void _exit P((int)) exiting;
-void exit P((int)) exiting;
-malloc_type malloc P((size_t));
-malloc_type realloc P((malloc_type,size_t));
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-
-/* <string.h> */
-char *strcpy P((char*,char const*));
-char *strchr P((char const*,int));
-char *strrchr P((char const*,int));
-void *memcpy P((void*,void const*,size_t));
-#if has_memmove
- void *memmove P((void*,void const*,size_t));
-#endif
-
-/* <time.h> */
-time_t time P((time_t*));
diff --git a/gnu/usr.bin/rcs/lib/maketime.c b/gnu/usr.bin/rcs/lib/maketime.c
deleted file mode 100644
index 0f83bf5690d6..000000000000
--- a/gnu/usr.bin/rcs/lib/maketime.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/* Convert struct partime into time_t. */
-
-/* Copyright 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-#if has_conf_h
-# include "conf.h"
-#else
-# ifdef __STDC__
-# define P(x) x
-# else
-# define const
-# define P(x) ()
-# endif
-# include <stdlib.h>
-# include <time.h>
-#endif
-
-#include "partime.h"
-#include "maketime.h"
-
-char const maketId[]
- = "$FreeBSD$";
-
-static int isleap P((int));
-static int month_days P((struct tm const*));
-static time_t maketime P((struct partime const*,time_t));
-
-/*
-* For maximum portability, use only localtime and gmtime.
-* Make no assumptions about the time_t epoch or the range of time_t values.
-* Avoid mktime because it's not universal and because there's no easy,
-* portable way for mktime to yield the inverse of gmtime.
-*/
-
-#define TM_YEAR_ORIGIN 1900
-
- static int
-isleap(y)
- int y;
-{
- return (y&3) == 0 && (y%100 != 0 || y%400 == 0);
-}
-
-static int const month_yday[] = {
- /* days in year before start of months 0-12 */
- 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365
-};
-
-/* Yield the number of days in TM's month. */
- static int
-month_days(tm)
- struct tm const *tm;
-{
- int m = tm->tm_mon;
- return month_yday[m+1] - month_yday[m]
- + (m==1 && isleap(tm->tm_year + TM_YEAR_ORIGIN));
-}
-
-/*
-* Convert UNIXTIME to struct tm form.
-* Use gmtime if available and if !LOCALZONE, localtime otherwise.
-*/
- struct tm *
-time2tm(unixtime, localzone)
- time_t unixtime;
- int localzone;
-{
- struct tm *tm;
-# if TZ_must_be_set
- static char const *TZ;
- if (!TZ && !(TZ = getenv("TZ")))
- faterror("The TZ environment variable is not set; please set it to your timezone");
-# endif
- if (localzone || !(tm = gmtime(&unixtime)))
- tm = localtime(&unixtime);
- return tm;
-}
-
-/* Yield A - B, measured in seconds. */
- time_t
-difftm(a, b)
- struct tm const *a, *b;
-{
- int ay = a->tm_year + (TM_YEAR_ORIGIN - 1);
- int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
- int difference_in_day_of_year = a->tm_yday - b->tm_yday;
- int intervening_leap_days = (
- ((ay >> 2) - (by >> 2))
- - (ay/100 - by/100)
- + ((ay/100 >> 2) - (by/100 >> 2))
- );
- time_t difference_in_years = ay - by;
- time_t difference_in_days = (
- difference_in_years*365
- + (intervening_leap_days + difference_in_day_of_year)
- );
- return
- (
- (
- 24*difference_in_days
- + (a->tm_hour - b->tm_hour)
- )*60 + (a->tm_min - b->tm_min)
- )*60 + (a->tm_sec - b->tm_sec);
-}
-
-/*
-* Adjust time T by adding SECONDS. SECONDS must be at most 24 hours' worth.
-* Adjust only T's year, mon, mday, hour, min and sec members;
-* plus adjust wday if it is defined.
-*/
- void
-adjzone(t, seconds)
- register struct tm *t;
- long seconds;
-{
- /*
- * This code can be off by a second if SECONDS is not a multiple of 60,
- * if T is local time, and if a leap second happens during this minute.
- * But this bug has never occurred, and most likely will not ever occur.
- * Liberia, the last country for which SECONDS % 60 was nonzero,
- * switched to UTC in May 1972; the first leap second was in June 1972.
- */
- int leap_second = t->tm_sec == 60;
- long sec = seconds + (t->tm_sec - leap_second);
- if (sec < 0) {
- if ((t->tm_min -= (59-sec)/60) < 0) {
- if ((t->tm_hour -= (59-t->tm_min)/60) < 0) {
- t->tm_hour += 24;
- if (TM_DEFINED(t->tm_wday) && --t->tm_wday < 0)
- t->tm_wday = 6;
- if (--t->tm_mday <= 0) {
- if (--t->tm_mon < 0) {
- --t->tm_year;
- t->tm_mon = 11;
- }
- t->tm_mday = month_days(t);
- }
- }
- t->tm_min += 24 * 60;
- }
- sec += 24L * 60 * 60;
- } else
- if (60 <= (t->tm_min += sec/60))
- if (24 <= (t->tm_hour += t->tm_min/60)) {
- t->tm_hour -= 24;
- if (TM_DEFINED(t->tm_wday) && ++t->tm_wday == 7)
- t->tm_wday = 0;
- if (month_days(t) < ++t->tm_mday) {
- if (11 < ++t->tm_mon) {
- ++t->tm_year;
- t->tm_mon = 0;
- }
- t->tm_mday = 1;
- }
- }
- t->tm_min %= 60;
- t->tm_sec = (int) (sec%60) + leap_second;
-}
-
-/*
-* Convert TM to time_t, using localtime if LOCALZONE and gmtime otherwise.
-* Use only TM's year, mon, mday, hour, min, and sec members.
-* Ignore TM's old tm_yday and tm_wday, but fill in their correct values.
-* Yield -1 on failure (e.g. a member out of range).
-* Posix 1003.1-1990 doesn't allow leap seconds, but some implementations
-* have them anyway, so allow them if localtime/gmtime does.
-*/
- time_t
-tm2time(tm, localzone)
- struct tm *tm;
- int localzone;
-{
- /* Cache the most recent t,tm pairs; 1 for gmtime, 1 for localtime. */
- static time_t t_cache[2];
- static struct tm tm_cache[2];
-
- time_t d, gt;
- struct tm const *gtm;
- /*
- * The maximum number of iterations should be enough to handle any
- * combinations of leap seconds, time zone rule changes, and solar time.
- * 4 is probably enough; we use a bigger number just to be safe.
- */
- int remaining_tries = 8;
-
- /* Avoid subscript errors. */
- if (12 <= (unsigned)tm->tm_mon)
- return -1;
-
- tm->tm_yday = month_yday[tm->tm_mon] + tm->tm_mday
- - (tm->tm_mon<2 || ! isleap(tm->tm_year + TM_YEAR_ORIGIN));
-
- /* Make a first guess. */
- gt = t_cache[localzone];
- gtm = gt ? &tm_cache[localzone] : time2tm(gt,localzone);
-
- /* Repeatedly use the error from the guess to improve the guess. */
- while ((d = difftm(tm, gtm)) != 0) {
- if (--remaining_tries == 0)
- return -1;
- gt += d;
- gtm = time2tm(gt,localzone);
- }
- t_cache[localzone] = gt;
- tm_cache[localzone] = *gtm;
-
- /*
- * Check that the guess actually matches;
- * overflow can cause difftm to yield 0 even on differing times,
- * or tm may have members out of range (e.g. bad leap seconds).
- */
- if ( (tm->tm_year ^ gtm->tm_year)
- | (tm->tm_mon ^ gtm->tm_mon)
- | (tm->tm_mday ^ gtm->tm_mday)
- | (tm->tm_hour ^ gtm->tm_hour)
- | (tm->tm_min ^ gtm->tm_min)
- | (tm->tm_sec ^ gtm->tm_sec))
- return -1;
-
- tm->tm_wday = gtm->tm_wday;
- return gt;
-}
-
-/*
-* Check *PT and convert it to time_t.
-* If it is incompletely specified, use DEFAULT_TIME to fill it out.
-* Use localtime if PT->zone is the special value TM_LOCAL_ZONE.
-* Yield -1 on failure.
-* ISO 8601 day-of-year and week numbers are not yet supported.
-*/
- static time_t
-maketime(pt, default_time)
- struct partime const *pt;
- time_t default_time;
-{
- int localzone, wday;
- struct tm tm;
- struct tm *tm0 = 0;
- time_t r;
-
- tm0 = 0; /* Keep gcc -Wall happy. */
- localzone = pt->zone==TM_LOCAL_ZONE;
-
- tm = pt->tm;
-
- if (TM_DEFINED(pt->ymodulus) || !TM_DEFINED(tm.tm_year)) {
- /* Get tm corresponding to current time. */
- tm0 = time2tm(default_time, localzone);
- if (!localzone)
- adjzone(tm0, pt->zone);
- }
-
- if (TM_DEFINED(pt->ymodulus))
- tm.tm_year +=
- (tm0->tm_year + TM_YEAR_ORIGIN)/pt->ymodulus * pt->ymodulus;
- else if (!TM_DEFINED(tm.tm_year)) {
- /* Set default year, month, day from current time. */
- tm.tm_year = tm0->tm_year + TM_YEAR_ORIGIN;
- if (!TM_DEFINED(tm.tm_mon)) {
- tm.tm_mon = tm0->tm_mon;
- if (!TM_DEFINED(tm.tm_mday))
- tm.tm_mday = tm0->tm_mday;
- }
- }
-
- /* Convert from partime year (Gregorian) to Posix year. */
- tm.tm_year -= TM_YEAR_ORIGIN;
-
- /* Set remaining default fields to be their minimum values. */
- if (!TM_DEFINED(tm.tm_mon)) tm.tm_mon = 0;
- if (!TM_DEFINED(tm.tm_mday)) tm.tm_mday = 1;
- if (!TM_DEFINED(tm.tm_hour)) tm.tm_hour = 0;
- if (!TM_DEFINED(tm.tm_min)) tm.tm_min = 0;
- if (!TM_DEFINED(tm.tm_sec)) tm.tm_sec = 0;
-
- if (!localzone)
- adjzone(&tm, -pt->zone);
- wday = tm.tm_wday;
-
- /* Convert and fill in the rest of the tm. */
- r = tm2time(&tm, localzone);
-
- /* Check weekday. */
- if (r != -1 && TM_DEFINED(wday) && wday != tm.tm_wday)
- return -1;
-
- return r;
-}
-
-/* Parse a free-format date in SOURCE, yielding a Unix format time. */
- time_t
-str2time(source, default_time, default_zone)
- char const *source;
- time_t default_time;
- long default_zone;
-{
- struct partime pt;
-
- if (*partime(source, &pt))
- return -1;
- if (pt.zone == TM_UNDEFINED_ZONE)
- pt.zone = default_zone;
- return maketime(&pt, default_time);
-}
-
-#if TEST
-#include <stdio.h>
- int
-main(argc, argv) int argc; char **argv;
-{
- time_t default_time = time((time_t *)0);
- long default_zone = argv[1] ? atol(argv[1]) : 0;
- char buf[1000];
- while (fgets(buf, 1000, stdin)) {
- time_t t = str2time(buf, default_time, default_zone);
- printf("%s", asctime(gmtime(&t)));
- }
- return 0;
-}
-#endif
diff --git a/gnu/usr.bin/rcs/lib/maketime.h b/gnu/usr.bin/rcs/lib/maketime.h
deleted file mode 100644
index fbe12562051d..000000000000
--- a/gnu/usr.bin/rcs/lib/maketime.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Yield time_t from struct partime yielded by partime. */
-
-/* Copyright 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-#if defined(__STDC__) || has_prototypes
-# define __MAKETIME_P(x) x
-#else
-# define __MAKETIME_P(x) ()
-#endif
-
-struct tm *time2tm __MAKETIME_P((time_t,int));
-time_t difftm __MAKETIME_P((struct tm const *, struct tm const *));
-time_t str2time __MAKETIME_P((char const *, time_t, long));
-time_t tm2time __MAKETIME_P((struct tm *, int));
-void adjzone __MAKETIME_P((struct tm *, long));
diff --git a/gnu/usr.bin/rcs/lib/merger.c b/gnu/usr.bin/rcs/lib/merger.c
deleted file mode 100644
index 8f1d610d5f56..000000000000
--- a/gnu/usr.bin/rcs/lib/merger.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* three-way file merge internals */
-
-/* Copyright 1991, 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-#include "rcsbase.h"
-
-libId(mergerId, "$FreeBSD$")
-
- static char const *normalize_arg P((char const*,char**));
- static char const *
-normalize_arg(s, b)
- char const *s;
- char **b;
-/*
- * If S looks like an option, prepend ./ to it. Yield the result.
- * Set *B to the address of any storage that was allocated.
- */
-{
- char *t;
- if (*s == '-') {
- *b = t = testalloc(strlen(s) + 3);
- VOID sprintf(t, ".%c%s", SLASH, s);
- return t;
- } else {
- *b = 0;
- return s;
- }
-}
-
- int
-merge(tostdout, edarg, label, argv)
- int tostdout;
- char const *edarg;
- char const *const label[3];
- char const *const argv[3];
-/*
- * Do `merge [-p] EDARG -L l0 -L l1 -L l2 a0 a1 a2',
- * where TOSTDOUT specifies whether -p is present,
- * EDARG gives the editing type (e.g. "-A", or null for the default),
- * LABEL gives l0, l1 and l2, and ARGV gives a0, a1 and a2.
- * Yield DIFF_SUCCESS or DIFF_FAILURE.
- */
-{
- register int i;
- FILE *f;
- RILE *rt;
- char const *a[3], *t;
- char *b[3];
- int s;
-#if !DIFF3_BIN
- char const *d[2];
-#endif
-
- for (i=3; 0<=--i; )
- a[i] = normalize_arg(argv[i], &b[i]);
-
- if (!edarg)
- edarg = "-E";
-
-#if DIFF3_BIN
- t = 0;
- if (!tostdout)
- t = maketemp(0);
- s = run(
- -1, t,
- DIFF3, edarg, "-am",
- "-L", label[0],
- "-L", label[1],
- "-L", label[2],
- a[0], a[1], a[2], (char*)0
- );
- switch (s) {
- case DIFF_SUCCESS:
- break;
- case DIFF_FAILURE:
- warn("conflicts during merge");
- break;
- default:
- exiterr();
- }
- if (t) {
- if (!(f = fopenSafer(argv[0], "w")))
- efaterror(argv[0]);
- if (!(rt = Iopen(t, "r", (struct stat*)0)))
- efaterror(t);
- fastcopy(rt, f);
- Ifclose(rt);
- Ofclose(f);
- }
-#else
- for (i=0; i<2; i++)
- switch (run(
- -1, d[i]=maketemp(i),
- DIFF, a[i], a[2], (char*)0
- )) {
- case DIFF_FAILURE: case DIFF_SUCCESS: break;
- default: faterror("diff failed");
- }
- t = maketemp(2);
- s = run(
- -1, t,
- DIFF3, edarg, d[0], d[1], a[0], a[1], a[2],
- label[0], label[2], (char*)0
- );
- if (s != DIFF_SUCCESS) {
- s = DIFF_FAILURE;
- warn("overlaps or other problems during merge");
- }
- if (!(f = fopenSafer(t, "a+")))
- efaterror(t);
- aputs(tostdout ? "1,$p\n" : "w\n", f);
- Orewind(f);
- aflush(f);
- if (run(fileno(f), (char*)0, ED, "-", a[0], (char*)0))
- exiterr();
- Ofclose(f);
-#endif
-
- tempunlink();
- for (i=3; 0<=--i; )
- if (b[i])
- tfree(b[i]);
- return s;
-}
diff --git a/gnu/usr.bin/rcs/lib/partime.c b/gnu/usr.bin/rcs/lib/partime.c
deleted file mode 100644
index 05b010854950..000000000000
--- a/gnu/usr.bin/rcs/lib/partime.c
+++ /dev/null
@@ -1,701 +0,0 @@
-/* Parse a string, yielding a struct partime that describes it. */
-
-/* Copyright 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-#if has_conf_h
-# include "conf.h"
-#else
-# ifdef __STDC__
-# define P(x) x
-# else
-# define const
-# define P(x) ()
-# endif
-# include <limits.h>
-# include <time.h>
-#endif
-
-#include <ctype.h>
-#undef isdigit
-#define isdigit(c) (((unsigned)(c)-'0') <= 9) /* faster than stock */
-
-#include "partime.h"
-
-char const partimeId[]
- = "$FreeBSD$";
-
-
-/* Lookup tables for names of months, weekdays, time zones. */
-
-#define NAME_LENGTH_MAXIMUM 4
-
-struct name_val {
- char name[NAME_LENGTH_MAXIMUM];
- int val;
-};
-
-
-static char const *parse_decimal P((char const*,int,int,int,int,int*,int*));
-static char const *parse_fixed P((char const*,int,int*));
-static char const *parse_pattern_letter P((char const*,int,struct partime*));
-static char const *parse_prefix P((char const*,struct partime*,int*));
-static char const *parse_ranged P((char const*,int,int,int,int*));
-static int lookup P((char const*,struct name_val const[]));
-static int merge_partime P((struct partime*, struct partime const*));
-static void undefine P((struct partime*));
-
-
-static struct name_val const month_names[] = {
- {"jan",0}, {"feb",1}, {"mar",2}, {"apr",3}, {"may",4}, {"jun",5},
- {"jul",6}, {"aug",7}, {"sep",8}, {"oct",9}, {"nov",10}, {"dec",11},
- {"", TM_UNDEFINED}
-};
-
-static struct name_val const weekday_names[] = {
- {"sun",0}, {"mon",1}, {"tue",2}, {"wed",3}, {"thu",4}, {"fri",5}, {"sat",6},
- {"", TM_UNDEFINED}
-};
-
-#define hr60nonnegative(t) ((t)/100 * 60 + (t)%100)
-#define hr60(t) ((t)<0 ? -hr60nonnegative(-(t)) : hr60nonnegative(t))
-#define zs(t,s) {s, hr60(t)}
-#define zd(t,s,d) zs(t, s), zs((t)+100, d)
-
-static struct name_val const zone_names[] = {
- zs(-1000, "hst"), /* Hawaii */
- zd(-1000,"hast","hadt"),/* Hawaii-Aleutian */
- zd(- 900,"akst","akdt"),/* Alaska */
- zd(- 800, "pst", "pdt"),/* Pacific */
- zd(- 700, "mst", "mdt"),/* Mountain */
- zd(- 600, "cst", "cdt"),/* Central */
- zd(- 500, "est", "edt"),/* Eastern */
- zd(- 400, "ast", "adt"),/* Atlantic */
- zd(- 330, "nst", "ndt"),/* Newfoundland */
- zs( 000, "utc"), /* Coordinated Universal */
- zs( 000, "cut"), /* " */
- zs( 000, "ut"), /* Universal */
- zs( 000, "z"), /* Zulu (required by ISO 8601) */
- zd( 000, "gmt", "bst"),/* Greenwich Mean, British Summer */
- zs( 000, "wet"), /* Western Europe */
- zs( 100, "met"), /* Middle Europe */
- zs( 100, "cet"), /* Central Europe */
- zs( 200, "eet"), /* Eastern Europe */
- zs( 530, "ist"), /* India */
- zd( 900, "jst", "jdt"),/* Japan */
- zd( 900, "kst", "kdt"),/* Korea */
- zd( 1200,"nzst","nzdt"),/* New Zealand */
- { "lt", 1 },
-#if 0
- /* The following names are duplicates or are not well attested. */
- zs(-1100, "sst"), /* Samoa */
- zs(-1000, "tht"), /* Tahiti */
- zs(- 930, "mqt"), /* Marquesas */
- zs(- 900, "gbt"), /* Gambier */
- zd(- 900, "yst", "ydt"),/* Yukon - name is no longer used */
- zs(- 830, "pit"), /* Pitcairn */
- zd(- 500, "cst", "cdt"),/* Cuba */
- zd(- 500, "ast", "adt"),/* Acre */
- zd(- 400, "wst", "wdt"),/* Western Brazil */
- zd(- 400, "ast", "adt"),/* Andes */
- zd(- 400, "cst", "cdt"),/* Chile */
- zs(- 300, "wgt"), /* Western Greenland */
- zd(- 300, "est", "edt"),/* Eastern South America */
- zs(- 300, "mgt"), /* Middle Greenland */
- zd(- 200, "fst", "fdt"),/* Fernando de Noronha */
- zs(- 100, "egt"), /* Eastern Greenland */
- zs(- 100, "aat"), /* Atlantic Africa */
- zs(- 100, "act"), /* Azores and Canaries */
- zs( 000, "wat"), /* West Africa */
- zs( 100, "cat"), /* Central Africa */
- zd( 100, "mez","mesz"),/* Mittel-Europaeische Zeit */
- zs( 200, "sat"), /* South Africa */
- zd( 200, "ist", "idt"),/* Israel */
- zs( 300, "eat"), /* East Africa */
- zd( 300, "ast", "adt"),/* Arabia */
- zd( 300, "msk", "msd"),/* Moscow */
- zd( 330, "ist", "idt"),/* Iran */
- zs( 400, "gst"), /* Gulf */
- zs( 400, "smt"), /* Seychelles & Mascarene */
- zd( 400, "esk", "esd"),/* Yekaterinburg */
- zd( 400, "bsk", "bsd"),/* Baku */
- zs( 430, "aft"), /* Afghanistan */
- zd( 500, "osk", "osd"),/* Omsk */
- zs( 500, "pkt"), /* Pakistan */
- zd( 500, "tsk", "tsd"),/* Tashkent */
- zs( 545, "npt"), /* Nepal */
- zs( 600, "bgt"), /* Bangladesh */
- zd( 600, "nsk", "nsd"),/* Novosibirsk */
- zs( 630, "bmt"), /* Burma */
- zs( 630, "cct"), /* Cocos */
- zs( 700, "ict"), /* Indochina */
- zs( 700, "jvt"), /* Java */
- zd( 700, "isk", "isd"),/* Irkutsk */
- zs( 800, "hkt"), /* Hong Kong */
- zs( 800, "pst"), /* Philippines */
- zs( 800, "sgt"), /* Singapore */
- zd( 800, "cst", "cdt"),/* China */
- zd( 800, "ust", "udt"),/* Ulan Bator */
- zd( 800, "wst", "wst"),/* Western Australia */
- zd( 800, "ysk", "ysd"),/* Yakutsk */
- zs( 900, "blt"), /* Belau */
- zs( 900, "mlt"), /* Moluccas */
- zd( 900, "vsk", "vsd"),/* Vladivostok */
- zd( 930, "cst", "cst"),/* Central Australia */
- zs( 1000, "gst"), /* Guam */
- zd( 1000, "gsk", "gsd"),/* Magadan */
- zd( 1000, "est", "est"),/* Eastern Australia */
- zd( 1100,"lhst","lhst"),/* Lord Howe */
- zd( 1100, "psk", "psd"),/* Petropavlovsk-Kamchatski */
- zs( 1100,"ncst"), /* New Caledonia */
- zs( 1130,"nrft"), /* Norfolk */
- zd( 1200, "ask", "asd"),/* Anadyr */
- zs( 1245,"nz-chat"), /* Chatham */
- zs( 1300, "tgt"), /* Tongatapu */
-#endif
- {"", -1}
-};
-
- static int
-lookup (s, table)
- char const *s;
- struct name_val const table[];
-/* Look for a prefix of S in TABLE, returning val for first matching entry. */
-{
- int j;
- char buf[NAME_LENGTH_MAXIMUM];
-
- for (j = 0; j < NAME_LENGTH_MAXIMUM; j++) {
- unsigned char c = *s++;
- buf[j] = isupper (c) ? tolower (c) : c;
- if (!isalpha (c))
- break;
- }
- for (; table[0].name[0]; table++)
- for (j = 0; buf[j] == table[0].name[j]; )
- if (++j == NAME_LENGTH_MAXIMUM || !table[0].name[j])
- goto done;
- done:
- return table[0].val;
-}
-
-
- static void
-undefine (t) struct partime *t;
-/* Set *T to ``undefined'' values. */
-{
- t->tm.tm_sec = t->tm.tm_min = t->tm.tm_hour = t->tm.tm_mday = t->tm.tm_mon
- = t->tm.tm_year = t->tm.tm_wday = t->tm.tm_yday
- = t->ymodulus = t->yweek
- = TM_UNDEFINED;
- t->zone = TM_UNDEFINED_ZONE;
-}
-
-/*
-* Array of patterns to look for in a date string.
-* Order is important: we look for the first matching pattern
-* whose values do not contradict values that we already know about.
-* See `parse_pattern_letter' below for the meaning of the pattern codes.
-*/
-static char const * const patterns[] = {
- /*
- * These traditional patterns must come first,
- * to prevent an ISO 8601 format from misinterpreting their prefixes.
- */
- "E_n_y", "x", /* RFC 822 */
- "E_n", "n_E", "n", "t:m:s_A", "t:m_A", "t_A", /* traditional */
- "y/N/D$", /* traditional RCS */
-
- /* ISO 8601:1988 formats, generalized a bit. */
- "y-N-D$", "4ND$", "Y-N$",
- "RND$", "-R=N$", "-R$", "--N=D$", "N=DT",
- "--N$", "---D$", "DT",
- "Y-d$", "4d$", "R=d$", "-d$", "dT",
- "y-W-X", "yWX", "y=W",
- "-r-W-X", "r-W-XT", "-rWX", "rWXT", "-W=X", "W=XT", "-W",
- "-w-X", "w-XT", "---X$", "XT", "4$",
- "T",
- "h:m:s$", "hms$", "h:m$", "hm$", "h$", "-m:s$", "-ms$", "-m$", "--s$",
- "Y", "Z",
-
- 0
-};
-
- static char const *
-parse_prefix (str, t, pi) char const *str; struct partime *t; int *pi;
-/*
-* Parse an initial prefix of STR, setting *T accordingly.
-* Return the first character after the prefix, or 0 if it couldn't be parsed.
-* Start with pattern *PI; if success, set *PI to the next pattern to try.
-* Set *PI to -1 if we know there are no more patterns to try;
-* if *PI is initially negative, give up immediately.
-*/
-{
- int i = *pi;
- char const *pat;
- unsigned char c;
-
- if (i < 0)
- return 0;
-
- /* Remove initial noise. */
- while (!isalnum (c = *str) && c != '-' && c != '+') {
- if (!c) {
- undefine (t);
- *pi = -1;
- return str;
- }
- str++;
- }
-
- /* Try a pattern until one succeeds. */
- while ((pat = patterns[i++]) != 0) {
- char const *s = str;
- undefine (t);
- do {
- if (!(c = *pat++)) {
- *pi = i;
- return s;
- }
- } while ((s = parse_pattern_letter (s, c, t)) != 0);
- }
-
- return 0;
-}
-
- static char const *
-parse_fixed (s, digits, res) char const *s; int digits, *res;
-/*
-* Parse an initial prefix of S of length DIGITS; it must be a number.
-* Store the parsed number into *RES.
-* Return the first character after the prefix, or 0 if it couldn't be parsed.
-*/
-{
- int n = 0;
- char const *lim = s + digits;
- while (s < lim) {
- unsigned d = *s++ - '0';
- if (9 < d)
- return 0;
- n = 10*n + d;
- }
- *res = n;
- return s;
-}
-
- static char const *
-parse_ranged (s, digits, lo, hi, res) char const *s; int digits, lo, hi, *res;
-/*
-* Parse an initial prefix of S of length DIGITS;
-* it must be a number in the range LO through HI.
-* Store the parsed number into *RES.
-* Return the first character after the prefix, or 0 if it couldn't be parsed.
-*/
-{
- s = parse_fixed (s, digits, res);
- return s && lo<=*res && *res<=hi ? s : 0;
-}
-
- static char const *
-parse_decimal (s, digits, lo, hi, resolution, res, fres)
- char const *s;
- int digits, lo, hi, resolution, *res, *fres;
-/*
-* Parse an initial prefix of S of length DIGITS;
-* it must be a number in the range LO through HI
-* and it may be followed by a fraction that is to be computed using RESOLUTION.
-* Store the parsed number into *RES; store the fraction times RESOLUTION,
-* rounded to the nearest integer, into *FRES.
-* Return the first character after the prefix, or 0 if it couldn't be parsed.
-*/
-{
- s = parse_fixed (s, digits, res);
- if (s && lo<=*res && *res<=hi) {
- int f = 0;
- if ((s[0]==',' || s[0]=='.') && isdigit ((unsigned char) s[1])) {
- char const *s1 = ++s;
- int num10 = 0, denom10 = 10, product;
- while (isdigit ((unsigned char) *++s))
- denom10 *= 10;
- s = parse_fixed (s1, s - s1, &num10);
- product = num10*resolution;
- f = (product + (denom10>>1)) / denom10;
- f -= f & (product%denom10 == denom10>>1); /* round to even */
- if (f < 0 || product/resolution != num10)
- return 0; /* overflow */
- }
- *fres = f;
- return s;
- }
- return 0;
-}
-
- char *
-parzone (s, zone) char const *s; long *zone;
-/*
-* Parse an initial prefix of S; it must denote a time zone.
-* Set *ZONE to the number of seconds east of GMT,
-* or to TM_LOCAL_ZONE if it is the local time zone.
-* Return the first character after the prefix, or 0 if it couldn't be parsed.
-*/
-{
- char sign;
- int hh, mm, ss;
- int minutesEastOfUTC;
- long offset, z;
-
- /*
- * The formats are LT, n, n DST, nDST, no, o
- * where n is a time zone name
- * and o is a time zone offset of the form [-+]hh[:mm[:ss]].
- */
- switch (*s) {
- case '-': case '+':
- z = 0;
- break;
-
- default:
- minutesEastOfUTC = lookup (s, zone_names);
- if (minutesEastOfUTC == -1)
- return 0;
-
- /* Don't bother to check rest of spelling. */
- while (isalpha ((unsigned char) *s))
- s++;
-
- /* Don't modify LT. */
- if (minutesEastOfUTC == 1) {
- *zone = TM_LOCAL_ZONE;
- return (char *) s;
- }
-
- z = minutesEastOfUTC * 60L;
-
- /* Look for trailing " DST". */
- if (
- (s[-1]=='T' || s[-1]=='t') &&
- (s[-2]=='S' || s[-2]=='s') &&
- (s[-3]=='D' || s[-3]=='t')
- )
- goto trailing_dst;
- while (isspace ((unsigned char) *s))
- s++;
- if (
- (s[0]=='D' || s[0]=='d') &&
- (s[1]=='S' || s[1]=='s') &&
- (s[2]=='T' || s[2]=='t')
- ) {
- s += 3;
- trailing_dst:
- *zone = z + 60*60;
- return (char *) s;
- }
-
- switch (*s) {
- case '-': case '+': break;
- default: return (char *) s;
- }
- }
- sign = *s++;
-
- if (!(s = parse_ranged (s, 2, 0, 23, &hh)))
- return 0;
- mm = ss = 0;
- if (*s == ':')
- s++;
- if (isdigit ((unsigned char) *s)) {
- if (!(s = parse_ranged (s, 2, 0, 59, &mm)))
- return 0;
- if (*s==':' && s[-3]==':' && isdigit ((unsigned char) s[1])) {
- if (!(s = parse_ranged (s + 1, 2, 0, 59, &ss)))
- return 0;
- }
- }
- if (isdigit ((unsigned char) *s))
- return 0;
- offset = (hh*60 + mm)*60L + ss;
- *zone = z + (sign=='-' ? -offset : offset);
- /*
- * ?? Are fractions allowed here?
- * If so, they're not implemented.
- */
- return (char *) s;
-}
-
- static char const *
-parse_pattern_letter (s, c, t) char const *s; int c; struct partime *t;
-/*
-* Parse an initial prefix of S, matching the pattern whose code is C.
-* Set *T accordingly.
-* Return the first character after the prefix, or 0 if it couldn't be parsed.
-*/
-{
- switch (c) {
- case '$': /* The next character must be a non-digit. */
- if (isdigit ((unsigned char) *s))
- return 0;
- break;
-
- case '-': case '/': case ':':
- /* These characters stand for themselves. */
- if (*s++ != c)
- return 0;
- break;
-
- case '4': /* 4-digit year */
- s = parse_fixed (s, 4, &t->tm.tm_year);
- break;
-
- case '=': /* optional '-' */
- s += *s == '-';
- break;
-
- case 'A': /* AM or PM */
- /*
- * This matches the regular expression [AaPp][Mm]?.
- * It must not be followed by a letter or digit;
- * otherwise it would match prefixes of strings like "PST".
- */
- switch (*s++) {
- case 'A': case 'a':
- if (t->tm.tm_hour == 12)
- t->tm.tm_hour = 0;
- break;
-
- case 'P': case 'p':
- if (t->tm.tm_hour != 12)
- t->tm.tm_hour += 12;
- break;
-
- default: return 0;
- }
- switch (*s) {
- case 'M': case 'm': s++; break;
- }
- if (isalnum (*s))
- return 0;
- break;
-
- case 'D': /* day of month [01-31] */
- s = parse_ranged (s, 2, 1, 31, &t->tm.tm_mday);
- break;
-
- case 'd': /* day of year [001-366] */
- s = parse_ranged (s, 3, 1, 366, &t->tm.tm_yday);
- t->tm.tm_yday--;
- break;
-
- case 'E': /* extended day of month [1-9, 01-31] */
- s = parse_ranged (s, (
- isdigit ((unsigned char) s[0]) &&
- isdigit ((unsigned char) s[1])
- ) + 1, 1, 31, &t->tm.tm_mday);
- break;
-
- case 'h': /* hour [00-23 followed by optional fraction] */
- {
- int frac;
- s = parse_decimal (s, 2, 0, 23, 60*60, &t->tm.tm_hour, &frac);
- t->tm.tm_min = frac / 60;
- t->tm.tm_sec = frac % 60;
- }
- break;
-
- case 'm': /* minute [00-59 followed by optional fraction] */
- s = parse_decimal (s, 2, 0, 59, 60, &t->tm.tm_min, &t->tm.tm_sec);
- break;
-
- case 'n': /* month name [e.g. "Jan"] */
- if (!TM_DEFINED (t->tm.tm_mon = lookup (s, month_names)))
- return 0;
- /* Don't bother to check rest of spelling. */
- while (isalpha ((unsigned char) *s))
- s++;
- break;
-
- case 'N': /* month [01-12] */
- s = parse_ranged (s, 2, 1, 12, &t->tm.tm_mon);
- t->tm.tm_mon--;
- break;
-
- case 'r': /* year % 10 (remainder in origin-0 decade) [0-9] */
- s = parse_fixed (s, 1, &t->tm.tm_year);
- t->ymodulus = 10;
- break;
-
- case_R:
- case 'R': /* year % 100 (remainder in origin-0 century) [00-99] */
- s = parse_fixed (s, 2, &t->tm.tm_year);
- t->ymodulus = 100;
- break;
-
- case 's': /* second [00-60 followed by optional fraction] */
- {
- int frac;
- s = parse_decimal (s, 2, 0, 60, 1, &t->tm.tm_sec, &frac);
- t->tm.tm_sec += frac;
- }
- break;
-
- case 'T': /* 'T' or 't' */
- switch (*s++) {
- case 'T': case 't': break;
- default: return 0;
- }
- break;
-
- case 't': /* traditional hour [1-9 or 01-12] */
- s = parse_ranged (s, (
- isdigit ((unsigned char) s[0]) && isdigit ((unsigned char) s[1])
- ) + 1, 1, 12, &t->tm.tm_hour);
- break;
-
- case 'w': /* 'W' or 'w' only (stands for current week) */
- switch (*s++) {
- case 'W': case 'w': break;
- default: return 0;
- }
- break;
-
- case 'W': /* 'W' or 'w', followed by a week of year [00-53] */
- switch (*s++) {
- case 'W': case 'w': break;
- default: return 0;
- }
- s = parse_ranged (s, 2, 0, 53, &t->yweek);
- break;
-
- case 'X': /* weekday (1=Mon ... 7=Sun) [1-7] */
- s = parse_ranged (s, 1, 1, 7, &t->tm.tm_wday);
- t->tm.tm_wday--;
- break;
-
- case 'x': /* weekday name [e.g. "Sun"] */
- if (!TM_DEFINED (t->tm.tm_wday = lookup (s, weekday_names)))
- return 0;
- /* Don't bother to check rest of spelling. */
- while (isalpha ((unsigned char) *s))
- s++;
- break;
-
- case 'y': /* either R or Y */
- if (
- isdigit ((unsigned char) s[0]) &&
- isdigit ((unsigned char) s[1]) &&
- !isdigit ((unsigned char) s[2])
- )
- goto case_R;
- /* fall into */
- case 'Y': /* year in full [4 or more digits] */
- {
- int len = 0;
- while (isdigit ((unsigned char) s[len]))
- len++;
- if (len < 4)
- return 0;
- s = parse_fixed (s, len, &t->tm.tm_year);
- }
- break;
-
- case 'Z': /* time zone */
- s = parzone (s, &t->zone);
- break;
-
- case '_': /* possibly empty sequence of non-alphanumerics */
- while (!isalnum (*s) && *s)
- s++;
- break;
-
- default: /* bad pattern */
- return 0;
- }
- return s;
-}
-
- static int
-merge_partime (t, u) struct partime *t; struct partime const *u;
-/*
-* If there is no conflict, merge into *T the additional information in *U
-* and return 0. Otherwise do nothing and return -1.
-*/
-{
-# define conflict(a,b) ((a) != (b) && TM_DEFINED (a) && TM_DEFINED (b))
- if (
- conflict (t->tm.tm_sec, u->tm.tm_sec) ||
- conflict (t->tm.tm_min, u->tm.tm_min) ||
- conflict (t->tm.tm_hour, u->tm.tm_hour) ||
- conflict (t->tm.tm_mday, u->tm.tm_mday) ||
- conflict (t->tm.tm_mon, u->tm.tm_mon) ||
- conflict (t->tm.tm_year, u->tm.tm_year) ||
- conflict (t->tm.tm_wday, u->tm.tm_yday) ||
- conflict (t->ymodulus, u->ymodulus) ||
- conflict (t->yweek, u->yweek) ||
- (
- t->zone != u->zone &&
- t->zone != TM_UNDEFINED_ZONE &&
- u->zone != TM_UNDEFINED_ZONE
- )
- )
- return -1;
-# undef conflict
-# define merge_(a,b) if (TM_DEFINED (b)) (a) = (b);
- merge_ (t->tm.tm_sec, u->tm.tm_sec)
- merge_ (t->tm.tm_min, u->tm.tm_min)
- merge_ (t->tm.tm_hour, u->tm.tm_hour)
- merge_ (t->tm.tm_mday, u->tm.tm_mday)
- merge_ (t->tm.tm_mon, u->tm.tm_mon)
- merge_ (t->tm.tm_year, u->tm.tm_year)
- merge_ (t->tm.tm_wday, u->tm.tm_yday)
- merge_ (t->ymodulus, u->ymodulus)
- merge_ (t->yweek, u->yweek)
-# undef merge_
- if (u->zone != TM_UNDEFINED_ZONE) t->zone = u->zone;
- return 0;
-}
-
- char *
-partime (s, t) char const *s; struct partime *t;
-/*
-* Parse a date/time prefix of S, putting the parsed result into *T.
-* Return the first character after the prefix.
-* The prefix may contain no useful information;
-* in that case, *T will contain only undefined values.
-*/
-{
- struct partime p;
-
- undefine (t);
- while (*s) {
- int i = 0;
- char const *s1;
- do {
- if (!(s1 = parse_prefix (s, &p, &i)))
- return (char *) s;
- } while (merge_partime (t, &p) != 0);
- s = s1;
- }
- return (char *) s;
-}
diff --git a/gnu/usr.bin/rcs/lib/partime.h b/gnu/usr.bin/rcs/lib/partime.h
deleted file mode 100644
index 5d3983fbb048..000000000000
--- a/gnu/usr.bin/rcs/lib/partime.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Parse a string, yielding a struct partime that describes it. */
-
-/* Copyright 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-#define TM_UNDEFINED (-1)
-#define TM_DEFINED(x) (0 <= (x))
-
-#define TM_UNDEFINED_ZONE ((long) -24 * 60 * 60)
-#define TM_LOCAL_ZONE (TM_UNDEFINED_ZONE - 1)
-
-struct partime {
- /*
- * This structure describes the parsed time.
- * Only the following tm_* values in it are used:
- * sec, min, hour, mday, mon, year, wday, yday.
- * If TM_UNDEFINED(value), the parser never found the value.
- * The tm_year field is the actual year, not the year - 1900;
- * but see ymodulus below.
- */
- struct tm tm;
-
- /*
- * If !TM_UNDEFINED(ymodulus),
- * then tm.tm_year is actually modulo ymodulus.
- */
- int ymodulus;
-
- /*
- * Week of year, ISO 8601 style.
- * If TM_UNDEFINED(yweek), the parser never found yweek.
- * Weeks start on Mondays.
- * Week 1 includes Jan 4.
- */
- int yweek;
-
- /* Seconds east of UTC; or TM_LOCAL_ZONE or TM_UNDEFINED_ZONE. */
- long zone;
-};
-
-#if defined(__STDC__) || has_prototypes
-# define __PARTIME_P(x) x
-#else
-# define __PARTIME_P(x) ()
-#endif
-
-char *partime __PARTIME_P((char const *, struct partime *));
-char *parzone __PARTIME_P((char const *, long *));
diff --git a/gnu/usr.bin/rcs/lib/rcsbase.h b/gnu/usr.bin/rcs/lib/rcsbase.h
deleted file mode 100644
index 9f2f68cc8b6b..000000000000
--- a/gnu/usr.bin/rcs/lib/rcsbase.h
+++ /dev/null
@@ -1,762 +0,0 @@
-/* RCS common definitions and data structures */
-
-#define RCSBASE "$FreeBSD$"
-
-/* Copyright 1982, 1988, 1989 Walter Tichy
- Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-/*
- * Revision 5.20 1995/06/16 06:19:24 eggert
- * Update FSF address.
- *
- * Revision 5.19 1995/06/01 16:23:43 eggert
- * (SIZEABLE_PATH): Don't depend on PATH_MAX: it's not worth configuring.
- * (Ioffset_type,BINARY_EXPAND,MIN_UNEXPAND,MIN_UNCHANGED_EXPAND): New macros.
- * (maps_memory): New macro; replaces many instances of `has_mmap'.
- * (cacheptr): Renamed from cachetell.
- * (struct RILE): New alternate name for RILE; the type is now recursive.
- * (deallocate): New member for RILE, used for generic buffer deallocation.
- * (cacheunget_): No longer take a failure arg; just call Ierror on failure.
- * (struct rcslock): Renamed from struct lock, to avoid collisions with
- * system headers on some hosts. All users changed.
- * (basefilename): Renamed from basename, likewise.
- * (dirtpname): Remove; no longer external.
- * (dirlen, dateform): Remove; no longer used.
- * (cmpdate, fopenSafer, fdSafer, readAccessFilenameBuffer): New functions.
- * (zonelenmax): Increase to 9 for full ISO 8601 format.
- * (catchmmapints): Depend on has_NFS.
- *
- * Revision 5.18 1994/03/17 14:05:48 eggert
- * Add primitives for reading backwards from a RILE;
- * this is needed to go back and find the $Log prefix.
- * Specify subprocess input via file descriptor, not file name. Remove lint.
- *
- * Revision 5.17 1993/11/09 17:40:15 eggert
- * Move RCS-specific time handling into rcstime.c.
- * printf_string now takes two arguments, alas.
- *
- * Revision 5.16 1993/11/03 17:42:27 eggert
- * Don't arbitrarily limit the number of joins. Remove `nil'.
- * Add Name keyword. Don't discard ignored phrases.
- * Add support for merge -A vs -E, and allow up to three labels.
- * Improve quality of diagnostics and prototypes.
- *
- * Revision 5.15 1992/07/28 16:12:44 eggert
- * Statement macro names now end in _.
- *
- * Revision 5.14 1992/02/17 23:02:22 eggert
- * Add -T support. Work around NFS mmap SIGBUS problem.
- *
- * Revision 5.13 1992/01/24 18:44:19 eggert
- * Add support for bad_creat0. lint -> RCS_lint
- *
- * Revision 5.12 1992/01/06 02:42:34 eggert
- * while (E) ; -> while (E) continue;
- *
- * Revision 5.11 1991/10/07 17:32:46 eggert
- * Support piece tables even if !has_mmap.
- *
- * Revision 5.10 1991/09/24 00:28:39 eggert
- * Remove unexported functions.
- *
- * Revision 5.9 1991/08/19 03:13:55 eggert
- * Add piece tables and other tuneups, and NFS workarounds.
- *
- * Revision 5.8 1991/04/21 11:58:20 eggert
- * Add -x, RCSINIT, MS-DOS support.
- *
- * Revision 5.7 1991/02/28 19:18:50 eggert
- * Try setuid() if seteuid() doesn't work.
- *
- * Revision 5.6 1991/02/26 17:48:37 eggert
- * Support new link behavior. Move ANSI C / Posix declarations into conf.sh.
- *
- * Revision 5.5 1990/12/04 05:18:43 eggert
- * Use -I for prompts and -q for diagnostics.
- *
- * Revision 5.4 1990/11/01 05:03:35 eggert
- * Don't assume that builtins are functions; they may be macros.
- * Permit arbitrary data in logs.
- *
- * Revision 5.3 1990/09/26 23:36:58 eggert
- * Port wait() to non-Posix ANSI C hosts.
- *
- * Revision 5.2 1990/09/04 08:02:20 eggert
- * Don't redefine NAME_MAX, PATH_MAX.
- * Improve incomplete line handling. Standardize yes-or-no procedure.
- *
- * Revision 5.1 1990/08/29 07:13:53 eggert
- * Add -kkvl. Fix type typos exposed by porting. Clean old log messages too.
- *
- * Revision 5.0 1990/08/22 08:12:44 eggert
- * Adjust ANSI C / Posix support. Add -k, -V, setuid. Don't call access().
- * Remove compile-time limits; use malloc instead.
- * Ansify and Posixate. Add support for ISO 8859.
- * Remove snoop and v2 support.
- *
- * Revision 4.9 89/05/01 15:17:14 narten
- * botched previous USG fix
- *
- * Revision 4.8 89/05/01 14:53:05 narten
- * changed #include <strings.h> -> string.h for USG systems.
- *
- * Revision 4.7 88/11/08 15:58:45 narten
- * removed defs for functions loaded from libraries
- *
- * Revision 4.6 88/08/09 19:12:36 eggert
- * Shrink stdio code size; remove lint; permit -Dhshsize=nn.
- *
- * Revision 4.5 87/12/18 17:06:41 narten
- * made removed BSD ifdef, now uses V4_2BSD
- *
- * Revision 4.4 87/10/18 10:29:49 narten
- * Updating version numbers
- * Changes relative to 1.1 are actually relative to 4.2
- *
- * Revision 1.3 87/09/24 14:02:25 narten
- * changes for lint
- *
- * Revision 1.2 87/03/27 14:22:02 jenkins
- * Port to suns
- *
- * Revision 4.2 83/12/20 16:04:20 wft
- * merged 3.6.1.1 and 4.1 (SMALLOG, logsize).
- * moved setting of STRICT_LOCKING to Makefile.
- * changed DOLLAR to UNKN (conflict with KDELIM).
- *
- * Revision 4.1 83/05/04 09:12:41 wft
- * Added markers Id and RCSfile.
- * Added Dbranch for default branches.
- *
- * Revision 3.6.1.1 83/12/02 21:56:22 wft
- * Increased logsize, added macro SMALLOG.
- *
- * Revision 3.6 83/01/15 16:43:28 wft
- * 4.2 prerelease
- *
- * Revision 3.6 83/01/15 16:43:28 wft
- * Replaced dbm.h with BYTESIZ, fixed definition of rindex().
- * Added variants of NCPFN and NCPPN for bsd 4.2, selected by defining V4_2BSD.
- * Added macro DELNUMFORM to have uniform format for printing delta text nodes.
- * Added macro DELETE to mark deleted deltas.
- *
- * Revision 3.5 82/12/10 12:16:56 wft
- * Added two forms of DATEFORM, one using %02d, the other %.2d.
- *
- * Revision 3.4 82/12/04 20:01:25 wft
- * added LOCKER, Locker, and USG (redefinition of rindex).
- *
- * Revision 3.3 82/12/03 12:22:04 wft
- * Added dbm.h, stdio.h, RCSBASE, RCSSEP, RCSSUF, WORKMODE, TMPFILE3,
- * PRINTDATE, PRINTTIME, map, and ctab; removed Suffix. Redefined keyvallength
- * using NCPPN. Changed putc() to abort on write error.
- *
- * Revision 3.2 82/10/18 15:03:52 wft
- * added macro STRICT_LOCKING, removed RCSUMASK.
- * renamed JOINFILE[1,2] to JOINFIL[1,2].
- *
- * Revision 3.1 82/10/11 19:41:17 wft
- * removed NBPW, NBPC, NCPW.
- * added typdef int void to aid compiling
- */
-
-
-#include "conf.h"
-
-
-#define EXIT_TROUBLE DIFF_TROUBLE
-
-#ifdef _POSIX_PATH_MAX
-# define SIZEABLE_PATH _POSIX_PATH_MAX
-#else
-# define SIZEABLE_PATH 255 /* size of a large path; not a hard limit */
-#endif
-
-/* for traditional C hosts with unusual size arguments */
-#define Fread(p,s,n,f) fread(p, (freadarg_type)(s), (freadarg_type)(n), f)
-#define Fwrite(p,s,n,f) fwrite(p, (freadarg_type)(s), (freadarg_type)(n), f)
-
-
-/*
- * Parameters
- */
-
-/* backwards compatibility with old versions of RCS */
-#define VERSION_min 3 /* old output RCS format supported */
-#define VERSION_max 5 /* newest output RCS format supported */
-#ifndef VERSION_DEFAULT /* default RCS output format */
-# define VERSION_DEFAULT VERSION_max
-#endif
-#define VERSION(n) ((n) - VERSION_DEFAULT) /* internally, 0 is the default */
-
-#ifndef STRICT_LOCKING
-#define STRICT_LOCKING 1
-#endif
- /* 0 sets the default locking to non-strict; */
- /* used in experimental environments. */
- /* 1 sets the default locking to strict; */
- /* used in production environments. */
-
-#define yearlength 16 /* (good through AD 9,999,999,999,999,999) */
-#define datesize (yearlength+16) /* size of output of time2date */
-#define RCSTMPPREFIX '_' /* prefix for temp files in working dir */
-#define KDELIM '$' /* delimiter for keywords */
-#define VDELIM ':' /* separates keywords from values */
-#define DEFAULTSTATE "Exp" /* default state of revisions */
-
-
-
-#define true 1
-#define false 0
-
-
-/*
- * RILE - readonly file
- * declarecache; - declares local cache for RILE variable(s)
- * setupcache - sets up the local RILE cache, but does not initialize it
- * cache, uncache - caches and uncaches the local RILE;
- * (uncache,cache) is needed around functions that advance the RILE pointer
- * Igeteof_(f,c,s) - get a char c from f, executing statement s at EOF
- * cachegeteof_(c,s) - Igeteof_ applied to the local RILE
- * Iget_(f,c) - like Igeteof_, except EOF is an error
- * cacheget_(c) - Iget_ applied to the local RILE
- * cacheunget_(f,c,s) - read c backwards from cached f, executing s at BOF
- * Ifileno, Ioffset_type, Irewind, Itell - analogs to stdio routines
- *
- * By conventions, macros whose names end in _ are statements, not expressions.
- * Following such macros with `; else' results in a syntax error.
- */
-
-#define maps_memory (has_map_fd || has_mmap)
-
-#if large_memory
- typedef unsigned char const *Iptr_type;
- typedef struct RILE {
- Iptr_type ptr, lim;
- unsigned char *base; /* not Iptr_type for lint's sake */
- unsigned char *readlim;
- int fd;
-# if maps_memory
- void (*deallocate) P((struct RILE *));
-# else
- FILE *stream;
-# endif
- } RILE;
-# if maps_memory
-# define declarecache register Iptr_type ptr, lim
-# define setupcache(f) (lim = (f)->lim)
-# define Igeteof_(f,c,s) if ((f)->ptr==(f)->lim) s else (c)= *(f)->ptr++;
-# define cachegeteof_(c,s) if (ptr==lim) s else (c)= *ptr++;
-# else
- int Igetmore P((RILE*));
-# define declarecache register Iptr_type ptr; register RILE *rRILE
-# define setupcache(f) (rRILE = (f))
-# define Igeteof_(f,c,s) if ((f)->ptr==(f)->readlim && !Igetmore(f)) s else (c)= *(f)->ptr++;
-# define cachegeteof_(c,s) if (ptr==rRILE->readlim && !Igetmore(rRILE)) s else (c)= *ptr++;
-# endif
-# define uncache(f) ((f)->ptr = ptr)
-# define cache(f) (ptr = (f)->ptr)
-# define Iget_(f,c) Igeteof_(f,c,Ieof();)
-# define cacheget_(c) cachegeteof_(c,Ieof();)
-# define cacheunget_(f,c) (c)=(--ptr)[-1];
-# define Ioffset_type size_t
-# define Itell(f) ((f)->ptr - (f)->base)
-# define Irewind(f) ((f)->ptr = (f)->base)
-# define cacheptr() ptr
-# define Ifileno(f) ((f)->fd)
-#else
-# define RILE FILE
-# define declarecache register FILE *ptr
-# define setupcache(f) (ptr = (f))
-# define uncache(f)
-# define cache(f)
-# define Igeteof_(f,c,s) {if(((c)=getc(f))==EOF){testIerror(f);if(feof(f))s}}
-# define cachegeteof_(c,s) Igeteof_(ptr,c,s)
-# define Iget_(f,c) { if (((c)=getc(f))==EOF) testIeof(f); }
-# define cacheget_(c) Iget_(ptr,c)
-# define cacheunget_(f,c) if(fseek(ptr,-2L,SEEK_CUR))Ierror();else cacheget_(c)
-# define Ioffset_type long
-# define Itell(f) ftell(f)
-# define Ifileno(f) fileno(f)
-#endif
-
-/* Print a char, but abort on write error. */
-#define aputc_(c,o) { if (putc(c,o)==EOF) testOerror(o); }
-
-/* Get a character from an RCS file, perhaps copying to a new RCS file. */
-#define GETCeof_(o,c,s) { cachegeteof_(c,s) if (o) aputc_(c,o) }
-#define GETC_(o,c) { cacheget_(c) if (o) aputc_(c,o) }
-
-
-#define WORKMODE(RCSmode, writable) (((RCSmode)&(mode_t)~(S_IWUSR|S_IWGRP|S_IWOTH)) | ((writable)?S_IWUSR:0))
-/* computes mode of working file: same as RCSmode, but write permission */
-/* determined by writable */
-
-
-/* character classes and token codes */
-enum tokens {
-/* classes */ DELIM, DIGIT, IDCHAR, NEWLN, LETTER, Letter,
- PERIOD, SBEGIN, SPACE, UNKN,
-/* tokens */ COLON, ID, NUM, SEMI, STRING
-};
-
-#define SDELIM '@' /* the actual character is needed for string handling*/
-/* SDELIM must be consistent with ctab[], so that ctab[SDELIM]==SBEGIN.
- * there should be no overlap among SDELIM, KDELIM, and VDELIM
- */
-
-#define isdigit(c) (((unsigned)(c)-'0') <= 9) /* faster than ctab[c]==DIGIT */
-
-
-
-
-
-/***************************************
- * Data structures for the symbol table
- ***************************************/
-
-/* Buffer of arbitrary data */
-struct buf {
- char *string;
- size_t size;
-};
-struct cbuf {
- char const *string;
- size_t size;
-};
-
-/* Hash table entry */
-struct hshentry {
- char const * num; /* pointer to revision number (ASCIZ) */
- char const * date; /* pointer to date of checkin */
- char const * author; /* login of person checking in */
- char const * lockedby; /* who locks the revision */
- char const * state; /* state of revision (Exp by default) */
- char const * name; /* name (if any) by which retrieved */
- struct cbuf log; /* log message requested at checkin */
- struct branchhead * branches; /* list of first revisions on branches*/
- struct cbuf ig; /* ignored phrases in admin part */
- struct cbuf igtext; /* ignored phrases in deltatext part */
- struct hshentry * next; /* next revision on same branch */
- struct hshentry * nexthsh; /* next revision with same hash value */
- long insertlns;/* lines inserted (computed by rlog) */
- long deletelns;/* lines deleted (computed by rlog) */
- char selector; /* true if selected, false if deleted */
-};
-
-/* list of hash entries */
-struct hshentries {
- struct hshentries *rest;
- struct hshentry *first;
-};
-
-/* list element for branch lists */
-struct branchhead {
- struct hshentry * hsh;
- struct branchhead * nextbranch;
-};
-
-/* accesslist element */
-struct access {
- char const * login;
- struct access * nextaccess;
-};
-
-/* list element for locks */
-struct rcslock {
- char const * login;
- struct hshentry * delta;
- struct rcslock * nextlock;
-};
-
-/* list element for symbolic names */
-struct assoc {
- char const * symbol;
- char const * num;
- struct assoc * nextassoc;
-};
-
-
-#define mainArgs (argc,argv) int argc; char **argv;
-
-#if RCS_lint
-# define libId(name,rcsid)
-# define mainProg(name,cmd,rcsid) int name mainArgs
-#else
-# define libId(name,rcsid) char const name[] = rcsid;
-# define mainProg(n,c,i) char const Copyright[] = "Copyright 1982,1988,1989 Walter F. Tichy, Purdue CS\nCopyright 1990,1991,1992,1993,1994,1995 Paul Eggert", baseid[] = RCSBASE, cmdid[] = c; libId(n,i) int main P((int,char**)); int main mainArgs
-#endif
-
-/*
- * Markers for keyword expansion (used in co and ident)
- * Every byte must have class LETTER or Letter.
- */
-#define AUTHOR "Author"
-#define DATE "Date"
-#define HEADER "Header"
-#define IDH "Id"
-#define LOCKER "Locker"
-#define LOG "Log"
-#define NAME "Name"
-#define RCSFILE "RCSfile"
-#define REVISION "Revision"
-#define SOURCE "Source"
-#define STATE "State"
-#define CVSHEADER "CVSHeader"
-#define keylength 9 /* max length of any of the above keywords */
-
-enum markers { Nomatch, Author, Date, Header, Id,
- Locker, Log, Name, RCSfile, Revision, Source, State, CVSHeader,
- LocalId };
- /* This must be in the same order as rcskeys.c's Keyword[] array. */
-
-#define DELNUMFORM "\n\n%s\n%s\n"
-/* used by putdtext and scanlogtext */
-
-#define EMPTYLOG "*** empty log message ***" /* used by ci and rlog */
-
-/* main program */
-extern char const cmdid[];
-void exiterr P((void)) exiting;
-
-/* merge */
-int merge P((int,char const*,char const*const[3],char const*const[3]));
-
-/* rcsedit */
-#define ciklogsize 23 /* sizeof("checked in with -k by ") */
-extern FILE *fcopy;
-extern char const *resultname;
-extern char const ciklog[ciklogsize];
-extern int locker_expansion;
-RILE *rcswriteopen P((struct buf*,struct stat*,int));
-char const *makedirtemp P((int));
-char const *getcaller P((void));
-int addlock P((struct hshentry*,int));
-int addsymbol P((char const*,char const*,int));
-int checkaccesslist P((void));
-int chnamemod P((FILE**,char const*,char const*,int,mode_t,time_t));
-int donerewrite P((int,time_t));
-int dorewrite P((int,int));
-int expandline P((RILE*,FILE*,struct hshentry const*,int,FILE*,int));
-int findlock P((int,struct hshentry**));
-int setmtime P((char const*,time_t));
-void ORCSclose P((void));
-void ORCSerror P((void));
-void copystring P((void));
-void dirtempunlink P((void));
-void enterstring P((void));
-void finishedit P((struct hshentry const*,FILE*,int));
-void keepdirtemp P((char const*));
-void openfcopy P((FILE*));
-void snapshotedit P((FILE*));
-void xpandstring P((struct hshentry const*));
-#if has_NFS || bad_unlink
- int un_link P((char const*));
-#else
-# define un_link(s) unlink(s)
-#endif
-#if large_memory
- void edit_string P((void));
-# define editstring(delta) edit_string()
-#else
- void editstring P((struct hshentry const*));
-#endif
-
-/* rcsfcmp */
-int rcsfcmp P((RILE*,struct stat const*,char const*,struct hshentry const*));
-
-/* rcsfnms */
-#define bufautobegin(b) clear_buf(b)
-#define clear_buf(b) (VOID ((b)->string = 0, (b)->size = 0))
-extern FILE *workstdout;
-extern char *workname;
-extern char const *RCSname;
-extern char const *suffixes;
-extern int fdlock;
-extern struct stat RCSstat;
-RILE *rcsreadopen P((struct buf*,struct stat*,int));
-char *bufenlarge P((struct buf*,char const**));
-char const *basefilename P((char const*));
-char const *getfullRCSname P((void));
-char const *getfullCVSname P((void));
-char const *maketemp P((int));
-char const *rcssuffix P((char const*));
-int pairnames P((int,char**,RILE*(*)P((struct buf*,struct stat*,int)),int,int));
-struct cbuf bufremember P((struct buf*,size_t));
-void bufalloc P((struct buf*,size_t));
-void bufautoend P((struct buf*));
-void bufrealloc P((struct buf*,size_t));
-void bufscat P((struct buf*,char const*));
-void bufscpy P((struct buf*,char const*));
-void tempunlink P((void));
-
-/* rcsgen */
-extern int interactiveflag;
-extern struct buf curlogbuf;
-char const *buildrevision P((struct hshentries const*,struct hshentry*,FILE*,int));
-int getcstdin P((void));
-int putdtext P((struct hshentry const*,char const*,FILE*,int));
-int ttystdin P((void));
-int yesorno P((int,char const*,...)) printf_string(2,3);
-struct cbuf cleanlogmsg P((char*,size_t));
-struct cbuf getsstdin P((char const*,char const*,char const*,struct buf*));
-void putdesc P((int,char*));
-void putdftext P((struct hshentry const*,RILE*,FILE*,int));
-
-/* rcskeep */
-extern int prevkeys;
-extern struct buf prevauthor, prevdate, prevname, prevrev, prevstate;
-int getoldkeys P((RILE*));
-
-/* rcskeys */
-extern char const *Keyword[];
-extern enum markers LocalIdMode;
-enum markers trymatch P((char const*));
-void setRCSLocalId(char const *);
-void setIncExc(char const *);
-
-/* rcslex */
-extern FILE *foutptr;
-extern FILE *frewrite;
-extern RILE *finptr;
-extern char const *NextString;
-extern enum tokens nexttok;
-extern int hshenter;
-extern int nerror;
-extern int nextc;
-extern int quietflag;
-extern long rcsline;
-char const *getid P((void));
-void efaterror P((char const*)) exiting;
-void enfaterror P((int,char const*)) exiting;
-void fatcleanup P((int)) exiting;
-void faterror P((char const*,...)) printf_string_exiting(1,2);
-void fatserror P((char const*,...)) printf_string_exiting(1,2);
-void rcsfaterror P((char const*,...)) printf_string_exiting(1,2);
-void Ieof P((void)) exiting;
-void Ierror P((void)) exiting;
-void Oerror P((void)) exiting;
-char *checkid P((char*,int));
-char *checksym P((char*,int));
-int eoflex P((void));
-int getkeyopt P((char const*));
-int getlex P((enum tokens));
-struct cbuf getphrases P((char const*));
-struct cbuf savestring P((struct buf*));
-struct hshentry *getnum P((void));
-void Ifclose P((RILE*));
-void Izclose P((RILE**));
-void Lexinit P((void));
-void Ofclose P((FILE*));
-void Orewind P((FILE*));
-void Ozclose P((FILE**));
-void aflush P((FILE*));
-void afputc P((int,FILE*));
-void aprintf P((FILE*,char const*,...)) printf_string(2,3);
-void aputs P((char const*,FILE*));
-void checksid P((char*));
-void checkssym P((char*));
-void diagnose P((char const*,...)) printf_string(1,2);
-void eerror P((char const*));
-void eflush P((void));
-void enerror P((int,char const*));
-void error P((char const*,...)) printf_string(1,2);
-void fvfprintf P((FILE*,char const*,va_list));
-void getkey P((char const*));
-void getkeystring P((char const*));
-void nextlex P((void));
-void oflush P((void));
-void printstring P((void));
-void readstring P((void));
-void redefined P((int));
-void rcserror P((char const*,...)) printf_string(1,2);
-void rcswarn P((char const*,...)) printf_string(1,2);
-void testIerror P((FILE*));
-void testOerror P((FILE*));
-void warn P((char const*,...)) printf_string(1,2);
-void warnignore P((void));
-void workerror P((char const*,...)) printf_string(1,2);
-void workwarn P((char const*,...)) printf_string(1,2);
-#if has_madvise && has_mmap && large_memory
- void advise_access P((RILE*,int));
-# define if_advise_access(p,f,advice) if (p) advise_access(f,advice)
-#else
-# define advise_access(f,advice)
-# define if_advise_access(p,f,advice)
-#endif
-#if large_memory && maps_memory
- RILE *I_open P((char const*,struct stat*));
-# define Iopen(f,m,s) I_open(f,s)
-#else
- RILE *Iopen P((char const*,char const*,struct stat*));
-#endif
-#if !large_memory
- void testIeof P((FILE*));
- void Irewind P((RILE*));
-#endif
-
-/* rcsmap */
-extern enum tokens const ctab[];
-
-/* rcsrev */
-char *partialno P((struct buf*,char const*,int));
-char const *namedrev P((char const*,struct hshentry*));
-char const *tiprev P((void));
-int cmpdate P((char const*,char const*));
-int cmpnum P((char const*,char const*));
-int cmpnumfld P((char const*,char const*,int));
-int compartial P((char const*,char const*,int));
-int expandsym P((char const*,struct buf*));
-int fexpandsym P((char const*,struct buf*,RILE*));
-struct hshentry *genrevs P((char const*,char const*,char const*,char const*,struct hshentries**));
-int countnumflds P((char const*));
-void getbranchno P((char const*,struct buf*));
-
-/* rcssyn */
-/* These expand modes must agree with Expand_names[] in rcssyn.c. */
-#define KEYVAL_EXPAND 0 /* -kkv `$Keyword: value $' */
-#define KEYVALLOCK_EXPAND 1 /* -kkvl `$Keyword: value locker $' */
-#define KEY_EXPAND 2 /* -kk `$Keyword$' */
-#define VAL_EXPAND 3 /* -kv `value' */
-#define OLD_EXPAND 4 /* -ko use old string, omitting expansion */
-#define BINARY_EXPAND 5 /* -kb like -ko, but use binary mode I/O */
-#define MIN_UNEXPAND OLD_EXPAND /* min value for no logical expansion */
-#define MIN_UNCHANGED_EXPAND (OPEN_O_BINARY ? BINARY_EXPAND : OLD_EXPAND)
- /* min value guaranteed to yield an identical file */
-struct diffcmd {
- long
- line1, /* number of first line */
- nlines, /* number of lines affected */
- adprev, /* previous 'a' line1+1 or 'd' line1 */
- dafter; /* sum of previous 'd' line1 and previous 'd' nlines */
-};
-extern char const * Dbranch;
-extern struct access * AccessList;
-extern struct assoc * Symbols;
-extern struct cbuf Comment;
-extern struct cbuf Ignored;
-extern struct rcslock *Locks;
-extern struct hshentry * Head;
-extern int Expand;
-extern int StrictLocks;
-extern int TotalDeltas;
-extern char const *const expand_names[];
-extern char const
- Kaccess[], Kauthor[], Kbranch[], Kcomment[],
- Kdate[], Kdesc[], Kexpand[], Khead[], Klocks[], Klog[],
- Knext[], Kstate[], Kstrict[], Ksymbols[], Ktext[];
-void unexpected_EOF P((void)) exiting;
-int getdiffcmd P((RILE*,int,FILE*,struct diffcmd*));
-int str2expmode P((char const*));
-void getadmin P((void));
-void getdesc P((int));
-void gettree P((void));
-void ignorephrases P((char const*));
-void initdiffcmd P((struct diffcmd*));
-void putadmin P((void));
-void putstring P((FILE*,int,struct cbuf,int));
-void puttree P((struct hshentry const*,FILE*));
-
-/* rcstime */
-#define zonelenmax 9 /* maxiumum length of time zone string, e.g. "+12:34:56" */
-char const *date2str P((char const[datesize],char[datesize + zonelenmax]));
-time_t date2time P((char const[datesize]));
-void str2date P((char const*,char[datesize]));
-void time2date P((time_t,char[datesize]));
-void zone_set P((char const*));
-
-/* rcsutil */
-extern int RCSversion;
-FILE *fopenSafer P((char const*,char const*));
-char *cgetenv P((char const*));
-char *fstr_save P((char const*));
-char *str_save P((char const*));
-char const *getusername P((int));
-int fdSafer P((int));
-int getRCSINIT P((int,char**,char***));
-int run P((int,char const*,...));
-int runv P((int,char const*,char const**));
-malloc_type fremember P((malloc_type));
-malloc_type ftestalloc P((size_t));
-malloc_type testalloc P((size_t));
-malloc_type testrealloc P((malloc_type,size_t));
-#define ftalloc(T) ftnalloc(T,1)
-#define talloc(T) tnalloc(T,1)
-#if RCS_lint
- extern malloc_type lintalloc;
-# define ftnalloc(T,n) (lintalloc = ftestalloc(sizeof(T)*(n)), (T*)0)
-# define tnalloc(T,n) (lintalloc = testalloc(sizeof(T)*(n)), (T*)0)
-# define trealloc(T,p,n) (lintalloc = testrealloc((malloc_type)0, sizeof(T)*(n)), p)
-# define tfree(p)
-#else
-# define ftnalloc(T,n) ((T*) ftestalloc(sizeof(T)*(n)))
-# define tnalloc(T,n) ((T*) testalloc(sizeof(T)*(n)))
-# define trealloc(T,p,n) ((T*) testrealloc((malloc_type)(p), sizeof(T)*(n)))
-# define tfree(p) free((malloc_type)(p))
-#endif
-time_t now P((void));
-void awrite P((char const*,size_t,FILE*));
-void fastcopy P((RILE*,FILE*));
-void ffree P((void));
-void ffree1 P((char const*));
-void setRCSversion P((char const*));
-#if has_signal
- void catchints P((void));
- void ignoreints P((void));
- void restoreints P((void));
-#else
-# define catchints()
-# define ignoreints()
-# define restoreints()
-#endif
-#if has_mmap && large_memory
-# if has_NFS && mmap_signal
- void catchmmapints P((void));
- void readAccessFilenameBuffer P((char const*,unsigned char const*));
-# else
-# define catchmmapints()
-# endif
-#endif
-#if has_getuid
- uid_t ruid P((void));
-# define myself(u) ((u) == ruid())
-#else
-# define myself(u) true
-#endif
-#if has_setuid
- uid_t euid P((void));
- void nosetid P((void));
- void seteid P((void));
- void setrid P((void));
-#else
-# define nosetid()
-# define seteid()
-# define setrid()
-#endif
-
-/* version */
-extern char const RCS_version_string[];
diff --git a/gnu/usr.bin/rcs/lib/rcsedit.c b/gnu/usr.bin/rcs/lib/rcsedit.c
deleted file mode 100644
index dc9dd307de6a..000000000000
--- a/gnu/usr.bin/rcs/lib/rcsedit.c
+++ /dev/null
@@ -1,1958 +0,0 @@
-/* RCS stream editor */
-
-/******************************************************************************
- * edits the input file according to a
- * script from stdin, generated by diff -n
- * performs keyword expansion
- ******************************************************************************
- */
-
-/* Copyright 1982, 1988, 1989 Walter Tichy
- Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-/*
- * Revision 5.19 1995/06/16 06:19:24 eggert
- * Update FSF address.
- *
- * Revision 5.18 1995/06/01 16:23:43 eggert
- * (dirtpname): No longer external.
- * (do_link): Simplify logic.
- * (finisheditline, finishedit): Replace Iseek/Itell with what they stand for.
- * (fopen_update_truncate): Replace `#if' with `if'.
- * (keyreplace, makedirtemp): dirlen(x) -> basefilename(x)-x.
- *
- * (edit_string): Fix bug: if !large_memory, a bogus trailing `@' was output
- * at the end of incomplete lines.
- *
- * (keyreplace): Do not assume that seeking backwards
- * at the start of a file will fail; on some systems it succeeds.
- * Convert C- and Pascal-style comment starts to ` *' in comment leader.
- *
- * (rcswriteopen): Use fdSafer to get safer file descriptor.
- * Open RCS file with FOPEN_RB.
- *
- * (chnamemod): Work around bad_NFS_rename bug; don't ignore un_link result.
- * Fall back on chmod if fchmod fails, since it might be ENOSYS.
- *
- * (aflush): Move to rcslex.c.
- *
- * Revision 5.17 1994/03/20 04:52:58 eggert
- * Normally calculate the $Log prefix from context, not from RCS file.
- * Move setmtime here from rcsutil.c. Add ORCSerror. Remove lint.
- *
- * Revision 5.16 1993/11/03 17:42:27 eggert
- * Add -z. Add Name keyword. If bad_unlink, ignore errno when unlink fails.
- * Escape white space, $, and \ in keyword string file names.
- * Don't output 2 spaces between date and time after Log.
- *
- * Revision 5.15 1992/07/28 16:12:44 eggert
- * Some hosts have readlink but not ELOOP. Avoid `unsigned'.
- * Preserve dates more systematically. Statement macro names now end in _.
- *
- * Revision 5.14 1992/02/17 23:02:24 eggert
- * Add -T support.
- *
- * Revision 5.13 1992/01/24 18:44:19 eggert
- * Add support for bad_chmod_close, bad_creat0.
- *
- * Revision 5.12 1992/01/06 02:42:34 eggert
- * Add setmode parameter to chnamemod. addsymbol now reports changes.
- * while (E) ; -> while (E) continue;
- *
- * Revision 5.11 1991/11/03 01:11:44 eggert
- * Move the warning about link breaking to where they're actually being broken.
- *
- * Revision 5.10 1991/10/07 17:32:46 eggert
- * Support piece tables even if !has_mmap. Fix rare NFS bugs.
- *
- * Revision 5.9 1991/09/17 19:07:40 eggert
- * SGI readlink() yields ENXIO, not EINVAL, for nonlinks.
- *
- * Revision 5.8 1991/08/19 03:13:55 eggert
- * Add piece tables, NFS bug workarounds. Catch odd filenames. Tune.
- *
- * Revision 5.7 1991/04/21 11:58:21 eggert
- * Fix errno bugs. Add -x, RCSINIT, MS-DOS support.
- *
- * Revision 5.6 1991/02/25 07:12:40 eggert
- * Fix setuid bug. Support new link behavior. Work around broken "w+" fopen.
- *
- * Revision 5.5 1990/12/30 05:07:35 eggert
- * Fix report of busy RCS files when !defined(O_CREAT) | !defined(O_EXCL).
- *
- * Revision 5.4 1990/11/01 05:03:40 eggert
- * Permit arbitrary data in comment leaders.
- *
- * Revision 5.3 1990/09/11 02:41:13 eggert
- * Tune expandline().
- *
- * Revision 5.2 1990/09/04 08:02:21 eggert
- * Count RCS lines better. Improve incomplete line handling.
- *
- * Revision 5.1 1990/08/29 07:13:56 eggert
- * Add -kkvl.
- * Fix bug when getting revisions to files ending in incomplete lines.
- * Fix bug in comment leader expansion.
- *
- * Revision 5.0 1990/08/22 08:12:47 eggert
- * Don't require final newline.
- * Don't append "checked in with -k by " to logs,
- * so that checking in a program with -k doesn't change it.
- * Don't generate trailing white space for empty comment leader.
- * Remove compile-time limits; use malloc instead. Add -k, -V.
- * Permit dates past 1999/12/31. Make lock and temp files faster and safer.
- * Ansify and Posixate. Check diff's output.
- *
- * Revision 4.8 89/05/01 15:12:35 narten
- * changed copyright header to reflect current distribution rules
- *
- * Revision 4.7 88/11/08 13:54:14 narten
- * misplaced semicolon caused infinite loop
- *
- * Revision 4.6 88/08/09 19:12:45 eggert
- * Shrink stdio code size; allow cc -R.
- *
- * Revision 4.5 87/12/18 11:38:46 narten
- * Changes from the 43. version. Don't know the significance of the
- * first change involving "rewind". Also, additional "lint" cleanup.
- * (Guy Harris)
- *
- * Revision 4.4 87/10/18 10:32:21 narten
- * Updating version numbers. Changes relative to version 1.1 actually
- * relative to 4.1
- *
- * Revision 1.4 87/09/24 13:59:29 narten
- * Sources now pass through lint (if you ignore printf/sprintf/fprintf
- * warnings)
- *
- * Revision 1.3 87/09/15 16:39:39 shepler
- * added an initializatin of the variables editline and linecorr
- * this will be done each time a file is processed.
- * (there was an obscure bug where if co was used to retrieve multiple files
- * it would dump)
- * fix attributed to Roy Morris @FileNet Corp ...!felix!roy
- *
- * Revision 1.2 87/03/27 14:22:17 jenkins
- * Port to suns
- *
- * Revision 4.1 83/05/12 13:10:30 wft
- * Added new markers Id and RCSfile; added locker to Header and Id.
- * Overhauled expandline completely() (problem with $01234567890123456789@).
- * Moved trymatch() and marker table to rcskeys.c.
- *
- * Revision 3.7 83/05/12 13:04:39 wft
- * Added retry to expandline to resume after failed match which ended in $.
- * Fixed truncation problem for $19chars followed by@@.
- * Log no longer expands full path of RCS file.
- *
- * Revision 3.6 83/05/11 16:06:30 wft
- * added retry to expandline to resume after failed match which ended in $.
- * Fixed truncation problem for $19chars followed by@@.
- *
- * Revision 3.5 82/12/04 13:20:56 wft
- * Added expansion of keyword Locker.
- *
- * Revision 3.4 82/12/03 12:26:54 wft
- * Added line number correction in case editing does not start at the
- * beginning of the file.
- * Changed keyword expansion to always print a space before closing KDELIM;
- * Expansion for Header shortened.
- *
- * Revision 3.3 82/11/14 14:49:30 wft
- * removed Suffix from keyword expansion. Replaced fclose with ffclose.
- * keyreplace() gets log message from delta, not from curlogmsg.
- * fixed expression overflow in while(c=putc(GETC....
- * checked nil printing.
- *
- * Revision 3.2 82/10/18 21:13:39 wft
- * I added checks for write errors during the co process, and renamed
- * expandstring() to xpandstring().
- *
- * Revision 3.1 82/10/13 15:52:55 wft
- * changed type of result of getc() from char to int.
- * made keyword expansion loop in expandline() portable to machines
- * without sign-extension.
- */
-
-
-#include "rcsbase.h"
-
-libId(editId, "$FreeBSD$")
-
-static void editEndsPrematurely P((void)) exiting;
-static void editLineNumberOverflow P((void)) exiting;
-static void escape_string P((FILE*,char const*));
-static void keyreplace P((enum markers,struct hshentry const*,int,RILE*,FILE*,int));
-
-FILE *fcopy; /* result file descriptor */
-char const *resultname; /* result pathname */
-int locker_expansion; /* should the locker name be appended to Id val? */
-#if !large_memory
- static RILE *fedit; /* edit file descriptor */
- static char const *editname; /* edit pathname */
-#endif
-static long editline; /* edit line counter; #lines before cursor */
-static long linecorr; /* #adds - #deletes in each edit run. */
- /*used to correct editline in case file is not rewound after */
- /* applying one delta */
-
-/* indexes into dirtpname */
-#define lockdirtp_index 0
-#define newRCSdirtp_index bad_creat0
-#define newworkdirtp_index (newRCSdirtp_index+1)
-#define DIRTEMPNAMES (newworkdirtp_index + 1)
-
-enum maker {notmade, real, effective};
-static struct buf dirtpname[DIRTEMPNAMES]; /* unlink these when done */
-static enum maker volatile dirtpmaker[DIRTEMPNAMES]; /* if these are set */
-#define lockname (dirtpname[lockdirtp_index].string)
-#define newRCSname (dirtpname[newRCSdirtp_index].string)
-
-
-#if has_NFS || bad_unlink
- int
-un_link(s)
- char const *s;
-/*
- * Remove S, even if it is unwritable.
- * Ignore unlink() ENOENT failures; NFS generates bogus ones.
- */
-{
-# if bad_unlink
- if (unlink(s) == 0)
- return 0;
- else {
- int e = errno;
- /*
- * Forge ahead even if errno == ENOENT; some completely
- * brain-damaged hosts (e.g. PCTCP 2.2) yield ENOENT
- * even for existing unwritable files.
- */
- if (chmod(s, S_IWUSR) != 0) {
- errno = e;
- return -1;
- }
- }
-# endif
-# if has_NFS
- return unlink(s)==0 || errno==ENOENT ? 0 : -1;
-# else
- return unlink(s);
-# endif
-}
-#endif
-
-#if !has_rename
-# if !has_NFS
-# define do_link(s,t) link(s,t)
-# else
- static int do_link P((char const*,char const*));
- static int
-do_link(s, t)
- char const *s, *t;
-/* Link S to T, ignoring bogus EEXIST problems due to NFS failures. */
-{
- int r = link(s, t);
-
- if (r != 0 && errno == EEXIST) {
- struct stat sb, tb;
- if (
- stat(s, &sb) == 0 &&
- stat(t, &tb) == 0 &&
- same_file(sb, tb, 0)
- )
- r = 0;
- errno = EEXIST;
- }
- return r;
-}
-# endif
-#endif
-
-
- static void
-editEndsPrematurely()
-{
- fatserror("edit script ends prematurely");
-}
-
- static void
-editLineNumberOverflow()
-{
- fatserror("edit script refers to line past end of file");
-}
-
-
-#if large_memory
-
-#if has_memmove
-# define movelines(s1, s2, n) VOID memmove(s1, s2, (n)*sizeof(Iptr_type))
-#else
- static void movelines P((Iptr_type*,Iptr_type const*,long));
- static void
-movelines(s1, s2, n)
- register Iptr_type *s1;
- register Iptr_type const *s2;
- register long n;
-{
- if (s1 < s2)
- do {
- *s1++ = *s2++;
- } while (--n);
- else {
- s1 += n;
- s2 += n;
- do {
- *--s1 = *--s2;
- } while (--n);
- }
-}
-#endif
-
-static void deletelines P((long,long));
-static void finisheditline P((RILE*,FILE*,Iptr_type,struct hshentry const*));
-static void insertline P((long,Iptr_type));
-static void snapshotline P((FILE*,Iptr_type));
-
-/*
- * `line' contains pointers to the lines in the currently `edited' file.
- * It is a 0-origin array that represents linelim-gapsize lines.
- * line[0 .. gap-1] and line[gap+gapsize .. linelim-1] hold pointers to lines.
- * line[gap .. gap+gapsize-1] contains garbage.
- *
- * Any @s in lines are duplicated.
- * Lines are terminated by \n, or (for a last partial line only) by single @.
- */
-static Iptr_type *line;
-static size_t gap, gapsize, linelim;
-
- static void
-insertline(n, l)
- long n;
- Iptr_type l;
-/* Before line N, insert line L. N is 0-origin. */
-{
- if (linelim-gapsize < n)
- editLineNumberOverflow();
- if (!gapsize)
- line =
- !linelim ?
- tnalloc(Iptr_type, linelim = gapsize = 1024)
- : (
- gap = gapsize = linelim,
- trealloc(Iptr_type, line, linelim <<= 1)
- );
- if (n < gap)
- movelines(line+n+gapsize, line+n, gap-n);
- else if (gap < n)
- movelines(line+gap, line+gap+gapsize, n-gap);
-
- line[n] = l;
- gap = n + 1;
- gapsize--;
-}
-
- static void
-deletelines(n, nlines)
- long n, nlines;
-/* Delete lines N through N+NLINES-1. N is 0-origin. */
-{
- long l = n + nlines;
- if (linelim-gapsize < l || l < n)
- editLineNumberOverflow();
- if (l < gap)
- movelines(line+l+gapsize, line+l, gap-l);
- else if (gap < n)
- movelines(line+gap, line+gap+gapsize, n-gap);
-
- gap = n;
- gapsize += nlines;
-}
-
- static void
-snapshotline(f, l)
- register FILE *f;
- register Iptr_type l;
-{
- register int c;
- do {
- if ((c = *l++) == SDELIM && *l++ != SDELIM)
- return;
- aputc_(c, f)
- } while (c != '\n');
-}
-
- void
-snapshotedit(f)
- FILE *f;
-/* Copy the current state of the edits to F. */
-{
- register Iptr_type *p, *lim, *l=line;
- for (p=l, lim=l+gap; p<lim; )
- snapshotline(f, *p++);
- for (p+=gapsize, lim=l+linelim; p<lim; )
- snapshotline(f, *p++);
-}
-
- static void
-finisheditline(fin, fout, l, delta)
- RILE *fin;
- FILE *fout;
- Iptr_type l;
- struct hshentry const *delta;
-{
- fin->ptr = l;
- if (expandline(fin, fout, delta, true, (FILE*)0, true) < 0)
- faterror("finisheditline internal error");
-}
-
- void
-finishedit(delta, outfile, done)
- struct hshentry const *delta;
- FILE *outfile;
- int done;
-/*
- * Doing expansion if DELTA is set, output the state of the edits to OUTFILE.
- * But do nothing unless DONE is set (which means we are on the last pass).
- */
-{
- if (done) {
- openfcopy(outfile);
- outfile = fcopy;
- if (!delta)
- snapshotedit(outfile);
- else {
- register Iptr_type *p, *lim, *l = line;
- register RILE *fin = finptr;
- Iptr_type here = fin->ptr;
- for (p=l, lim=l+gap; p<lim; )
- finisheditline(fin, outfile, *p++, delta);
- for (p+=gapsize, lim=l+linelim; p<lim; )
- finisheditline(fin, outfile, *p++, delta);
- fin->ptr = here;
- }
- }
-}
-
-/* Open a temporary NAME for output, truncating any previous contents. */
-# define fopen_update_truncate(name) fopenSafer(name, FOPEN_W_WORK)
-#else /* !large_memory */
- static FILE * fopen_update_truncate P((char const*));
- static FILE *
-fopen_update_truncate(name)
- char const *name;
-{
- if (bad_fopen_wplus && un_link(name) != 0)
- efaterror(name);
- return fopenSafer(name, FOPEN_WPLUS_WORK);
-}
-#endif
-
-
- void
-openfcopy(f)
- FILE *f;
-{
- if (!(fcopy = f)) {
- if (!resultname)
- resultname = maketemp(2);
- if (!(fcopy = fopen_update_truncate(resultname)))
- efaterror(resultname);
- }
-}
-
-
-#if !large_memory
-
- static void swapeditfiles P((FILE*));
- static void
-swapeditfiles(outfile)
- FILE *outfile;
-/* Function: swaps resultname and editname, assigns fedit=fcopy,
- * and rewinds fedit for reading. Set fcopy to outfile if nonnull;
- * otherwise, set fcopy to be resultname opened for reading and writing.
- */
-{
- char const *tmpptr;
-
- editline = 0; linecorr = 0;
- Orewind(fcopy);
- fedit = fcopy;
- tmpptr=editname; editname=resultname; resultname=tmpptr;
- openfcopy(outfile);
-}
-
- void
-snapshotedit(f)
- FILE *f;
-/* Copy the current state of the edits to F. */
-{
- finishedit((struct hshentry *)0, (FILE*)0, false);
- fastcopy(fedit, f);
- Irewind(fedit);
-}
-
- void
-finishedit(delta, outfile, done)
- struct hshentry const *delta;
- FILE *outfile;
- int done;
-/* copy the rest of the edit file and close it (if it exists).
- * if delta, perform keyword substitution at the same time.
- * If DONE is set, we are finishing the last pass.
- */
-{
- register RILE *fe;
- register FILE *fc;
-
- fe = fedit;
- if (fe) {
- fc = fcopy;
- if (delta) {
- while (1 < expandline(fe,fc,delta,false,(FILE*)0,true))
- ;
- } else {
- fastcopy(fe,fc);
- }
- Ifclose(fe);
- }
- if (!done)
- swapeditfiles(outfile);
-}
-#endif
-
-
-
-#if large_memory
-# define copylines(upto,delta) (editline = (upto))
-#else
- static void copylines P((long,struct hshentry const*));
- static void
-copylines(upto, delta)
- register long upto;
- struct hshentry const *delta;
-/*
- * Copy input lines editline+1..upto from fedit to fcopy.
- * If delta, keyword expansion is done simultaneously.
- * editline is updated. Rewinds a file only if necessary.
- */
-{
- register int c;
- declarecache;
- register FILE *fc;
- register RILE *fe;
-
- if (upto < editline) {
- /* swap files */
- finishedit((struct hshentry *)0, (FILE*)0, false);
- /* assumes edit only during last pass, from the beginning*/
- }
- fe = fedit;
- fc = fcopy;
- if (editline < upto)
- if (delta)
- do {
- if (expandline(fe,fc,delta,false,(FILE*)0,true) <= 1)
- editLineNumberOverflow();
- } while (++editline < upto);
- else {
- setupcache(fe); cache(fe);
- do {
- do {
- cachegeteof_(c, editLineNumberOverflow();)
- aputc_(c, fc)
- } while (c != '\n');
- } while (++editline < upto);
- uncache(fe);
- }
-}
-#endif
-
-
-
- void
-xpandstring(delta)
- struct hshentry const *delta;
-/* Function: Reads a string terminated by SDELIM from finptr and writes it
- * to fcopy. Double SDELIM is replaced with single SDELIM.
- * Keyword expansion is performed with data from delta.
- * If foutptr is nonnull, the string is also copied unchanged to foutptr.
- */
-{
- while (1 < expandline(finptr,fcopy,delta,true,foutptr,true))
- continue;
-}
-
-
- void
-copystring()
-/* Function: copies a string terminated with a single SDELIM from finptr to
- * fcopy, replacing all double SDELIM with a single SDELIM.
- * If foutptr is nonnull, the string also copied unchanged to foutptr.
- * editline is incremented by the number of lines copied.
- * Assumption: next character read is first string character.
- */
-{ register c;
- declarecache;
- register FILE *frew, *fcop;
- register int amidline;
- register RILE *fin;
-
- fin = finptr;
- setupcache(fin); cache(fin);
- frew = foutptr;
- fcop = fcopy;
- amidline = false;
- for (;;) {
- GETC_(frew,c)
- switch (c) {
- case '\n':
- ++editline;
- ++rcsline;
- amidline = false;
- break;
- case SDELIM:
- GETC_(frew,c)
- if (c != SDELIM) {
- /* end of string */
- nextc = c;
- editline += amidline;
- uncache(fin);
- return;
- }
- /* fall into */
- default:
- amidline = true;
- break;
- }
- aputc_(c,fcop)
- }
-}
-
-
- void
-enterstring()
-/* Like copystring, except the string is put into the edit data structure. */
-{
-#if !large_memory
- editname = 0;
- fedit = 0;
- editline = linecorr = 0;
- resultname = maketemp(1);
- if (!(fcopy = fopen_update_truncate(resultname)))
- efaterror(resultname);
- copystring();
-#else
- register int c;
- declarecache;
- register FILE *frew;
- register long e, oe;
- register int amidline, oamidline;
- register Iptr_type optr;
- register RILE *fin;
-
- e = 0;
- gap = 0;
- gapsize = linelim;
- fin = finptr;
- setupcache(fin); cache(fin);
- advise_access(fin, MADV_NORMAL);
- frew = foutptr;
- amidline = false;
- for (;;) {
- optr = cacheptr();
- GETC_(frew,c)
- oamidline = amidline;
- oe = e;
- switch (c) {
- case '\n':
- ++e;
- ++rcsline;
- amidline = false;
- break;
- case SDELIM:
- GETC_(frew,c)
- if (c != SDELIM) {
- /* end of string */
- nextc = c;
- editline = e + amidline;
- linecorr = 0;
- uncache(fin);
- return;
- }
- /* fall into */
- default:
- amidline = true;
- break;
- }
- if (!oamidline)
- insertline(oe, optr);
- }
-#endif
-}
-
-
-
-
- void
-#if large_memory
-edit_string()
-#else
- editstring(delta)
- struct hshentry const *delta;
-#endif
-/*
- * Read an edit script from finptr and applies it to the edit file.
-#if !large_memory
- * The result is written to fcopy.
- * If delta, keyword expansion is performed simultaneously.
- * If running out of lines in fedit, fedit and fcopy are swapped.
- * editname is the name of the file that goes with fedit.
-#endif
- * If foutptr is set, the edit script is also copied verbatim to foutptr.
- * Assumes that all these files are open.
- * resultname is the name of the file that goes with fcopy.
- * Assumes the next input character from finptr is the first character of
- * the edit script. Resets nextc on exit.
- */
-{
- int ed; /* editor command */
- register int c;
- declarecache;
- register FILE *frew;
-# if !large_memory
- register FILE *f;
- long line_lim = LONG_MAX;
- register RILE *fe;
-# endif
- register long i;
- register RILE *fin;
-# if large_memory
- register long j;
-# endif
- struct diffcmd dc;
-
- editline += linecorr; linecorr=0; /*correct line number*/
- frew = foutptr;
- fin = finptr;
- setupcache(fin);
- initdiffcmd(&dc);
- while (0 <= (ed = getdiffcmd(fin,true,frew,&dc)))
-#if !large_memory
- if (line_lim <= dc.line1)
- editLineNumberOverflow();
- else
-#endif
- if (!ed) {
- copylines(dc.line1-1, delta);
- /* skip over unwanted lines */
- i = dc.nlines;
- linecorr -= i;
- editline += i;
-# if large_memory
- deletelines(editline+linecorr, i);
-# else
- fe = fedit;
- do {
- /*skip next line*/
- do {
- Igeteof_(fe, c, { if (i!=1) editLineNumberOverflow(); line_lim = dc.dafter; break; } )
- } while (c != '\n');
- } while (--i);
-# endif
- } else {
- /* Copy lines without deleting any. */
- copylines(dc.line1, delta);
- i = dc.nlines;
-# if large_memory
- j = editline+linecorr;
-# endif
- linecorr += i;
-#if !large_memory
- f = fcopy;
- if (delta)
- do {
- switch (expandline(fin,f,delta,true,frew,true)){
- case 0: case 1:
- if (i==1)
- return;
- /* fall into */
- case -1:
- editEndsPrematurely();
- }
- } while (--i);
- else
-#endif
- {
- cache(fin);
- do {
-# if large_memory
- insertline(j++, cacheptr());
-# endif
- for (;;) {
- GETC_(frew, c)
- if (c==SDELIM) {
- GETC_(frew, c)
- if (c!=SDELIM) {
- if (--i)
- editEndsPrematurely();
- nextc = c;
- uncache(fin);
- return;
- }
- }
-# if !large_memory
- aputc_(c, f)
-# endif
- if (c == '\n')
- break;
- }
- ++rcsline;
- } while (--i);
- uncache(fin);
- }
- }
-}
-
-
-
-/* The rest is for keyword expansion */
-
-
-
- int
-expandline(infile, outfile, delta, delimstuffed, frewfile, dolog)
- RILE *infile;
- FILE *outfile, *frewfile;
- struct hshentry const *delta;
- int delimstuffed, dolog;
-/*
- * Read a line from INFILE and write it to OUTFILE.
- * Do keyword expansion with data from DELTA.
- * If DELIMSTUFFED is true, double SDELIM is replaced with single SDELIM.
- * If FREWFILE is set, copy the line unchanged to FREWFILE.
- * DELIMSTUFFED must be true if FREWFILE is set.
- * Append revision history to log only if DOLOG is set.
- * Yields -1 if no data is copied, 0 if an incomplete line is copied,
- * 2 if a complete line is copied; adds 1 to yield if expansion occurred.
- */
-{
- register c;
- declarecache;
- register FILE *out, *frew;
- register char * tp;
- register int e, ds, r;
- char const *tlim;
- static struct buf keyval;
- enum markers matchresult;
-
- setupcache(infile); cache(infile);
- out = outfile;
- frew = frewfile;
- ds = delimstuffed;
- bufalloc(&keyval, keylength+3);
- e = 0;
- r = -1;
-
- for (;;) {
- if (ds)
- GETC_(frew, c)
- else
- cachegeteof_(c, goto uncache_exit;)
- for (;;) {
- switch (c) {
- case SDELIM:
- if (ds) {
- GETC_(frew, c)
- if (c != SDELIM) {
- /* end of string */
- nextc=c;
- goto uncache_exit;
- }
- }
- /* fall into */
- default:
- aputc_(c,out)
- r = 0;
- break;
-
- case '\n':
- rcsline += ds;
- aputc_(c,out)
- r = 2;
- goto uncache_exit;
-
- case KDELIM:
- r = 0;
- /* check for keyword */
- /* first, copy a long enough string into keystring */
- tp = keyval.string;
- *tp++ = KDELIM;
- for (;;) {
- if (ds)
- GETC_(frew, c)
- else
- cachegeteof_(c, goto keystring_eof;)
- if (tp <= &keyval.string[keylength])
- switch (ctab[c]) {
- case LETTER: case Letter:
- *tp++ = c;
- continue;
- default:
- break;
- }
- break;
- }
- *tp++ = c; *tp = '\0';
- matchresult = trymatch(keyval.string+1);
- if (matchresult==Nomatch) {
- tp[-1] = 0;
- aputs(keyval.string, out);
- continue; /* last c handled properly */
- }
-
- /* Now we have a keyword terminated with a K/VDELIM */
- if (c==VDELIM) {
- /* try to find closing KDELIM, and replace value */
- tlim = keyval.string + keyval.size;
- for (;;) {
- if (ds)
- GETC_(frew, c)
- else
- cachegeteof_(c, goto keystring_eof;)
- if (c=='\n' || c==KDELIM)
- break;
- *tp++ =c;
- if (tlim <= tp)
- tp = bufenlarge(&keyval, &tlim);
- if (c==SDELIM && ds) { /*skip next SDELIM */
- GETC_(frew, c)
- if (c != SDELIM) {
- /* end of string before closing KDELIM or newline */
- nextc = c;
- goto keystring_eof;
- }
- }
- }
- if (c!=KDELIM) {
- /* couldn't find closing KDELIM -- give up */
- *tp = 0;
- aputs(keyval.string, out);
- continue; /* last c handled properly */
- }
- }
- /* now put out the new keyword value */
- uncache(infile);
- keyreplace(matchresult, delta, ds, infile, out, dolog);
- cache(infile);
- e = 1;
- break;
- }
- break;
- }
- }
-
- keystring_eof:
- *tp = 0;
- aputs(keyval.string, out);
- uncache_exit:
- uncache(infile);
- return r + e;
-}
-
-
- static void
-escape_string(out, s)
- register FILE *out;
- register char const *s;
-/* Output to OUT the string S, escaping chars that would break `ci -k'. */
-{
- register char c;
- for (;;)
- switch ((c = *s++)) {
- case 0: return;
- case '\t': aputs("\\t", out); break;
- case '\n': aputs("\\n", out); break;
- case ' ': aputs("\\040", out); break;
- case KDELIM: aputs("\\044", out); break;
- case '\\': if (VERSION(5)<=RCSversion) {aputs("\\\\", out); break;}
- /* fall into */
- default: aputc_(c, out) break;
- }
-}
-
-char const ciklog[ciklogsize] = "checked in with -k by ";
-
- static void
-keyreplace(marker, delta, delimstuffed, infile, out, dolog)
- enum markers marker;
- register struct hshentry const *delta;
- int delimstuffed;
- RILE *infile;
- register FILE *out;
- int dolog;
-/* function: outputs the keyword value(s) corresponding to marker.
- * Attributes are derived from delta.
- */
-{
- register char const *sp, *cp, *date;
- register int c;
- register size_t cs, cw, ls;
- char const *sp1;
- char datebuf[datesize + zonelenmax];
- int RCSv;
- int exp;
-
- sp = Keyword[(int)marker];
- exp = Expand;
- date = delta->date;
- RCSv = RCSversion;
-
- if (exp != VAL_EXPAND)
- aprintf(out, "%c%s", KDELIM, sp);
- if (exp != KEY_EXPAND) {
-
- if (exp != VAL_EXPAND)
- aprintf(out, "%c%c", VDELIM,
- marker==Log && RCSv<VERSION(5) ? '\t' : ' '
- );
-
- switch (marker) {
- case Author:
- aputs(delta->author, out);
- break;
- case Date:
- aputs(date2str(date,datebuf), out);
- break;
- case Id:
- case LocalId:
- case Header:
- case CVSHeader:
- if (marker == Id || RCSv < VERSION(4) ||
- (marker == LocalId && LocalIdMode == Id))
- escape_string(out, basefilename(RCSname));
- else if (marker == CVSHeader ||
- (marker == LocalId && LocalIdMode == CVSHeader))
- escape_string(out, getfullCVSname());
- else
- escape_string(out, getfullRCSname());
- aprintf(out, " %s %s %s %s",
- delta->num,
- date2str(date, datebuf),
- delta->author,
- RCSv==VERSION(3) && delta->lockedby ? "Locked"
- : delta->state
- );
- if (delta->lockedby)
- if (VERSION(5) <= RCSv) {
- if (locker_expansion || exp==KEYVALLOCK_EXPAND)
- aprintf(out, " %s", delta->lockedby);
- } else if (RCSv == VERSION(4))
- aprintf(out, " Locker: %s", delta->lockedby);
- break;
- case Locker:
- if (delta->lockedby)
- if (
- locker_expansion
- || exp == KEYVALLOCK_EXPAND
- || RCSv <= VERSION(4)
- )
- aputs(delta->lockedby, out);
- break;
- case Log:
- case RCSfile:
- escape_string(out, basefilename(RCSname));
- break;
- case Name:
- if (delta->name)
- aputs(delta->name, out);
- break;
- case Revision:
- aputs(delta->num, out);
- break;
- case Source:
- escape_string(out, getfullRCSname());
- break;
- case State:
- aputs(delta->state, out);
- break;
- default:
- break;
- }
- if (exp != VAL_EXPAND)
- afputc(' ', out);
- }
- if (exp != VAL_EXPAND)
- afputc(KDELIM, out);
-
- if (marker == Log && dolog) {
- struct buf leader;
-
- sp = delta->log.string;
- ls = delta->log.size;
- if (sizeof(ciklog)-1<=ls && !memcmp(sp,ciklog,sizeof(ciklog)-1))
- return;
- bufautobegin(&leader);
- if (RCSversion < VERSION(5)) {
- cp = Comment.string;
- cs = Comment.size;
- } else {
- int kdelim_found = 0;
- Ioffset_type chars_read = Itell(infile);
- declarecache;
- setupcache(infile); cache(infile);
-
- c = 0; /* Pacify `gcc -Wall'. */
-
- /*
- * Back up to the start of the current input line,
- * setting CS to the number of characters before `$Log'.
- */
- cs = 0;
- for (;;) {
- if (!--chars_read)
- goto done_backing_up;
- cacheunget_(infile, c)
- if (c == '\n')
- break;
- if (c == SDELIM && delimstuffed) {
- if (!--chars_read)
- break;
- cacheunget_(infile, c)
- if (c != SDELIM) {
- cacheget_(c)
- break;
- }
- }
- cs += kdelim_found;
- kdelim_found |= c==KDELIM;
- }
- cacheget_(c)
- done_backing_up:;
-
- /* Copy characters before `$Log' into LEADER. */
- bufalloc(&leader, cs);
- cp = leader.string;
- for (cw = 0; cw < cs; cw++) {
- leader.string[cw] = c;
- if (c == SDELIM && delimstuffed)
- cacheget_(c)
- cacheget_(c)
- }
-
- /* Convert traditional C or Pascal leader to ` *'. */
- for (cw = 0; cw < cs; cw++)
- if (ctab[(unsigned char) cp[cw]] != SPACE)
- break;
- if (
- cw+1 < cs
- && cp[cw+1] == '*'
- && (cp[cw] == '/' || cp[cw] == '(')
- ) {
- size_t i = cw+1;
- for (;;)
- if (++i == cs) {
- warn(
- "`%c* $Log' is obsolescent; use ` * $Log'.",
- cp[cw]
- );
- leader.string[cw] = ' ';
- break;
- } else if (ctab[(unsigned char) cp[i]] != SPACE)
- break;
- }
-
- /* Skip `$Log ... $' string. */
- do {
- cacheget_(c)
- } while (c != KDELIM);
- uncache(infile);
- }
- afputc('\n', out);
- awrite(cp, cs, out);
- sp1 = date2str(date, datebuf);
- if (VERSION(5) <= RCSv) {
- aprintf(out, "Revision %s %s %s",
- delta->num, sp1, delta->author
- );
- } else {
- /* oddity: 2 spaces between date and time, not 1 as usual */
- sp1 = strchr(sp1, ' ');
- aprintf(out, "Revision %s %.*s %s %s",
- delta->num, (int)(sp1-datebuf), datebuf, sp1,
- delta->author
- );
- }
- /* Do not include state: it may change and is not updated. */
- cw = cs;
- if (VERSION(5) <= RCSv)
- for (; cw && (cp[cw-1]==' ' || cp[cw-1]=='\t'); --cw)
- continue;
- for (;;) {
- afputc('\n', out);
- awrite(cp, cw, out);
- if (!ls)
- break;
- --ls;
- c = *sp++;
- if (c != '\n') {
- awrite(cp+cw, cs-cw, out);
- do {
- afputc(c,out);
- if (!ls)
- break;
- --ls;
- c = *sp++;
- } while (c != '\n');
- }
- }
- bufautoend(&leader);
- }
-}
-
-#if has_readlink
- static int resolve_symlink P((struct buf*));
- static int
-resolve_symlink(L)
- struct buf *L;
-/*
- * If L is a symbolic link, resolve it to the name that it points to.
- * If unsuccessful, set errno and yield -1.
- * If it points to an existing file, yield 1.
- * Otherwise, set errno=ENOENT and yield 0.
- */
-{
- char *b, a[SIZEABLE_PATH];
- int e;
- size_t s;
- ssize_t r;
- struct buf bigbuf;
- int linkcount = MAXSYMLINKS;
-
- b = a;
- s = sizeof(a);
- bufautobegin(&bigbuf);
- while ((r = readlink(L->string,b,s)) != -1)
- if (r == s) {
- bufalloc(&bigbuf, s<<1);
- b = bigbuf.string;
- s = bigbuf.size;
- } else if (!linkcount--) {
-# ifndef ELOOP
- /*
- * Some pedantic Posix 1003.1-1990 hosts have readlink
- * but not ELOOP. Approximate ELOOP with EMLINK.
- */
-# define ELOOP EMLINK
-# endif
- errno = ELOOP;
- return -1;
- } else {
- /* Splice symbolic link into L. */
- b[r] = '\0';
- L->string[
- ROOTPATH(b) ? 0 : basefilename(L->string) - L->string
- ] = '\0';
- bufscat(L, b);
- }
- e = errno;
- bufautoend(&bigbuf);
- errno = e;
- switch (e) {
- case readlink_isreg_errno: return 1;
- case ENOENT: return 0;
- default: return -1;
- }
-}
-#endif
-
- RILE *
-rcswriteopen(RCSbuf, status, mustread)
- struct buf *RCSbuf;
- struct stat *status;
- int mustread;
-/*
- * Create the lock file corresponding to RCSBUF.
- * Then try to open RCSBUF for reading and yield its RILE* descriptor.
- * Put its status into *STATUS too.
- * MUSTREAD is true if the file must already exist, too.
- * If all goes well, discard any previously acquired locks,
- * and set fdlock to the file descriptor of the RCS lockfile.
- */
-{
- register char *tp;
- register char const *sp, *RCSpath, *x;
- RILE *f;
- size_t l;
- int e, exists, fdesc, fdescSafer, r, waslocked;
- struct buf *dirt;
- struct stat statbuf;
-
- waslocked = 0 <= fdlock;
- exists =
-# if has_readlink
- resolve_symlink(RCSbuf);
-# else
- stat(RCSbuf->string, &statbuf) == 0 ? 1
- : errno==ENOENT ? 0 : -1;
-# endif
- if (exists < (mustread|waslocked))
- /*
- * There's an unusual problem with the RCS file;
- * or the RCS file doesn't exist,
- * and we must read or we already have a lock elsewhere.
- */
- return 0;
-
- RCSpath = RCSbuf->string;
- sp = basefilename(RCSpath);
- l = sp - RCSpath;
- dirt = &dirtpname[waslocked];
- bufscpy(dirt, RCSpath);
- tp = dirt->string + l;
- x = rcssuffix(RCSpath);
-# if has_readlink
- if (!x) {
- error("symbolic link to non RCS file `%s'", RCSpath);
- errno = EINVAL;
- return 0;
- }
-# endif
- if (*sp == *x) {
- error("RCS pathname `%s' incompatible with suffix `%s'", sp, x);
- errno = EINVAL;
- return 0;
- }
- /* Create a lock filename that is a function of the RCS filename. */
- if (*x) {
- /*
- * The suffix is nonempty.
- * The lock filename is the first char of of the suffix,
- * followed by the RCS filename with last char removed. E.g.:
- * foo,v RCS filename with suffix ,v
- * ,foo, lock filename
- */
- *tp++ = *x;
- while (*sp)
- *tp++ = *sp++;
- *--tp = 0;
- } else {
- /*
- * The suffix is empty.
- * The lock filename is the RCS filename
- * with last char replaced by '_'.
- */
- while ((*tp++ = *sp++))
- continue;
- tp -= 2;
- if (*tp == '_') {
- error("RCS pathname `%s' ends with `%c'", RCSpath, *tp);
- errno = EINVAL;
- return 0;
- }
- *tp = '_';
- }
-
- sp = dirt->string;
-
- f = 0;
-
- /*
- * good news:
- * open(f, O_CREAT|O_EXCL|O_TRUNC|..., OPEN_CREAT_READONLY)
- * is atomic according to Posix 1003.1-1990.
- * bad news:
- * NFS ignores O_EXCL and doesn't comply with Posix 1003.1-1990.
- * good news:
- * (O_TRUNC,OPEN_CREAT_READONLY) normally guarantees atomicity
- * even with NFS.
- * bad news:
- * If you're root, (O_TRUNC,OPEN_CREAT_READONLY) doesn't
- * guarantee atomicity.
- * good news:
- * Root-over-the-wire NFS access is rare for security reasons.
- * This bug has never been reported in practice with RCS.
- * So we don't worry about this bug.
- *
- * An even rarer NFS bug can occur when clients retry requests.
- * This can happen in the usual case of NFS over UDP.
- * Suppose client A releases a lock by renaming ",f," to "f,v" at
- * about the same time that client B obtains a lock by creating ",f,",
- * and suppose A's first rename request is delayed, so A reissues it.
- * The sequence of events might be:
- * A sends rename(",f,", "f,v")
- * B sends create(",f,")
- * A sends retry of rename(",f,", "f,v")
- * server receives, does, and acknowledges A's first rename()
- * A receives acknowledgment, and its RCS program exits
- * server receives, does, and acknowledges B's create()
- * server receives, does, and acknowledges A's retry of rename()
- * This not only wrongly deletes B's lock, it removes the RCS file!
- * Most NFS implementations have idempotency caches that usually prevent
- * this scenario, but such caches are finite and can be overrun.
- * This problem afflicts not only RCS, which uses open() and rename()
- * to get and release locks; it also afflicts the traditional
- * Unix method of using link() and unlink() to get and release locks,
- * and the less traditional method of using mkdir() and rmdir().
- * There is no easy workaround.
- * Any new method based on lockf() seemingly would be incompatible with
- * the old methods; besides, lockf() is notoriously buggy under NFS.
- * Since this problem afflicts scads of Unix programs, but is so rare
- * that nobody seems to be worried about it, we won't worry either.
- */
-# if !open_can_creat
-# define create(f) creat(f, OPEN_CREAT_READONLY)
-# else
-# define create(f) open(f, OPEN_O_BINARY|OPEN_O_LOCK|OPEN_O_WRONLY|O_CREAT|O_EXCL|O_TRUNC, OPEN_CREAT_READONLY)
-# endif
-
- catchints();
- ignoreints();
-
- /*
- * Create a lock file for an RCS file. This should be atomic, i.e.
- * if two processes try it simultaneously, at most one should succeed.
- */
- seteid();
- fdesc = create(sp);
- fdescSafer = fdSafer(fdesc); /* Do it now; setrid might use stderr. */
- e = errno;
- setrid();
-
- if (0 <= fdesc)
- dirtpmaker[0] = effective;
-
- if (fdescSafer < 0) {
- if (e == EACCES && stat(sp,&statbuf) == 0)
- /* The RCS file is busy. */
- e = EEXIST;
- } else {
- e = ENOENT;
- if (exists) {
- f = Iopen(RCSpath, FOPEN_RB, status);
- e = errno;
- if (f && waslocked) {
- /* Discard the previous lock in favor of this one. */
- ORCSclose();
- seteid();
- r = un_link(lockname);
- e = errno;
- setrid();
- if (r != 0)
- enfaterror(e, lockname);
- bufscpy(&dirtpname[lockdirtp_index], sp);
- }
- }
- fdlock = fdescSafer;
- }
-
- restoreints();
-
- errno = e;
- return f;
-}
-
- void
-keepdirtemp(name)
- char const *name;
-/* Do not unlink name, either because it's not there any more,
- * or because it has already been unlinked.
- */
-{
- register int i;
- for (i=DIRTEMPNAMES; 0<=--i; )
- if (dirtpname[i].string == name) {
- dirtpmaker[i] = notmade;
- return;
- }
- faterror("keepdirtemp");
-}
-
- char const *
-makedirtemp(isworkfile)
- int isworkfile;
-/*
- * Create a unique pathname and store it into dirtpname.
- * Because of storage in tpnames, dirtempunlink() can unlink the file later.
- * Return a pointer to the pathname created.
- * If ISWORKFILE is 1, put it into the working file's directory;
- * if 0, put the unique file in RCSfile's directory.
- */
-{
- register char *tp, *np;
- register size_t dl;
- register struct buf *bn;
- register char const *name = isworkfile ? workname : RCSname;
-# if has_mktemp
- int fd;
-# endif
-
- dl = basefilename(name) - name;
- bn = &dirtpname[newRCSdirtp_index + isworkfile];
- bufalloc(bn,
-# if has_mktemp
- dl + 9
-# else
- strlen(name) + 3
-# endif
- );
- bufscpy(bn, name);
- np = tp = bn->string;
- tp += dl;
- *tp++ = '_';
- *tp++ = '0'+isworkfile;
- catchints();
-# if has_mktemp
- VOID strcpy(tp, "XXXXXX");
- fd = mkstemp(np);
- if (fd < 0 || !*np)
- faterror("can't make temporary pathname `%.*s_%cXXXXXX'",
- (int)dl, name, '0'+isworkfile
- );
- close(fd);
-# else
- /*
- * Posix 1003.1-1990 has no reliable way
- * to create a unique file in a named directory.
- * We fudge here. If the filename is abcde,
- * the temp filename is _Ncde where N is a digit.
- */
- name += dl;
- if (*name) name++;
- if (*name) name++;
- VOID strcpy(tp, name);
-# endif
- dirtpmaker[newRCSdirtp_index + isworkfile] = real;
- return np;
-}
-
- void
-dirtempunlink()
-/* Clean up makedirtemp() files. May be invoked by signal handler. */
-{
- register int i;
- enum maker m;
-
- for (i = DIRTEMPNAMES; 0 <= --i; )
- if ((m = dirtpmaker[i]) != notmade) {
- if (m == effective)
- seteid();
- VOID un_link(dirtpname[i].string);
- if (m == effective)
- setrid();
- dirtpmaker[i] = notmade;
- }
-}
-
-
- int
-#if has_prototypes
-chnamemod(
- FILE **fromp, char const *from, char const *to,
- int set_mode, mode_t mode, time_t mtime
-)
- /* The `#if has_prototypes' is needed because mode_t might promote to int. */
-#else
- chnamemod(fromp, from, to, set_mode, mode, mtime)
- FILE **fromp; char const *from,*to;
- int set_mode; mode_t mode; time_t mtime;
-#endif
-/*
- * Rename a file (with stream pointer *FROMP) from FROM to TO.
- * FROM already exists.
- * If 0 < SET_MODE, change the mode to MODE, before renaming if possible.
- * If MTIME is not -1, change its mtime to MTIME before renaming.
- * Close and clear *FROMP before renaming it.
- * Unlink TO if it already exists.
- * Return -1 on error (setting errno), 0 otherwise.
- */
-{
- mode_t mode_while_renaming = mode;
- int fchmod_set_mode = 0;
-
-# if bad_a_rename || bad_NFS_rename
- struct stat st;
- if (bad_NFS_rename || (bad_a_rename && set_mode <= 0)) {
- if (fstat(fileno(*fromp), &st) != 0)
- return -1;
- if (bad_a_rename && set_mode <= 0)
- mode = st.st_mode;
- }
-# endif
-
-# if bad_a_rename
- /*
- * There's a short window of inconsistency
- * during which the lock file is writable.
- */
- mode_while_renaming = mode|S_IWUSR;
- if (mode != mode_while_renaming)
- set_mode = 1;
-# endif
-
-# if has_fchmod
- if (0<set_mode && fchmod(fileno(*fromp),mode_while_renaming) == 0)
- fchmod_set_mode = set_mode;
-# endif
- /* If bad_chmod_close, we must close before chmod. */
- Ozclose(fromp);
- if (fchmod_set_mode<set_mode && chmod(from, mode_while_renaming) != 0)
- return -1;
-
- if (setmtime(from, mtime) != 0)
- return -1;
-
-# if !has_rename || bad_b_rename
- /*
- * There's a short window of inconsistency
- * during which TO does not exist.
- */
- if (un_link(to) != 0 && errno != ENOENT)
- return -1;
-# endif
-
-# if has_rename
- if (rename(from,to) != 0 && !(has_NFS && errno==ENOENT))
- return -1;
-# else
- if (do_link(from,to) != 0 || un_link(from) != 0)
- return -1;
-# endif
-
-# if bad_NFS_rename
- {
- /*
- * Check whether the rename falsely reported success.
- * A race condition can occur between the rename and the stat.
- */
- struct stat tostat;
- if (stat(to, &tostat) != 0)
- return -1;
- if (! same_file(st, tostat, 0)) {
- errno = EIO;
- return -1;
- }
- }
-# endif
-
-# if bad_a_rename
- if (0 < set_mode && chmod(to, mode) != 0)
- return -1;
-# endif
-
- return 0;
-}
-
- int
-setmtime(file, mtime)
- char const *file;
- time_t mtime;
-/* Set FILE's last modified time to MTIME, but do nothing if MTIME is -1. */
-{
- static struct utimbuf amtime; /* static so unused fields are zero */
- if (mtime == -1)
- return 0;
- amtime.actime = now();
- amtime.modtime = mtime;
- return utime(file, &amtime);
-}
-
-
-
- int
-findlock(delete, target)
- int delete;
- struct hshentry **target;
-/*
- * Find the first lock held by caller and return a pointer
- * to the locked delta; also removes the lock if DELETE.
- * If one lock, put it into *TARGET.
- * Return 0 for no locks, 1 for one, 2 for two or more.
- */
-{
- register struct rcslock *next, **trail, **found;
-
- found = 0;
- for (trail = &Locks; (next = *trail); trail = &next->nextlock)
- if (strcmp(getcaller(), next->login) == 0) {
- if (found) {
- rcserror("multiple revisions locked by %s; please specify one", getcaller());
- return 2;
- }
- found = trail;
- }
- if (!found)
- return 0;
- next = *found;
- *target = next->delta;
- if (delete) {
- next->delta->lockedby = 0;
- *found = next->nextlock;
- }
- return 1;
-}
-
- int
-addlock(delta, verbose)
- struct hshentry * delta;
- int verbose;
-/*
- * Add a lock held by caller to DELTA and yield 1 if successful.
- * Print an error message if verbose and yield -1 if no lock is added because
- * DELTA is locked by somebody other than caller.
- * Return 0 if the caller already holds the lock.
- */
-{
- register struct rcslock *next;
-
- for (next = Locks; next; next = next->nextlock)
- if (cmpnum(delta->num, next->delta->num) == 0)
- if (strcmp(getcaller(), next->login) == 0)
- return 0;
- else {
- if (verbose)
- rcserror("Revision %s is already locked by %s.",
- delta->num, next->login
- );
- return -1;
- }
- next = ftalloc(struct rcslock);
- delta->lockedby = next->login = getcaller();
- next->delta = delta;
- next->nextlock = Locks;
- Locks = next;
- return 1;
-}
-
-
- int
-addsymbol(num, name, rebind)
- char const *num, *name;
- int rebind;
-/*
- * Associate with revision NUM the new symbolic NAME.
- * If NAME already exists and REBIND is set, associate NAME with NUM;
- * otherwise, print an error message and return false;
- * Return -1 if unsuccessful, 0 if no change, 1 if change.
- */
-{
- register struct assoc *next;
-
- for (next = Symbols; next; next = next->nextassoc)
- if (strcmp(name, next->symbol) == 0)
- if (strcmp(next->num,num) == 0)
- return 0;
- else if (rebind) {
- next->num = num;
- return 1;
- } else {
- rcserror("symbolic name %s already bound to %s",
- name, next->num
- );
- return -1;
- }
- next = ftalloc(struct assoc);
- next->symbol = name;
- next->num = num;
- next->nextassoc = Symbols;
- Symbols = next;
- return 1;
-}
-
-
-
- char const *
-getcaller()
-/* Get the caller's login name. */
-{
-# if has_setuid
- return getusername(euid()!=ruid());
-# else
- return getusername(false);
-# endif
-}
-
-
- int
-checkaccesslist()
-/*
- * Return true if caller is the superuser, the owner of the
- * file, the access list is empty, or caller is on the access list.
- * Otherwise, print an error message and return false.
- */
-{
- register struct access const *next;
-
- if (!AccessList || myself(RCSstat.st_uid) || strcmp(getcaller(),"root")==0)
- return true;
-
- next = AccessList;
- do {
- if (strcmp(getcaller(), next->login) == 0)
- return true;
- } while ((next = next->nextaccess));
-
- rcserror("user %s not on the access list", getcaller());
- return false;
-}
-
-
- int
-dorewrite(lockflag, changed)
- int lockflag, changed;
-/*
- * Do nothing if LOCKFLAG is zero.
- * Prepare to rewrite an RCS file if CHANGED is positive.
- * Stop rewriting if CHANGED is zero, because there won't be any changes.
- * Fail if CHANGED is negative.
- * Return 0 on success, -1 on failure.
- */
-{
- int r = 0, e;
-
- if (lockflag)
- if (changed) {
- if (changed < 0)
- return -1;
- putadmin();
- puttree(Head, frewrite);
- aprintf(frewrite, "\n\n%s%c", Kdesc, nextc);
- foutptr = frewrite;
- } else {
-# if bad_creat0
- int nr = !!frewrite, ne = 0;
-# endif
- ORCSclose();
- seteid();
- ignoreints();
-# if bad_creat0
- if (nr) {
- nr = un_link(newRCSname);
- ne = errno;
- keepdirtemp(newRCSname);
- }
-# endif
- r = un_link(lockname);
- e = errno;
- keepdirtemp(lockname);
- restoreints();
- setrid();
- if (r != 0)
- enerror(e, lockname);
-# if bad_creat0
- if (nr != 0) {
- enerror(ne, newRCSname);
- r = -1;
- }
-# endif
- }
- return r;
-}
-
- int
-donerewrite(changed, newRCStime)
- int changed;
- time_t newRCStime;
-/*
- * Finish rewriting an RCS file if CHANGED is nonzero.
- * Set its mode if CHANGED is positive.
- * Set its modification time to NEWRCSTIME unless it is -1.
- * Return 0 on success, -1 on failure.
- */
-{
- int r = 0, e = 0;
-# if bad_creat0
- int lr, le;
-# endif
-
- if (changed && !nerror) {
- if (finptr) {
- fastcopy(finptr, frewrite);
- Izclose(&finptr);
- }
- if (1 < RCSstat.st_nlink)
- rcswarn("breaking hard link");
- aflush(frewrite);
- seteid();
- ignoreints();
- r = chnamemod(
- &frewrite, newRCSname, RCSname, changed,
- RCSstat.st_mode & (mode_t)~(S_IWUSR|S_IWGRP|S_IWOTH),
- newRCStime
- );
- e = errno;
- keepdirtemp(newRCSname);
-# if bad_creat0
- lr = un_link(lockname);
- le = errno;
- keepdirtemp(lockname);
-# endif
- restoreints();
- setrid();
- if (r != 0) {
- enerror(e, RCSname);
- error("saved in %s", newRCSname);
- }
-# if bad_creat0
- if (lr != 0) {
- enerror(le, lockname);
- r = -1;
- }
-# endif
- }
- return r;
-}
-
- void
-ORCSclose()
-{
- if (0 <= fdlock) {
- if (close(fdlock) != 0)
- efaterror(lockname);
- fdlock = -1;
- }
- Ozclose(&frewrite);
-}
-
- void
-ORCSerror()
-/*
-* Like ORCSclose, except we are cleaning up after an interrupt or fatal error.
-* Do not report errors, since this may loop. This is needed only because
-* some brain-damaged hosts (e.g. OS/2) cannot unlink files that are open, and
-* some nearly-Posix hosts (e.g. NFS) work better if the files are closed first.
-* This isn't a completely reliable away to work around brain-damaged hosts,
-* because of the gap between actual file opening and setting frewrite etc.,
-* but it's better than nothing.
-*/
-{
- if (0 <= fdlock)
- VOID close(fdlock);
- if (frewrite)
- /* Avoid fclose, since stdio may not be reentrant. */
- VOID close(fileno(frewrite));
-}
diff --git a/gnu/usr.bin/rcs/lib/rcsfcmp.c b/gnu/usr.bin/rcs/lib/rcsfcmp.c
deleted file mode 100644
index ef0529001b87..000000000000
--- a/gnu/usr.bin/rcs/lib/rcsfcmp.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* Compare working files, ignoring RCS keyword strings. */
-
-/*****************************************************************************
- * rcsfcmp()
- * Testprogram: define FCMPTEST
- *****************************************************************************
- */
-
-/* Copyright 1982, 1988, 1989 Walter Tichy
- Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-
-
-
-
-/*
- * Revision 5.14 1995/06/16 06:19:24 eggert
- * Update FSF address.
- *
- * Revision 5.13 1995/06/01 16:23:43 eggert
- * (rcsfcmp): Add -kb support.
- *
- * Revision 5.12 1994/03/17 14:05:48 eggert
- * Normally calculate the $Log prefix from context, not from RCS file.
- * Calculate line numbers correctly even if the $Log prefix contains newlines.
- * Remove lint.
- *
- * Revision 5.11 1993/11/03 17:42:27 eggert
- * Fix yet another off-by-one error when comparing Log string expansions.
- *
- * Revision 5.10 1992/07/28 16:12:44 eggert
- * Statement macro names now end in _.
- *
- * Revision 5.9 1991/10/07 17:32:46 eggert
- * Count log lines correctly.
- *
- * Revision 5.8 1991/08/19 03:13:55 eggert
- * Tune.
- *
- * Revision 5.7 1991/04/21 11:58:22 eggert
- * Fix errno bug. Add MS-DOS support.
- *
- * Revision 5.6 1991/02/28 19:18:47 eggert
- * Open work file at most once.
- *
- * Revision 5.5 1990/11/27 09:26:05 eggert
- * Fix comment leader bug.
- *
- * Revision 5.4 1990/11/01 05:03:42 eggert
- * Permit arbitrary data in logs and comment leaders.
- *
- * Revision 5.3 1990/09/11 02:41:15 eggert
- * Don't ignore differences inside keyword strings if -ko is set.
- *
- * Revision 5.1 1990/08/29 07:13:58 eggert
- * Clean old log messages too.
- *
- * Revision 5.0 1990/08/22 08:12:49 eggert
- * Don't append "checked in with -k by " log to logs,
- * so that checking in a program with -k doesn't change it.
- * Ansify and Posixate. Remove lint.
- *
- * Revision 4.5 89/05/01 15:12:42 narten
- * changed copyright header to reflect current distribution rules
- *
- * Revision 4.4 88/08/09 19:12:50 eggert
- * Shrink stdio code size.
- *
- * Revision 4.3 87/12/18 11:40:02 narten
- * lint cleanups (Guy Harris)
- *
- * Revision 4.2 87/10/18 10:33:06 narten
- * updting version number. Changes relative to 1.1 actually relative to
- * 4.1
- *
- * Revision 1.2 87/03/27 14:22:19 jenkins
- * Port to suns
- *
- * Revision 4.1 83/05/10 16:24:04 wft
- * Marker matching now uses trymatch(). Marker pattern is now
- * checked precisely.
- *
- * Revision 3.1 82/12/04 13:21:40 wft
- * Initial revision.
- *
- */
-
-/*
-#define FCMPTEST
-*/
-/* Testprogram; prints out whether two files are identical,
- * except for keywords
- */
-
-#include "rcsbase.h"
-
-libId(fcmpId, "$FreeBSD$")
-
- static int discardkeyval P((int,RILE*));
- static int
-discardkeyval(c, f)
- register int c;
- register RILE *f;
-{
- for (;;)
- switch (c) {
- case KDELIM:
- case '\n':
- return c;
- default:
- Igeteof_(f, c, return EOF;)
- break;
- }
-}
-
- int
-rcsfcmp(xfp, xstatp, uname, delta)
- register RILE *xfp;
- struct stat const *xstatp;
- char const *uname;
- struct hshentry const *delta;
-/* Compare the files xfp and uname. Return zero
- * if xfp has the same contents as uname and neither has keywords,
- * otherwise -1 if they are the same ignoring keyword values,
- * and 1 if they differ even ignoring
- * keyword values. For the LOG-keyword, rcsfcmp skips the log message
- * given by the parameter delta in xfp. Thus, rcsfcmp returns nonpositive
- * if xfp contains the same as uname, with the keywords expanded.
- * Implementation: character-by-character comparison until $ is found.
- * If a $ is found, read in the marker keywords; if they are real keywords
- * and identical, read in keyword value. If value is terminated properly,
- * disregard it and optionally skip log message; otherwise, compare value.
- */
-{
- register int xc, uc;
- char xkeyword[keylength+2];
- int eqkeyvals;
- register RILE *ufp;
- register int xeof, ueof;
- register char * tp;
- register char const *sp;
- register size_t leaderlen;
- int result;
- enum markers match1;
- struct stat ustat;
-
- if (!(ufp = Iopen(uname, FOPEN_R_WORK, &ustat))) {
- efaterror(uname);
- }
- xeof = ueof = false;
- if (MIN_UNEXPAND <= Expand) {
- if (!(result = xstatp->st_size!=ustat.st_size)) {
-# if large_memory && maps_memory
- result = !!memcmp(xfp->base,ufp->base,(size_t)xstatp->st_size);
-# else
- for (;;) {
- /* get the next characters */
- Igeteof_(xfp, xc, xeof=true;)
- Igeteof_(ufp, uc, ueof=true;)
- if (xeof | ueof)
- goto eof;
- if (xc != uc)
- goto return1;
- }
-# endif
- }
- } else {
- xc = 0;
- uc = 0; /* Keep lint happy. */
- leaderlen = 0;
- result = 0;
-
- for (;;) {
- if (xc != KDELIM) {
- /* get the next characters */
- Igeteof_(xfp, xc, xeof=true;)
- Igeteof_(ufp, uc, ueof=true;)
- if (xeof | ueof)
- goto eof;
- } else {
- /* try to get both keywords */
- tp = xkeyword;
- for (;;) {
- Igeteof_(xfp, xc, xeof=true;)
- Igeteof_(ufp, uc, ueof=true;)
- if (xeof | ueof)
- goto eof;
- if (xc != uc)
- break;
- switch (xc) {
- default:
- if (xkeyword+keylength <= tp)
- break;
- *tp++ = xc;
- continue;
- case '\n': case KDELIM: case VDELIM:
- break;
- }
- break;
- }
- if (
- (xc==KDELIM || xc==VDELIM) && (uc==KDELIM || uc==VDELIM) &&
- (*tp = xc, (match1 = trymatch(xkeyword)) != Nomatch)
- ) {
-#ifdef FCMPTEST
- VOID printf("found common keyword %s\n",xkeyword);
-#endif
- result = -1;
- for (;;) {
- if (xc != uc) {
- xc = discardkeyval(xc, xfp);
- uc = discardkeyval(uc, ufp);
- if ((xeof = xc==EOF) | (ueof = uc==EOF))
- goto eof;
- eqkeyvals = false;
- break;
- }
- switch (xc) {
- default:
- Igeteof_(xfp, xc, xeof=true;)
- Igeteof_(ufp, uc, ueof=true;)
- if (xeof | ueof)
- goto eof;
- continue;
-
- case '\n': case KDELIM:
- eqkeyvals = true;
- break;
- }
- break;
- }
- if (xc != uc)
- goto return1;
- if (xc==KDELIM) {
- /* Skip closing KDELIM. */
- Igeteof_(xfp, xc, xeof=true;)
- Igeteof_(ufp, uc, ueof=true;)
- if (xeof | ueof)
- goto eof;
- /* if the keyword is LOG, also skip the log message in xfp*/
- if (match1==Log) {
- /* first, compute the number of line feeds in log msg */
- int lncnt;
- size_t ls, ccnt;
- sp = delta->log.string;
- ls = delta->log.size;
- if (ls<sizeof(ciklog)-1 || memcmp(sp,ciklog,sizeof(ciklog)-1)) {
- /*
- * This log message was inserted. Skip its header.
- * The number of newlines to skip is
- * 1 + (C+1)*(1+L+1), where C is the number of newlines
- * in the comment leader, and L is the number of
- * newlines in the log string.
- */
- int c1 = 1;
- for (ccnt=Comment.size; ccnt--; )
- c1 += Comment.string[ccnt] == '\n';
- lncnt = 2*c1 + 1;
- while (ls--) if (*sp++=='\n') lncnt += c1;
- for (;;) {
- if (xc=='\n')
- if(--lncnt==0) break;
- Igeteof_(xfp, xc, goto returnresult;)
- }
- /* skip last comment leader */
- /* Can't just skip another line here, because there may be */
- /* additional characters on the line (after the Log....$) */
- ccnt = RCSversion<VERSION(5) ? Comment.size : leaderlen;
- do {
- Igeteof_(xfp, xc, goto returnresult;)
- /*
- * Read to the end of the comment leader or '\n',
- * whatever comes first, because the leader's
- * trailing white space was probably stripped.
- */
- } while (ccnt-- && (xc!='\n' || --c1));
- }
- }
- } else {
- /* both end in the same character, but not a KDELIM */
- /* must compare string values.*/
-#ifdef FCMPTEST
- VOID printf("non-terminated keywords %s, potentially different values\n",xkeyword);
-#endif
- if (!eqkeyvals)
- goto return1;
- }
- }
- }
- if (xc != uc)
- goto return1;
- if (xc == '\n')
- leaderlen = 0;
- else
- leaderlen++;
- }
- }
-
- eof:
- if (xeof==ueof)
- goto returnresult;
- return1:
- result = 1;
- returnresult:
- Ifclose(ufp);
- return result;
-}
-
-
-
-#ifdef FCMPTEST
-
-char const cmdid[] = "rcsfcmp";
-
-main(argc, argv)
-int argc; char *argv[];
-/* first argument: comment leader; 2nd: log message, 3rd: expanded file,
- * 4th: unexpanded file
- */
-{ struct hshentry delta;
-
- Comment.string = argv[1];
- Comment.size = strlen(argv[1]);
- delta.log.string = argv[2];
- delta.log.size = strlen(argv[2]);
- if (rcsfcmp(Iopen(argv[3], FOPEN_R_WORK, (struct stat*)0), argv[4], &delta))
- VOID printf("files are the same\n");
- else VOID printf("files are different\n");
-}
-#endif
diff --git a/gnu/usr.bin/rcs/lib/rcsfnms.c b/gnu/usr.bin/rcs/lib/rcsfnms.c
deleted file mode 100644
index 00caec5adf6f..000000000000
--- a/gnu/usr.bin/rcs/lib/rcsfnms.c
+++ /dev/null
@@ -1,1132 +0,0 @@
-/* RCS filename and pathname handling */
-
-/****************************************************************************
- * creation and deletion of /tmp temporaries
- * pairing of RCS pathnames and working pathnames.
- * Testprogram: define PAIRTEST
- ****************************************************************************
- */
-
-/* Copyright 1982, 1988, 1989 Walter Tichy
- Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-
-
-
-/*
- * Revision 5.16 1995/06/16 06:19:24 eggert
- * Update FSF address.
- *
- * Revision 5.15 1995/06/01 16:23:43 eggert
- * (basefilename): Renamed from basename to avoid collisions.
- * (dirlen): Remove (for similar reasons).
- * (rcsreadopen): Open with FOPEN_RB.
- * (SLASHSLASH_is_SLASH): Default is 0.
- * (getcwd): Work around bad_wait_if_SIGCHLD_ignored bug.
- *
- * Revision 5.14 1994/03/17 14:05:48 eggert
- * Strip trailing SLASHes from TMPDIR; some systems need this. Remove lint.
- *
- * Revision 5.13 1993/11/03 17:42:27 eggert
- * Determine whether a file name is too long indirectly,
- * by examining inode numbers, instead of trying to use operating system
- * primitives like pathconf, which are not trustworthy in general.
- * File names may now hold white space or $.
- * Do not flatten ../X in pathnames; that may yield wrong answer for symlinks.
- * Add getabsname hook. Improve quality of diagnostics.
- *
- * Revision 5.12 1992/07/28 16:12:44 eggert
- * Add .sty. .pl now implies Perl, not Prolog. Fix fdlock initialization bug.
- * Check that $PWD is really ".". Be consistent about pathnames vs filenames.
- *
- * Revision 5.11 1992/02/17 23:02:25 eggert
- * `a/RCS/b/c' is now an RCS file with an empty extension, not just `a/b/RCS/c'.
- *
- * Revision 5.10 1992/01/24 18:44:19 eggert
- * Fix bug: Expand and Ignored weren't reinitialized.
- * Avoid `char const c=ch;' compiler bug.
- * Add support for bad_creat0.
- *
- * Revision 5.9 1992/01/06 02:42:34 eggert
- * Shorten long (>31 chars) name.
- * while (E) ; -> while (E) continue;
- *
- * Revision 5.8 1991/09/24 00:28:40 eggert
- * Don't export bindex().
- *
- * Revision 5.7 1991/08/19 03:13:55 eggert
- * Fix messages when rcswriteopen fails.
- * Look in $TMP and $TEMP if $TMPDIR isn't set. Tune.
- *
- * Revision 5.6 1991/04/21 11:58:23 eggert
- * Fix errno bugs. Add -x, RCSINIT, MS-DOS support.
- *
- * Revision 5.5 1991/02/26 17:48:38 eggert
- * Fix setuid bug. Support new link behavior.
- * Define more portable getcwd().
- *
- * Revision 5.4 1990/11/01 05:03:43 eggert
- * Permit arbitrary data in comment leaders.
- *
- * Revision 5.3 1990/09/14 22:56:16 hammer
- * added more filename extensions and their comment leaders
- *
- * Revision 5.2 1990/09/04 08:02:23 eggert
- * Fix typo when !RCSSEP.
- *
- * Revision 5.1 1990/08/29 07:13:59 eggert
- * Work around buggy compilers with defective argument promotion.
- *
- * Revision 5.0 1990/08/22 08:12:50 eggert
- * Ignore signals when manipulating the semaphore file.
- * Modernize list of filename extensions.
- * Permit paths of arbitrary length. Beware filenames beginning with "-".
- * Remove compile-time limits; use malloc instead.
- * Permit dates past 1999/12/31. Make lock and temp files faster and safer.
- * Ansify and Posixate.
- * Don't use access(). Fix test for non-regular files. Tune.
- *
- * Revision 4.8 89/05/01 15:09:41 narten
- * changed getwd to not stat empty directories.
- *
- * Revision 4.7 88/08/09 19:12:53 eggert
- * Fix troff macro comment leader bug; add Prolog; allow cc -R; remove lint.
- *
- * Revision 4.6 87/12/18 11:40:23 narten
- * additional file types added from 4.3 BSD version, and SPARC assembler
- * comment character added. Also, more lint cleanups. (Guy Harris)
- *
- * Revision 4.5 87/10/18 10:34:16 narten
- * Updating version numbers. Changes relative to 1.1 actually relative
- * to verion 4.3
- *
- * Revision 1.3 87/03/27 14:22:21 jenkins
- * Port to suns
- *
- * Revision 1.2 85/06/26 07:34:28 svb
- * Comment leader '% ' for '*.tex' files added.
- *
- * Revision 4.3 83/12/15 12:26:48 wft
- * Added check for KDELIM in filenames to pairfilenames().
- *
- * Revision 4.2 83/12/02 22:47:45 wft
- * Added csh, red, and sl filename suffixes.
- *
- * Revision 4.1 83/05/11 16:23:39 wft
- * Added initialization of Dbranch to InitAdmin(). Canged pairfilenames():
- * 1. added copying of path from workfile to RCS file, if RCS file is omitted;
- * 2. added getting the file status of RCS and working files;
- * 3. added ignoring of directories.
- *
- * Revision 3.7 83/05/11 15:01:58 wft
- * Added comtable[] which pairs filename suffixes with comment leaders;
- * updated InitAdmin() accordingly.
- *
- * Revision 3.6 83/04/05 14:47:36 wft
- * fixed Suffix in InitAdmin().
- *
- * Revision 3.5 83/01/17 18:01:04 wft
- * Added getwd() and rename(); these can be removed by defining
- * V4_2BSD, since they are not needed in 4.2 bsd.
- * Changed sys/param.h to sys/types.h.
- *
- * Revision 3.4 82/12/08 21:55:20 wft
- * removed unused variable.
- *
- * Revision 3.3 82/11/28 20:31:37 wft
- * Changed mktempfile() to store the generated filenames.
- * Changed getfullRCSname() to store the file and pathname, and to
- * delete leading "../" and "./".
- *
- * Revision 3.2 82/11/12 14:29:40 wft
- * changed pairfilenames() to handle file.sfx,v; also deleted checkpathnosfx(),
- * checksuffix(), checkfullpath(). Semaphore name generation updated.
- * mktempfile() now checks for nil path; freefilename initialized properly.
- * Added Suffix .h to InitAdmin. Added testprogram PAIRTEST.
- * Moved rmsema, trysema, trydiraccess, getfullRCSname from rcsutil.c to here.
- *
- * Revision 3.1 82/10/18 14:51:28 wft
- * InitAdmin() now initializes StrictLocks=STRICT_LOCKING (def. in rcsbase.h).
- * renamed checkpath() to checkfullpath().
- */
-
-
-#include "rcsbase.h"
-
-libId(fnmsId, "$FreeBSD$")
-
-static char const *bindex P((char const*,int));
-static int fin2open P((char const*, size_t, char const*, size_t, char const*, size_t, RILE*(*)P((struct buf*,struct stat*,int)), int));
-static int finopen P((RILE*(*)P((struct buf*,struct stat*,int)), int));
-static int suffix_matches P((char const*,char const*));
-static size_t dir_useful_len P((char const*));
-static size_t suffixlen P((char const*));
-static void InitAdmin P((void));
-
-char const *RCSname;
-char *workname;
-int fdlock;
-FILE *workstdout;
-struct stat RCSstat;
-char const *suffixes;
-
-static char const rcsdir[] = "RCS";
-#define rcslen (sizeof(rcsdir)-1)
-
-static struct buf RCSbuf, RCSb;
-static int RCSerrno;
-
-
-/* Temp names to be unlinked when done, if they are not 0. */
-#define TEMPNAMES 5 /* must be at least DIRTEMPNAMES (see rcsedit.c) */
-static char *volatile tpnames[TEMPNAMES];
-
-
-struct compair {
- char const *suffix, *comlead;
-};
-
-/*
-* This table is present only for backwards compatibility.
-* Normally we ignore this table, and use the prefix of the `$Log' line instead.
-*/
-static struct compair const comtable[] = {
- { "a" , "-- " }, /* Ada */
- { "ada" , "-- " },
- { "adb" , "-- " },
- { "ads" , "-- " },
- { "asm" , ";; " }, /* assembler (MS-DOS) */
- { "bat" , ":: " }, /* batch (MS-DOS) */
- { "body", "-- " }, /* Ada */
- { "c" , " * " }, /* C */
- { "c++" , "// " }, /* C++ in all its infinite guises */
- { "cc" , "// " },
- { "cpp" , "// " },
- { "cxx" , "// " },
- { "cl" , ";;; "}, /* Common Lisp */
- { "cmd" , ":: " }, /* command (OS/2) */
- { "cmf" , "c " }, /* CM Fortran */
- { "cs" , " * " }, /* C* */
- { "el" , "; " }, /* Emacs Lisp */
- { "f" , "c " }, /* Fortran */
- { "for" , "c " },
- { "h" , " * " }, /* C-header */
- { "hpp" , "// " }, /* C++ header */
- { "hxx" , "// " },
- { "l" , " * " }, /* lex (NOTE: franzlisp disagrees) */
- { "lisp", ";;; "}, /* Lucid Lisp */
- { "lsp" , ";; " }, /* Microsoft Lisp */
- { "m" , "// " }, /* Objective C */
- { "mac" , ";; " }, /* macro (DEC-10, MS-DOS, PDP-11, VMS, etc) */
- { "me" , ".\\\" "}, /* troff -me */
- { "ml" , "; " }, /* mocklisp */
- { "mm" , ".\\\" "}, /* troff -mm */
- { "ms" , ".\\\" "}, /* troff -ms */
- { "p" , " * " }, /* Pascal */
- { "pas" , " * " },
- { "ps" , "% " }, /* PostScript */
- { "spec", "-- " }, /* Ada */
- { "sty" , "% " }, /* LaTeX style */
- { "tex" , "% " }, /* TeX */
- { "y" , " * " }, /* yacc */
- { 0 , "# " } /* default for unknown suffix; must be last */
-};
-
-#if has_mktemp
- static char const *tmp P((void));
- static char const *
-tmp()
-/* Yield the name of the tmp directory. */
-{
- static char const *s;
- if (!s
- && !(s = cgetenv("TMPDIR")) /* Unix tradition */
- && !(s = cgetenv("TMP")) /* DOS tradition */
- && !(s = cgetenv("TEMP")) /* another DOS tradition */
- )
- s = TMPDIR;
- return s;
-}
-#endif
-
- char const *
-maketemp(n)
- int n;
-/* Create a unique pathname using n and the process id and store it
- * into the nth slot in tpnames.
- * Because of storage in tpnames, tempunlink() can unlink the file later.
- * Return a pointer to the pathname created.
- */
-{
- char *p;
- char const *t = tpnames[n];
-# if has_mktemp
- int fd;
-# endif
-
- if (t)
- return t;
-
- catchints();
- {
-# if has_mktemp
- char const *tp = tmp();
- size_t tplen = dir_useful_len(tp);
- p = testalloc(tplen + 10);
- VOID sprintf(p, "%.*s%cT%cXXXXXX", (int)tplen, tp, SLASH, '0'+n);
- fd = mkstemp(p);
- if (fd < 0 || !*p)
- faterror("can't make temporary pathname `%.*s%cT%cXXXXXX'",
- (int)tplen, tp, SLASH, '0'+n
- );
- close(fd);
-# else
- static char tpnamebuf[TEMPNAMES][L_tmpnam];
- p = tpnamebuf[n];
- if (!tmpnam(p) || !*p)
-# ifdef P_tmpdir
- faterror("can't make temporary pathname `%s...'",P_tmpdir);
-# else
- faterror("can't make temporary pathname");
-# endif
-# endif
- }
-
- tpnames[n] = p;
- return p;
-}
-
- void
-tempunlink()
-/* Clean up maketemp() files. May be invoked by signal handler.
- */
-{
- register int i;
- register char *p;
-
- for (i = TEMPNAMES; 0 <= --i; )
- if ((p = tpnames[i])) {
- VOID unlink(p);
- /*
- * We would tfree(p) here,
- * but this might dump core if we're handing a signal.
- * We're about to exit anyway, so we won't bother.
- */
- tpnames[i] = 0;
- }
-}
-
-
- static char const *
-bindex(sp, c)
- register char const *sp;
- register int c;
-/* Function: Finds the last occurrence of character c in string sp
- * and returns a pointer to the character just beyond it. If the
- * character doesn't occur in the string, sp is returned.
- */
-{
- register char const *r;
- r = sp;
- while (*sp) {
- if (*sp++ == c) r=sp;
- }
- return r;
-}
-
-
-
- static int
-suffix_matches(suffix, pattern)
- register char const *suffix, *pattern;
-{
- register int c;
- if (!pattern)
- return true;
- for (;;)
- switch (*suffix++ - (c = *pattern++)) {
- case 0:
- if (!c)
- return true;
- break;
-
- case 'A'-'a':
- if (ctab[c] == Letter)
- break;
- /* fall into */
- default:
- return false;
- }
-}
-
-
- static void
-InitAdmin()
-/* function: initializes an admin node */
-{
- register char const *Suffix;
- register int i;
-
- Head=0; Dbranch=0; AccessList=0; Symbols=0; Locks=0;
- StrictLocks=STRICT_LOCKING;
-
- /* guess the comment leader from the suffix*/
- Suffix = bindex(workname, '.');
- if (Suffix==workname) Suffix= ""; /* empty suffix; will get default*/
- for (i=0; !suffix_matches(Suffix,comtable[i].suffix); i++)
- continue;
- Comment.string = comtable[i].comlead;
- Comment.size = strlen(comtable[i].comlead);
- Expand = KEYVAL_EXPAND;
- clear_buf(&Ignored);
- Lexinit(); /* note: if !finptr, reads nothing; only initializes */
-}
-
-
-
- void
-bufalloc(b, size)
- register struct buf *b;
- size_t size;
-/* Ensure *B is a name buffer of at least SIZE bytes.
- * *B's old contents can be freed; *B's new contents are undefined.
- */
-{
- if (b->size < size) {
- if (b->size)
- tfree(b->string);
- else
- b->size = sizeof(malloc_type);
- while (b->size < size)
- b->size <<= 1;
- b->string = tnalloc(char, b->size);
- }
-}
-
- void
-bufrealloc(b, size)
- register struct buf *b;
- size_t size;
-/* like bufalloc, except *B's old contents, if any, are preserved */
-{
- if (b->size < size) {
- if (!b->size)
- bufalloc(b, size);
- else {
- while ((b->size <<= 1) < size)
- continue;
- b->string = trealloc(char, b->string, b->size);
- }
- }
-}
-
- void
-bufautoend(b)
- struct buf *b;
-/* Free an auto buffer at block exit. */
-{
- if (b->size)
- tfree(b->string);
-}
-
- struct cbuf
-bufremember(b, s)
- struct buf *b;
- size_t s;
-/*
- * Free the buffer B with used size S.
- * Yield a cbuf with identical contents.
- * The cbuf will be reclaimed when this input file is finished.
- */
-{
- struct cbuf cb;
-
- if ((cb.size = s))
- cb.string = fremember(trealloc(char, b->string, s));
- else {
- bufautoend(b); /* not really auto */
- cb.string = "";
- }
- return cb;
-}
-
- char *
-bufenlarge(b, alim)
- register struct buf *b;
- char const **alim;
-/* Make *B larger. Set *ALIM to its new limit, and yield the relocated value
- * of its old limit.
- */
-{
- size_t s = b->size;
- bufrealloc(b, s + 1);
- *alim = b->string + b->size;
- return b->string + s;
-}
-
- void
-bufscat(b, s)
- struct buf *b;
- char const *s;
-/* Concatenate S to B's end. */
-{
- size_t blen = b->string ? strlen(b->string) : 0;
- bufrealloc(b, blen+strlen(s)+1);
- VOID strcpy(b->string+blen, s);
-}
-
- void
-bufscpy(b, s)
- struct buf *b;
- char const *s;
-/* Copy S into B. */
-{
- bufalloc(b, strlen(s)+1);
- VOID strcpy(b->string, s);
-}
-
-
- char const *
-basefilename(p)
- char const *p;
-/* Yield the address of the base filename of the pathname P. */
-{
- register char const *b = p, *q = p;
- for (;;)
- switch (*q++) {
- case SLASHes: b = q; break;
- case 0: return b;
- }
-}
-
-
- static size_t
-suffixlen(x)
- char const *x;
-/* Yield the length of X, an RCS pathname suffix. */
-{
- register char const *p;
-
- p = x;
- for (;;)
- switch (*p) {
- case 0: case SLASHes:
- return p - x;
-
- default:
- ++p;
- continue;
- }
-}
-
- char const *
-rcssuffix(name)
- char const *name;
-/* Yield the suffix of NAME if it is an RCS pathname, 0 otherwise. */
-{
- char const *x, *p, *nz;
- size_t nl, xl;
-
- nl = strlen(name);
- nz = name + nl;
- x = suffixes;
- do {
- if ((xl = suffixlen(x))) {
- if (xl <= nl && memcmp(p = nz-xl, x, xl) == 0)
- return p;
- } else
- for (p = name; p < nz - rcslen; p++)
- if (
- isSLASH(p[rcslen])
- && (p==name || isSLASH(p[-1]))
- && memcmp(p, rcsdir, rcslen) == 0
- )
- return nz;
- x += xl;
- } while (*x++);
- return 0;
-}
-
- /*ARGSUSED*/ RILE *
-rcsreadopen(RCSpath, status, mustread)
- struct buf *RCSpath;
- struct stat *status;
- int mustread;
-/* Open RCSPATH for reading and yield its FILE* descriptor.
- * If successful, set *STATUS to its status.
- * Pass this routine to pairnames() for read-only access to the file. */
-{
- return Iopen(RCSpath->string, FOPEN_RB, status);
-}
-
- static int
-finopen(rcsopen, mustread)
- RILE *(*rcsopen)P((struct buf*,struct stat*,int));
- int mustread;
-/*
- * Use RCSOPEN to open an RCS file; MUSTREAD is set if the file must be read.
- * Set finptr to the result and yield true if successful.
- * RCSb holds the file's name.
- * Set RCSbuf to the best RCS name found so far, and RCSerrno to its errno.
- * Yield true if successful or if an unusual failure.
- */
-{
- int interesting, preferold;
-
- /*
- * We prefer an old name to that of a nonexisting new RCS file,
- * unless we tried locking the old name and failed.
- */
- preferold = RCSbuf.string[0] && (mustread||0<=fdlock);
-
- finptr = (*rcsopen)(&RCSb, &RCSstat, mustread);
- interesting = finptr || errno!=ENOENT;
- if (interesting || !preferold) {
- /* Use the new name. */
- RCSerrno = errno;
- bufscpy(&RCSbuf, RCSb.string);
- }
- return interesting;
-}
-
- static int
-fin2open(d, dlen, base, baselen, x, xlen, rcsopen, mustread)
- char const *d, *base, *x;
- size_t dlen, baselen, xlen;
- RILE *(*rcsopen)P((struct buf*,struct stat*,int));
- int mustread;
-/*
- * D is a directory name with length DLEN (including trailing slash).
- * BASE is a filename with length BASELEN.
- * X is an RCS pathname suffix with length XLEN.
- * Use RCSOPEN to open an RCS file; MUSTREAD is set if the file must be read.
- * Yield true if successful.
- * Try dRCS/basex first; if that fails and x is nonempty, try dbasex.
- * Put these potential names in RCSb.
- * Set RCSbuf to the best RCS name found so far, and RCSerrno to its errno.
- * Yield true if successful or if an unusual failure.
- */
-{
- register char *p;
-
- bufalloc(&RCSb, dlen + rcslen + 1 + baselen + xlen + 1);
-
- /* Try dRCS/basex. */
- VOID memcpy(p = RCSb.string, d, dlen);
- VOID memcpy(p += dlen, rcsdir, rcslen);
- p += rcslen;
- *p++ = SLASH;
- VOID memcpy(p, base, baselen);
- VOID memcpy(p += baselen, x, xlen);
- p[xlen] = 0;
- if (xlen) {
- if (finopen(rcsopen, mustread))
- return true;
-
- /* Try dbasex. */
- /* Start from scratch, because finopen() may have changed RCSb. */
- VOID memcpy(p = RCSb.string, d, dlen);
- VOID memcpy(p += dlen, base, baselen);
- VOID memcpy(p += baselen, x, xlen);
- p[xlen] = 0;
- }
- return finopen(rcsopen, mustread);
-}
-
- int
-pairnames(argc, argv, rcsopen, mustread, quiet)
- int argc;
- char **argv;
- RILE *(*rcsopen)P((struct buf*,struct stat*,int));
- int mustread, quiet;
-/*
- * Pair the pathnames pointed to by argv; argc indicates
- * how many there are.
- * Place a pointer to the RCS pathname into RCSname,
- * and a pointer to the pathname of the working file into workname.
- * If both are given, and workstdout
- * is set, a warning is printed.
- *
- * If the RCS file exists, places its status into RCSstat.
- *
- * If the RCS file exists, it is RCSOPENed for reading, the file pointer
- * is placed into finptr, and the admin-node is read in; returns 1.
- * If the RCS file does not exist and MUSTREAD,
- * print an error unless QUIET and return 0.
- * Otherwise, initialize the admin node and return -1.
- *
- * 0 is returned on all errors, e.g. files that are not regular files.
- */
-{
- static struct buf tempbuf;
-
- register char *p, *arg, *RCS1;
- char const *base, *RCSbase, *x;
- int paired;
- size_t arglen, dlen, baselen, xlen;
-
- fdlock = -1;
-
- if (!(arg = *argv)) return 0; /* already paired pathname */
- if (*arg == '-') {
- error("%s option is ignored after pathnames", arg);
- return 0;
- }
-
- base = basefilename(arg);
- paired = false;
-
- /* first check suffix to see whether it is an RCS file or not */
- if ((x = rcssuffix(arg)))
- {
- /* RCS pathname given */
- RCS1 = arg;
- RCSbase = base;
- baselen = x - base;
- if (
- 1 < argc &&
- !rcssuffix(workname = p = argv[1]) &&
- baselen <= (arglen = strlen(p)) &&
- ((p+=arglen-baselen) == workname || isSLASH(p[-1])) &&
- memcmp(base, p, baselen) == 0
- ) {
- argv[1] = 0;
- paired = true;
- } else {
- bufscpy(&tempbuf, base);
- workname = p = tempbuf.string;
- p[baselen] = 0;
- }
- } else {
- /* working file given; now try to find RCS file */
- workname = arg;
- baselen = strlen(base);
- /* Derive RCS pathname. */
- if (
- 1 < argc &&
- (x = rcssuffix(RCS1 = argv[1])) &&
- baselen <= x - RCS1 &&
- ((RCSbase=x-baselen)==RCS1 || isSLASH(RCSbase[-1])) &&
- memcmp(base, RCSbase, baselen) == 0
- ) {
- argv[1] = 0;
- paired = true;
- } else
- RCSbase = RCS1 = 0;
- }
- /* Now we have a (tentative) RCS pathname in RCS1 and workname. */
- /* Second, try to find the right RCS file */
- if (RCSbase!=RCS1) {
- /* a path for RCSfile is given; single RCS file to look for */
- bufscpy(&RCSbuf, RCS1);
- finptr = (*rcsopen)(&RCSbuf, &RCSstat, mustread);
- RCSerrno = errno;
- } else {
- bufscpy(&RCSbuf, "");
- if (RCS1)
- /* RCS filename was given without path. */
- VOID fin2open(arg, (size_t)0, RCSbase, baselen,
- x, strlen(x), rcsopen, mustread
- );
- else {
- /* No RCS pathname was given. */
- /* Try each suffix in turn. */
- dlen = base-arg;
- x = suffixes;
- while (! fin2open(arg, dlen, base, baselen,
- x, xlen=suffixlen(x), rcsopen, mustread
- )) {
- x += xlen;
- if (!*x++)
- break;
- }
- }
- }
- RCSname = p = RCSbuf.string;
- if (finptr) {
- if (!S_ISREG(RCSstat.st_mode)) {
- error("%s isn't a regular file -- ignored", p);
- return 0;
- }
- Lexinit(); getadmin();
- } else {
- if (RCSerrno!=ENOENT || mustread || fdlock<0) {
- if (RCSerrno == EEXIST)
- error("RCS file %s is in use", p);
- else if (!quiet || RCSerrno!=ENOENT)
- enerror(RCSerrno, p);
- return 0;
- }
- InitAdmin();
- };
-
- if (paired && workstdout)
- workwarn("Working file ignored due to -p option");
-
- prevkeys = false;
- return finptr ? 1 : -1;
-}
-
-
- char const *
-getfullRCSname()
-/*
- * Return a pointer to the full pathname of the RCS file.
- * Remove leading `./'.
- */
-{
- if (ROOTPATH(RCSname)) {
- return RCSname;
- } else {
- static struct buf rcsbuf;
-# if needs_getabsname
- bufalloc(&rcsbuf, SIZEABLE_PATH + 1);
- while (getabsname(RCSname, rcsbuf.string, rcsbuf.size) != 0)
- if (errno == ERANGE)
- bufalloc(&rcsbuf, rcsbuf.size<<1);
- else
- efaterror("getabsname");
-# else
- static char const *wdptr;
- static struct buf wdbuf;
- static size_t wdlen;
-
- register char const *r;
- register size_t dlen;
- register char *d;
- register char const *wd;
-
- if (!(wd = wdptr)) {
- /* Get working directory for the first time. */
- char *PWD = cgetenv("PWD");
- struct stat PWDstat, dotstat;
- if (! (
- (d = PWD) &&
- ROOTPATH(PWD) &&
- stat(PWD, &PWDstat) == 0 &&
- stat(".", &dotstat) == 0 &&
- same_file(PWDstat, dotstat, 1)
- )) {
- bufalloc(&wdbuf, SIZEABLE_PATH + 1);
-# if has_getcwd || !has_getwd
- while (!(d = getcwd(wdbuf.string, wdbuf.size)))
- if (errno == ERANGE)
- bufalloc(&wdbuf, wdbuf.size<<1);
- else if ((d = PWD))
- break;
- else
- efaterror("getcwd");
-# else
- d = getwd(wdbuf.string);
- if (!d && !(d = PWD))
- efaterror("getwd");
-# endif
- }
- wdlen = dir_useful_len(d);
- d[wdlen] = 0;
- wdptr = wd = d;
- }
- /*
- * Remove leading `./'s from RCSname.
- * Do not try to handle `../', since removing it may yield
- * the wrong answer in the presence of symbolic links.
- */
- for (r = RCSname; r[0]=='.' && isSLASH(r[1]); r += 2)
- /* `.////' is equivalent to `./'. */
- while (isSLASH(r[2]))
- r++;
- /* Build full pathname. */
- dlen = wdlen;
- bufalloc(&rcsbuf, dlen + strlen(r) + 2);
- d = rcsbuf.string;
- VOID memcpy(d, wd, dlen);
- d += dlen;
- *d++ = SLASH;
- VOID strcpy(d, r);
-# endif
- return rcsbuf.string;
- }
-}
-
-/* Derived from code from the XFree86 project */
- char const *
-getfullCVSname()
-/* Function: returns a pointer to the path name of the RCS file with the
- * CVSROOT part stripped off, and with 'Attic/' stripped off (if present).
- */
-{
-
-#define ATTICDIR "/Attic"
-
- char const *namebuf = getfullRCSname();
- char *cvsroot = cgetenv("CVSROOT");
- int cvsrootlen;
- char *c = NULL;
- int alen = strlen(ATTICDIR);
-
- if ((c = strrchr(namebuf, '/')) != NULL) {
- if (namebuf - c >= alen) {
- if (!strncmp(c - alen, ATTICDIR, alen)) {
- while(*c != '\0') {
- *(c - alen) = *c;
- c++;
- }
- *(c - alen) = '\0';
- }
- }
- }
-
- if (!cvsroot)
- return(namebuf);
- else
- {
- cvsrootlen = strlen(cvsroot);
- if (!strncmp(namebuf, cvsroot, cvsrootlen) &&
- namebuf[cvsrootlen] == '/')
- return(namebuf + cvsrootlen + 1);
- else
- return(namebuf);
- }
-}
-
- static size_t
-dir_useful_len(d)
- char const *d;
-/*
-* D names a directory; yield the number of characters of D's useful part.
-* To create a file in D, append a SLASH and a file name to D's useful part.
-* Ignore trailing slashes if possible; not only are they ugly,
-* but some non-Posix systems misbehave unless the slashes are omitted.
-*/
-{
-# ifndef SLASHSLASH_is_SLASH
-# define SLASHSLASH_is_SLASH 0
-# endif
- size_t dlen = strlen(d);
- if (!SLASHSLASH_is_SLASH && dlen==2 && isSLASH(d[0]) && isSLASH(d[1]))
- --dlen;
- else
- while (dlen && isSLASH(d[dlen-1]))
- --dlen;
- return dlen;
-}
-
-#ifndef isSLASH
- int
-isSLASH(c)
- int c;
-{
- switch (c) {
- case SLASHes:
- return true;
- default:
- return false;
- }
-}
-#endif
-
-
-#if !has_getcwd && !has_getwd
-
- char *
-getcwd(path, size)
- char *path;
- size_t size;
-{
- static char const usrbinpwd[] = "/usr/bin/pwd";
-# define binpwd (usrbinpwd+4)
-
- register FILE *fp;
- register int c;
- register char *p, *lim;
- int closeerrno, closeerror, e, fd[2], readerror, toolong, wstatus;
- pid_t child;
-
- if (!size) {
- errno = EINVAL;
- return 0;
- }
- if (pipe(fd) != 0)
- return 0;
-# if bad_wait_if_SIGCHLD_ignored
-# ifndef SIGCHLD
-# define SIGCHLD SIGCLD
-# endif
- VOID signal(SIGCHLD, SIG_DFL);
-# endif
- if (!(child = vfork())) {
- if (
- close(fd[0]) == 0 &&
- (fd[1] == STDOUT_FILENO ||
-# ifdef F_DUPFD
- (VOID close(STDOUT_FILENO),
- fcntl(fd[1], F_DUPFD, STDOUT_FILENO))
-# else
- dup2(fd[1], STDOUT_FILENO)
-# endif
- == STDOUT_FILENO &&
- close(fd[1]) == 0
- )
- ) {
- VOID close(STDERR_FILENO);
- VOID execl(binpwd, binpwd, (char *)0);
- VOID execl(usrbinpwd, usrbinpwd, (char *)0);
- }
- _exit(EXIT_FAILURE);
- }
- e = errno;
- closeerror = close(fd[1]);
- closeerrno = errno;
- fp = 0;
- readerror = toolong = wstatus = 0;
- p = path;
- if (0 <= child) {
- fp = fdopen(fd[0], "r");
- e = errno;
- if (fp) {
- lim = p + size;
- for (p = path; ; *p++ = c) {
- if ((c=getc(fp)) < 0) {
- if (feof(fp))
- break;
- if (ferror(fp)) {
- readerror = 1;
- e = errno;
- break;
- }
- }
- if (p == lim) {
- toolong = 1;
- break;
- }
- }
- }
-# if has_waitpid
- if (waitpid(child, &wstatus, 0) < 0)
- wstatus = 1;
-# else
- {
- pid_t w;
- do {
- if ((w = wait(&wstatus)) < 0) {
- wstatus = 1;
- break;
- }
- } while (w != child);
- }
-# endif
- }
- if (!fp) {
- VOID close(fd[0]);
- errno = e;
- return 0;
- }
- if (fclose(fp) != 0)
- return 0;
- if (readerror) {
- errno = e;
- return 0;
- }
- if (closeerror) {
- errno = closeerrno;
- return 0;
- }
- if (toolong) {
- errno = ERANGE;
- return 0;
- }
- if (wstatus || p == path || *--p != '\n') {
- errno = EACCES;
- return 0;
- }
- *p = '\0';
- return path;
-}
-#endif
-
-
-#ifdef PAIRTEST
-/* test program for pairnames() and getfullRCSname() */
-
-char const cmdid[] = "pair";
-
-main(argc, argv)
-int argc; char *argv[];
-{
- int result;
- int initflag;
- quietflag = initflag = false;
-
- while(--argc, ++argv, argc>=1 && ((*argv)[0] == '-')) {
- switch ((*argv)[1]) {
-
- case 'p': workstdout = stdout;
- break;
- case 'i': initflag=true;
- break;
- case 'q': quietflag=true;
- break;
- default: error("unknown option: %s", *argv);
- break;
- }
- }
-
- do {
- RCSname = workname = 0;
- result = pairnames(argc,argv,rcsreadopen,!initflag,quietflag);
- if (result!=0) {
- diagnose("RCS pathname: %s; working pathname: %s\nFull RCS pathname: %s\n",
- RCSname, workname, getfullRCSname()
- );
- }
- switch (result) {
- case 0: continue; /* already paired file */
-
- case 1: if (initflag) {
- rcserror("already exists");
- } else {
- diagnose("RCS file %s exists\n", RCSname);
- }
- Ifclose(finptr);
- break;
-
- case -1:diagnose("RCS file doesn't exist\n");
- break;
- }
-
- } while (++argv, --argc>=1);
-
-}
-
- void
-exiterr()
-{
- dirtempunlink();
- tempunlink();
- _exit(EXIT_FAILURE);
-}
-#endif
diff --git a/gnu/usr.bin/rcs/lib/rcsgen.c b/gnu/usr.bin/rcs/lib/rcsgen.c
deleted file mode 100644
index 35d8702a34f8..000000000000
--- a/gnu/usr.bin/rcs/lib/rcsgen.c
+++ /dev/null
@@ -1,681 +0,0 @@
-/* Generate RCS revisions. */
-
-/* Copyright 1982, 1988, 1989 Walter Tichy
- Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-/*
- * Revision 5.16 1995/06/16 06:19:24 eggert
- * Update FSF address.
- *
- * Revision 5.15 1995/06/01 16:23:43 eggert
- * (putadmin): Open RCS file with FOPEN_WB.
- *
- * Revision 5.14 1994/03/17 14:05:48 eggert
- * Work around SVR4 stdio performance bug.
- * Flush stderr after prompt. Remove lint.
- *
- * Revision 5.13 1993/11/03 17:42:27 eggert
- * Don't discard ignored phrases. Improve quality of diagnostics.
- *
- * Revision 5.12 1992/07/28 16:12:44 eggert
- * Statement macro names now end in _.
- * Be consistent about pathnames vs filenames.
- *
- * Revision 5.11 1992/01/24 18:44:19 eggert
- * Move put routines here from rcssyn.c.
- * Add support for bad_creat0.
- *
- * Revision 5.10 1991/10/07 17:32:46 eggert
- * Fix log bugs, e.g. ci -t/dev/null when has_mmap.
- *
- * Revision 5.9 1991/09/10 22:15:46 eggert
- * Fix test for redirected stdin.
- *
- * Revision 5.8 1991/08/19 03:13:55 eggert
- * Add piece tables. Tune.
- *
- * Revision 5.7 1991/04/21 11:58:24 eggert
- * Add MS-DOS support.
- *
- * Revision 5.6 1990/12/27 19:54:26 eggert
- * Fix bug: rcs -t inserted \n, making RCS file grow.
- *
- * Revision 5.5 1990/12/04 05:18:45 eggert
- * Use -I for prompts and -q for diagnostics.
- *
- * Revision 5.4 1990/11/01 05:03:47 eggert
- * Add -I and new -t behavior. Permit arbitrary data in logs.
- *
- * Revision 5.3 1990/09/21 06:12:43 hammer
- * made putdesc() treat stdin the same whether or not it was from a terminal
- * by making it recognize that a single '.' was then end of the
- * description always
- *
- * Revision 5.2 1990/09/04 08:02:25 eggert
- * Fix `co -p1.1 -ko' bug. Standardize yes-or-no procedure.
- *
- * Revision 5.1 1990/08/29 07:14:01 eggert
- * Clean old log messages too.
- *
- * Revision 5.0 1990/08/22 08:12:52 eggert
- * Remove compile-time limits; use malloc instead.
- * Ansify and Posixate.
- *
- * Revision 4.7 89/05/01 15:12:49 narten
- * changed copyright header to reflect current distribution rules
- *
- * Revision 4.6 88/08/28 14:59:10 eggert
- * Shrink stdio code size; allow cc -R; remove lint; isatty() -> ttystdin()
- *
- * Revision 4.5 87/12/18 11:43:25 narten
- * additional lint cleanups, and a bug fix from the 4.3BSD version that
- * keeps "ci" from sticking a '\377' into the description if you run it
- * with a zero-length file as the description. (Guy Harris)
- *
- * Revision 4.4 87/10/18 10:35:10 narten
- * Updating version numbers. Changes relative to 1.1 actually relative to
- * 4.2
- *
- * Revision 1.3 87/09/24 13:59:51 narten
- * Sources now pass through lint (if you ignore printf/sprintf/fprintf
- * warnings)
- *
- * Revision 1.2 87/03/27 14:22:27 jenkins
- * Port to suns
- *
- * Revision 4.2 83/12/02 23:01:39 wft
- * merged 4.1 and 3.3.1.1 (clearerr(stdin)).
- *
- * Revision 4.1 83/05/10 16:03:33 wft
- * Changed putamin() to abort if trying to reread redirected stdin.
- * Fixed getdesc() to output a prompt on initial newline.
- *
- * Revision 3.3.1.1 83/10/19 04:21:51 lepreau
- * Added clearerr(stdin) for re-reading description from stdin.
- *
- * Revision 3.3 82/11/28 21:36:49 wft
- * 4.2 prerelease
- *
- * Revision 3.3 82/11/28 21:36:49 wft
- * Replaced ferror() followed by fclose() with ffclose().
- * Putdesc() now suppresses the prompts if stdin
- * is not a terminal. A pointer to the current log message is now
- * inserted into the corresponding delta, rather than leaving it in a
- * global variable.
- *
- * Revision 3.2 82/10/18 21:11:26 wft
- * I added checks for write errors during editing, and improved
- * the prompt on putdesc().
- *
- * Revision 3.1 82/10/13 15:55:09 wft
- * corrected type of variables assigned to by getc (char --> int)
- */
-
-
-
-
-#include "rcsbase.h"
-
-libId(genId, "$FreeBSD$")
-
-int interactiveflag; /* Should we act as if stdin is a tty? */
-struct buf curlogbuf; /* buffer for current log message */
-
-enum stringwork { enter, copy, edit, expand, edit_expand };
-
-static void putdelta P((struct hshentry const*,FILE*));
-static void scandeltatext P((struct hshentry*,enum stringwork,int));
-
-
-
-
- char const *
-buildrevision(deltas, target, outfile, expandflag)
- struct hshentries const *deltas;
- struct hshentry *target;
- FILE *outfile;
- int expandflag;
-/* Function: Generates the revision given by target
- * by retrieving all deltas given by parameter deltas and combining them.
- * If outfile is set, the revision is output to it,
- * otherwise written into a temporary file.
- * Temporary files are allocated by maketemp().
- * if expandflag is set, keyword expansion is performed.
- * Return 0 if outfile is set, the name of the temporary file otherwise.
- *
- * Algorithm: Copy initial revision unchanged. Then edit all revisions but
- * the last one into it, alternating input and output files (resultname and
- * editname). The last revision is then edited in, performing simultaneous
- * keyword substitution (this saves one extra pass).
- * All this simplifies if only one revision needs to be generated,
- * or no keyword expansion is necessary, or if output goes to stdout.
- */
-{
- if (deltas->first == target) {
- /* only latest revision to generate */
- openfcopy(outfile);
- scandeltatext(target, expandflag?expand:copy, true);
- if (outfile)
- return 0;
- else {
- Ozclose(&fcopy);
- return resultname;
- }
- } else {
- /* several revisions to generate */
- /* Get initial revision without keyword expansion. */
- scandeltatext(deltas->first, enter, false);
- while ((deltas=deltas->rest)->rest) {
- /* do all deltas except last one */
- scandeltatext(deltas->first, edit, false);
- }
- if (expandflag || outfile) {
- /* first, get to beginning of file*/
- finishedit((struct hshentry*)0, outfile, false);
- }
- scandeltatext(target, expandflag?edit_expand:edit, true);
- finishedit(
- expandflag ? target : (struct hshentry*)0,
- outfile, true
- );
- if (outfile)
- return 0;
- Ozclose(&fcopy);
- return resultname;
- }
-}
-
-
-
- static void
-scandeltatext(delta, func, needlog)
- struct hshentry *delta;
- enum stringwork func;
- int needlog;
-/* Function: Scans delta text nodes up to and including the one given
- * by delta. For the one given by delta, the log message is saved into
- * delta->log if needlog is set; func specifies how to handle the text.
- * Similarly, if needlog, delta->igtext is set to the ignored phrases.
- * Assumes the initial lexeme must be read in first.
- * Does not advance nexttok after it is finished.
- */
-{
- struct hshentry const *nextdelta;
- struct cbuf cb;
-
- for (;;) {
- if (eoflex())
- fatserror("can't find delta for revision %s", delta->num);
- nextlex();
- if (!(nextdelta=getnum())) {
- fatserror("delta number corrupted");
- }
- getkeystring(Klog);
- if (needlog && delta==nextdelta) {
- cb = savestring(&curlogbuf);
- delta->log = cleanlogmsg(curlogbuf.string, cb.size);
- nextlex();
- delta->igtext = getphrases(Ktext);
- } else {readstring();
- ignorephrases(Ktext);
- }
- getkeystring(Ktext);
-
- if (delta==nextdelta)
- break;
- readstring(); /* skip over it */
-
- }
- switch (func) {
- case enter: enterstring(); break;
- case copy: copystring(); break;
- case expand: xpandstring(delta); break;
- case edit: editstring((struct hshentry *)0); break;
- case edit_expand: editstring(delta); break;
- }
-}
-
- struct cbuf
-cleanlogmsg(m, s)
- char *m;
- size_t s;
-{
- register char *t = m;
- register char const *f = t;
- struct cbuf r;
- while (s) {
- --s;
- if ((*t++ = *f++) == '\n')
- while (m < --t)
- if (t[-1]!=' ' && t[-1]!='\t') {
- *t++ = '\n';
- break;
- }
- }
- while (m < t && (t[-1]==' ' || t[-1]=='\t' || t[-1]=='\n'))
- --t;
- r.string = m;
- r.size = t - m;
- return r;
-}
-
-
-int ttystdin()
-{
- static int initialized;
- if (!initialized) {
- if (!interactiveflag)
- interactiveflag = isatty(STDIN_FILENO);
- initialized = true;
- }
- return interactiveflag;
-}
-
- int
-getcstdin()
-{
- register FILE *in;
- register int c;
-
- in = stdin;
- if (feof(in) && ttystdin())
- clearerr(in);
- c = getc(in);
- if (c == EOF) {
- testIerror(in);
- if (feof(in) && ttystdin())
- afputc('\n',stderr);
- }
- return c;
-}
-
-#if has_prototypes
- int
-yesorno(int default_answer, char const *question, ...)
-#else
- /*VARARGS2*/ int
- yesorno(default_answer, question, va_alist)
- int default_answer; char const *question; va_dcl
-#endif
-{
- va_list args;
- register int c, r;
- if (!quietflag && ttystdin()) {
- oflush();
- vararg_start(args, question);
- fvfprintf(stderr, question, args);
- va_end(args);
- eflush();
- r = c = getcstdin();
- while (c!='\n' && !feof(stdin))
- c = getcstdin();
- if (r=='y' || r=='Y')
- return true;
- if (r=='n' || r=='N')
- return false;
- }
- return default_answer;
-}
-
-
- void
-putdesc(textflag, textfile)
- int textflag;
- char *textfile;
-/* Function: puts the descriptive text into file frewrite.
- * if finptr && !textflag, the text is copied from the old description.
- * Otherwise, if textfile, the text is read from that
- * file, or from stdin, if !textfile.
- * A textfile with a leading '-' is treated as a string, not a pathname.
- * If finptr, the old descriptive text is discarded.
- * Always clears foutptr.
- */
-{
- static struct buf desc;
- static struct cbuf desclean;
-
- register FILE *txt;
- register int c;
- register FILE * frew;
- register char *p;
- register size_t s;
- char const *plim;
-
- frew = frewrite;
- if (finptr && !textflag) {
- /* copy old description */
- aprintf(frew, "\n\n%s%c", Kdesc, nextc);
- foutptr = frewrite;
- getdesc(false);
- foutptr = 0;
- } else {
- foutptr = 0;
- /* get new description */
- if (finptr) {
- /*skip old description*/
- getdesc(false);
- }
- aprintf(frew,"\n\n%s\n%c",Kdesc,SDELIM);
- if (!textfile)
- desclean = getsstdin(
- "t-", "description",
- "NOTE: This is NOT the log message!\n", &desc
- );
- else if (!desclean.string) {
- if (*textfile == '-') {
- p = textfile + 1;
- s = strlen(p);
- } else {
- if (!(txt = fopenSafer(textfile, "r")))
- efaterror(textfile);
- bufalloc(&desc, 1);
- p = desc.string;
- plim = p + desc.size;
- for (;;) {
- if ((c=getc(txt)) == EOF) {
- testIerror(txt);
- if (feof(txt))
- break;
- }
- if (plim <= p)
- p = bufenlarge(&desc, &plim);
- *p++ = c;
- }
- if (fclose(txt) != 0)
- Ierror();
- s = p - desc.string;
- p = desc.string;
- }
- desclean = cleanlogmsg(p, s);
- }
- putstring(frew, false, desclean, true);
- aputc_('\n', frew)
- }
-}
-
- struct cbuf
-getsstdin(option, name, note, buf)
- char const *option, *name, *note;
- struct buf *buf;
-{
- register int c;
- register char *p;
- register size_t i;
- register int tty = ttystdin();
-
- if (tty) {
- aprintf(stderr,
- "enter %s, terminated with single '.' or end of file:\n%s>> ",
- name, note
- );
- eflush();
- } else if (feof(stdin))
- rcsfaterror("can't reread redirected stdin for %s; use -%s<%s>",
- name, option, name
- );
-
- for (
- i = 0, p = 0;
- c = getcstdin(), !feof(stdin);
- bufrealloc(buf, i+1), p = buf->string, p[i++] = c
- )
- if (c == '\n')
- if (i && p[i-1]=='.' && (i==1 || p[i-2]=='\n')) {
- /* Remove trailing '.'. */
- --i;
- break;
- } else if (tty) {
- aputs(">> ", stderr);
- eflush();
- }
- return cleanlogmsg(p, i);
-}
-
-
- void
-putadmin()
-/* Output the admin node. */
-{
- register FILE *fout;
- struct assoc const *curassoc;
- struct rcslock const *curlock;
- struct access const *curaccess;
-
- if (!(fout = frewrite)) {
-# if bad_creat0
- ORCSclose();
- fout = fopenSafer(makedirtemp(0), FOPEN_WB);
-# else
- int fo = fdlock;
- fdlock = -1;
- fout = fdopen(fo, FOPEN_WB);
-# endif
-
- if (!(frewrite = fout))
- efaterror(RCSname);
- }
-
- /*
- * Output the first character with putc, not printf.
- * Otherwise, an SVR4 stdio bug buffers output inefficiently.
- */
- aputc_(*Khead, fout)
- aprintf(fout, "%s\t%s;\n", Khead + 1, Head?Head->num:"");
- if (Dbranch && VERSION(4)<=RCSversion)
- aprintf(fout, "%s\t%s;\n", Kbranch, Dbranch);
-
- aputs(Kaccess, fout);
- curaccess = AccessList;
- while (curaccess) {
- aprintf(fout, "\n\t%s", curaccess->login);
- curaccess = curaccess->nextaccess;
- }
- aprintf(fout, ";\n%s", Ksymbols);
- curassoc = Symbols;
- while (curassoc) {
- aprintf(fout, "\n\t%s:%s", curassoc->symbol, curassoc->num);
- curassoc = curassoc->nextassoc;
- }
- aprintf(fout, ";\n%s", Klocks);
- curlock = Locks;
- while (curlock) {
- aprintf(fout, "\n\t%s:%s", curlock->login, curlock->delta->num);
- curlock = curlock->nextlock;
- }
- if (StrictLocks) aprintf(fout, "; %s", Kstrict);
- aprintf(fout, ";\n");
- if (Comment.size) {
- aprintf(fout, "%s\t", Kcomment);
- putstring(fout, true, Comment, false);
- aprintf(fout, ";\n");
- }
- if (Expand != KEYVAL_EXPAND)
- aprintf(fout, "%s\t%c%s%c;\n",
- Kexpand, SDELIM, expand_names[Expand], SDELIM
- );
- awrite(Ignored.string, Ignored.size, fout);
- aputc_('\n', fout)
-}
-
-
- static void
-putdelta(node, fout)
- register struct hshentry const *node;
- register FILE * fout;
-/* Output the delta NODE to FOUT. */
-{
- struct branchhead const *nextbranch;
-
- if (!node) return;
-
- aprintf(fout, "\n%s\n%s\t%s;\t%s %s;\t%s %s;\nbranches",
- node->num,
- Kdate, node->date,
- Kauthor, node->author,
- Kstate, node->state?node->state:""
- );
- nextbranch = node->branches;
- while (nextbranch) {
- aprintf(fout, "\n\t%s", nextbranch->hsh->num);
- nextbranch = nextbranch->nextbranch;
- }
-
- aprintf(fout, ";\n%s\t%s;\n", Knext, node->next?node->next->num:"");
- awrite(node->ig.string, node->ig.size, fout);
-}
-
-
- void
-puttree(root, fout)
- struct hshentry const *root;
- register FILE *fout;
-/* Output the delta tree with base ROOT in preorder to FOUT. */
-{
- struct branchhead const *nextbranch;
-
- if (!root) return;
-
- if (root->selector)
- putdelta(root, fout);
-
- puttree(root->next, fout);
-
- nextbranch = root->branches;
- while (nextbranch) {
- puttree(nextbranch->hsh, fout);
- nextbranch = nextbranch->nextbranch;
- }
-}
-
-
- int
-putdtext(delta, srcname, fout, diffmt)
- struct hshentry const *delta;
- char const *srcname;
- FILE *fout;
- int diffmt;
-/*
- * Output a deltatext node with delta number DELTA->num, log message DELTA->log,
- * ignored phrases DELTA->igtext and text SRCNAME to FOUT.
- * Double up all SDELIMs in both the log and the text.
- * Make sure the log message ends in \n.
- * Return false on error.
- * If DIFFMT, also check that the text is valid diff -n output.
- */
-{
- RILE *fin;
- if (!(fin = Iopen(srcname, "r", (struct stat*)0))) {
- eerror(srcname);
- return false;
- }
- putdftext(delta, fin, fout, diffmt);
- Ifclose(fin);
- return true;
-}
-
- void
-putstring(out, delim, s, log)
- register FILE *out;
- struct cbuf s;
- int delim, log;
-/*
- * Output to OUT one SDELIM if DELIM, then the string S with SDELIMs doubled.
- * If LOG is set then S is a log string; append a newline if S is nonempty.
- */
-{
- register char const *sp;
- register size_t ss;
-
- if (delim)
- aputc_(SDELIM, out)
- sp = s.string;
- for (ss = s.size; ss; --ss) {
- if (*sp == SDELIM)
- aputc_(SDELIM, out)
- aputc_(*sp++, out)
- }
- if (s.size && log)
- aputc_('\n', out)
- aputc_(SDELIM, out)
-}
-
- void
-putdftext(delta, finfile, foutfile, diffmt)
- struct hshentry const *delta;
- RILE *finfile;
- FILE *foutfile;
- int diffmt;
-/* like putdtext(), except the source file is already open */
-{
- declarecache;
- register FILE *fout;
- register int c;
- register RILE *fin;
- int ed;
- struct diffcmd dc;
-
- fout = foutfile;
- aprintf(fout, DELNUMFORM, delta->num, Klog);
-
- /* put log */
- putstring(fout, true, delta->log, true);
- aputc_('\n', fout)
-
- /* put ignored phrases */
- awrite(delta->igtext.string, delta->igtext.size, fout);
-
- /* put text */
- aprintf(fout, "%s\n%c", Ktext, SDELIM);
-
- fin = finfile;
- setupcache(fin);
- if (!diffmt) {
- /* Copy the file */
- cache(fin);
- for (;;) {
- cachegeteof_(c, break;)
- if (c==SDELIM) aputc_(SDELIM, fout) /*double up SDELIM*/
- aputc_(c, fout)
- }
- } else {
- initdiffcmd(&dc);
- while (0 <= (ed = getdiffcmd(fin, false, fout, &dc)))
- if (ed) {
- cache(fin);
- while (dc.nlines--)
- do {
- cachegeteof_(c, { if (!dc.nlines) goto OK_EOF; unexpected_EOF(); })
- if (c == SDELIM)
- aputc_(SDELIM, fout)
- aputc_(c, fout)
- } while (c != '\n');
- uncache(fin);
- }
- }
- OK_EOF:
- aprintf(fout, "%c\n", SDELIM);
-}
diff --git a/gnu/usr.bin/rcs/lib/rcskeep.c b/gnu/usr.bin/rcs/lib/rcskeep.c
deleted file mode 100644
index 4a90f851e615..000000000000
--- a/gnu/usr.bin/rcs/lib/rcskeep.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/* Extract RCS keyword string values from working files. */
-
-/* Copyright 1982, 1988, 1989 Walter Tichy
- Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-/*
- * Revision 5.10 1995/06/16 06:19:24 eggert
- * Update FSF address.
- *
- * Revision 5.9 1995/06/01 16:23:43 eggert
- * (getoldkeys): Don't panic if a Name: is empty.
- *
- * Revision 5.8 1994/03/17 14:05:48 eggert
- * Remove lint.
- *
- * Revision 5.7 1993/11/09 17:40:15 eggert
- * Use simpler timezone parsing strategy now that we're using ISO 8601 format.
- *
- * Revision 5.6 1993/11/03 17:42:27 eggert
- * Scan for Name keyword. Improve quality of diagnostics.
- *
- * Revision 5.5 1992/07/28 16:12:44 eggert
- * Statement macro names now end in _.
- *
- * Revision 5.4 1991/08/19 03:13:55 eggert
- * Tune.
- *
- * Revision 5.3 1991/04/21 11:58:25 eggert
- * Shorten names to keep them distinct on shortname hosts.
- *
- * Revision 5.2 1990/10/04 06:30:20 eggert
- * Parse time zone offsets; future RCS versions may output them.
- *
- * Revision 5.1 1990/09/20 02:38:56 eggert
- * ci -k now checks dates more thoroughly.
- *
- * Revision 5.0 1990/08/22 08:12:53 eggert
- * Retrieve old log message if there is one.
- * Don't require final newline.
- * Remove compile-time limits; use malloc instead. Tune.
- * Permit dates past 1999/12/31. Ansify and Posixate.
- *
- * Revision 4.6 89/05/01 15:12:56 narten
- * changed copyright header to reflect current distribution rules
- *
- * Revision 4.5 88/08/09 19:13:03 eggert
- * Remove lint and speed up by making FILE *fp local, not global.
- *
- * Revision 4.4 87/12/18 11:44:21 narten
- * more lint cleanups (Guy Harris)
- *
- * Revision 4.3 87/10/18 10:35:50 narten
- * Updating version numbers. Changes relative to 1.1 actually relative
- * to 4.1
- *
- * Revision 1.3 87/09/24 14:00:00 narten
- * Sources now pass through lint (if you ignore printf/sprintf/fprintf
- * warnings)
- *
- * Revision 1.2 87/03/27 14:22:29 jenkins
- * Port to suns
- *
- * Revision 4.1 83/05/10 16:26:44 wft
- * Added new markers Id and RCSfile; extraction added.
- * Marker matching with trymatch().
- *
- * Revision 3.2 82/12/24 12:08:26 wft
- * added missing #endif.
- *
- * Revision 3.1 82/12/04 13:22:41 wft
- * Initial revision.
- *
- */
-
-#include "rcsbase.h"
-
-libId(keepId, "$FreeBSD$")
-
-static int badly_terminated P((void));
-static int checknum P((char const*));
-static int get0val P((int,RILE*,struct buf*,int));
-static int getval P((RILE*,struct buf*,int));
-static int keepdate P((RILE*));
-static int keepid P((int,RILE*,struct buf*));
-static int keeprev P((RILE*));
-
-int prevkeys;
-struct buf prevauthor, prevdate, prevname, prevrev, prevstate;
-
- int
-getoldkeys(fp)
- register RILE *fp;
-/* Function: Tries to read keyword values for author, date,
- * revision number, and state out of the file fp.
- * If fp is null, workname is opened and closed instead of using fp.
- * The results are placed into
- * prevauthor, prevdate, prevname, prevrev, prevstate.
- * Aborts immediately if it finds an error and returns false.
- * If it returns true, it doesn't mean that any of the
- * values were found; instead, check to see whether the corresponding arrays
- * contain the empty string.
- */
-{
- register int c;
- char keyword[keylength+1];
- register char * tp;
- int needs_closing;
- int prevname_found;
-
- if (prevkeys)
- return true;
-
- needs_closing = false;
- if (!fp) {
- if (!(fp = Iopen(workname, FOPEN_R_WORK, (struct stat*)0))) {
- eerror(workname);
- return false;
- }
- needs_closing = true;
- }
-
- /* initialize to empty */
- bufscpy(&prevauthor, "");
- bufscpy(&prevdate, "");
- bufscpy(&prevname, ""); prevname_found = 0;
- bufscpy(&prevrev, "");
- bufscpy(&prevstate, "");
-
- c = '\0'; /* anything but KDELIM */
- for (;;) {
- if ( c==KDELIM) {
- do {
- /* try to get keyword */
- tp = keyword;
- for (;;) {
- Igeteof_(fp, c, goto ok;)
- switch (c) {
- default:
- if (keyword+keylength <= tp)
- break;
- *tp++ = c;
- continue;
-
- case '\n': case KDELIM: case VDELIM:
- break;
- }
- break;
- }
- } while (c==KDELIM);
- if (c!=VDELIM) continue;
- *tp = c;
- Igeteof_(fp, c, break;)
- switch (c) {
- case ' ': case '\t': break;
- default: continue;
- }
-
- switch (trymatch(keyword)) {
- case Author:
- if (!keepid(0, fp, &prevauthor))
- return false;
- c = 0;
- break;
- case Date:
- if (!(c = keepdate(fp)))
- return false;
- break;
- case Header:
- case Id:
- case LocalId:
- if (!(
- getval(fp, (struct buf*)0, false) &&
- keeprev(fp) &&
- (c = keepdate(fp)) &&
- keepid(c, fp, &prevauthor) &&
- keepid(0, fp, &prevstate)
- ))
- return false;
- /* Skip either ``who'' (new form) or ``Locker: who'' (old). */
- if (getval(fp, (struct buf*)0, true) &&
- getval(fp, (struct buf*)0, true))
- c = 0;
- else if (nerror)
- return false;
- else
- c = KDELIM;
- break;
- case Locker:
- (void) getval(fp, (struct buf*)0, false);
- c = 0;
- break;
- case Log:
- case RCSfile:
- case Source:
- if (!getval(fp, (struct buf*)0, false))
- return false;
- c = 0;
- break;
- case Name:
- if (getval(fp, &prevname, false)) {
- if (*prevname.string)
- checkssym(prevname.string);
- prevname_found = 1;
- }
- c = 0;
- break;
- case Revision:
- if (!keeprev(fp))
- return false;
- c = 0;
- break;
- case State:
- if (!keepid(0, fp, &prevstate))
- return false;
- c = 0;
- break;
- default:
- continue;
- }
- if (!c)
- Igeteof_(fp, c, c=0;)
- if (c != KDELIM) {
- workerror("closing %c missing on keyword", KDELIM);
- return false;
- }
- if (prevname_found &&
- *prevauthor.string && *prevdate.string &&
- *prevrev.string && *prevstate.string
- )
- break;
- }
- Igeteof_(fp, c, break;)
- }
-
- ok:
- if (needs_closing)
- Ifclose(fp);
- else
- Irewind(fp);
- prevkeys = true;
- return true;
-}
-
- static int
-badly_terminated()
-{
- workerror("badly terminated keyword value");
- return false;
-}
-
- static int
-getval(fp, target, optional)
- register RILE *fp;
- struct buf *target;
- int optional;
-/* Reads a keyword value from FP into TARGET.
- * Returns true if one is found, false otherwise.
- * Does not modify target if it is 0.
- * Do not report an error if OPTIONAL is set and KDELIM is found instead.
- */
-{
- int c;
- Igeteof_(fp, c, return badly_terminated();)
- return get0val(c, fp, target, optional);
-}
-
- static int
-get0val(c, fp, target, optional)
- register int c;
- register RILE *fp;
- struct buf *target;
- int optional;
-/* Reads a keyword value from C+FP into TARGET, perhaps OPTIONALly.
- * Same as getval, except C is the lookahead character.
- */
-{ register char * tp;
- char const *tlim;
- register int got1;
-
- if (target) {
- bufalloc(target, 1);
- tp = target->string;
- tlim = tp + target->size;
- } else
- tlim = tp = 0;
- got1 = false;
- for (;;) {
- switch (c) {
- default:
- got1 = true;
- if (tp) {
- *tp++ = c;
- if (tlim <= tp)
- tp = bufenlarge(target, &tlim);
- }
- break;
-
- case ' ':
- case '\t':
- if (tp) {
- *tp = 0;
-# ifdef KEEPTEST
- VOID printf("getval: %s\n", target);
-# endif
- }
- return got1;
-
- case KDELIM:
- if (!got1 && optional)
- return false;
- /* fall into */
- case '\n':
- case 0:
- return badly_terminated();
- }
- Igeteof_(fp, c, return badly_terminated();)
- }
-}
-
-
- static int
-keepdate(fp)
- RILE *fp;
-/* Function: reads a date prevdate; checks format
- * Return 0 on error, lookahead character otherwise.
- */
-{
- struct buf prevday, prevtime;
- register int c;
-
- c = 0;
- bufautobegin(&prevday);
- if (getval(fp,&prevday,false)) {
- bufautobegin(&prevtime);
- if (getval(fp,&prevtime,false)) {
- Igeteof_(fp, c, c=0;)
- if (c) {
- register char const *d = prevday.string, *t = prevtime.string;
- bufalloc(&prevdate, strlen(d) + strlen(t) + 9);
- VOID sprintf(prevdate.string, "%s%s %s%s",
- /* Parse dates put out by old versions of RCS. */
- isdigit(d[0]) && isdigit(d[1]) && !isdigit(d[2])
- ? "19" : "",
- d, t,
- strchr(t,'-') || strchr(t,'+') ? "" : "+0000"
- );
- }
- }
- bufautoend(&prevtime);
- }
- bufautoend(&prevday);
- return c;
-}
-
- static int
-keepid(c, fp, b)
- int c;
- RILE *fp;
- struct buf *b;
-/* Get previous identifier from C+FP into B. */
-{
- if (!c)
- Igeteof_(fp, c, return false;)
- if (!get0val(c, fp, b, false))
- return false;
- checksid(b->string);
- return !nerror;
-}
-
- static int
-keeprev(fp)
- RILE *fp;
-/* Get previous revision from FP into prevrev. */
-{
- return getval(fp,&prevrev,false) && checknum(prevrev.string);
-}
-
-
- static int
-checknum(s)
- char const *s;
-{
- register char const *sp;
- register int dotcount = 0;
- for (sp=s; ; sp++) {
- switch (*sp) {
- case 0:
- if (dotcount & 1)
- return true;
- else
- break;
-
- case '.':
- dotcount++;
- continue;
-
- default:
- if (isdigit(*sp))
- continue;
- break;
- }
- break;
- }
- workerror("%s is not a revision number", s);
- return false;
-}
-
-
-
-#ifdef KEEPTEST
-
-/* Print the keyword values found. */
-
-char const cmdid[] ="keeptest";
-
- int
-main(argc, argv)
-int argc; char *argv[];
-{
- while (*(++argv)) {
- workname = *argv;
- getoldkeys((RILE*)0);
- VOID printf("%s: revision: %s, date: %s, author: %s, name: %s, state: %s\n",
- *argv, prevrev.string, prevdate.string, prevauthor.string, prevname.string, prevstate.string);
- }
- exitmain(EXIT_SUCCESS);
-}
-#endif
diff --git a/gnu/usr.bin/rcs/lib/rcskeys.c b/gnu/usr.bin/rcs/lib/rcskeys.c
deleted file mode 100644
index 378f57dd0f77..000000000000
--- a/gnu/usr.bin/rcs/lib/rcskeys.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* RCS keyword table and match operation */
-
-/* Copyright 1982, 1988, 1989 Walter Tichy
- Copyright 1990, 1991, 1992, 1993, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-/*
- * Revision 5.4 1995/06/16 06:19:24 eggert
- * Update FSF address.
- *
- * Revision 5.3 1993/11/03 17:42:27 eggert
- * Add Name keyword.
- *
- * Revision 5.2 1991/08/19 03:13:55 eggert
- * Say `T const' instead of `const T'; it's less confusing for pointer types.
- * (This change was made in other source files too.)
- *
- * Revision 5.1 1991/04/21 11:58:25 eggert
- * Don't put , just before } in initializer.
- *
- * Revision 5.0 1990/08/22 08:12:54 eggert
- * Add -k. Ansify and Posixate.
- *
- * Revision 4.3 89/05/01 15:13:02 narten
- * changed copyright header to reflect current distribution rules
- *
- * Revision 4.2 87/10/18 10:36:33 narten
- * Updating version numbers. Changes relative to 1.1 actuallyt
- * relative to 4.1
- *
- * Revision 1.2 87/09/24 14:00:10 narten
- * Sources now pass through lint (if you ignore printf/sprintf/fprintf
- * warnings)
- *
- * Revision 4.1 83/05/04 10:06:53 wft
- * Initial revision.
- *
- */
-
-
-#include "rcsbase.h"
-
-libId(keysId, "$FreeBSD$")
-
-
-char const *Keyword[] = {
- /* This must be in the same order as rcsbase.h's enum markers type. */
- 0,
- AUTHOR, DATE, HEADER, IDH,
- LOCKER, LOG, NAME, RCSFILE, REVISION, SOURCE, STATE, CVSHEADER,
- NULL
-};
-
-/* Expand all keywords by default */
-static int ExpandKeyword[] = {
- false,
- true, true, true, true,
- true, true, true, true, true, true, true, true,
- true
-};
-enum markers LocalIdMode = Id;
-
- enum markers
-trymatch(string)
- char const *string;
-/* function: Checks whether string starts with a keyword followed
- * by a KDELIM or a VDELIM.
- * If successful, returns the appropriate marker, otherwise Nomatch.
- */
-{
- register int j;
- register char const *p, *s;
- for (j = sizeof(Keyword)/sizeof(*Keyword); (--j); ) {
- if (!ExpandKeyword[j])
- continue;
- /* try next keyword */
- p = Keyword[j];
- if (p == NULL)
- continue;
- s = string;
- while (*p++ == *s++) {
- if (!*p)
- switch (*s) {
- case KDELIM:
- case VDELIM:
- return (enum markers)j;
- default:
- return Nomatch;
- }
- }
- }
- return(Nomatch);
-}
-
- void
-setIncExc(arg)
- char const *arg;
-/* Sets up the ExpandKeyword table according to command-line flags */
-{
- char *key;
- char *copy, *next;
- int include = 0, j;
-
- copy = strdup(arg);
- next = copy;
- switch (*next++) {
- case 'e':
- include = false;
- break;
- case 'i':
- include = true;
- break;
- default:
- free(copy);
- return;
- }
- if (include)
- for (j = sizeof(Keyword)/sizeof(*Keyword); (--j); )
- ExpandKeyword[j] = false;
- key = strtok(next, ",");
- while (key) {
- for (j = sizeof(Keyword)/sizeof(*Keyword); (--j); ) {
- if (Keyword[j] == NULL)
- continue;
- if (!strcmp(key, Keyword[j]))
- ExpandKeyword[j] = include;
- }
- key = strtok(NULL, ",");
- }
- free(copy);
- return;
-}
-
- void
-setRCSLocalId(string)
- char const *string;
-/* function: sets local RCS id and RCSLOCALID envariable */
-{
- static char local_id[keylength+1];
- char *copy, *next, *key;
- int j;
-
- copy = strdup(string);
- next = copy;
- key = strtok(next, "=");
- if (strlen(key) > keylength)
- faterror("LocalId is too long");
- VOID strcpy(local_id, key);
- Keyword[LocalId] = local_id;
-
- /* options? */
- while (key = strtok(NULL, ",")) {
- if (!strcmp(key, Keyword[Id]))
- LocalIdMode=Id;
- else if (!strcmp(key, Keyword[Header]))
- LocalIdMode=Header;
- else if (!strcmp(key, Keyword[CVSHeader]))
- LocalIdMode=CVSHeader;
- else
- error("Unknown LocalId mode");
- }
- free(copy);
-}
diff --git a/gnu/usr.bin/rcs/lib/rcslex.c b/gnu/usr.bin/rcs/lib/rcslex.c
deleted file mode 100644
index 7a11f79b46c8..000000000000
--- a/gnu/usr.bin/rcs/lib/rcslex.c
+++ /dev/null
@@ -1,1568 +0,0 @@
-/* lexical analysis of RCS files */
-
-/******************************************************************************
- * Lexical Analysis.
- * hashtable, Lexinit, nextlex, getlex, getkey,
- * getid, getnum, readstring, printstring, savestring,
- * checkid, fatserror, error, faterror, warn, diagnose
- * Testprogram: define LEXDB
- ******************************************************************************
- */
-
-/* Copyright 1982, 1988, 1989 Walter Tichy
- Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-
-
-/*
- * Revision 5.19 1995/06/16 06:19:24 eggert
- * Update FSF address.
- *
- * Revision 5.18 1995/06/01 16:23:43 eggert
- * (map_fd_deallocate,mmap_deallocate,read_deallocate,nothing_to_deallocate):
- * New functions.
- * (Iclose): If large_memory and maps_memory, use them to deallocate mapping.
- * (fd2RILE): Use map_fd if available.
- * If one mapping method fails, try the next instead of giving up;
- * if they all fail, fall back on ordinary read.
- * Work around bug: root mmap over NFS succeeds, but accessing dumps core.
- * Use MAP_FAILED macro for mmap failure, and `char *' instead of caddr_t.
- * (advise_access): Use madvise only if this instance used mmap.
- * (Iopen): Use fdSafer to get safer file descriptor.
- * (aflush): Moved here from rcsedit.c.
- *
- * Revision 5.17 1994/03/20 04:52:58 eggert
- * Don't worry if madvise fails. Add Orewind. Remove lint.
- *
- * Revision 5.16 1993/11/09 17:55:29 eggert
- * Fix `label: }' typo.
- *
- * Revision 5.15 1993/11/03 17:42:27 eggert
- * Improve quality of diagnostics by putting file names in them more often.
- * Don't discard ignored phrases.
- *
- * Revision 5.14 1992/07/28 16:12:44 eggert
- * Identifiers may now start with a digit and (unless they are symbolic names)
- * may contain `.'. Avoid `unsigned'. Statement macro names now end in _.
- *
- * Revision 5.13 1992/02/17 23:02:27 eggert
- * Work around NFS mmap SIGBUS problem.
- *
- * Revision 5.12 1992/01/06 02:42:34 eggert
- * Use OPEN_O_BINARY if mode contains 'b'.
- *
- * Revision 5.11 1991/11/03 03:30:44 eggert
- * Fix porting bug to ancient hosts lacking vfprintf.
- *
- * Revision 5.10 1991/10/07 17:32:46 eggert
- * Support piece tables even if !has_mmap.
- *
- * Revision 5.9 1991/09/24 00:28:42 eggert
- * Don't export errsay().
- *
- * Revision 5.8 1991/08/19 03:13:55 eggert
- * Add eoflex(), mmap support. Tune.
- *
- * Revision 5.7 1991/04/21 11:58:26 eggert
- * Add MS-DOS support.
- *
- * Revision 5.6 1991/02/25 07:12:42 eggert
- * Work around fputs bug. strsave -> str_save (DG/UX name clash)
- *
- * Revision 5.5 1990/12/04 05:18:47 eggert
- * Use -I for prompts and -q for diagnostics.
- *
- * Revision 5.4 1990/11/19 20:05:28 hammer
- * no longer gives warning about unknown keywords if -q is specified
- *
- * Revision 5.3 1990/11/01 05:03:48 eggert
- * When ignoring unknown phrases, copy them to the output RCS file.
- *
- * Revision 5.2 1990/09/04 08:02:27 eggert
- * Count RCS lines better.
- *
- * Revision 5.1 1990/08/29 07:14:03 eggert
- * Work around buggy compilers with defective argument promotion.
- *
- * Revision 5.0 1990/08/22 08:12:55 eggert
- * Remove compile-time limits; use malloc instead.
- * Report errno-related errors with perror().
- * Ansify and Posixate. Add support for ISO 8859.
- * Use better hash function.
- *
- * Revision 4.6 89/05/01 15:13:07 narten
- * changed copyright header to reflect current distribution rules
- *
- * Revision 4.5 88/08/28 15:01:12 eggert
- * Don't loop when writing error messages to a full filesystem.
- * Flush stderr/stdout when mixing output.
- * Yield exit status compatible with diff(1).
- * Shrink stdio code size; allow cc -R; remove lint.
- *
- * Revision 4.4 87/12/18 11:44:47 narten
- * fixed to use "varargs" in "fprintf"; this is required if it is to
- * work on a SPARC machine such as a Sun-4
- *
- * Revision 4.3 87/10/18 10:37:18 narten
- * Updating version numbers. Changes relative to 1.1 actually relative
- * to version 4.1
- *
- * Revision 1.3 87/09/24 14:00:17 narten
- * Sources now pass through lint (if you ignore printf/sprintf/fprintf
- * warnings)
- *
- * Revision 1.2 87/03/27 14:22:33 jenkins
- * Port to suns
- *
- * Revision 4.1 83/03/25 18:12:51 wft
- * Only changed $Header to $Id.
- *
- * Revision 3.3 82/12/10 16:22:37 wft
- * Improved error messages, changed exit status on error to 1.
- *
- * Revision 3.2 82/11/28 21:27:10 wft
- * Renamed ctab to map and included EOFILE; ctab is now a macro in rcsbase.h.
- * Added fflsbuf(), fputs(), and fprintf(), which abort the RCS operations
- * properly in case there is an IO-error (e.g., file system full).
- *
- * Revision 3.1 82/10/11 19:43:56 wft
- * removed unused label out:;
- * made sure all calls to getc() return into an integer, not a char.
- */
-
-
-/*
-#define LEXDB
-*/
-/* version LEXDB is for testing the lexical analyzer. The testprogram
- * reads a stream of lexemes, enters the revision numbers into the
- * hashtable, and prints the recognized tokens. Keywords are recognized
- * as identifiers.
- */
-
-
-
-#include "rcsbase.h"
-
-libId(lexId, "$FreeBSD$")
-
-static char *checkidentifier P((char*,int,int));
-static void errsay P((char const*));
-static void fatsay P((char const*));
-static void lookup P((char const*));
-static void startsay P((const char*,const char*));
-static void warnsay P((char const*));
-
-static struct hshentry *nexthsh; /*pointer to next hash entry, set by lookup*/
-
-enum tokens nexttok; /*next token, set by nextlex */
-
-int hshenter; /*if true, next suitable lexeme will be entered */
- /*into the symbol table. Handle with care. */
-int nextc; /*next input character, initialized by Lexinit */
-
-long rcsline; /*current line-number of input */
-int nerror; /*counter for errors */
-int quietflag; /*indicates quiet mode */
-RILE * finptr; /*input file descriptor */
-
-FILE * frewrite; /*file descriptor for echoing input */
-
-FILE * foutptr; /* copy of frewrite, but 0 to suppress echo */
-
-static struct buf tokbuf; /* token buffer */
-
-char const * NextString; /* next token */
-
-/*
- * Our hash algorithm is h[0] = 0, h[i+1] = 4*h[i] + c,
- * so hshsize should be odd.
- * See B J McKenzie, R Harries & T Bell, Selecting a hashing algorithm,
- * Software--practice & experience 20, 2 (Feb 1990), 209-224.
- */
-#ifndef hshsize
-# define hshsize 511
-#endif
-
-static struct hshentry *hshtab[hshsize]; /*hashtable */
-
-static int ignored_phrases; /* have we ignored phrases in this RCS file? */
-
- void
-warnignore()
-{
- if (!ignored_phrases) {
- ignored_phrases = true;
- rcswarn("Unknown phrases like `%s ...;' are present.", NextString);
- }
-}
-
-
-
- static void
-lookup(str)
- char const *str;
-/* Function: Looks up the character string pointed to by str in the
- * hashtable. If the string is not present, a new entry for it is created.
- * In any case, the address of the corresponding hashtable entry is placed
- * into nexthsh.
- */
-{
- register unsigned ihash; /* index into hashtable */
- register char const *sp;
- register struct hshentry *n, **p;
-
- /* calculate hash code */
- sp = str;
- ihash = 0;
- while (*sp)
- ihash = (ihash<<2) + *sp++;
- ihash %= hshsize;
-
- for (p = &hshtab[ihash]; ; p = &n->nexthsh)
- if (!(n = *p)) {
- /* empty slot found */
- *p = n = ftalloc(struct hshentry);
- n->num = fstr_save(str);
- n->nexthsh = 0;
-# ifdef LEXDB
- VOID printf("\nEntered: %s at %u ", str, ihash);
-# endif
- break;
- } else if (strcmp(str, n->num) == 0)
- /* match found */
- break;
- nexthsh = n;
- NextString = n->num;
-}
-
-
-
-
-
-
- void
-Lexinit()
-/* Function: Initialization of lexical analyzer:
- * initializes the hashtable,
- * initializes nextc, nexttok if finptr != 0
- */
-{ register int c;
-
- for (c = hshsize; 0 <= --c; ) {
- hshtab[c] = 0;
- }
-
- nerror = 0;
- if (finptr) {
- foutptr = 0;
- hshenter = true;
- ignored_phrases = false;
- rcsline = 1;
- bufrealloc(&tokbuf, 2);
- Iget_(finptr, nextc)
- nextlex(); /*initial token*/
- }
-}
-
-
-
-
-
-
-
- void
-nextlex()
-
-/* Function: Reads the next token and sets nexttok to the next token code.
- * Only if hshenter is set, a revision number is entered into the
- * hashtable and a pointer to it is placed into nexthsh.
- * This is useful for avoiding that dates are placed into the hashtable.
- * For ID's and NUM's, NextString is set to the character string.
- * Assumption: nextc contains the next character.
- */
-{ register c;
- declarecache;
- register FILE *frew;
- register char * sp;
- char const *limit;
- register enum tokens d;
- register RILE *fin;
-
- fin=finptr; frew=foutptr;
- setupcache(fin); cache(fin);
- c = nextc;
-
- for (;;) { switch ((d = ctab[c])) {
-
- default:
- fatserror("unknown character `%c'", c);
- /*NOTREACHED*/
-
- case NEWLN:
- ++rcsline;
-# ifdef LEXDB
- afputc('\n',stdout);
-# endif
- /* Note: falls into next case */
-
- case SPACE:
- GETC_(frew, c)
- continue;
-
- case IDCHAR:
- case LETTER:
- case Letter:
- d = ID;
- /* fall into */
- case DIGIT:
- case PERIOD:
- sp = tokbuf.string;
- limit = sp + tokbuf.size;
- *sp++ = c;
- for (;;) {
- GETC_(frew, c)
- switch (ctab[c]) {
- case IDCHAR:
- case LETTER:
- case Letter:
- d = ID;
- /* fall into */
- case DIGIT:
- case PERIOD:
- *sp++ = c;
- if (limit <= sp)
- sp = bufenlarge(&tokbuf, &limit);
- continue;
-
- default:
- break;
- }
- break;
- }
- *sp = 0;
- if (d == DIGIT || d == PERIOD) {
- d = NUM;
- if (hshenter) {
- lookup(tokbuf.string);
- break;
- }
- }
- NextString = fstr_save(tokbuf.string);
- break;
-
- case SBEGIN: /* long string */
- d = STRING;
- /* note: only the initial SBEGIN has been read*/
- /* read the string, and reset nextc afterwards*/
- break;
-
- case COLON:
- case SEMI:
- GETC_(frew, c)
- break;
- } break; }
- nextc = c;
- nexttok = d;
- uncache(fin);
-}
-
- int
-eoflex()
-/*
- * Yield true if we look ahead to the end of the input, false otherwise.
- * nextc becomes undefined at end of file.
- */
-{
- register int c;
- declarecache;
- register FILE *fout;
- register RILE *fin;
-
- c = nextc;
- fin = finptr;
- fout = foutptr;
- setupcache(fin); cache(fin);
-
- for (;;) {
- switch (ctab[c]) {
- default:
- nextc = c;
- uncache(fin);
- return false;
-
- case NEWLN:
- ++rcsline;
- /* fall into */
- case SPACE:
- cachegeteof_(c, {uncache(fin);return true;})
- break;
- }
- if (fout)
- aputc_(c, fout)
- }
-}
-
-
-int getlex(token)
-enum tokens token;
-/* Function: Checks if nexttok is the same as token. If so,
- * advances the input by calling nextlex and returns true.
- * otherwise returns false.
- * Doesn't work for strings and keywords; loses the character string for ids.
- */
-{
- if (nexttok==token) {
- nextlex();
- return(true);
- } else return(false);
-}
-
- int
-getkeyopt(key)
- char const *key;
-/* Function: If the current token is a keyword identical to key,
- * advances the input by calling nextlex and returns true;
- * otherwise returns false.
- */
-{
- if (nexttok==ID && strcmp(key,NextString) == 0) {
- /* match found */
- ffree1(NextString);
- nextlex();
- return(true);
- }
- return(false);
-}
-
- void
-getkey(key)
- char const *key;
-/* Check that the current input token is a keyword identical to key,
- * and advance the input by calling nextlex.
- */
-{
- if (!getkeyopt(key))
- fatserror("missing '%s' keyword", key);
-}
-
- void
-getkeystring(key)
- char const *key;
-/* Check that the current input token is a keyword identical to key,
- * and advance the input by calling nextlex; then look ahead for a string.
- */
-{
- getkey(key);
- if (nexttok != STRING)
- fatserror("missing string after '%s' keyword", key);
-}
-
-
- char const *
-getid()
-/* Function: Checks if nexttok is an identifier. If so,
- * advances the input by calling nextlex and returns a pointer
- * to the identifier; otherwise returns 0.
- * Treats keywords as identifiers.
- */
-{
- register char const *name;
- if (nexttok==ID) {
- name = NextString;
- nextlex();
- return name;
- } else
- return 0;
-}
-
-
-struct hshentry * getnum()
-/* Function: Checks if nexttok is a number. If so,
- * advances the input by calling nextlex and returns a pointer
- * to the hashtable entry. Otherwise returns 0.
- * Doesn't work if hshenter is false.
- */
-{
- register struct hshentry * num;
- if (nexttok==NUM) {
- num=nexthsh;
- nextlex();
- return num;
- } else
- return 0;
-}
-
- struct cbuf
-getphrases(key)
- char const *key;
-/*
-* Get a series of phrases that do not start with KEY. Yield resulting buffer.
-* Stop when the next phrase starts with a token that is not an identifier,
-* or is KEY. Copy input to foutptr if it is set. Unlike ignorephrases(),
-* this routine assumes nextlex() has already been invoked before we start.
-*/
-{
- declarecache;
- register int c;
- register char const *kn;
- struct cbuf r;
- register RILE *fin;
- register FILE *frew;
-# if large_memory
-# define savech_(c) ;
-# else
- register char *p;
- char const *limit;
- struct buf b;
-# define savech_(c) {if (limit<=p)p=bufenlarge(&b,&limit); *p++ =(c);}
-# endif
-
- if (nexttok!=ID || strcmp(NextString,key) == 0)
- clear_buf(&r);
- else {
- warnignore();
- fin = finptr;
- frew = foutptr;
- setupcache(fin); cache(fin);
-# if large_memory
- r.string = (char const*)cacheptr() - strlen(NextString) - 1;
-# else
- bufautobegin(&b);
- bufscpy(&b, NextString);
- p = b.string + strlen(b.string);
- limit = b.string + b.size;
-# endif
- ffree1(NextString);
- c = nextc;
- for (;;) {
- for (;;) {
- savech_(c)
- switch (ctab[c]) {
- default:
- fatserror("unknown character `%c'", c);
- /*NOTREACHED*/
- case NEWLN:
- ++rcsline;
- /* fall into */
- case COLON: case DIGIT: case LETTER: case Letter:
- case PERIOD: case SPACE:
- GETC_(frew, c)
- continue;
- case SBEGIN: /* long string */
- for (;;) {
- for (;;) {
- GETC_(frew, c)
- savech_(c)
- switch (c) {
- case '\n':
- ++rcsline;
- /* fall into */
- default:
- continue;
-
- case SDELIM:
- break;
- }
- break;
- }
- GETC_(frew, c)
- if (c != SDELIM)
- break;
- savech_(c)
- }
- continue;
- case SEMI:
- cacheget_(c)
- if (ctab[c] == NEWLN) {
- if (frew)
- aputc_(c, frew)
- ++rcsline;
- savech_(c)
- cacheget_(c)
- }
-# if large_memory
- r.size = (char const*)cacheptr() - 1 - r.string;
-# endif
- for (;;) {
- switch (ctab[c]) {
- case NEWLN:
- ++rcsline;
- /* fall into */
- case SPACE:
- cacheget_(c)
- continue;
-
- default: break;
- }
- break;
- }
- if (frew)
- aputc_(c, frew)
- break;
- }
- break;
- }
- if (ctab[c] == Letter) {
- for (kn = key; c && *kn==c; kn++)
- GETC_(frew, c)
- if (!*kn)
- switch (ctab[c]) {
- case DIGIT: case LETTER: case Letter:
- case IDCHAR: case PERIOD:
- break;
- default:
- nextc = c;
- NextString = fstr_save(key);
- nexttok = ID;
- uncache(fin);
- goto returnit;
- }
-# if !large_memory
- {
- register char const *ki;
- for (ki=key; ki<kn; )
- savech_(*ki++)
- }
-# endif
- } else {
- nextc = c;
- uncache(fin);
- nextlex();
- break;
- }
- }
- returnit:;
-# if !large_memory
- return bufremember(&b, (size_t)(p - b.string));
-# endif
- }
- return r;
-}
-
-
- void
-readstring()
-/* skip over characters until terminating single SDELIM */
-/* If foutptr is set, copy every character read to foutptr. */
-/* Does not advance nextlex at the end. */
-{ register c;
- declarecache;
- register FILE *frew;
- register RILE *fin;
- fin=finptr; frew=foutptr;
- setupcache(fin); cache(fin);
- for (;;) {
- GETC_(frew, c)
- switch (c) {
- case '\n':
- ++rcsline;
- break;
-
- case SDELIM:
- GETC_(frew, c)
- if (c != SDELIM) {
- /* end of string */
- nextc = c;
- uncache(fin);
- return;
- }
- break;
- }
- }
-}
-
-
- void
-printstring()
-/* Function: copy a string to stdout, until terminated with a single SDELIM.
- * Does not advance nextlex at the end.
- */
-{
- register c;
- declarecache;
- register FILE *fout;
- register RILE *fin;
- fin=finptr;
- fout = stdout;
- setupcache(fin); cache(fin);
- for (;;) {
- cacheget_(c)
- switch (c) {
- case '\n':
- ++rcsline;
- break;
- case SDELIM:
- cacheget_(c)
- if (c != SDELIM) {
- nextc=c;
- uncache(fin);
- return;
- }
- break;
- }
- aputc_(c,fout)
- }
-}
-
-
-
- struct cbuf
-savestring(target)
- struct buf *target;
-/* Copies a string terminated with SDELIM from file finptr to buffer target.
- * Double SDELIM is replaced with SDELIM.
- * If foutptr is set, the string is also copied unchanged to foutptr.
- * Does not advance nextlex at the end.
- * Yield a copy of *TARGET, except with exact length.
- */
-{
- register c;
- declarecache;
- register FILE *frew;
- register char *tp;
- register RILE *fin;
- char const *limit;
- struct cbuf r;
-
- fin=finptr; frew=foutptr;
- setupcache(fin); cache(fin);
- tp = target->string; limit = tp + target->size;
- for (;;) {
- GETC_(frew, c)
- switch (c) {
- case '\n':
- ++rcsline;
- break;
- case SDELIM:
- GETC_(frew, c)
- if (c != SDELIM) {
- /* end of string */
- nextc=c;
- r.string = target->string;
- r.size = tp - r.string;
- uncache(fin);
- return r;
- }
- break;
- }
- if (tp == limit)
- tp = bufenlarge(target, &limit);
- *tp++ = c;
- }
-}
-
-
- static char *
-checkidentifier(id, delimiter, dotok)
- register char *id;
- int delimiter;
- register int dotok;
-/* Function: check whether the string starting at id is an */
-/* identifier and return a pointer to the delimiter*/
-/* after the identifier. White space, delim and 0 */
-/* are legal delimiters. Aborts the program if not*/
-/* a legal identifier. Useful for checking commands*/
-/* If !delim, the only delimiter is 0. */
-/* Allow '.' in identifier only if DOTOK is set. */
-{
- register char *temp;
- register char c;
- register char delim = delimiter;
- int isid = false;
-
- temp = id;
- for (;; id++) {
- switch (ctab[(unsigned char)(c = *id)]) {
- case IDCHAR:
- case LETTER:
- case Letter:
- isid = true;
- continue;
-
- case DIGIT:
- continue;
-
- case PERIOD:
- if (dotok)
- continue;
- break;
-
- default:
- break;
- }
- break;
- }
- if ( ! isid
- || (c && (!delim || (c!=delim && c!=' ' && c!='\t' && c!='\n')))
- ) {
- /* append \0 to end of id before error message */
- while ((c = *id) && c!=' ' && c!='\t' && c!='\n' && c!=delim)
- id++;
- *id = '\0';
- faterror("invalid %s `%s'",
- dotok ? "identifier" : "symbol", temp
- );
- }
- return id;
-}
-
- char *
-checkid(id, delimiter)
- char *id;
- int delimiter;
-{
- return checkidentifier(id, delimiter, true);
-}
-
- char *
-checksym(sym, delimiter)
- char *sym;
- int delimiter;
-{
- return checkidentifier(sym, delimiter, false);
-}
-
- void
-checksid(id)
- char *id;
-/* Check whether the string ID is an identifier. */
-{
- VOID checkid(id, 0);
-}
-
- void
-checkssym(sym)
- char *sym;
-{
- VOID checksym(sym, 0);
-}
-
-
-#if !large_memory
-# define Iclose(f) fclose(f)
-#else
-# if !maps_memory
- static int Iclose P((RILE *));
- static int
- Iclose(f)
- register RILE *f;
- {
- tfree(f->base);
- f->base = 0;
- return fclose(f->stream);
- }
-# else
- static int Iclose P((RILE *));
- static int
- Iclose(f)
- register RILE *f;
- {
- (* f->deallocate) (f);
- f->base = 0;
- return close(f->fd);
- }
-
-# if has_map_fd
- static void map_fd_deallocate P((RILE *));
- static void
- map_fd_deallocate(f)
- register RILE *f;
- {
- if (vm_deallocate(
- task_self(),
- (vm_address_t) f->base,
- (vm_size_t) (f->lim - f->base)
- ) != KERN_SUCCESS)
- efaterror("vm_deallocate");
- }
-# endif
-# if has_mmap
- static void mmap_deallocate P((RILE *));
- static void
- mmap_deallocate(f)
- register RILE *f;
- {
- if (munmap((char *) f->base, (size_t) (f->lim - f->base)) != 0)
- efaterror("munmap");
- }
-# endif
- static void read_deallocate P((RILE *));
- static void
- read_deallocate(f)
- RILE *f;
- {
- tfree(f->base);
- }
-
- static void nothing_to_deallocate P((RILE *));
- static void
- nothing_to_deallocate(f)
- RILE *f;
- {
- }
-# endif
-#endif
-
-
-#if large_memory && maps_memory
- static RILE *fd2_RILE P((int,char const*,struct stat*));
- static RILE *
-fd2_RILE(fd, name, status)
-#else
- static RILE *fd2RILE P((int,char const*,char const*,struct stat*));
- static RILE *
-fd2RILE(fd, name, type, status)
- char const *type;
-#endif
- int fd;
- char const *name;
- register struct stat *status;
-{
- struct stat st;
-
- if (!status)
- status = &st;
- if (fstat(fd, status) != 0)
- efaterror(name);
- if (!S_ISREG(status->st_mode)) {
- error("`%s' is not a regular file", name);
- VOID close(fd);
- errno = EINVAL;
- return 0;
- } else {
-
-# if !(large_memory && maps_memory)
- FILE *stream;
- if (!(stream = fdopen(fd, type)))
- efaterror(name);
-# endif
-
-# if !large_memory
- return stream;
-# else
-# define RILES 3
- {
- static RILE rilebuf[RILES];
-
- register RILE *f;
- size_t s = status->st_size;
-
- if (s != status->st_size)
- faterror("%s: too large", name);
- for (f = rilebuf; f->base; f++)
- if (f == rilebuf+RILES)
- faterror("too many RILEs");
-# if maps_memory
- f->deallocate = nothing_to_deallocate;
-# endif
- if (!s) {
- static unsigned char nothing;
- f->base = &nothing; /* Any nonzero address will do. */
- } else {
- f->base = 0;
-# if has_map_fd
- map_fd(
- fd, (vm_offset_t)0, (vm_address_t*) &f->base,
- TRUE, (vm_size_t)s
- );
- f->deallocate = map_fd_deallocate;
-# endif
-# if has_mmap
- if (!f->base) {
- catchmmapints();
- f->base = (unsigned char *) mmap(
- (char *)0, s, PROT_READ, MAP_SHARED,
- fd, (off_t)0
- );
-# ifndef MAP_FAILED
-# define MAP_FAILED (-1)
-# endif
- if (f->base == (unsigned char *) MAP_FAILED)
- f->base = 0;
- else {
-# if has_NFS && mmap_signal
- /*
- * On many hosts, the superuser
- * can mmap an NFS file it can't read.
- * So access the first page now, and print
- * a nice message if a bus error occurs.
- */
- readAccessFilenameBuffer(name, f->base);
-# endif
- }
- f->deallocate = mmap_deallocate;
- }
-# endif
- if (!f->base) {
- f->base = tnalloc(unsigned char, s);
-# if maps_memory
- {
- /*
- * We can't map the file into memory for some reason.
- * Read it into main memory all at once; this is
- * the simplest substitute for memory mapping.
- */
- char *bufptr = (char *) f->base;
- size_t bufsiz = s;
- do {
- ssize_t r = read(fd, bufptr, bufsiz);
- switch (r) {
- case -1:
- efaterror(name);
-
- case 0:
- /* The file must have shrunk! */
- status->st_size = s -= bufsiz;
- bufsiz = 0;
- break;
-
- default:
- bufptr += r;
- bufsiz -= r;
- break;
- }
- } while (bufsiz);
- if (lseek(fd, (off_t)0, SEEK_SET) == -1)
- efaterror(name);
- f->deallocate = read_deallocate;
- }
-# endif
- }
- }
- f->ptr = f->base;
- f->lim = f->base + s;
- f->fd = fd;
-# if !maps_memory
- f->readlim = f->base;
- f->stream = stream;
-# endif
- if_advise_access(s, f, MADV_SEQUENTIAL);
- return f;
- }
-# endif
- }
-}
-
-#if !maps_memory && large_memory
- int
-Igetmore(f)
- register RILE *f;
-{
- register fread_type r;
- register size_t s = f->lim - f->readlim;
-
- if (BUFSIZ < s)
- s = BUFSIZ;
- if (!(r = Fread(f->readlim, sizeof(*f->readlim), s, f->stream))) {
- testIerror(f->stream);
- f->lim = f->readlim; /* The file might have shrunk! */
- return 0;
- }
- f->readlim += r;
- return 1;
-}
-#endif
-
-#if has_madvise && has_mmap && large_memory
- void
-advise_access(f, advice)
- register RILE *f;
- int advice;
-{
- if (f->deallocate == mmap_deallocate)
- VOID madvise((char *)f->base, (size_t)(f->lim - f->base), advice);
- /* Don't worry if madvise fails; it's only advisory. */
-}
-#endif
-
- RILE *
-#if large_memory && maps_memory
-I_open(name, status)
-#else
-Iopen(name, type, status)
- char const *type;
-#endif
- char const *name;
- struct stat *status;
-/* Open NAME for reading, yield its descriptor, and set *STATUS. */
-{
- int fd = fdSafer(open(name, O_RDONLY
-# if OPEN_O_BINARY
- | (strchr(type,'b') ? OPEN_O_BINARY : 0)
-# endif
- ));
-
- if (fd < 0)
- return 0;
-# if large_memory && maps_memory
- return fd2_RILE(fd, name, status);
-# else
- return fd2RILE(fd, name, type, status);
-# endif
-}
-
-
-static int Oerrloop;
-
- void
-Oerror()
-{
- if (Oerrloop)
- exiterr();
- Oerrloop = true;
- efaterror("output error");
-}
-
-void Ieof() { fatserror("unexpected end of file"); }
-void Ierror() { efaterror("input error"); }
-void testIerror(f) FILE *f; { if (ferror(f)) Ierror(); }
-void testOerror(o) FILE *o; { if (ferror(o)) Oerror(); }
-
-void Ifclose(f) RILE *f; { if (f && Iclose(f)!=0) Ierror(); }
-void Ofclose(f) FILE *f; { if (f && fclose(f)!=0) Oerror(); }
-void Izclose(p) RILE **p; { Ifclose(*p); *p = 0; }
-void Ozclose(p) FILE **p; { Ofclose(*p); *p = 0; }
-
-#if !large_memory
- void
-testIeof(f)
- FILE *f;
-{
- testIerror(f);
- if (feof(f))
- Ieof();
-}
-void Irewind(f) FILE *f; { if (fseek(f,0L,SEEK_SET) != 0) Ierror(); }
-#endif
-
-void Orewind(f) FILE *f; { if (fseek(f,0L,SEEK_SET) != 0) Oerror(); }
-
-void aflush(f) FILE *f; { if (fflush(f) != 0) Oerror(); }
-void eflush() { if (fflush(stderr)!=0 && !Oerrloop) Oerror(); }
-void oflush()
-{
- if (fflush(workstdout ? workstdout : stdout) != 0 && !Oerrloop)
- Oerror();
-}
-
- void
-fatcleanup(already_newline)
- int already_newline;
-{
- VOID fprintf(stderr, already_newline+"\n%s aborted\n", cmdid);
- exiterr();
-}
-
- static void
-startsay(s, t)
- const char *s, *t;
-{
- oflush();
- if (s)
- aprintf(stderr, "%s: %s: %s", cmdid, s, t);
- else
- aprintf(stderr, "%s: %s", cmdid, t);
-}
-
- static void
-fatsay(s)
- char const *s;
-{
- startsay(s, "");
-}
-
- static void
-errsay(s)
- char const *s;
-{
- fatsay(s);
- nerror++;
-}
-
- static void
-warnsay(s)
- char const *s;
-{
- startsay(s, "warning: ");
-}
-
-void eerror(s) char const *s; { enerror(errno,s); }
-
- void
-enerror(e,s)
- int e;
- char const *s;
-{
- errsay((char const*)0);
- errno = e;
- perror(s);
- eflush();
-}
-
-void efaterror(s) char const *s; { enfaterror(errno,s); }
-
- void
-enfaterror(e,s)
- int e;
- char const *s;
-{
- fatsay((char const*)0);
- errno = e;
- perror(s);
- fatcleanup(true);
-}
-
-#if has_prototypes
- void
-error(char const *format,...)
-#else
- /*VARARGS1*/ void error(format, va_alist) char const *format; va_dcl
-#endif
-/* non-fatal error */
-{
- va_list args;
- errsay((char const*)0);
- vararg_start(args, format);
- fvfprintf(stderr, format, args);
- va_end(args);
- afputc('\n',stderr);
- eflush();
-}
-
-#if has_prototypes
- void
-rcserror(char const *format,...)
-#else
- /*VARARGS1*/ void rcserror(format, va_alist) char const *format; va_dcl
-#endif
-/* non-fatal RCS file error */
-{
- va_list args;
- errsay(RCSname);
- vararg_start(args, format);
- fvfprintf(stderr, format, args);
- va_end(args);
- afputc('\n',stderr);
- eflush();
-}
-
-#if has_prototypes
- void
-workerror(char const *format,...)
-#else
- /*VARARGS1*/ void workerror(format, va_alist) char const *format; va_dcl
-#endif
-/* non-fatal working file error */
-{
- va_list args;
- errsay(workname);
- vararg_start(args, format);
- fvfprintf(stderr, format, args);
- va_end(args);
- afputc('\n',stderr);
- eflush();
-}
-
-#if has_prototypes
- void
-fatserror(char const *format,...)
-#else
- /*VARARGS1*/ void
- fatserror(format, va_alist) char const *format; va_dcl
-#endif
-/* fatal RCS file syntax error */
-{
- va_list args;
- oflush();
- VOID fprintf(stderr, "%s: %s:%ld: ", cmdid, RCSname, rcsline);
- vararg_start(args, format);
- fvfprintf(stderr, format, args);
- va_end(args);
- fatcleanup(false);
-}
-
-#if has_prototypes
- void
-faterror(char const *format,...)
-#else
- /*VARARGS1*/ void faterror(format, va_alist)
- char const *format; va_dcl
-#endif
-/* fatal error, terminates program after cleanup */
-{
- va_list args;
- fatsay((char const*)0);
- vararg_start(args, format);
- fvfprintf(stderr, format, args);
- va_end(args);
- fatcleanup(false);
-}
-
-#if has_prototypes
- void
-rcsfaterror(char const *format,...)
-#else
- /*VARARGS1*/ void rcsfaterror(format, va_alist)
- char const *format; va_dcl
-#endif
-/* fatal RCS file error, terminates program after cleanup */
-{
- va_list args;
- fatsay(RCSname);
- vararg_start(args, format);
- fvfprintf(stderr, format, args);
- va_end(args);
- fatcleanup(false);
-}
-
-#if has_prototypes
- void
-warn(char const *format,...)
-#else
- /*VARARGS1*/ void warn(format, va_alist) char const *format; va_dcl
-#endif
-/* warning */
-{
- va_list args;
- if (!quietflag) {
- warnsay((char *)0);
- vararg_start(args, format);
- fvfprintf(stderr, format, args);
- va_end(args);
- afputc('\n', stderr);
- eflush();
- }
-}
-
-#if has_prototypes
- void
-rcswarn(char const *format,...)
-#else
- /*VARARGS1*/ void rcswarn(format, va_alist) char const *format; va_dcl
-#endif
-/* RCS file warning */
-{
- va_list args;
- if (!quietflag) {
- warnsay(RCSname);
- vararg_start(args, format);
- fvfprintf(stderr, format, args);
- va_end(args);
- afputc('\n', stderr);
- eflush();
- }
-}
-
-#if has_prototypes
- void
-workwarn(char const *format,...)
-#else
- /*VARARGS1*/ void workwarn(format, va_alist) char const *format; va_dcl
-#endif
-/* working file warning */
-{
- va_list args;
- if (!quietflag) {
- warnsay(workname);
- vararg_start(args, format);
- fvfprintf(stderr, format, args);
- va_end(args);
- afputc('\n', stderr);
- eflush();
- }
-}
-
- void
-redefined(c)
- int c;
-{
- warn("redefinition of -%c option", c);
-}
-
-#if has_prototypes
- void
-diagnose(char const *format,...)
-#else
- /*VARARGS1*/ void diagnose(format, va_alist) char const *format; va_dcl
-#endif
-/* prints a diagnostic message */
-/* Unlike the other routines, it does not append a newline. */
-/* This lets some callers suppress the newline, and is faster */
-/* in implementations that flush stderr just at the end of each printf. */
-{
- va_list args;
- if (!quietflag) {
- oflush();
- vararg_start(args, format);
- fvfprintf(stderr, format, args);
- va_end(args);
- eflush();
- }
-}
-
-
-
- void
-afputc(c, f)
-/* afputc(c,f); acts like aputc_(c,f) but is smaller and slower. */
- int c;
- register FILE *f;
-{
- aputc_(c,f)
-}
-
-
- void
-aputs(s, iop)
- char const *s;
- FILE *iop;
-/* Function: Put string s on file iop, abort on error.
- */
-{
-#if has_fputs
- if (fputs(s, iop) < 0)
- Oerror();
-#else
- awrite(s, strlen(s), iop);
-#endif
-}
-
-
-
- void
-#if has_prototypes
-fvfprintf(FILE *stream, char const *format, va_list args)
-#else
- fvfprintf(stream,format,args) FILE *stream; char *format; va_list args;
-#endif
-/* like vfprintf, except abort program on error */
-{
-#if has_vfprintf
- if (vfprintf(stream, format, args) < 0)
- Oerror();
-#else
-# if has__doprintf
- _doprintf(stream, format, args);
-# else
-# if has__doprnt
- _doprnt(format, args, stream);
-# else
- int *a = (int *)args;
- VOID fprintf(stream, format,
- a[0], a[1], a[2], a[3], a[4],
- a[5], a[6], a[7], a[8], a[9]
- );
-# endif
-# endif
- if (ferror(stream))
- Oerror();
-#endif
-}
-
-#if has_prototypes
- void
-aprintf(FILE *iop, char const *fmt, ...)
-#else
- /*VARARGS2*/ void
-aprintf(iop, fmt, va_alist)
-FILE *iop;
-char const *fmt;
-va_dcl
-#endif
-/* Function: formatted output. Same as fprintf in stdio,
- * but aborts program on error
- */
-{
- va_list ap;
- vararg_start(ap, fmt);
- fvfprintf(iop, fmt, ap);
- va_end(ap);
-}
-
-
-
-#ifdef LEXDB
-/* test program reading a stream of lexemes and printing the tokens.
- */
-
-
-
- int
-main(argc,argv)
-int argc; char * argv[];
-{
- cmdid="lextest";
- if (argc<2) {
- aputs("No input file\n",stderr);
- exitmain(EXIT_FAILURE);
- }
- if (!(finptr=Iopen(argv[1], FOPEN_R, (struct stat*)0))) {
- faterror("can't open input file %s",argv[1]);
- }
- Lexinit();
- while (!eoflex()) {
- switch (nexttok) {
-
- case ID:
- VOID printf("ID: %s",NextString);
- break;
-
- case NUM:
- if (hshenter)
- VOID printf("NUM: %s, index: %d",nexthsh->num, nexthsh-hshtab);
- else
- VOID printf("NUM, unentered: %s",NextString);
- hshenter = !hshenter; /*alternate between dates and numbers*/
- break;
-
- case COLON:
- VOID printf("COLON"); break;
-
- case SEMI:
- VOID printf("SEMI"); break;
-
- case STRING:
- readstring();
- VOID printf("STRING"); break;
-
- case UNKN:
- VOID printf("UNKN"); break;
-
- default:
- VOID printf("DEFAULT"); break;
- }
- VOID printf(" | ");
- nextlex();
- }
- exitmain(EXIT_SUCCESS);
-}
-
-void exiterr() { _exit(EXIT_FAILURE); }
-
-
-#endif
diff --git a/gnu/usr.bin/rcs/lib/rcsmap.c b/gnu/usr.bin/rcs/lib/rcsmap.c
deleted file mode 100644
index 89fb08daf364..000000000000
--- a/gnu/usr.bin/rcs/lib/rcsmap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* RCS map of character types */
-
-/* Copyright (C) 1982, 1988, 1989 Walter Tichy
- Copyright 1990, 1991, 1995 by Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-#include "rcsbase.h"
-
-libId(mapId, "$FreeBSD$")
-
-/* map of character types */
-/* ISO 8859/1 (Latin-1) */
-enum tokens const ctab[] = {
- UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN,
- SPACE, SPACE, NEWLN, SPACE, SPACE, SPACE, UNKN, UNKN,
- UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN,
- UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN,
- SPACE, IDCHAR, IDCHAR, IDCHAR, DELIM, IDCHAR, IDCHAR, IDCHAR,
- IDCHAR, IDCHAR, IDCHAR, IDCHAR, DELIM, IDCHAR, PERIOD, IDCHAR,
- DIGIT, DIGIT, DIGIT, DIGIT, DIGIT, DIGIT, DIGIT, DIGIT,
- DIGIT, DIGIT, COLON, SEMI, IDCHAR, IDCHAR, IDCHAR, IDCHAR,
- SBEGIN, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
- LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
- LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
- LETTER, LETTER, LETTER, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR,
- IDCHAR, Letter, Letter, Letter, Letter, Letter, Letter, Letter,
- Letter, Letter, Letter, Letter, Letter, Letter, Letter, Letter,
- Letter, Letter, Letter, Letter, Letter, Letter, Letter, Letter,
- Letter, Letter, Letter, IDCHAR, IDCHAR, IDCHAR, IDCHAR, UNKN,
- UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN,
- UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN,
- UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN,
- UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN,
- IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR,
- IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR,
- IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR,
- IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR, IDCHAR,
- LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
- LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
- LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, IDCHAR,
- LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, Letter,
- Letter, Letter, Letter, Letter, Letter, Letter, Letter, Letter,
- Letter, Letter, Letter, Letter, Letter, Letter, Letter, Letter,
- Letter, Letter, Letter, Letter, Letter, Letter, Letter, IDCHAR,
- Letter, Letter, Letter, Letter, Letter, Letter, Letter, Letter
-};
diff --git a/gnu/usr.bin/rcs/lib/rcsrev.c b/gnu/usr.bin/rcs/lib/rcsrev.c
deleted file mode 100644
index 12c6c43006ac..000000000000
--- a/gnu/usr.bin/rcs/lib/rcsrev.c
+++ /dev/null
@@ -1,911 +0,0 @@
-/* Handle RCS revision numbers. */
-
-/* Copyright 1982, 1988, 1989 Walter Tichy
- Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
- Distributed under license by the Free Software Foundation, Inc.
-
-This file is part of RCS.
-
-RCS is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-RCS is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with RCS; see the file COPYING.
-If not, write to the Free Software Foundation,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Report problems and direct all questions to:
-
- rcs-bugs@cs.purdue.edu
-
-*/
-
-/*
- * Revision 5.10 1995/06/16 06:19:24 eggert
- * Update FSF address.
- *
- * Revision 5.9 1995/06/01 16:23:43 eggert
- * (cmpdate, normalizeyear): New functions work around MKS RCS incompatibility.
- * (cmpnum, compartial): s[d] -> *(s+d) to work around Cray compiler bug.
- * (genrevs, genbranch): cmpnum -> cmpdate
- *
- * Revision 5.8 1994/03/17 14:05:48 eggert
- * Remove lint.
- *
- * Revision 5.7 1993/11/09 17:40:15 eggert
- * Fix format string typos.
- *
- * Revision 5.6 1993/11/03 17:42:27 eggert
- * Revision number `.N' now stands for `D.N', where D is the default branch.
- * Add -z. Improve quality of diagnostics. Add `namedrev' for Name support.
- *
- * Revision 5.5 1992/07/28 16:12:44 eggert
- * Identifiers may now start with a digit. Avoid `unsigned'.
- *
- * Revision 5.4 1992/01/06 02:42:34 eggert
- * while (E) ; -> while (E) continue;
- *
- * Revision 5.3 1991/08/19 03:13:55 eggert
- * Add `-r$', `-rB.'. Remove botches like `<now>' from messages. Tune.
- *
- * Revision 5.2 1991/04/21 11:58:28 eggert
- * Add tiprev().
- *
- * Revision 5.1 1991/02/25 07:12:43 eggert
- * Avoid overflow when comparing revision numbers.
- *
- * Revision 5.0 1990/08/22 08:13:43 eggert
- * Remove compile-time limits; use malloc instead.
- * Ansify and Posixate. Tune.
- * Remove possibility of an internal error. Remove lint.
- *
- * Revision 4.5 89/05/01 15:13:22 narten
- * changed copyright header to reflect current distribution rules
- *
- * Revision 4.4 87/12/18 11:45:22 narten
- * more lint cleanups. Also, the NOTREACHED comment is no longer necessary,
- * since there's now a return value there with a value. (Guy Harris)
- *
- * Revision 4.3 87/10/18 10:38:42 narten
- * Updating version numbers. Changes relative to version 1.1 actually
- * relative to 4.1
- *
- * Revision 1.3 87/09/24 14:00:37 narten
- * Sources now pass through lint (if you ignore printf/sprintf/fprintf
- * warnings)
- *
- * Revision 1.2 87/03/27 14:22:37 jenkins
- * Port to suns
- *
- * Revision 4.1 83/03/25 21:10:45 wft
- * Only changed $Header to $Id.
- *
- * Revision 3.4 82/12/04 13:24:08 wft
- * Replaced getdelta() with gettree().
- *
- * Revision 3.3 82/11/28 21:33:15 wft
- * fixed compartial() and compnum() for nil-parameters; fixed nils
- * in error messages. Testprogram output shortenend.
- *
- * Revision 3.2 82/10/18 21:19:47 wft
- * renamed compnum->cmpnum, compnumfld->cmpnumfld,
- * numericrevno->numricrevno.
- *
- * Revision 3.1 82/10/11 19:46:09 wft
- * changed expandsym() to check for source==nil; returns zero length string
- * in that case.
- */
-
-#include "rcsbase.h"
-
-libId(revId, "$FreeBSD$")
-
-static char const *branchtip P((char const*));
-static char const *lookupsym P((char const*));
-static char const *normalizeyear P((char const*,char[5]));
-static struct hshentry *genbranch P((struct hshentry const*,char const*,int,char const*,char const*,char const*,struct hshentries**));
-static void absent P((char const*,int));
-static void cantfindbranch P((char const*,char const[datesize],char const*,char const*));
-static void store1 P((struct hshentries***,struct hshentry*));
-
-
-
- int
-countnumflds(s)
- char const *s;
-/* Given a pointer s to a dotted number (date or revision number),
- * countnumflds returns the number of digitfields in s.
- */
-{
- register char const *sp;
- register int count;
- if (!(sp=s) || !*sp)
- return 0;
- count = 1;
- do {
- if (*sp++ == '.') count++;
- } while (*sp);
- return(count);
-}
-
- void
-getbranchno(revno,branchno)
- char const *revno;
- struct buf *branchno;
-/* Given a revision number revno, getbranchno copies the number of the branch
- * on which revno is into branchno. If revno itself is a branch number,
- * it is copied unchanged.
- */
-{
- register int numflds;
- register char *tp;
-
- bufscpy(branchno, revno);
- numflds=countnumflds(revno);
- if (!(numflds & 1)) {
- tp = branchno->string;
- while (--numflds)
- while (*tp++ != '.')
- continue;
- *(tp-1)='\0';
- }
-}
-
-
-
-int cmpnum(num1, num2)
- char const *num1, *num2;
-/* compares the two dotted numbers num1 and num2 lexicographically
- * by field. Individual fields are compared numerically.
- * returns <0, 0, >0 if num1<num2, num1==num2, and num1>num2, resp.
- * omitted fields are assumed to be higher than the existing ones.
-*/
-{
- register char const *s1, *s2;
- register size_t d1, d2;
- register int r;
-
- s1 = num1 ? num1 : "";
- s2 = num2 ? num2 : "";
-
- for (;;) {
- /* Give precedence to shorter one. */
- if (!*s1)
- return (unsigned char)*s2;
- if (!*s2)
- return -1;
-
- /* Strip leading zeros, then find number of digits. */
- while (*s1=='0') ++s1;
- while (*s2=='0') ++s2;
- for (d1=0; isdigit(*(s1+d1)); d1++) continue;
- for (d2=0; isdigit(*(s2+d2)); d2++) continue;
-
- /* Do not convert to integer; it might overflow! */
- if (d1 != d2)
- return d1<d2 ? -1 : 1;
- if ((r = memcmp(s1, s2, d1)))
- return r;
- s1 += d1;
- s2 += d1;
-
- /* skip '.' */
- if (*s1) s1++;
- if (*s2) s2++;
- }
-}
-
-
-
-int cmpnumfld(num1, num2, fld)
- char const *num1, *num2;
- int fld;
-/* Compare the two dotted numbers at field fld.
- * num1 and num2 must have at least fld fields.
- * fld must be positive.
-*/
-{
- register char const *s1, *s2;
- register size_t d1, d2;
-
- s1 = num1;
- s2 = num2;
- /* skip fld-1 fields */
- while (--fld) {
- while (*s1++ != '.')
- continue;
- while (*s2++ != '.')
- continue;
- }
- /* Now s1 and s2 point to the beginning of the respective fields */
- while (*s1=='0') ++s1; for (d1=0; isdigit(*(s1+d1)); d1++) continue;
- while (*s2=='0') ++s2; for (d2=0; isdigit(*(s2+d2)); d2++) continue;
-
- return d1<d2 ? -1 : d1==d2 ? memcmp(s1,s2,d1) : 1;
-}
-
-
- int
-cmpdate(d1, d2)
- char const *d1, *d2;
-/*
-* Compare the two dates. This is just like cmpnum,
-* except that for compatibility with old versions of RCS,
-* 1900 is added to dates with two-digit years.
-*/
-{
- char year1[5], year2[5];
- int r = cmpnumfld(normalizeyear(d1,year1), normalizeyear(d2,year2), 1);
-
- if (r)
- return r;
- else {
- while (isdigit(*d1)) d1++; d1 += *d1=='.';
- while (isdigit(*d2)) d2++; d2 += *d2=='.';
- return cmpnum(d1, d2);
- }
-}
-
- static char const *
-normalizeyear(date, year)
- char const *date;
- char year[5];
-{
- if (isdigit(date[0]) && isdigit(date[1]) && !isdigit(date[2])) {
- year[0] = '1';
- year[1] = '9';
- year[2] = date[0];
- year[3] = date[1];
- year[4] = 0;
- return year;
- } else
- return date;
-}
-
-
- static void
-cantfindbranch(revno, date, author, state)
- char const *revno, date[datesize], *author, *state;
-{
- char datebuf[datesize + zonelenmax];
-
- rcserror("No revision on branch %s has%s%s%s%s%s%s.",
- revno,
- date ? " a date before " : "",
- date ? date2str(date,datebuf) : "",
- author ? " and author "+(date?0:4) : "",
- author ? author : "",
- state ? " and state "+(date||author?0:4) : "",
- state ? state : ""
- );
-}
-
- static void
-absent(revno, field)
- char const *revno;
- int field;
-{
- struct buf t;
- bufautobegin(&t);
- rcserror("%s %s absent", field&1?"revision":"branch",
- partialno(&t,revno,field)
- );
- bufautoend(&t);
-}
-
-
- int
-compartial(num1, num2, length)
- char const *num1, *num2;
- int length;
-
-/* compare the first "length" fields of two dot numbers;
- the omitted field is considered to be larger than any number */
-/* restriction: at least one number has length or more fields */
-
-{
- register char const *s1, *s2;
- register size_t d1, d2;
- register int r;
-
- s1 = num1; s2 = num2;
- if (!s1) return 1;
- if (!s2) return -1;
-
- for (;;) {
- if (!*s1) return 1;
- if (!*s2) return -1;
-
- while (*s1=='0') ++s1; for (d1=0; isdigit(*(s1+d1)); d1++) continue;
- while (*s2=='0') ++s2; for (d2=0; isdigit(*(s2+d2)); d2++) continue;
-
- if (d1 != d2)
- return d1<d2 ? -1 : 1;
- if ((r = memcmp(s1, s2, d1)))
- return r;
- if (!--length)
- return 0;
-
- s1 += d1;
- s2 += d1;
-
- if (*s1 == '.') s1++;
- if (*s2 == '.') s2++;
- }
-}
-
-
-char * partialno(rev1,rev2,length)
- struct buf *rev1;
- char const *rev2;
- register int length;
-/* Function: Copies length fields of revision number rev2 into rev1.
- * Return rev1's string.
- */
-{
- register char *r1;
-
- bufscpy(rev1, rev2);
- r1 = rev1->string;
- while (length) {
- while (*r1!='.' && *r1)
- ++r1;
- ++r1;
- length--;
- }
- /* eliminate last '.'*/
- *(r1-1)='\0';
- return rev1->string;
-}
-
-
-
-
- static void
-store1(store, next)
- struct hshentries ***store;
- struct hshentry *next;
-/*
- * Allocate a new list node that addresses NEXT.
- * Append it to the list that **STORE is the end pointer of.
- */
-{
- register struct hshentries *p;
-
- p = ftalloc(struct hshentries);
- p->first = next;
- **store = p;
- *store = &p->rest;
-}
-
-struct hshentry * genrevs(revno,date,author,state,store)
- char const *revno, *date, *author, *state;
- struct hshentries **store;
-/* Function: finds the deltas needed for reconstructing the
- * revision given by revno, date, author, and state, and stores pointers
- * to these deltas into a list whose starting address is given by store.
- * The last delta (target delta) is returned.
- * If the proper delta could not be found, 0 is returned.
- */
-{
- int length;
- register struct hshentry * next;
- int result;
- char const *branchnum;
- struct buf t;
- char datebuf[datesize + zonelenmax];
-
- bufautobegin(&t);
-
- if (!(next = Head)) {
- rcserror("RCS file empty");
- goto norev;
- }
-
- length = countnumflds(revno);
-
- if (length >= 1) {
- /* at least one field; find branch exactl