mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-02-23 13:21:43 +08:00

2_10-branch'. Sprout from cygnus 2000-02-22 16:18:13 UTC Ian Lance Taylor <ian@airs.com> 'import libiberty from egcs' Cherrypick from master 2000-04-02 08:24:54 UTC Richard Henderson <rth@redhat.com> ' * config/tc-d30v.c (check_range): Allow signed or unsigned 32-bit': ChangeLog Makefile.in bfd/ChangeLog bfd/Makefile.am bfd/Makefile.in bfd/acinclude.m4 bfd/aclocal.m4 bfd/aix386-core.c bfd/aout-adobe.c bfd/aout-arm.c bfd/aout-ns32k.c bfd/aout-target.h bfd/aout-tic30.c bfd/aoutx.h bfd/archive.c bfd/archures.c bfd/armnetbsd.c bfd/bfd-in.h bfd/bfd-in2.h bfd/bfd.c bfd/binary.c bfd/bout.c bfd/cisco-core.c bfd/coff-a29k.c bfd/coff-alpha.c bfd/coff-apollo.c bfd/coff-arm.c bfd/coff-go32.c bfd/coff-h8300.c bfd/coff-h8500.c bfd/coff-i386.c bfd/coff-i860.c bfd/coff-i960.c bfd/coff-m68k.c bfd/coff-m88k.c bfd/coff-mcore.c bfd/coff-mips.c bfd/coff-ppc.c bfd/coff-rs6000.c bfd/coff-sh.c bfd/coff-sparc.c bfd/coff-stgo32.c bfd/coff-tic30.c bfd/coff-tic80.c bfd/coff-w65.c bfd/coff-we32k.c bfd/coff-z8k.c bfd/coffcode.h bfd/coffgen.c bfd/cofflink.c bfd/coffswap.h bfd/config.bfd bfd/config.in bfd/configure bfd/configure.host bfd/configure.in bfd/cpu-arm.c bfd/cpu-avr.c bfd/cpu-d10v.c bfd/cpu-h8500.c bfd/cpu-hppa.c bfd/cpu-i370.c bfd/cpu-m10300.c bfd/cpu-m32r.c bfd/cpu-mcore.c bfd/cpu-ns32k.c bfd/cpu-pj.c bfd/cpu-sh.c bfd/cpu-w65.c bfd/doc/Makefile.in bfd/dwarf1.c bfd/dwarf2.c bfd/ecoff.c bfd/ecofflink.c bfd/elf-bfd.h bfd/elf-hppa.h bfd/elf-m10200.c bfd/elf-m10300.c bfd/elf.c bfd/elf32-arc.c bfd/elf32-arm.h bfd/elf32-avr.c bfd/elf32-d10v.c bfd/elf32-d30v.c bfd/elf32-fr30.c bfd/elf32-gen.c bfd/elf32-hppa.c bfd/elf32-hppa.h bfd/elf32-i370.c bfd/elf32-i386.c bfd/elf32-i860.c bfd/elf32-i960.c bfd/elf32-m32r.c bfd/elf32-m68k.c bfd/elf32-m88k.c bfd/elf32-mcore.c bfd/elf32-mips.c bfd/elf32-pj.c bfd/elf32-ppc.c bfd/elf32-sh.c bfd/elf32-sparc.c bfd/elf32-v850.c bfd/elf64-alpha.c bfd/elf64-gen.c bfd/elf64-mips.c bfd/elf64-sparc.c bfd/elfarm-nabi.c bfd/elfarm-oabi.c bfd/elfcode.h bfd/elflink.c bfd/elflink.h bfd/elfxx-target.h bfd/epoc-pe-arm.c bfd/epoc-pei-arm.c bfd/freebsd.h bfd/hash.c bfd/hosts/alphalinux.h bfd/hp300hpux.c bfd/hppabsd-core.c bfd/hpux-core.c bfd/i386linux.c bfd/i386lynx.c bfd/i386msdos.c bfd/i386os9k.c bfd/ieee.c bfd/ihex.c bfd/irix-core.c bfd/libbfd-in.h bfd/libbfd.c bfd/libbfd.h bfd/libcoff-in.h bfd/libcoff.h bfd/libecoff.h bfd/libhppa.h bfd/libpei.h bfd/linker.c bfd/m68klinux.c bfd/mipsbsd.c bfd/netbsd-core.c bfd/netbsd.h bfd/nlm-target.h bfd/nlm32-ppc.c bfd/nlm32-sparc.c bfd/nlmcode.h bfd/oasys.c bfd/osf-core.c bfd/pc532-mach.c bfd/pe-arm.c bfd/pe-i386.c bfd/pe-mips.c bfd/pe-ppc.c bfd/pe-sh.c bfd/pei-arm.c bfd/pei-i386.c bfd/pei-mcore.c bfd/pei-mips.c bfd/pei-ppc.c bfd/pei-sh.c bfd/peicode.h bfd/peigen.c bfd/po/POTFILES.in bfd/po/bfd.pot bfd/ppcboot.c bfd/ptrace-core.c bfd/reloc.c bfd/reloc16.c bfd/riscix.c bfd/rs6000-core.c bfd/sco5-core.c bfd/section.c bfd/som.c bfd/sparclinux.c bfd/srec.c bfd/stabs.c bfd/sunos.c bfd/syms.c bfd/targets.c bfd/tekhex.c bfd/trad-core.c bfd/versados.c bfd/vms-gsd.c bfd/vms-hdr.c bfd/vms-misc.c bfd/vms-tir.c bfd/vms.c bfd/vms.h bfd/xcofflink.c binutils/ChangeLog binutils/Makefile.am binutils/Makefile.in binutils/NEWS binutils/aclocal.m4 binutils/addr2line.c binutils/ar.1 binutils/ar.c binutils/arparse.y binutils/arsup.c binutils/binutils.texi binutils/config.in binutils/configure binutils/configure.in binutils/debug.c binutils/deflex.l binutils/defparse.y binutils/dlltool.c binutils/dllwrap.c binutils/dyn-string.c binutils/dyn-string.h binutils/filemode.c binutils/ieee.c binutils/nm.c binutils/objcopy.1 binutils/objcopy.c binutils/objdump.c binutils/po/POTFILES.in binutils/po/binutils.pot binutils/prdbg.c binutils/rclex.l binutils/rcparse.y binutils/rdcoff.c binutils/rddbg.c binutils/readelf.c binutils/rename.c binutils/rescoff.c binutils/resrc.c binutils/resres.c binutils/size.c binutils/stabs.c binutils/strings.1 binutils/strings.c binutils/testsuite/ChangeLog binutils/testsuite/binutils-all/hppa/freg.s binutils/testsuite/binutils-all/hppa/objdump.exp binutils/testsuite/binutils-all/objcopy.exp binutils/testsuite/binutils-all/objdump.exp binutils/testsuite/binutils-all/readelf.h binutils/testsuite/binutils-all/readelf.r binutils/testsuite/binutils-all/readelf.s binutils/testsuite/binutils-all/readelf.ss binutils/testsuite/binutils-all/readelf.wi binutils/testsuite/binutils-all/testprog.c binutils/windres.c binutils/windres.h binutils/wrstabs.c config.guess config.sub config/ChangeLog config/mh-i370pic config/mt-aix43 config/mt-i370pic config/mt-wince configure configure.in gas/ChangeLog gas/Makefile.am gas/Makefile.in gas/NEWS gas/aclocal.m4 gas/app.c gas/as.c gas/as.h gas/atof-generic.c gas/cgen.c gas/cond.c gas/config/atof-ieee.c gas/config/atof-vax.c gas/config/e-i386aout.c gas/config/m68k-parse.h gas/config/obj-aout.c gas/config/obj-aout.h gas/config/obj-bout.c gas/config/obj-coff.c gas/config/obj-coff.h gas/config/obj-ecoff.c gas/config/obj-ecoff.h gas/config/obj-elf.c gas/config/obj-elf.h gas/config/obj-evax.h gas/config/obj-multi.h gas/config/obj-som.c gas/config/obj-vms.h gas/config/tc-alpha.c gas/config/tc-alpha.h gas/config/tc-arc.c gas/config/tc-arc.h gas/config/tc-arm.c gas/config/tc-arm.h gas/config/tc-avr.c gas/config/tc-avr.h gas/config/tc-d10v.c gas/config/tc-d10v.h gas/config/tc-d30v.c gas/config/tc-d30v.h gas/config/tc-fr30.c gas/config/tc-h8300.c gas/config/tc-hppa.c gas/config/tc-hppa.h gas/config/tc-i370.c gas/config/tc-i370.h gas/config/tc-i386.c gas/config/tc-i386.h gas/config/tc-i860.c gas/config/tc-i960.c gas/config/tc-i960.h gas/config/tc-m32r.c gas/config/tc-m68k.c gas/config/tc-m68k.h gas/config/tc-m88k.c gas/config/tc-m88k.h gas/config/tc-mcore.c gas/config/tc-mcore.h gas/config/tc-mips.c gas/config/tc-mips.h gas/config/tc-mn10200.c gas/config/tc-mn10300.c gas/config/tc-ns32k.c gas/config/tc-ns32k.h gas/config/tc-pj.c gas/config/tc-pj.h gas/config/tc-ppc.c gas/config/tc-ppc.h gas/config/tc-sh.c gas/config/tc-sh.h gas/config/tc-sparc.c gas/config/tc-sparc.h gas/config/tc-tahoe.c gas/config/tc-tic30.c gas/config/tc-v850.c gas/config/tc-vax.c gas/config/tc-w65.c gas/config/tc-z8k.c gas/config/te-go32.h gas/config/te-interix.h gas/config/te-wince-pe.h gas/configure gas/configure.in gas/dep-in.sed gas/doc/Makefile.am gas/doc/Makefile.in gas/doc/all.texi gas/doc/as.1 gas/doc/as.texinfo gas/doc/c-arm.texi gas/doc/c-i370.texi gas/doc/c-i386.texi gas/doc/c-m32r.texi gas/doc/c-mips.texi gas/doc/c-pj.texi gas/doc/c-sparc.texi gas/doc/internals.texi gas/dwarf2dbg.c gas/dwarf2dbg.h gas/ecoff.c gas/ecoff.h gas/expr.c gas/expr.h gas/frags.c gas/frags.h gas/gasp.c gas/hash.c gas/hash.h gas/input-file.c gas/input-scrub.c gas/itbl-ops.c gas/itbl-ops.h gas/listing.c gas/macro.c gas/macro.h gas/obj.h gas/output-file.c gas/po/POTFILES.in gas/po/gas.pot gas/read.c gas/read.h gas/sb.h gas/stabs.c gas/struc-symbol.h gas/subsegs.c gas/symbols.c gas/symbols.h gas/testsuite/ChangeLog gas/testsuite/gas/all/cond.d gas/testsuite/gas/all/gas.exp gas/testsuite/gas/all/itbl-test.c gas/testsuite/gas/arm/arm7t.d gas/testsuite/gas/arm/arm7t.s gas/testsuite/gas/arm/float.s gas/testsuite/gas/arm/inst.d gas/testsuite/gas/arm/inst.s gas/testsuite/gas/arm/thumb.s gas/testsuite/gas/d10v/d10.exp gas/testsuite/gas/d10v/inst.d gas/testsuite/gas/d10v/inst.s gas/testsuite/gas/elf/elf.exp gas/testsuite/gas/elf/section0.d gas/testsuite/gas/elf/section0.s gas/testsuite/gas/elf/section1.d gas/testsuite/gas/elf/section1.s gas/testsuite/gas/hppa/basic/add.s gas/testsuite/gas/hppa/basic/add2.s gas/testsuite/gas/hppa/basic/addi.s gas/testsuite/gas/hppa/basic/basic.exp gas/testsuite/gas/hppa/basic/branch.s gas/testsuite/gas/hppa/basic/branch2.s gas/testsuite/gas/hppa/basic/comclr.s gas/testsuite/gas/hppa/basic/copr.s gas/testsuite/gas/hppa/basic/coprmem.s gas/testsuite/gas/hppa/basic/dcor.s gas/testsuite/gas/hppa/basic/dcor2.s gas/testsuite/gas/hppa/basic/deposit.s gas/testsuite/gas/hppa/basic/deposit2.s gas/testsuite/gas/hppa/basic/deposit3.s gas/testsuite/gas/hppa/basic/ds.s gas/testsuite/gas/hppa/basic/extract.s gas/testsuite/gas/hppa/basic/extract2.s gas/testsuite/gas/hppa/basic/extract3.s gas/testsuite/gas/hppa/basic/fmem.s gas/testsuite/gas/hppa/basic/fp_comp.s gas/testsuite/gas/hppa/basic/fp_comp2.s gas/testsuite/gas/hppa/basic/fp_conv.s gas/testsuite/gas/hppa/basic/fp_fcmp.s gas/testsuite/gas/hppa/basic/fp_misc.s gas/testsuite/gas/hppa/basic/imem.s gas/testsuite/gas/hppa/basic/immed.s gas/testsuite/gas/hppa/basic/logical.s gas/testsuite/gas/hppa/basic/media.s gas/testsuite/gas/hppa/basic/perf.s gas/testsuite/gas/hppa/basic/purge.s gas/testsuite/gas/hppa/basic/purge2.s gas/testsuite/gas/hppa/basic/sh1add.s gas/testsuite/gas/hppa/basic/sh2add.s gas/testsuite/gas/hppa/basic/sh3add.s gas/testsuite/gas/hppa/basic/shift.s gas/testsuite/gas/hppa/basic/shift2.s gas/testsuite/gas/hppa/basic/shift3.s gas/testsuite/gas/hppa/basic/shladd.s gas/testsuite/gas/hppa/basic/shladd2.s gas/testsuite/gas/hppa/basic/special.s gas/testsuite/gas/hppa/basic/spop.s gas/testsuite/gas/hppa/basic/sub.s gas/testsuite/gas/hppa/basic/sub2.s gas/testsuite/gas/hppa/basic/subi.s gas/testsuite/gas/hppa/basic/system.s gas/testsuite/gas/hppa/basic/system2.s gas/testsuite/gas/hppa/basic/unit.s gas/testsuite/gas/hppa/basic/unit2.s gas/testsuite/gas/hppa/parse/align1.s gas/testsuite/gas/hppa/parse/align2.s gas/testsuite/gas/hppa/parse/badfmpyadd.s gas/testsuite/gas/hppa/parse/block1.s gas/testsuite/gas/hppa/parse/block2.s gas/testsuite/gas/hppa/parse/calldatabug.s gas/testsuite/gas/hppa/parse/callinfobug.s gas/testsuite/gas/hppa/parse/defbug.s gas/testsuite/gas/hppa/parse/entrybug.s gas/testsuite/gas/hppa/parse/exportbug.s gas/testsuite/gas/hppa/parse/exprbug.s gas/testsuite/gas/hppa/parse/fixup7bug.s gas/testsuite/gas/hppa/parse/global.s gas/testsuite/gas/hppa/parse/labelbug.s gas/testsuite/gas/hppa/parse/linesepbug.s gas/testsuite/gas/hppa/parse/lselbug.s gas/testsuite/gas/hppa/parse/parse.exp gas/testsuite/gas/hppa/parse/procbug.s gas/testsuite/gas/hppa/parse/regpopbug.s gas/testsuite/gas/hppa/parse/stdreg.s gas/testsuite/gas/hppa/parse/stringer.s gas/testsuite/gas/hppa/parse/undefbug.s gas/testsuite/gas/hppa/parse/versionbug.s gas/testsuite/gas/hppa/parse/xmpyubug.s gas/testsuite/gas/hppa/reloc/applybug.s gas/testsuite/gas/hppa/reloc/blebug.s gas/testsuite/gas/hppa/reloc/blebug2.s gas/testsuite/gas/hppa/reloc/blebug3.s gas/testsuite/gas/hppa/reloc/exitbug.s gas/testsuite/gas/hppa/reloc/fixupbug.s gas/testsuite/gas/hppa/reloc/funcrelocbug.s gas/testsuite/gas/hppa/reloc/labelopbug.s gas/testsuite/gas/hppa/reloc/longcall.s gas/testsuite/gas/hppa/reloc/picreloc.s gas/testsuite/gas/hppa/reloc/plabelbug.s gas/testsuite/gas/hppa/reloc/r_no_reloc.s gas/testsuite/gas/hppa/reloc/reduce.s gas/testsuite/gas/hppa/reloc/reduce3.s gas/testsuite/gas/hppa/reloc/reloc.exp gas/testsuite/gas/hppa/reloc/roundmode.s gas/testsuite/gas/hppa/reloc/selectorbug.s gas/testsuite/gas/hppa/unsorted/brlenbug.s gas/testsuite/gas/hppa/unsorted/common.s gas/testsuite/gas/hppa/unsorted/fragbug.s gas/testsuite/gas/hppa/unsorted/importbug.s gas/testsuite/gas/hppa/unsorted/labeldiffs.s gas/testsuite/gas/hppa/unsorted/locallabel.s gas/testsuite/gas/hppa/unsorted/unsorted.exp gas/testsuite/gas/i386/amd.d gas/testsuite/gas/i386/amd.s gas/testsuite/gas/i386/float.l gas/testsuite/gas/i386/float.s gas/testsuite/gas/i386/general.l gas/testsuite/gas/i386/general.s gas/testsuite/gas/i386/i386.exp gas/testsuite/gas/i386/intel.d gas/testsuite/gas/i386/intel.s gas/testsuite/gas/i386/jump.d gas/testsuite/gas/i386/jump.s gas/testsuite/gas/i386/jump16.d gas/testsuite/gas/i386/jump16.s gas/testsuite/gas/i386/katmai.d gas/testsuite/gas/i386/katmai.s gas/testsuite/gas/i386/modrm.l gas/testsuite/gas/i386/modrm.s gas/testsuite/gas/i386/naked.d gas/testsuite/gas/i386/naked.s gas/testsuite/gas/i386/opcode.d gas/testsuite/gas/i386/prefix.d gas/testsuite/gas/i386/prefix.s gas/testsuite/gas/i386/reloc.d gas/testsuite/gas/i386/reloc.s gas/testsuite/gas/i386/white.l gas/testsuite/gas/i386/white.s gas/testsuite/gas/ieee-fp/x930509a.exp gas/testsuite/gas/m32r/error.exp gas/testsuite/gas/m32r/fslotx.d gas/testsuite/gas/m32r/fslotx.s gas/testsuite/gas/m32r/interfere.s gas/testsuite/gas/m32r/m32rx.d gas/testsuite/gas/m32r/m32rx.exp gas/testsuite/gas/m32r/m32rx.s gas/testsuite/gas/m32r/relax-2.d gas/testsuite/gas/m32r/relax-2.s gas/testsuite/gas/m32r/wrongsize.s gas/testsuite/gas/macros/irp.d gas/testsuite/gas/macros/irp.s gas/testsuite/gas/macros/rept.d gas/testsuite/gas/macros/rept.s gas/testsuite/gas/macros/test2.d gas/testsuite/gas/macros/test2.s gas/testsuite/gas/macros/test3.d gas/testsuite/gas/macros/test3.s gas/testsuite/gas/mcore/allinsn.d gas/testsuite/gas/mips/e32-rel2.d gas/testsuite/gas/mips/elf-rel.d gas/testsuite/gas/mips/elf-rel.s gas/testsuite/gas/mips/elf-rel2.d gas/testsuite/gas/mips/elf-rel2.s gas/testsuite/gas/mips/elf_e_flags.c gas/testsuite/gas/mips/elf_e_flags.s gas/testsuite/gas/mips/elf_e_flags1.d gas/testsuite/gas/mips/elf_e_flags2.d gas/testsuite/gas/mips/elf_e_flags3.d gas/testsuite/gas/mips/elf_e_flags4.d gas/testsuite/gas/mips/empic.d gas/testsuite/gas/mips/empic.s gas/testsuite/gas/mips/la-svr4pic.d gas/testsuite/gas/mips/la-xgot.d gas/testsuite/gas/mips/la.d gas/testsuite/gas/mips/mips.exp gas/testsuite/gas/mips/mips16-e.d gas/testsuite/gas/mips/mips16-e.s gas/testsuite/gas/mips/mips16-f.d gas/testsuite/gas/mips/mips16-f.s gas/testsuite/gas/mips/sync.d gas/testsuite/gas/mn10300/am33.s gas/testsuite/gas/mn10300/am33_2.s gas/testsuite/gas/mn10300/am33_3.s gas/testsuite/gas/mn10300/am33_4.s gas/testsuite/gas/mn10300/am33_5.s gas/testsuite/gas/mn10300/am33_6.s gas/testsuite/gas/mn10300/am33_7.s gas/testsuite/gas/mn10300/am33_8.s gas/testsuite/gas/mn10300/basic.exp gas/testsuite/gas/pj/ops.d gas/testsuite/gas/pj/ops.s gas/testsuite/gas/pj/pj.exp gas/testsuite/gas/sparc/prefetch.d gas/testsuite/gas/sparc/rdpr.d gas/testsuite/gas/sparc/reloc64.d gas/testsuite/gas/sparc/set64.d gas/testsuite/gas/sparc/set64.s gas/testsuite/gas/sparc/sparc.exp gas/testsuite/gas/sparc/synth64.d gas/testsuite/gas/sparc/synth64.s gas/testsuite/gas/sparc/wrpr.d gas/testsuite/gas/vtable/vtable.exp gas/testsuite/lib/gas-defs.exp gas/write.c gprof/ChangeLog gprof/Makefile.am gprof/Makefile.in gprof/alpha.c gprof/basic_blocks.c gprof/call_graph.c gprof/cg_dfn.c gprof/configure gprof/configure.in gprof/corefile.c gprof/gmon_io.c gprof/gprof.texi gprof/hertz.h gprof/hist.c gprof/i386.c gprof/po/POTFILES.in gprof/po/gprof.pot gprof/sparc.c gprof/sym_ids.c gprof/symtab.c gprof/tahoe.c gprof/utils.c gprof/vax.c include/ChangeLog include/ansidecl.h include/aout/ChangeLog include/aout/aout64.h include/bfdlink.h include/coff/ChangeLog include/coff/arm.h include/coff/internal.h include/coff/mcore.h include/coff/mipspe.h include/coff/pe.h include/coff/sh.h include/dis-asm.h include/elf/ChangeLog include/elf/arm-oabi.h include/elf/arm.h include/elf/avr.h include/elf/common.h include/elf/dwarf.h include/elf/dwarf2.h include/elf/hppa.h include/elf/i370.h include/elf/i386.h include/elf/i960.h include/elf/m32r.h include/elf/m68k.h include/elf/mcore.h include/elf/mips.h include/elf/mn10300.h include/elf/pj.h include/elf/reloc-macros.h include/elf/sh.h include/elf/sparc.h include/hashtab.h include/hp-symtab.h include/opcode/ChangeLog include/opcode/alpha.h include/opcode/cgen.h include/opcode/d10v.h include/opcode/d30v.h include/opcode/hppa.h include/opcode/i370.h include/opcode/i386.h include/opcode/m68k.h include/opcode/mips.h include/opcode/mn10300.h include/opcode/pj.h include/opcode/ppc.h include/partition.h include/remote-sim.h include/sim-d10v.h ld/ChangeLog ld/Makefile.am ld/Makefile.in ld/NEWS ld/aclocal.m4 ld/config.in ld/configure ld/configure.host ld/configure.in ld/configure.tgt ld/deffile.h ld/deffilep.y ld/emulparams/arm_epoc_pe.sh ld/emulparams/armelf.sh ld/emulparams/armelf_linux.sh ld/emulparams/armelf_linux26.sh ld/emulparams/armelf_oabi.sh ld/emulparams/armnbsd.sh ld/emulparams/armpe.sh ld/emulparams/avr1200.sh ld/emulparams/avr23xx.sh ld/emulparams/avr4433.sh ld/emulparams/avr44x4.sh ld/emulparams/avr85xx.sh ld/emulparams/avrmega103.sh ld/emulparams/avrmega161.sh ld/emulparams/avrmega603.sh ld/emulparams/d10velf.sh ld/emulparams/elf32_i960.sh ld/emulparams/elf32bmipn32.sh ld/emulparams/elf32i370.sh ld/emulparams/elf32mcore.sh ld/emulparams/elf32ppc.sh ld/emulparams/elf32ppclinux.sh ld/emulparams/elf64_sparc.sh ld/emulparams/elf64bmip.sh ld/emulparams/elf64hppa.sh ld/emulparams/i386pe.sh ld/emulparams/i386pe_posix.sh ld/emulparams/mcorepe.sh ld/emulparams/mipspe.sh ld/emulparams/pjelf.sh ld/emulparams/pjlelf.sh ld/emulparams/ppcpe.sh ld/emulparams/shpe.sh ld/emultempl/aix.em ld/emultempl/armcoff.em ld/emultempl/armelf.em ld/emultempl/armelf_oabi.em ld/emultempl/astring.sed ld/emultempl/beos.em ld/emultempl/elf32.em ld/emultempl/generic.em ld/emultempl/gld960.em ld/emultempl/gld960c.em ld/emultempl/hppaelf.em ld/emultempl/linux.em ld/emultempl/lnk960.em ld/emultempl/mipsecoff.em ld/emultempl/ostring.sed ld/emultempl/pe.em ld/emultempl/sunos.em ld/emultempl/vanilla.em ld/genscripts.sh ld/ld.h ld/ld.texinfo ld/ldcref.c ld/ldemul.c ld/ldemul.h ld/ldexp.c ld/ldfile.c ld/ldfile.h ld/ldgram.y ld/ldlang.c ld/ldlang.h ld/ldmain.c ld/ldmisc.c ld/lexsup.c ld/mri.c ld/pe-dll.c ld/pe-dll.h ld/po/POTFILES.in ld/po/ld.pot ld/scripttempl/armcoff.sc ld/scripttempl/elf.sc ld/scripttempl/elf32avr.sc ld/scripttempl/elfd10v.sc ld/scripttempl/elfi370.sc ld/scripttempl/epocpe.sc ld/scripttempl/i386go32.sc ld/scripttempl/mcorepe.sc ld/scripttempl/pe.sc ld/scripttempl/pj.sc ld/scripttempl/v850.sc ld/testsuite/ChangeLog ld/testsuite/ld-cdtest/cdtest-foo.cc ld/testsuite/ld-cdtest/cdtest-main.cc ld/testsuite/ld-checks/asm.s ld/testsuite/ld-checks/checks.exp ld/testsuite/ld-elfvers/vers.exp ld/testsuite/ld-elfvers/vers1.c ld/testsuite/ld-elfvers/vers15.c ld/testsuite/ld-elfvers/vers17.c ld/testsuite/ld-elfvers/vers17.dsym ld/testsuite/ld-elfvers/vers17.map ld/testsuite/ld-elfvers/vers17.ver ld/testsuite/ld-elfvers/vers18.c ld/testsuite/ld-elfvers/vers18.dsym ld/testsuite/ld-elfvers/vers18.map ld/testsuite/ld-elfvers/vers18.sym ld/testsuite/ld-elfvers/vers18.ver ld/testsuite/ld-elfvers/vers19.c ld/testsuite/ld-elfvers/vers19.dsym ld/testsuite/ld-elfvers/vers19.ver ld/testsuite/ld-elfvers/vers2.c ld/testsuite/ld-elfvers/vers3.c ld/testsuite/ld-elfvers/vers4.c ld/testsuite/ld-elfvers/vers6.c ld/testsuite/ld-elfvers/vers7.c ld/testsuite/ld-elfvers/vers9.c ld/testsuite/ld-scripts/phdrs.exp ld/testsuite/ld-scripts/phdrs.t ld/testsuite/ld-scripts/script.exp ld/testsuite/ld-scripts/weak.exp ld/testsuite/ld-selective/selective.exp ld/testsuite/ld-shared/main.c ld/testsuite/ld-shared/sh1.c ld/testsuite/ld-shared/shared.exp ld/testsuite/ld-srec/sr3.cc ld/testsuite/ld-srec/srec.exp ld/testsuite/ld-undefined/undefined.exp ld/testsuite/lib/ld-lib.exp libiberty/ChangeLog libiberty/Makefile.in libiberty/argv.c libiberty/choose-temp.c libiberty/config.in libiberty/configure libiberty/configure.in libiberty/cplus-dem.c libiberty/floatformat.c libiberty/getruntime.c libiberty/hashtab.c libiberty/partition.c libiberty/pexecute.c libiberty/splay-tree.c libiberty/vasprintf.c libiberty/xmalloc.c ltconfig ltmain.sh mkdep opcodes/ChangeLog opcodes/Makefile.am opcodes/Makefile.in opcodes/aclocal.m4 opcodes/alpha-dis.c opcodes/alpha-opc.c opcodes/arm-dis.c opcodes/arm-opc.h opcodes/avr-dis.c opcodes/cgen-opc.c opcodes/configure opcodes/configure.in opcodes/d10v-opc.c opcodes/d30v-dis.c opcodes/d30v-opc.c opcodes/dis-buf.c opcodes/disassemble.c opcodes/fr30-asm.c opcodes/fr30-desc.h opcodes/fr30-dis.c opcodes/fr30-ibld.c opcodes/fr30-opc.c opcodes/hppa-dis.c opcodes/i370-dis.c opcodes/i370-opc.c opcodes/i386-dis.c opcodes/m10300-dis.c opcodes/m10300-opc.c opcodes/m32r-asm.c opcodes/m32r-desc.c opcodes/m32r-desc.h opcodes/m32r-dis.c opcodes/m32r-ibld.c opcodes/m32r-opc.c opcodes/m32r-opc.h opcodes/m32r-opinst.c opcodes/m68k-dis.c opcodes/m68k-opc.c opcodes/mcore-dis.c opcodes/mcore-opc.h opcodes/mips-dis.c opcodes/mips-opc.c opcodes/pj-dis.c opcodes/pj-opc.c opcodes/po/POTFILES.in opcodes/po/opcodes.pot opcodes/ppc-opc.c opcodes/sh-dis.c opcodes/sh-opc.h opcodes/sparc-dis.c opcodes/sparc-opc.c opcodes/tic30-dis.c texinfo/texinfo.tex Delete: bfd/configure.bat bfd/makefile.dos binutils/configure.bat config/mh-aix43 configure.bat gas/config/go32.cfg gas/config/te-multi.h gas/configure.bat gprof/configure.bat include/wait.h intl/ChangeLog.Cygnus ld/configure.bat ld/emulparams/go32.sh ld/emultempl/stringify.sed ld/scripttempl/go32coff.sc ld/testsuite/ld-selective/5.cc libiberty/configure.bat libiberty/makefile.dos makeall.bat opcodes/configure.bat
660 lines
15 KiB
C
660 lines
15 KiB
C
/* resres.c: read_res_file and write_res_file implementation for windres.
|
|
Copyright 1998, 1999 Free Software Foundation, Inc.
|
|
Written by Anders Norlander <anorland@hem2.passagen.se>.
|
|
|
|
This file is part of GNU Binutils.
|
|
|
|
This program 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 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
02111-1307, USA. */
|
|
|
|
/* FIXME: This file does not work correctly in a cross configuration.
|
|
It assumes that it can use fread and fwrite to read and write
|
|
integers. It does no swapping. */
|
|
|
|
#include "bfd.h"
|
|
#include "bucomm.h"
|
|
#include "libiberty.h"
|
|
#include "windres.h"
|
|
|
|
#include <assert.h>
|
|
#include <time.h>
|
|
|
|
struct res_hdr
|
|
{
|
|
unsigned long data_size;
|
|
unsigned long header_size;
|
|
};
|
|
|
|
static void write_res_directory
|
|
PARAMS ((const struct res_directory *,
|
|
const struct res_id *, const struct res_id *,
|
|
int *, int));
|
|
static void write_res_resource
|
|
PARAMS ((const struct res_id *, const struct res_id *,
|
|
const struct res_resource *, int *));
|
|
static void write_res_bin
|
|
PARAMS ((const struct res_resource *, const struct res_id *,
|
|
const struct res_id *, const struct res_res_info *));
|
|
|
|
static void write_res_id PARAMS ((const struct res_id *));
|
|
static void write_res_info PARAMS ((const struct res_res_info *));
|
|
static void write_res_data PARAMS ((const void *, size_t, int));
|
|
static void write_res_header
|
|
PARAMS ((unsigned long, const struct res_id *, const struct res_id *,
|
|
const struct res_res_info *));
|
|
|
|
static int read_resource_entry PARAMS ((void));
|
|
static void read_res_data PARAMS ((void *, size_t, int));
|
|
static void read_res_id PARAMS ((struct res_id *));
|
|
static unichar *read_unistring PARAMS ((int *));
|
|
static void skip_null_resource PARAMS ((void));
|
|
|
|
static unsigned long get_id_size PARAMS ((const struct res_id *));
|
|
static void res_align_file PARAMS ((void));
|
|
|
|
static void
|
|
res_add_resource
|
|
PARAMS ((struct res_resource *, const struct res_id *,
|
|
const struct res_id *, int, int));
|
|
|
|
void
|
|
res_append_resource
|
|
PARAMS ((struct res_directory **, struct res_resource *,
|
|
int, const struct res_id *, int));
|
|
|
|
static struct res_directory *resources = NULL;
|
|
|
|
static FILE *fres;
|
|
static const char *filename;
|
|
|
|
extern char *program_name;
|
|
|
|
/* Read resource file */
|
|
struct res_directory *
|
|
read_res_file (fn)
|
|
const char *fn;
|
|
{
|
|
filename = fn;
|
|
fres = fopen (filename, "rb");
|
|
if (fres == NULL)
|
|
fatal ("can't open `%s' for output: %s", filename, strerror (errno));
|
|
|
|
skip_null_resource ();
|
|
|
|
while (read_resource_entry ())
|
|
;
|
|
|
|
fclose (fres);
|
|
|
|
return resources;
|
|
}
|
|
|
|
/* Write resource file */
|
|
void
|
|
write_res_file (fn, resdir)
|
|
const char *fn;
|
|
const struct res_directory *resdir;
|
|
{
|
|
int language;
|
|
static const unsigned char sign[] =
|
|
{0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
|
|
0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
|
|
long fpos;
|
|
|
|
filename = fn;
|
|
|
|
fres = fopen (filename, "wb");
|
|
if (fres == NULL)
|
|
fatal ("can't open `%s' for output: %s", filename, strerror (errno));
|
|
|
|
/* Write 32 bit resource signature */
|
|
write_res_data (sign, sizeof (sign), 1);
|
|
|
|
/* write resources */
|
|
|
|
language = -1;
|
|
write_res_directory (resdir, (const struct res_id *) NULL,
|
|
(const struct res_id *) NULL, &language, 1);
|
|
|
|
/* end file on DWORD boundary */
|
|
fpos = ftell (fres);
|
|
if (fpos % 4)
|
|
write_res_data (sign, fpos % 4, 1);
|
|
|
|
fclose (fres);
|
|
}
|
|
|
|
/* Read a resource entry, returns 0 when all resources are read */
|
|
static int
|
|
read_resource_entry (void)
|
|
{
|
|
struct res_id type;
|
|
struct res_id name;
|
|
struct res_res_info resinfo;
|
|
struct res_hdr reshdr;
|
|
long version;
|
|
void *buff;
|
|
|
|
struct res_resource *r;
|
|
|
|
res_align_file ();
|
|
|
|
/* Read header */
|
|
if (fread (&reshdr, sizeof (reshdr), 1, fres) != 1)
|
|
return 0;
|
|
|
|
/* read resource type */
|
|
read_res_id (&type);
|
|
/* read resource id */
|
|
read_res_id (&name);
|
|
|
|
res_align_file ();
|
|
|
|
/* Read additional resource header */
|
|
read_res_data (&resinfo.version, sizeof (resinfo.version), 1);
|
|
read_res_data (&resinfo.memflags, sizeof (resinfo.memflags), 1);
|
|
read_res_data (&resinfo.language, sizeof (resinfo.language), 1);
|
|
read_res_data (&version, sizeof (version), 1);
|
|
read_res_data (&resinfo.characteristics, sizeof (resinfo.characteristics), 1);
|
|
|
|
res_align_file ();
|
|
|
|
/* Allocate buffer for data */
|
|
buff = res_alloc (reshdr.data_size);
|
|
/* Read data */
|
|
read_res_data (buff, reshdr.data_size, 1);
|
|
/* Convert binary data to resource */
|
|
r = bin_to_res (type, buff, reshdr.data_size, 0);
|
|
r->res_info = resinfo;
|
|
/* Add resource to resource directory */
|
|
res_add_resource (r, &type, &name, resinfo.language, 0);
|
|
|
|
return 1;
|
|
}
|
|
|
|
/* write resource directory to binary resource file */
|
|
static void
|
|
write_res_directory (rd, type, name, language, level)
|
|
const struct res_directory *rd;
|
|
const struct res_id *type;
|
|
const struct res_id *name;
|
|
int *language;
|
|
int level;
|
|
{
|
|
const struct res_entry *re;
|
|
|
|
for (re = rd->entries; re != NULL; re = re->next)
|
|
{
|
|
switch (level)
|
|
{
|
|
case 1:
|
|
/* If we're at level 1, the key of this resource is the
|
|
type. This normally duplicates the information we have
|
|
stored with the resource itself, but we need to remember
|
|
the type if this is a user define resource type. */
|
|
type = &re->id;
|
|
break;
|
|
|
|
case 2:
|
|
/* If we're at level 2, the key of this resource is the name
|
|
we are going to use in the rc printout. */
|
|
name = &re->id;
|
|
break;
|
|
|
|
case 3:
|
|
/* If we're at level 3, then this key represents a language.
|
|
Use it to update the current language. */
|
|
if (!re->id.named
|
|
&& re->id.u.id != (unsigned long) *language
|
|
&& (re->id.u.id & 0xffff) == re->id.u.id)
|
|
{
|
|
*language = re->id.u.id;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
if (re->subdir)
|
|
write_res_directory (re->u.dir, type, name, language, level + 1);
|
|
else
|
|
{
|
|
if (level == 3)
|
|
{
|
|
/* This is the normal case: the three levels are
|
|
TYPE/NAME/LANGUAGE. NAME will have been set at level
|
|
2, and represents the name to use. We probably just
|
|
set LANGUAGE, and it will probably match what the
|
|
resource itself records if anything. */
|
|
write_res_resource (type, name, re->u.res, language);
|
|
}
|
|
else
|
|
{
|
|
fprintf (stderr, "// Resource at unexpected level %d\n", level);
|
|
write_res_resource (type, (struct res_id *) NULL, re->u.res,
|
|
language);
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
static void
|
|
write_res_resource (type, name, res, language)
|
|
const struct res_id *type;
|
|
const struct res_id *name;
|
|
const struct res_resource *res;
|
|
int *language ATTRIBUTE_UNUSED;
|
|
{
|
|
int rt;
|
|
|
|
switch (res->type)
|
|
{
|
|
default:
|
|
abort ();
|
|
|
|
case RES_TYPE_ACCELERATOR:
|
|
rt = RT_ACCELERATOR;
|
|
break;
|
|
|
|
case RES_TYPE_BITMAP:
|
|
rt = RT_BITMAP;
|
|
break;
|
|
|
|
case RES_TYPE_CURSOR:
|
|
rt = RT_CURSOR;
|
|
break;
|
|
|
|
case RES_TYPE_GROUP_CURSOR:
|
|
rt = RT_GROUP_CURSOR;
|
|
break;
|
|
|
|
case RES_TYPE_DIALOG:
|
|
rt = RT_DIALOG;
|
|
break;
|
|
|
|
case RES_TYPE_FONT:
|
|
rt = RT_FONT;
|
|
break;
|
|
|
|
case RES_TYPE_FONTDIR:
|
|
rt = RT_FONTDIR;
|
|
break;
|
|
|
|
case RES_TYPE_ICON:
|
|
rt = RT_ICON;
|
|
break;
|
|
|
|
case RES_TYPE_GROUP_ICON:
|
|
rt = RT_GROUP_ICON;
|
|
break;
|
|
|
|
case RES_TYPE_MENU:
|
|
rt = RT_MENU;
|
|
break;
|
|
|
|
case RES_TYPE_MESSAGETABLE:
|
|
rt = RT_MESSAGETABLE;
|
|
break;
|
|
|
|
case RES_TYPE_RCDATA:
|
|
rt = RT_RCDATA;
|
|
break;
|
|
|
|
case RES_TYPE_STRINGTABLE:
|
|
rt = RT_STRING;
|
|
break;
|
|
|
|
case RES_TYPE_USERDATA:
|
|
rt = 0;
|
|
break;
|
|
|
|
case RES_TYPE_VERSIONINFO:
|
|
rt = RT_VERSION;
|
|
break;
|
|
}
|
|
|
|
if (rt != 0
|
|
&& type != NULL
|
|
&& (type->named || type->u.id != (unsigned long) rt))
|
|
{
|
|
fprintf (stderr, "// Unexpected resource type mismatch: ");
|
|
res_id_print (stderr, *type, 1);
|
|
fprintf (stderr, " != %d", rt);
|
|
abort ();
|
|
}
|
|
|
|
write_res_bin (res, type, name, &res->res_info);
|
|
return;
|
|
}
|
|
|
|
/* Write a resource in binary resource format */
|
|
static void
|
|
write_res_bin (res, type, name, resinfo)
|
|
const struct res_resource *res;
|
|
const struct res_id *type;
|
|
const struct res_id *name;
|
|
const struct res_res_info *resinfo;
|
|
{
|
|
unsigned long datasize = 0;
|
|
const struct bindata *bin_rep, *data;
|
|
|
|
bin_rep = res_to_bin (res, 0);
|
|
for (data = bin_rep; data != NULL; data = data->next)
|
|
datasize += data->length;
|
|
|
|
write_res_header (datasize, type, name, resinfo);
|
|
|
|
for (data = bin_rep; data != NULL; data = data->next)
|
|
write_res_data (data->data, data->length, 1);
|
|
}
|
|
|
|
/* Get number of bytes needed to store an id in binary format */
|
|
static unsigned long
|
|
get_id_size (id)
|
|
const struct res_id *id;
|
|
{
|
|
if (id->named)
|
|
return sizeof (unichar) * (id->u.n.length + 1);
|
|
else
|
|
return sizeof (unichar) * 2;
|
|
}
|
|
|
|
/* Write a resource header */
|
|
static void
|
|
write_res_header (datasize, type, name, resinfo)
|
|
unsigned long datasize;
|
|
const struct res_id *type;
|
|
const struct res_id *name;
|
|
const struct res_res_info *resinfo;
|
|
{
|
|
struct res_hdr reshdr;
|
|
reshdr.data_size = datasize;
|
|
reshdr.header_size = 24 + get_id_size (type) + get_id_size (name);
|
|
|
|
res_align_file ();
|
|
write_res_data (&reshdr, sizeof (reshdr), 1);
|
|
write_res_id (type);
|
|
write_res_id (name);
|
|
|
|
res_align_file ();
|
|
|
|
write_res_info (resinfo);
|
|
res_align_file ();
|
|
}
|
|
|
|
|
|
/* Write data to file, abort on failure */
|
|
static void
|
|
write_res_data (data, size, count)
|
|
const void *data;
|
|
size_t size;
|
|
int count;
|
|
{
|
|
if (fwrite (data, size, count, fres) != (size_t) count)
|
|
fatal ("%s: could not write to file", filename);
|
|
}
|
|
|
|
/* Read data from file, abort on failure */
|
|
static void
|
|
read_res_data (data, size, count)
|
|
void *data;
|
|
size_t size;
|
|
int count;
|
|
{
|
|
if (fread (data, size, count, fres) != (size_t) count)
|
|
fatal ("%s: unexpected end of file", filename);
|
|
}
|
|
|
|
/* Write a resource id */
|
|
static void
|
|
write_res_id (id)
|
|
const struct res_id *id;
|
|
{
|
|
if (id->named)
|
|
{
|
|
unsigned long len = id->u.n.length;
|
|
unichar null_term = 0;
|
|
write_res_data (id->u.n.name, len * sizeof (unichar), 1);
|
|
write_res_data (&null_term, sizeof (null_term), 1);
|
|
}
|
|
else
|
|
{
|
|
unsigned short i = 0xFFFF;
|
|
write_res_data (&i, sizeof (i), 1);
|
|
i = id->u.id;
|
|
write_res_data (&i, sizeof (i), 1);
|
|
}
|
|
}
|
|
|
|
/* Write resource info */
|
|
static void
|
|
write_res_info (info)
|
|
const struct res_res_info *info;
|
|
{
|
|
write_res_data (&info->version, sizeof (info->version), 1);
|
|
write_res_data (&info->memflags, sizeof (info->memflags), 1);
|
|
write_res_data (&info->language, sizeof (info->language), 1);
|
|
write_res_data (&info->version, sizeof (info->version), 1);
|
|
write_res_data (&info->characteristics, sizeof (info->characteristics), 1);
|
|
}
|
|
|
|
/* read a resource identifier */
|
|
void
|
|
read_res_id (id)
|
|
struct res_id *id;
|
|
{
|
|
unsigned short ord;
|
|
unichar *id_s = NULL;
|
|
int len;
|
|
|
|
read_res_data (&ord, sizeof (ord), 1);
|
|
if (ord == 0xFFFF) /* an ordinal id */
|
|
{
|
|
read_res_data (&ord, sizeof (ord), 1);
|
|
id->named = 0;
|
|
id->u.id = ord;
|
|
}
|
|
else
|
|
/* named id */
|
|
{
|
|
if (fseek (fres, -sizeof (ord), SEEK_CUR) != 0)
|
|
fatal ("%s: %s: could not seek in file", program_name, filename);
|
|
id_s = read_unistring (&len);
|
|
id->named = 1;
|
|
id->u.n.length = len;
|
|
id->u.n.name = id_s;
|
|
}
|
|
}
|
|
|
|
/* Read a null terminated UNICODE string */
|
|
static unichar *
|
|
read_unistring (len)
|
|
int *len;
|
|
{
|
|
unichar *s;
|
|
unichar c;
|
|
unichar *p;
|
|
int l;
|
|
|
|
*len = 0;
|
|
l = 0;
|
|
|
|
/* there are hardly any names longer than 256 characters */
|
|
p = s = (unichar *) xmalloc (sizeof (unichar) * 256);
|
|
do
|
|
{
|
|
read_res_data (&c, sizeof (c), 1);
|
|
*p++ = c;
|
|
if (c != 0)
|
|
l++;
|
|
}
|
|
while (c != 0);
|
|
*len = l;
|
|
return s;
|
|
}
|
|
|
|
/* align file on DWORD boundary */
|
|
static void
|
|
res_align_file (void)
|
|
{
|
|
if (fseek (fres, ftell (fres) % 4, SEEK_CUR) != 0)
|
|
fatal ("%s: %s: unable to align file", program_name, filename);
|
|
}
|
|
|
|
/* Check if file is a win32 binary resource file, if so
|
|
skip past the null resource. Returns 0 if successful, -1 on
|
|
error.
|
|
*/
|
|
static void
|
|
skip_null_resource (void)
|
|
{
|
|
struct res_hdr reshdr =
|
|
{0, 0};
|
|
read_res_data (&reshdr, sizeof (reshdr), 1);
|
|
if ((reshdr.data_size != 0) || (reshdr.header_size != 0x20))
|
|
goto skip_err;
|
|
|
|
/* Subtract size of HeaderSize and DataSize */
|
|
if (fseek (fres, reshdr.header_size - 8, SEEK_CUR) != 0)
|
|
goto skip_err;
|
|
|
|
return;
|
|
|
|
skip_err:
|
|
fprintf (stderr, "%s: %s: Not a valid WIN32 resource file\n", program_name,
|
|
filename);
|
|
xexit (1);
|
|
}
|
|
|
|
/* Add a resource to resource directory */
|
|
void
|
|
res_add_resource (r, type, id, language, dupok)
|
|
struct res_resource *r;
|
|
const struct res_id *type;
|
|
const struct res_id *id;
|
|
int language;
|
|
int dupok;
|
|
{
|
|
struct res_id a[3];
|
|
|
|
a[0] = *type;
|
|
a[1] = *id;
|
|
a[2].named = 0;
|
|
a[2].u.id = language;
|
|
res_append_resource (&resources, r, 3, a, dupok);
|
|
}
|
|
|
|
/* Append a resource to resource directory.
|
|
This is just copied from define_resource
|
|
and modified to add an existing resource.
|
|
*/
|
|
void
|
|
res_append_resource (resources, resource, cids, ids, dupok)
|
|
struct res_directory **resources;
|
|
struct res_resource *resource;
|
|
int cids;
|
|
const struct res_id *ids;
|
|
int dupok;
|
|
{
|
|
struct res_entry *re = NULL;
|
|
int i;
|
|
|
|
assert (cids > 0);
|
|
for (i = 0; i < cids; i++)
|
|
{
|
|
struct res_entry **pp;
|
|
|
|
if (*resources == NULL)
|
|
{
|
|
static unsigned long timeval;
|
|
|
|
/* Use the same timestamp for every resource created in a
|
|
single run. */
|
|
if (timeval == 0)
|
|
timeval = time (NULL);
|
|
|
|
*resources = ((struct res_directory *)
|
|
res_alloc (sizeof **resources));
|
|
(*resources)->characteristics = 0;
|
|
(*resources)->time = timeval;
|
|
(*resources)->major = 0;
|
|
(*resources)->minor = 0;
|
|
(*resources)->entries = NULL;
|
|
}
|
|
|
|
for (pp = &(*resources)->entries; *pp != NULL; pp = &(*pp)->next)
|
|
if (res_id_cmp ((*pp)->id, ids[i]) == 0)
|
|
break;
|
|
|
|
if (*pp != NULL)
|
|
re = *pp;
|
|
else
|
|
{
|
|
re = (struct res_entry *) res_alloc (sizeof *re);
|
|
re->next = NULL;
|
|
re->id = ids[i];
|
|
if ((i + 1) < cids)
|
|
{
|
|
re->subdir = 1;
|
|
re->u.dir = NULL;
|
|
}
|
|
else
|
|
{
|
|
re->subdir = 0;
|
|
re->u.res = NULL;
|
|
}
|
|
|
|
*pp = re;
|
|
}
|
|
|
|
if ((i + 1) < cids)
|
|
{
|
|
if (!re->subdir)
|
|
{
|
|
fprintf (stderr, "%s: ", program_name);
|
|
res_ids_print (stderr, i, ids);
|
|
fprintf (stderr, ": expected to be a directory\n");
|
|
xexit (1);
|
|
}
|
|
|
|
resources = &re->u.dir;
|
|
}
|
|
}
|
|
|
|
if (re->subdir)
|
|
{
|
|
fprintf (stderr, "%s: ", program_name);
|
|
res_ids_print (stderr, cids, ids);
|
|
fprintf (stderr, ": expected to be a leaf\n");
|
|
xexit (1);
|
|
}
|
|
|
|
if (re->u.res != NULL)
|
|
{
|
|
if (dupok)
|
|
return;
|
|
|
|
fprintf (stderr, "%s: warning: ", program_name);
|
|
res_ids_print (stderr, cids, ids);
|
|
fprintf (stderr, ": duplicate value\n");
|
|
}
|
|
|
|
re->u.res = resource;
|
|
}
|