diff options
Diffstat (limited to 'crypto/heimdal/lib/roken')
84 files changed, 3101 insertions, 313 deletions
diff --git a/crypto/heimdal/lib/roken/.libs/libroken.lai b/crypto/heimdal/lib/roken/.libs/libroken.lai new file mode 100644 index 0000000..6987bcd --- /dev/null +++ b/crypto/heimdal/lib/roken/.libs/libroken.lai @@ -0,0 +1,32 @@ +# libroken.la - a libtool library file +# Generated by ltmain.sh - GNU libtool 1.4.2 (1.922.2.53 2001/09/11 03:18:52) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libroken.so.16' + +# Names of this library. +library_names='libroken.so.16 libroken.so libroken.so' + +# The name of the static archive. +old_library='libroken.a' + +# Libraries that this one depends upon. +dependency_libs='' + +# Version information for libroken. +current=16 +age=7 +revision=0 + +# Is this an already installed library? +installed=yes + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/usr/heimdal/lib' diff --git a/crypto/heimdal/lib/roken/.libs/libroken.so.16 b/crypto/heimdal/lib/roken/.libs/libroken.so.16 Binary files differnew file mode 100755 index 0000000..182647a --- /dev/null +++ b/crypto/heimdal/lib/roken/.libs/libroken.so.16 diff --git a/crypto/heimdal/lib/roken/.libs/libtest.al b/crypto/heimdal/lib/roken/.libs/libtest.al Binary files differnew file mode 100644 index 0000000..db4f929 --- /dev/null +++ b/crypto/heimdal/lib/roken/.libs/libtest.al diff --git a/crypto/heimdal/lib/roken/.libs/snprintf-test b/crypto/heimdal/lib/roken/.libs/snprintf-test Binary files differnew file mode 100755 index 0000000..b0df610 --- /dev/null +++ b/crypto/heimdal/lib/roken/.libs/snprintf-test diff --git a/crypto/heimdal/lib/roken/ChangeLog b/crypto/heimdal/lib/roken/ChangeLog index 833ddae..9f209a8 100644 --- a/crypto/heimdal/lib/roken/ChangeLog +++ b/crypto/heimdal/lib/roken/ChangeLog @@ -1,3 +1,78 @@ +2002-08-28 Johan Danielsson <joda@pdc.kth.se> + + * resolve.c (dns_srv_order): do alignment tricks with the random() + state (from NetBSD) + +2002-08-27 Assar Westerlund <assar@kth.se> + + * resolve.c (parse_reply): verify the lengths (both external and + internal) are consistent and not too long + (dns_lookup_int): be conservative in the length sent in to to + parse_reply + +2002-08-26 Assar Westerlund <assar@kth.se> + + * roken.h.in: add prototypes for str, unvis functions + * resolve.h: add fallback definition for T_AAAA + +2002-08-22 Johan Danielsson <joda@pdc.kth.se> + + * roken.h.in: we may need a prototype for strndup + +2002-08-20 Johan Danielsson <joda@pdc.kth.se> + + * roken.h.in: typedef ssize_t here + + * getarg.c: don't put Ns before comma + + * resolve.c: _res might not be available + + * localtime_r.c: include stdio.h and roken.h + + * strftime.c: only use altzone if we have it + + * roken-common.h: AI_NUMERICHOST needs special handling + + * strlcat.c: add some consistency checks + + * strlcpy.c: make the logic simpler, and handle dst_sz == 0 + +2002-08-19 Johan Danielsson <joda@pdc.kth.se> + + * resolve.h: prefix these functions to avoid conflicts with other + packages + +2002-08-14 Johan Danielsson <joda@pdc.kth.se> + + * strsep_copy.c: don't write to buf if len == 0 + +2002-05-31 Assar Westerlund <assar@pdc.kth.se> + + * Makefile.am: *_LDADD: add LDADD, so that libroken is used + +2002-05-17 Johan Danielsson <joda@pdc.kth.se> + + * xdbm.h: remove old dbm part + +2002-04-30 Johan Danielsson <joda@pdc.kth.se> + + * ndbm_wrap.{c,h}: ndbm wrapper for newer db libraries + +2002-04-18 Johan Danielsson <joda@pdc.kth.se> + + * roken.h.in: move mini_inetd protos to after addrinfo definition + + * snprintf.c (append_number): make rep const + + * getarg.h: rename optind and optarg to avoid some gcc warnings + + * getarg.c: rename optind and optarg to avoid some gcc warnings + +2002-02-18 Johan Danielsson <joda@pdc.kth.se> + + * mini_inetd.c: mini_inetd_addrinfo that takes an addrinfo instead + of a port number + 2001-11-30 Assar Westerlund <assar@sics.se> * getifaddrs.c: support SIOCGLIFCONF and SIOCGLIFFLAGS which are diff --git a/crypto/heimdal/lib/roken/Makefile b/crypto/heimdal/lib/roken/Makefile new file mode 100644 index 0000000..b0e3c71 --- /dev/null +++ b/crypto/heimdal/lib/roken/Makefile @@ -0,0 +1,1075 @@ +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# lib/roken/Makefile. Generated from Makefile.in by configure. + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + + +# $Id: Makefile.am,v 1.120 2002/05/31 02:44:37 assar Exp $ + +# $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $ + +# $Id: Makefile.am.common,v 1.36 2002/08/19 16:10:25 joda Exp $ +SHELL = /bin/sh + +srcdir = . +top_srcdir = ../.. + +prefix = /usr/heimdal +exec_prefix = ${prefix} + +bindir = ${exec_prefix}/bin +sbindir = ${exec_prefix}/sbin +libexecdir = ${exec_prefix}/libexec +datadir = ${prefix}/share +sysconfdir = /etc +sharedstatedir = ${prefix}/com +localstatedir = /var/heimdal +libdir = ${exec_prefix}/lib +infodir = ${prefix}/info +mandir = ${prefix}/man +includedir = ${prefix}/include +oldincludedir = /usr/include +pkgdatadir = $(datadir)/heimdal +pkglibdir = $(libdir)/heimdal +pkgincludedir = $(includedir)/heimdal +top_builddir = ../.. + +ACLOCAL = ${SHELL} /usr/home/nectar/devel/heimdal/missing --run aclocal-1.6 +AUTOCONF = ${SHELL} /usr/home/nectar/devel/heimdal/missing --run autoconf +AUTOMAKE = ${SHELL} /usr/home/nectar/devel/heimdal/missing --run automake-1.6 +AUTOHEADER = ${SHELL} /usr/home/nectar/devel/heimdal/missing --run autoheader + +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c +INSTALL_PROGRAM = ${INSTALL} +INSTALL_DATA = ${INSTALL} -m 644 +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_SCRIPT = ${INSTALL} +INSTALL_HEADER = $(INSTALL_DATA) +transform = s,x,x, +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = +host_triplet = i386-unknown-freebsd5.0 + +EXEEXT = +OBJEXT = o +PATH_SEPARATOR = : +AIX_EXTRA_KAFS = +AMTAR = ${SHELL} /usr/home/nectar/devel/heimdal/missing --run tar +AS = @AS@ +AWK = gawk +CANONICAL_HOST = i386-unknown-freebsd5.0 +CATMAN = /usr/bin/nroff -mdoc $< > $@ +CATMANEXT = $$section +CC = gcc +COMPILE_ET = compile_et +CPP = gcc -E +DBLIB = +DEPDIR = .deps +DIR_com_err = +DIR_des = +DIR_roken = roken +DLLTOOL = @DLLTOOL@ +ECHO = echo +EXTRA_LIB45 = +GROFF = /usr/bin/groff +INCLUDES_roken = -I$(top_builddir)/lib/roken -I$(top_srcdir)/lib/roken +INCLUDE_ = @INCLUDE_@ +INCLUDE_des = +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +LEX = flex + +LEXLIB = -lfl +LEX_OUTPUT_ROOT = lex.yy +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LIB_ = @LIB_@ +LIB_AUTH_SUBDIRS = +LIB_NDBM = +LIB_com_err = -lcom_err +LIB_com_err_a = +LIB_com_err_so = +LIB_des = -lcrypto +LIB_des_a = -lcrypto +LIB_des_appl = -lcrypto +LIB_des_so = -lcrypto +LIB_kdb = +LIB_otp = $(top_builddir)/lib/otp/libotp.la +LIB_roken = $(top_builddir)/lib/vers/libvers.la $(top_builddir)/lib/roken/libroken.la $(LIB_crypt) $(LIB_dbopen) +LIB_security = +LN_S = ln -s +LTLIBOBJS = copyhostent.lo ecalloc.lo emalloc.lo erealloc.lo estrdup.lo strlwr.lo strndup.lo strnlen.lo strsep_copy.lo strupr.lo +NEED_WRITEAUTH_FALSE = +NEED_WRITEAUTH_TRUE = # +NROFF = /usr/bin/nroff +OBJDUMP = @OBJDUMP@ +PACKAGE = heimdal +RANLIB = ranlib +STRIP = strip +VERSION = 0.4f +VOID_RETSIGTYPE = +WFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast -Wmissing-declarations -Wnested-externs +WFLAGS_NOIMPLICITINT = +WFLAGS_NOUNUSED = +X_CFLAGS = -I/usr/X11R6/include +X_EXTRA_LIBS = +X_LIBS = -L/usr/X11R6/lib +X_PRE_LIBS = -lSM -lICE +YACC = bison -y +am__include = include +am__quote = +dpagaix_cflags = -D_THREAD_SAFE -D_AIX_PTHREADS_D7 -D_AIX32_THREADS=1 -D_AES_SOURCE -D_AIX41 -I/usr/include/dce +dpagaix_ldadd = -L/usr/lib/threads -ldcelibc_r -ldcepthreads -lpthreads_compat lpthreads -lc_r +dpagaix_ldflags = -Wl,-bI:dfspag.exp +install_sh = /usr/home/nectar/devel/heimdal/install-sh + +AUTOMAKE_OPTIONS = foreign no-dependencies 1.6 + +SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .hin + +INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) + +ROKEN_RENAME = -DROKEN_RENAME + +AM_CFLAGS = $(WFLAGS) + +CP = cp + +buildinclude = $(top_builddir)/include + +LIB_XauReadAuth = -lXau +LIB_crypt = -lcrypt +LIB_dbm_firstkey = +LIB_dbopen = +LIB_dlopen = +LIB_dn_expand = +LIB_el_init = -ledit +LIB_getattr = @LIB_getattr@ +LIB_gethostbyname = +LIB_getpwent_r = @LIB_getpwent_r@ +LIB_getpwnam_r = +LIB_getsockopt = +LIB_logout = -lutil +LIB_logwtmp = -lutil +LIB_odm_initialize = @LIB_odm_initialize@ +LIB_openpty = -lutil +LIB_pidfile = +LIB_res_search = +LIB_setpcred = @LIB_setpcred@ +LIB_setsockopt = +LIB_socket = +LIB_syslog = +LIB_tgetent = -ltermcap + +HESIODLIB = @HESIODLIB@ +HESIODINCLUDE = @HESIODINCLUDE@ +INCLUDE_hesiod = +LIB_hesiod = + +INCLUDE_krb4 = +LIB_krb4 = + +INCLUDE_openldap = +LIB_openldap = + +INCLUDE_readline = +LIB_readline = $(top_builddir)/lib/editline/libel_compat.la $(LIB_el_init) $(LIB_tgetent) + +NROFF_MAN = groff -mandoc -Tascii + +#LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS) + +LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \ + $(top_builddir)/lib/asn1/libasn1.la + +LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la + +#LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la + +ACLOCAL_AMFLAGS = -I ../../cf + +CLEANFILES = roken.h make-roken.c $(XHEADERS) + +lib_LTLIBRARIES = libroken.la +libroken_la_LDFLAGS = -version-info 16:0:7 + +noinst_PROGRAMS = make-roken snprintf-test + +nodist_make_roken_SOURCES = make-roken.c + +check_PROGRAMS = \ + base64-test \ + getaddrinfo-test \ + parse_bytes-test \ + snprintf-test \ + strpftime-test + + +TESTS = $(check_PROGRAMS) + +LDADD = libroken.la $(LIB_crypt) +make_roken_LDADD = + +noinst_LTLIBRARIES = libtest.la +libtest_la_SOURCES = strftime.c strptime.c snprintf.c +libtest_la_CFLAGS = -DTEST_SNPRINTF + +strpftime_test_SOURCES = strpftime-test.c +strpftime_test_LDADD = libtest.la $(LDADD) +snprintf_test_SOURCES = snprintf-test.c +snprintf_test_LDADD = libtest.la $(LDADD) +snprintf_test_CFLAGS = -DTEST_SNPRINTF + +libroken_la_SOURCES = \ + base64.c \ + bswap.c \ + concat.c \ + environment.c \ + eread.c \ + esetenv.c \ + ewrite.c \ + getaddrinfo_hostspec.c \ + get_default_username.c \ + get_window_size.c \ + getarg.c \ + getnameinfo_verified.c \ + getprogname.c \ + h_errno.c \ + hostent_find_fqdn.c \ + issuid.c \ + k_getpwnam.c \ + k_getpwuid.c \ + mini_inetd.c \ + net_read.c \ + net_write.c \ + parse_bytes.c \ + parse_time.c \ + parse_units.c \ + resolve.c \ + roken_gethostby.c \ + rtbl.c \ + rtbl.h \ + setprogname.c \ + signal.c \ + simple_exec.c \ + snprintf.c \ + socket.c \ + strcollect.c \ + timeval.c \ + tm2time.c \ + unvis.c \ + verify.c \ + vis.c \ + vis.h \ + warnerr.c \ + write_pid.c \ + xdbm.h + + +EXTRA_libroken_la_SOURCES = \ + chown.c \ + copyhostent.c \ + daemon.c \ + ecalloc.c \ + emalloc.c \ + erealloc.c \ + estrdup.c \ + err.c \ + err.hin \ + errx.c \ + fchown.c \ + flock.c \ + fnmatch.c \ + fnmatch.hin \ + freehostent.c \ + gai_strerror.c \ + getdtablesize.c \ + getegid.c \ + geteuid.c \ + getgid.c \ + gethostname.c \ + getifaddrs.c \ + getipnodebyaddr.c \ + getipnodebyname.c \ + getopt.c \ + gettimeofday.c \ + getuid.c \ + getusershell.c \ + glob.hin \ + hstrerror.c \ + ifaddrs.hin \ + inet_aton.c \ + inet_ntop.c \ + inet_pton.c \ + initgroups.c \ + innetgr.c \ + iruserok.c \ + lstat.c \ + memmove.c \ + mkstemp.c \ + putenv.c \ + rcmd.c \ + readv.c \ + recvmsg.c \ + sendmsg.c \ + setegid.c \ + setenv.c \ + seteuid.c \ + strcasecmp.c \ + strdup.c \ + strerror.c \ + strftime.c \ + strlcat.c \ + strlcpy.c \ + strlwr.c \ + strncasecmp.c \ + strndup.c \ + strnlen.c \ + strptime.c \ + strsep.c \ + strsep_copy.c \ + strtok_r.c \ + strupr.c \ + swab.c \ + unsetenv.c \ + verr.c \ + verrx.c \ + vis.hin \ + vsyslog.c \ + vwarn.c \ + vwarnx.c \ + warn.c \ + warnx.c \ + writev.c + + +EXTRA_DIST = roken.awk roken.h.in + +libroken_la_LIBADD = copyhostent.lo ecalloc.lo emalloc.lo erealloc.lo estrdup.lo strlwr.lo strndup.lo strnlen.lo strsep_copy.lo strupr.lo $(DBLIB) + +BUILT_SOURCES = make-roken.c roken.h + +err_h = +#err_h = err.h + +#fnmatch_h = +fnmatch_h = fnmatch.h + +glob_h = +#glob_h = glob.h + +ifaddrs_h = +#ifaddrs_h = ifaddrs.h + +vis_h = +#vis_h = vis.h + +XHEADERS = $(err_h) $(fnmatch_h) $(glob_h) $(ifaddrs_h) $(vis_h) + +include_HEADERS = \ + base64.h \ + getarg.h \ + parse_bytes.h \ + parse_time.h \ + parse_units.h \ + resolve.h \ + roken-common.h \ + rtbl.h \ + xdbm.h \ + $(XHEADERS) + + +nodist_include_HEADERS = roken.h + +man_MANS = getarg.3 +subdir = lib/roken +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/include/config.h +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) + +libroken_la_DEPENDENCIES = copyhostent.lo ecalloc.lo emalloc.lo erealloc.lo estrdup.lo strlwr.lo strndup.lo strnlen.lo strsep_copy.lo strupr.lo +am_libroken_la_OBJECTS = base64.lo bswap.lo concat.lo environment.lo \ + eread.lo esetenv.lo ewrite.lo getaddrinfo_hostspec.lo \ + get_default_username.lo get_window_size.lo getarg.lo \ + getnameinfo_verified.lo getprogname.lo h_errno.lo \ + hostent_find_fqdn.lo issuid.lo k_getpwnam.lo k_getpwuid.lo \ + mini_inetd.lo net_read.lo net_write.lo parse_bytes.lo \ + parse_time.lo parse_units.lo resolve.lo roken_gethostby.lo \ + rtbl.lo setprogname.lo signal.lo simple_exec.lo snprintf.lo \ + socket.lo strcollect.lo timeval.lo tm2time.lo unvis.lo \ + verify.lo vis.lo warnerr.lo write_pid.lo +libroken_la_OBJECTS = $(am_libroken_la_OBJECTS) +libtest_la_LDFLAGS = +libtest_la_LIBADD = +am_libtest_la_OBJECTS = libtest_la-strftime.lo libtest_la-strptime.lo \ + libtest_la-snprintf.lo +libtest_la_OBJECTS = $(am_libtest_la_OBJECTS) +check_PROGRAMS = base64-test$(EXEEXT) getaddrinfo-test$(EXEEXT) \ + parse_bytes-test$(EXEEXT) snprintf-test$(EXEEXT) \ + strpftime-test$(EXEEXT) +noinst_PROGRAMS = make-roken$(EXEEXT) snprintf-test$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) + +base64_test_SOURCES = base64-test.c +base64_test_OBJECTS = base64-test.$(OBJEXT) +base64_test_LDADD = $(LDADD) +base64_test_DEPENDENCIES = libroken.la +base64_test_LDFLAGS = +getaddrinfo_test_SOURCES = getaddrinfo-test.c +getaddrinfo_test_OBJECTS = getaddrinfo-test.$(OBJEXT) +getaddrinfo_test_LDADD = $(LDADD) +getaddrinfo_test_DEPENDENCIES = libroken.la +getaddrinfo_test_LDFLAGS = +nodist_make_roken_OBJECTS = make-roken.$(OBJEXT) +make_roken_OBJECTS = $(nodist_make_roken_OBJECTS) +make_roken_DEPENDENCIES = +make_roken_LDFLAGS = +parse_bytes_test_SOURCES = parse_bytes-test.c +parse_bytes_test_OBJECTS = parse_bytes-test.$(OBJEXT) +parse_bytes_test_LDADD = $(LDADD) +parse_bytes_test_DEPENDENCIES = libroken.la +parse_bytes_test_LDFLAGS = +am_snprintf_test_OBJECTS = snprintf_test-snprintf-test.$(OBJEXT) +snprintf_test_OBJECTS = $(am_snprintf_test_OBJECTS) +snprintf_test_DEPENDENCIES = libtest.la libroken.la +snprintf_test_LDFLAGS = +am_strpftime_test_OBJECTS = strpftime-test.$(OBJEXT) +strpftime_test_OBJECTS = $(am_strpftime_test_OBJECTS) +strpftime_test_DEPENDENCIES = libtest.la libroken.la +strpftime_test_LDFLAGS = + +DEFS = -DHAVE_CONFIG_H +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include +CPPFLAGS = +LDFLAGS = +LIBS = +depcomp = +am__depfiles_maybe = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CFLAGS = -DINET6 -g -O2 +DIST_SOURCES = $(libroken_la_SOURCES) $(EXTRA_libroken_la_SOURCES) \ + $(libtest_la_SOURCES) base64-test.c getaddrinfo-test.c \ + parse_bytes-test.c $(snprintf_test_SOURCES) \ + $(strpftime_test_SOURCES) +MANS = $(man_MANS) +HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) + +DIST_COMMON = $(include_HEADERS) ChangeLog Makefile.am Makefile.in \ + acinclude.m4 freeaddrinfo.c getaddrinfo.c getcap.c \ + getnameinfo.c glob.c install-sh missing mkinstalldirs +SOURCES = $(libroken_la_SOURCES) $(EXTRA_libroken_la_SOURCES) $(libtest_la_SOURCES) base64-test.c getaddrinfo-test.c $(nodist_make_roken_SOURCES) parse_bytes-test.c $(snprintf_test_SOURCES) $(strpftime_test_SOURCES) + +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .hin .c .lo .o .obj +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign lib/roken/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +libLTLIBRARIES_INSTALL = $(INSTALL) +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test -z "$dir" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test -z "$dir" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libroken.la: $(libroken_la_OBJECTS) $(libroken_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libroken_la_LDFLAGS) $(libroken_la_OBJECTS) $(libroken_la_LIBADD) $(LIBS) +libtest_la-strftime.lo: strftime.c +libtest_la-strptime.lo: strptime.c +libtest_la-snprintf.lo: snprintf.c +libtest.la: $(libtest_la_OBJECTS) $(libtest_la_DEPENDENCIES) + $(LINK) $(libtest_la_LDFLAGS) $(libtest_la_OBJECTS) $(libtest_la_LIBADD) $(LIBS) + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +base64-test$(EXEEXT): $(base64_test_OBJECTS) $(base64_test_DEPENDENCIES) + @rm -f base64-test$(EXEEXT) + $(LINK) $(base64_test_LDFLAGS) $(base64_test_OBJECTS) $(base64_test_LDADD) $(LIBS) +getaddrinfo-test$(EXEEXT): $(getaddrinfo_test_OBJECTS) $(getaddrinfo_test_DEPENDENCIES) + @rm -f getaddrinfo-test$(EXEEXT) + $(LINK) $(getaddrinfo_test_LDFLAGS) $(getaddrinfo_test_OBJECTS) $(getaddrinfo_test_LDADD) $(LIBS) +make-roken$(EXEEXT): $(make_roken_OBJECTS) $(make_roken_DEPENDENCIES) + @rm -f make-roken$(EXEEXT) + $(LINK) $(make_roken_LDFLAGS) $(make_roken_OBJECTS) $(make_roken_LDADD) $(LIBS) +parse_bytes-test$(EXEEXT): $(parse_bytes_test_OBJECTS) $(parse_bytes_test_DEPENDENCIES) + @rm -f parse_bytes-test$(EXEEXT) + $(LINK) $(parse_bytes_test_LDFLAGS) $(parse_bytes_test_OBJECTS) $(parse_bytes_test_LDADD) $(LIBS) +snprintf_test-snprintf-test.$(OBJEXT): snprintf-test.c +snprintf-test$(EXEEXT): $(snprintf_test_OBJECTS) $(snprintf_test_DEPENDENCIES) + @rm -f snprintf-test$(EXEEXT) + $(LINK) $(snprintf_test_LDFLAGS) $(snprintf_test_OBJECTS) $(snprintf_test_LDADD) $(LIBS) +strpftime-test$(EXEEXT): $(strpftime_test_OBJECTS) $(strpftime_test_DEPENDENCIES) + @rm -f strpftime-test$(EXEEXT) + $(LINK) $(strpftime_test_LDFLAGS) $(strpftime_test_OBJECTS) $(strpftime_test_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core + +distclean-compile: + -rm -f *.tab.c + +.c.o: + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + +.c.obj: + $(COMPILE) -c `cygpath -w $<` + +.c.lo: + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +libtest_la-strftime.o: strftime.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strftime.o `test -f 'strftime.c' || echo '$(srcdir)/'`strftime.c + +libtest_la-strftime.obj: strftime.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strftime.obj `cygpath -w strftime.c` + +libtest_la-strftime.lo: strftime.c + $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strftime.lo `test -f 'strftime.c' || echo '$(srcdir)/'`strftime.c + +libtest_la-strptime.o: strptime.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strptime.o `test -f 'strptime.c' || echo '$(srcdir)/'`strptime.c + +libtest_la-strptime.obj: strptime.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strptime.obj `cygpath -w strptime.c` + +libtest_la-strptime.lo: strptime.c + $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strptime.lo `test -f 'strptime.c' || echo '$(srcdir)/'`strptime.c + +libtest_la-snprintf.o: snprintf.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-snprintf.o `test -f 'snprintf.c' || echo '$(srcdir)/'`snprintf.c + +libtest_la-snprintf.obj: snprintf.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-snprintf.obj `cygpath -w snprintf.c` + +libtest_la-snprintf.lo: snprintf.c + $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-snprintf.lo `test -f 'snprintf.c' || echo '$(srcdir)/'`snprintf.c + +snprintf_test-snprintf-test.o: snprintf-test.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snprintf_test_CFLAGS) $(CFLAGS) -c -o snprintf_test-snprintf-test.o `test -f 'snprintf-test.c' || echo '$(srcdir)/'`snprintf-test.c + +snprintf_test-snprintf-test.obj: snprintf-test.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snprintf_test_CFLAGS) $(CFLAGS) -c -o snprintf_test-snprintf-test.obj `cygpath -w snprintf-test.c` + +snprintf_test-snprintf-test.lo: snprintf-test.c + $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snprintf_test_CFLAGS) $(CFLAGS) -c -o snprintf_test-snprintf-test.lo `test -f 'snprintf-test.c' || echo '$(srcdir)/'`snprintf-test.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +man3dir = $(mandir)/man3 +install-man3: $(man3_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man3dir) + @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \ + done +uninstall-man3: + @$(NORMAL_UNINSTALL) + @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \ + rm -f $(DESTDIR)$(man3dir)/$$inst; \ + done +includeHEADERS_INSTALL = $(INSTALL_HEADER) +install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(includedir) + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ + $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \ + done + +uninstall-includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_HEADERS)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(includedir)/$$f"; \ + rm -f $(DESTDIR)$(includedir)/$$f; \ + done +nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) +install-nodist_includeHEADERS: $(nodist_include_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(includedir) + @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(nodist_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ + $(nodist_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \ + done + +uninstall-nodist_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(includedir)/$$f"; \ + rm -f $(DESTDIR)$(includedir)/$$f; \ + done + +ETAGS = etags +ETAGSFLAGS = + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH + +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; \ + srcdir=$(srcdir); export srcdir; \ + list='$(TESTS)'; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all tests failed"; \ + else \ + banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + fi; \ + fi; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @list='$(DISTFILES)'; for file in $$list; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="${top_distdir}" distdir="$(distdir)" \ + dist-hook +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local +check: check-am +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) all-local + +installdirs: + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(man3dir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir) + +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +clean: clean-am + +clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ + mostlyclean-am + +distclean: distclean-am + +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: install-data-local install-includeHEADERS install-man \ + install-nodist_includeHEADERS + +install-exec-am: install-libLTLIBRARIES + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + +install-info: install-info-am + +install-man: install-man3 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +uninstall-am: uninstall-includeHEADERS uninstall-info-am \ + uninstall-libLTLIBRARIES uninstall-man \ + uninstall-nodist_includeHEADERS + +uninstall-man: uninstall-man3 + +.PHONY: GTAGS all all-am all-local check check-TESTS check-am \ + check-local clean clean-checkPROGRAMS clean-generic \ + clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-data-local install-exec install-exec-am \ + install-includeHEADERS install-info install-info-am \ + install-libLTLIBRARIES install-man install-man3 \ + install-nodist_includeHEADERS install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool tags uninstall \ + uninstall-am uninstall-includeHEADERS uninstall-info-am \ + uninstall-libLTLIBRARIES uninstall-man uninstall-man3 \ + uninstall-nodist_includeHEADERS + + +install-suid-programs: + @foo='$(bin_SUIDS)'; \ + for file in $$foo; do \ + x=$(DESTDIR)$(bindir)/$$file; \ + if chown 0:0 $$x && chmod u+s $$x; then :; else \ + echo "*"; \ + echo "* Failed to install $$x setuid root"; \ + echo "*"; \ + fi; done + +install-exec-hook: install-suid-programs + +install-build-headers:: $(include_HEADERS) $(build_HEADERZ) + @foo='$(include_HEADERS) $(nodist_include_HEADERS) $(build_HEADERZ)'; \ + for f in $$foo; do \ + f=`basename $$f`; \ + if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \ + else file="$$f"; fi; \ + if cmp -s $$file $(buildinclude)/$$f 2> /dev/null ; then \ + : ; else \ + echo " $(CP) $$file $(buildinclude)/$$f"; \ + $(CP) $$file $(buildinclude)/$$f; \ + fi ; \ + done + +all-local: install-build-headers + +check-local:: + @if test '$(CHECK_LOCAL)'; then \ + foo='$(CHECK_LOCAL)'; else \ + foo='$(PROGRAMS)'; fi; \ + if test "$$foo"; then \ + failed=0; all=0; \ + for i in $$foo; do \ + all=`expr $$all + 1`; \ + if ./$$i --version > /dev/null 2>&1; then \ + echo "PASS: $$i"; \ + else \ + echo "FAIL: $$i"; \ + failed=`expr $$failed + 1`; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="$$failed of $$all tests failed"; \ + fi; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + fi + +.x.c: + @cmp -s $< $@ 2> /dev/null || cp $< $@ +#NROFF_MAN = nroff -man +.1.cat1: + $(NROFF_MAN) $< > $@ +.3.cat3: + $(NROFF_MAN) $< > $@ +.5.cat5: + $(NROFF_MAN) $< > $@ +.8.cat8: + $(NROFF_MAN) $< > $@ + +dist-cat1-mans: + @foo='$(man1_MANS)'; \ + bar='$(man_MANS)'; \ + for i in $$bar; do \ + case $$i in \ + *.1) foo="$$foo $$i";; \ + esac; done ;\ + for i in $$foo; do \ + x=`echo $$i | sed 's/\.[^.]*$$/.cat1/'`; \ + echo "$(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x"; \ + $(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x; \ + done + +dist-cat3-mans: + @foo='$(man3_MANS)'; \ + bar='$(man_MANS)'; \ + for i in $$bar; do \ + case $$i in \ + *.3) foo="$$foo $$i";; \ + esac; done ;\ + for i in $$foo; do \ + x=`echo $$i | sed 's/\.[^.]*$$/.cat3/'`; \ + echo "$(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x"; \ + $(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x; \ + done + +dist-cat5-mans: + @foo='$(man5_MANS)'; \ + bar='$(man_MANS)'; \ + for i in $$bar; do \ + case $$i in \ + *.5) foo="$$foo $$i";; \ + esac; done ;\ + for i in $$foo; do \ + x=`echo $$i | sed 's/\.[^.]*$$/.cat5/'`; \ + echo "$(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x"; \ + $(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x; \ + done + +dist-cat8-mans: + @foo='$(man8_MANS)'; \ + bar='$(man_MANS)'; \ + for i in $$bar; do \ + case $$i in \ + *.8) foo="$$foo $$i";; \ + esac; done ;\ + for i in $$foo; do \ + x=`echo $$i | sed 's/\.[^.]*$$/.cat8/'`; \ + echo "$(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x"; \ + $(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x; \ + done + +dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans + +install-cat-mans: + $(SHELL) $(top_srcdir)/cf/install-catman.sh "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS) + +install-data-local: install-cat-mans + +.et.h: + $(COMPILE_ET) $< +.et.c: + $(COMPILE_ET) $< + +$(LTLIBOBJS) $(libroken_la_OBJECTS): $(include_HEADERS) roken.h $(XHEADERS) +.hin.h: + cp $< $@ + +roken.h: make-roken$(EXEEXT) + @./make-roken$(EXEEXT) > tmp.h ;\ + if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ + else rm -f roken.h; mv tmp.h roken.h; fi + +make-roken.c: roken.h.in roken.awk + $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/crypto/heimdal/lib/roken/Makefile.am b/crypto/heimdal/lib/roken/Makefile.am index 4c96b3c..13121ad 100644 --- a/crypto/heimdal/lib/roken/Makefile.am +++ b/crypto/heimdal/lib/roken/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.117 2001/10/27 17:47:53 assar Exp $ +# $Id: Makefile.am,v 1.120 2002/05/31 02:44:37 assar Exp $ include $(top_srcdir)/Makefile.am.common @@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../cf CLEANFILES = roken.h make-roken.c $(XHEADERS) lib_LTLIBRARIES = libroken.la -libroken_la_LDFLAGS = -version-info 15:0:6 +libroken_la_LDFLAGS = -version-info 16:0:7 noinst_PROGRAMS = make-roken snprintf-test @@ -22,13 +22,17 @@ check_PROGRAMS = \ TESTS = $(check_PROGRAMS) -LIB_crypt = @LIB_crypt@ - LDADD = libroken.la $(LIB_crypt) make_roken_LDADD = -strpftime_test_SOURCES = strpftime-test.c strftime.c strptime.c snprintf.c -snprintf_test_SOURCES = snprintf-test.c snprintf.c +noinst_LTLIBRARIES = libtest.la +libtest_la_SOURCES = strftime.c strptime.c snprintf.c +libtest_la_CFLAGS = -DTEST_SNPRINTF + +strpftime_test_SOURCES = strpftime-test.c +strpftime_test_LDADD = libtest.la $(LDADD) +snprintf_test_SOURCES = snprintf-test.c +snprintf_test_LDADD = libtest.la $(LDADD) snprintf_test_CFLAGS = -DTEST_SNPRINTF libroken_la_SOURCES = \ @@ -91,7 +95,6 @@ EXTRA_libroken_la_SOURCES = \ flock.c \ fnmatch.c \ fnmatch.hin \ - freeaddrinfo.c \ freehostent.c \ gai_strerror.c \ getdtablesize.c \ @@ -210,7 +213,7 @@ nodist_include_HEADERS = roken.h man_MANS = getarg.3 -SUFFIXES = .hin +SUFFIXES += .hin .hin.h: cp $< $@ diff --git a/crypto/heimdal/lib/roken/Makefile.in b/crypto/heimdal/lib/roken/Makefile.in index 0bdf597..7969334 100644 --- a/crypto/heimdal/lib/roken/Makefile.in +++ b/crypto/heimdal/lib/roken/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -13,14 +14,11 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.117 2001/10/27 17:47:53 assar Exp $ +# $Id: Makefile.am,v 1.120 2002/05/31 02:44:37 assar Exp $ +# $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $ -# $Id: Makefile.am.common,v 1.3 1999/04/01 14:58:43 joda Exp $ - - -# $Id: Makefile.am.common,v 1.31 2001/09/01 11:12:18 assar Exp $ - +# $Id: Makefile.am.common,v 1.36 2002/08/19 16:10:25 joda Exp $ SHELL = @SHELL@ srcdir = @srcdir@ @@ -51,9 +49,13 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -65,6 +67,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AIX_EXTRA_KAFS = @AIX_EXTRA_KAFS@ AMTAR = @AMTAR@ AS = @AS@ @@ -81,7 +87,7 @@ DIR_com_err = @DIR_com_err@ DIR_des = @DIR_des@ DIR_roken = @DIR_roken@ DLLTOOL = @DLLTOOL@ -EXEEXT = @EXEEXT@ +ECHO = @ECHO@ EXTRA_LIB45 = @EXTRA_LIB45@ GROFF = @GROFF@ INCLUDES_roken = @INCLUDES_roken@ @@ -89,7 +95,9 @@ INCLUDE_ = @INCLUDE_@ INCLUDE_des = @INCLUDE_des@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LEX = @LEX@ -LIBOBJS = @LIBOBJS@ + +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBTOOL = @LIBTOOL@ LIB_ = @LIB_@ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@ @@ -111,9 +119,9 @@ NEED_WRITEAUTH_FALSE = @NEED_WRITEAUTH_FALSE@ NEED_WRITEAUTH_TRUE = @NEED_WRITEAUTH_TRUE@ NROFF = @NROFF@ OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@ WFLAGS = @WFLAGS@ @@ -126,16 +134,19 @@ X_PRE_LIBS = @X_PRE_LIBS@ YACC = @YACC@ am__include = @am__include@ am__quote = @am__quote@ -dpagaix_CFLAGS = @dpagaix_CFLAGS@ -dpagaix_LDADD = @dpagaix_LDADD@ +dpagaix_cflags = @dpagaix_cflags@ +dpagaix_ldadd = @dpagaix_ldadd@ +dpagaix_ldflags = @dpagaix_ldflags@ install_sh = @install_sh@ -AUTOMAKE_OPTIONS = foreign no-dependencies 1.4b +AUTOMAKE_OPTIONS = foreign no-dependencies 1.6 -SUFFIXES = .hin +SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .hin INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) +@do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME + AM_CFLAGS = $(WFLAGS) CP = cp @@ -143,7 +154,6 @@ CP = cp buildinclude = $(top_builddir)/include LIB_XauReadAuth = @LIB_XauReadAuth@ - LIB_crypt = @LIB_crypt@ LIB_dbm_firstkey = @LIB_dbm_firstkey@ LIB_dbopen = @LIB_dbopen@ @@ -167,8 +177,6 @@ LIB_socket = @LIB_socket@ LIB_syslog = @LIB_syslog@ LIB_tgetent = @LIB_tgetent@ -LIBS = @LIBS@ - HESIODLIB = @HESIODLIB@ HESIODINCLUDE = @HESIODINCLUDE@ INCLUDE_hesiod = @INCLUDE_hesiod@ @@ -183,8 +191,6 @@ LIB_openldap = @LIB_openldap@ INCLUDE_readline = @INCLUDE_readline@ LIB_readline = @LIB_readline@ -LEXLIB = @LEXLIB@ - NROFF_MAN = groff -mandoc -Tascii @KRB4_TRUE@LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS) @@ -196,14 +202,12 @@ NROFF_MAN = groff -mandoc -Tascii @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la -CHECK_LOCAL = $(PROGRAMS) - ACLOCAL_AMFLAGS = -I ../../cf CLEANFILES = roken.h make-roken.c $(XHEADERS) lib_LTLIBRARIES = libroken.la -libroken_la_LDFLAGS = -version-info 15:0:6 +libroken_la_LDFLAGS = -version-info 16:0:7 noinst_PROGRAMS = make-roken snprintf-test @@ -222,8 +226,14 @@ TESTS = $(check_PROGRAMS) LDADD = libroken.la $(LIB_crypt) make_roken_LDADD = -strpftime_test_SOURCES = strpftime-test.c strftime.c strptime.c snprintf.c -snprintf_test_SOURCES = snprintf-test.c snprintf.c +noinst_LTLIBRARIES = libtest.la +libtest_la_SOURCES = strftime.c strptime.c snprintf.c +libtest_la_CFLAGS = -DTEST_SNPRINTF + +strpftime_test_SOURCES = strpftime-test.c +strpftime_test_LDADD = libtest.la $(LDADD) +snprintf_test_SOURCES = snprintf-test.c +snprintf_test_LDADD = libtest.la $(LDADD) snprintf_test_CFLAGS = -DTEST_SNPRINTF libroken_la_SOURCES = \ @@ -287,7 +297,6 @@ EXTRA_libroken_la_SOURCES = \ flock.c \ fnmatch.c \ fnmatch.hin \ - freeaddrinfo.c \ freehostent.c \ gai_strerror.c \ getdtablesize.c \ @@ -393,7 +402,7 @@ subdir = lib/roken mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = -LTLIBRARIES = $(lib_LTLIBRARIES) +LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) libroken_la_DEPENDENCIES = @LTLIBOBJS@ am_libroken_la_OBJECTS = base64.lo bswap.lo concat.lo environment.lo \ @@ -407,6 +416,11 @@ am_libroken_la_OBJECTS = base64.lo bswap.lo concat.lo environment.lo \ socket.lo strcollect.lo timeval.lo tm2time.lo unvis.lo \ verify.lo vis.lo warnerr.lo write_pid.lo libroken_la_OBJECTS = $(am_libroken_la_OBJECTS) +libtest_la_LDFLAGS = +libtest_la_LIBADD = +am_libtest_la_OBJECTS = libtest_la-strftime.lo libtest_la-strptime.lo \ + libtest_la-snprintf.lo +libtest_la_OBJECTS = $(am_libtest_la_OBJECTS) check_PROGRAMS = base64-test$(EXEEXT) getaddrinfo-test$(EXEEXT) \ parse_bytes-test$(EXEEXT) snprintf-test$(EXEEXT) \ strpftime-test$(EXEEXT) @@ -432,24 +446,22 @@ parse_bytes_test_OBJECTS = parse_bytes-test.$(OBJEXT) parse_bytes_test_LDADD = $(LDADD) parse_bytes_test_DEPENDENCIES = libroken.la parse_bytes_test_LDFLAGS = -am_snprintf_test_OBJECTS = snprintf_test-snprintf-test.$(OBJEXT) \ - snprintf_test-snprintf.$(OBJEXT) +am_snprintf_test_OBJECTS = snprintf_test-snprintf-test.$(OBJEXT) snprintf_test_OBJECTS = $(am_snprintf_test_OBJECTS) -snprintf_test_LDADD = $(LDADD) -snprintf_test_DEPENDENCIES = libroken.la +snprintf_test_DEPENDENCIES = libtest.la libroken.la snprintf_test_LDFLAGS = -am_strpftime_test_OBJECTS = strpftime-test.$(OBJEXT) strftime.$(OBJEXT) \ - strptime.$(OBJEXT) snprintf.$(OBJEXT) +am_strpftime_test_OBJECTS = strpftime-test.$(OBJEXT) strpftime_test_OBJECTS = $(am_strpftime_test_OBJECTS) -strpftime_test_LDADD = $(LDADD) -strpftime_test_DEPENDENCIES = libroken.la +strpftime_test_DEPENDENCIES = libtest.la libroken.la strpftime_test_LDFLAGS = DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ depcomp = +am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -459,66 +471,85 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CFLAGS = @CFLAGS@ DIST_SOURCES = $(libroken_la_SOURCES) $(EXTRA_libroken_la_SOURCES) \ - base64-test.c getaddrinfo-test.c parse_bytes-test.c \ - $(snprintf_test_SOURCES) $(strpftime_test_SOURCES) - -NROFF = nroff + $(libtest_la_SOURCES) base64-test.c getaddrinfo-test.c \ + parse_bytes-test.c $(snprintf_test_SOURCES) \ + $(strpftime_test_SOURCES) MANS = $(man_MANS) HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) DIST_COMMON = $(include_HEADERS) ChangeLog Makefile.am Makefile.in \ acinclude.m4 freeaddrinfo.c getaddrinfo.c getcap.c \ getnameinfo.c glob.c install-sh missing mkinstalldirs -SOURCES = $(libroken_la_SOURCES) $(EXTRA_libroken_la_SOURCES) base64-test.c getaddrinfo-test.c $(nodist_make_roken_SOURCES) parse_bytes-test.c $(snprintf_test_SOURCES) $(strpftime_test_SOURCES) +SOURCES = $(libroken_la_SOURCES) $(EXTRA_libroken_la_SOURCES) $(libtest_la_SOURCES) base64-test.c getaddrinfo-test.c $(nodist_make_roken_SOURCES) parse_bytes-test.c $(snprintf_test_SOURCES) $(strpftime_test_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .hin .1 .3 .5 .8 .c .cat1 .cat3 .cat5 .cat8 .et .h .lo .o .obj .x - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool +.SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .hin .c .lo .o .obj $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/roken/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +libLTLIBRARIES_INSTALL = $(INSTALL) install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test -z "$dir" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test -z "$dir" && dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done libroken.la: $(libroken_la_OBJECTS) $(libroken_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libroken_la_LDFLAGS) $(libroken_la_OBJECTS) $(libroken_la_LIBADD) $(LIBS) +libtest_la-strftime.lo: strftime.c +libtest_la-strptime.lo: strptime.c +libtest_la-snprintf.lo: snprintf.c +libtest.la: $(libtest_la_OBJECTS) $(libtest_la_DEPENDENCIES) + $(LINK) $(libtest_la_LDFLAGS) $(libtest_la_OBJECTS) $(libtest_la_LIBADD) $(LIBS) clean-checkPROGRAMS: - -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) + @list='$(check_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done base64-test$(EXEEXT): $(base64_test_OBJECTS) $(base64_test_DEPENDENCIES) @rm -f base64-test$(EXEEXT) $(LINK) $(base64_test_LDFLAGS) $(base64_test_OBJECTS) $(base64_test_LDADD) $(LIBS) @@ -532,7 +563,6 @@ parse_bytes-test$(EXEEXT): $(parse_bytes_test_OBJECTS) $(parse_bytes_test_DEPEND @rm -f parse_bytes-test$(EXEEXT) $(LINK) $(parse_bytes_test_LDFLAGS) $(parse_bytes_test_OBJECTS) $(parse_bytes_test_LDADD) $(LIBS) snprintf_test-snprintf-test.$(OBJEXT): snprintf-test.c -snprintf_test-snprintf.$(OBJEXT): snprintf.c snprintf-test$(EXEEXT): $(snprintf_test_OBJECTS) $(snprintf_test_DEPENDENCIES) @rm -f snprintf-test$(EXEEXT) $(LINK) $(snprintf_test_LDFLAGS) $(snprintf_test_OBJECTS) $(snprintf_test_LDADD) $(LIBS) @@ -547,31 +577,58 @@ distclean-compile: -rm -f *.tab.c .c.o: - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: $(COMPILE) -c `cygpath -w $<` .c.lo: - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +libtest_la-strftime.o: strftime.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strftime.o `test -f 'strftime.c' || echo '$(srcdir)/'`strftime.c + +libtest_la-strftime.obj: strftime.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strftime.obj `cygpath -w strftime.c` + +libtest_la-strftime.lo: strftime.c + $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strftime.lo `test -f 'strftime.c' || echo '$(srcdir)/'`strftime.c + +libtest_la-strptime.o: strptime.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strptime.o `test -f 'strptime.c' || echo '$(srcdir)/'`strptime.c + +libtest_la-strptime.obj: strptime.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strptime.obj `cygpath -w strptime.c` + +libtest_la-strptime.lo: strptime.c + $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strptime.lo `test -f 'strptime.c' || echo '$(srcdir)/'`strptime.c + +libtest_la-snprintf.o: snprintf.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-snprintf.o `test -f 'snprintf.c' || echo '$(srcdir)/'`snprintf.c + +libtest_la-snprintf.obj: snprintf.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-snprintf.obj `cygpath -w snprintf.c` + +libtest_la-snprintf.lo: snprintf.c + $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-snprintf.lo `test -f 'snprintf.c' || echo '$(srcdir)/'`snprintf.c snprintf_test-snprintf-test.o: snprintf-test.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snprintf_test_CFLAGS) $(CFLAGS) -c -o snprintf_test-snprintf-test.o `test -f snprintf-test.c || echo '$(srcdir)/'`snprintf-test.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snprintf_test_CFLAGS) $(CFLAGS) -c -o snprintf_test-snprintf-test.o `test -f 'snprintf-test.c' || echo '$(srcdir)/'`snprintf-test.c snprintf_test-snprintf-test.obj: snprintf-test.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snprintf_test_CFLAGS) $(CFLAGS) -c -o snprintf_test-snprintf-test.obj `cygpath -w snprintf-test.c` snprintf_test-snprintf-test.lo: snprintf-test.c - $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snprintf_test_CFLAGS) $(CFLAGS) -c -o snprintf_test-snprintf-test.lo `test -f snprintf-test.c || echo '$(srcdir)/'`snprintf-test.c + $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snprintf_test_CFLAGS) $(CFLAGS) -c -o snprintf_test-snprintf-test.lo `test -f 'snprintf-test.c' || echo '$(srcdir)/'`snprintf-test.c -snprintf_test-snprintf.o: snprintf.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snprintf_test_CFLAGS) $(CFLAGS) -c -o snprintf_test-snprintf.o `test -f snprintf.c || echo '$(srcdir)/'`snprintf.c +mostlyclean-libtool: + -rm -f *.lo -snprintf_test-snprintf.obj: snprintf.c - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snprintf_test_CFLAGS) $(CFLAGS) -c -o snprintf_test-snprintf.obj `cygpath -w snprintf.c` +clean-libtool: + -rm -rf .libs _libs -snprintf_test-snprintf.lo: snprintf.c - $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snprintf_test_CFLAGS) $(CFLAGS) -c -o snprintf_test-snprintf.lo `test -f snprintf.c || echo '$(srcdir)/'`snprintf.c +distclean-libtool: + -rm -f libtool uninstall-info-am: man3dir = $(mandir)/man3 @@ -589,6 +646,10 @@ install-man3: $(man3_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -612,14 +673,15 @@ uninstall-man3: echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \ rm -f $(DESTDIR)$(man3dir)/$$inst; \ done +includeHEADERS_INSTALL = $(INSTALL_HEADER) install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(includedir) @list='$(include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ - $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f; \ + echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ + $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \ done uninstall-includeHEADERS: @@ -629,14 +691,15 @@ uninstall-includeHEADERS: echo " rm -f $(DESTDIR)$(includedir)/$$f"; \ rm -f $(DESTDIR)$(includedir)/$$f; \ done +nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(includedir) @list='$(nodist_include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ - $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f; \ + echo " $(nodist_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ + $(nodist_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \ done uninstall-nodist_includeHEADERS: @@ -647,32 +710,36 @@ uninstall-nodist_includeHEADERS: rm -f $(DESTDIR)$(includedir)/$$f; \ done +ETAGS = etags +ETAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here @@ -732,23 +799,27 @@ check-TESTS: $(TESTS) echo "$$banner"; \ echo "$$dashes"; \ test "$$failed" -eq 0; \ - fi - + else :; fi DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @list='$(DISTFILES)'; for file in $$list; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -778,6 +849,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -786,7 +858,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -795,7 +867,8 @@ maintainer-clean-generic: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ - clean-libtool clean-noinstPROGRAMS mostlyclean-am + clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ + mostlyclean-am distclean: distclean-am @@ -840,14 +913,15 @@ uninstall-man: uninstall-man3 .PHONY: GTAGS all all-am all-local check check-TESTS check-am \ check-local clean clean-checkPROGRAMS clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \ - distclean distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-data-local \ - install-exec install-exec-am install-includeHEADERS \ - install-info install-info-am install-libLTLIBRARIES install-man \ - install-man3 install-nodist_includeHEADERS install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-data-local install-exec install-exec-am \ + install-includeHEADERS install-info install-info-am \ + install-libLTLIBRARIES install-man install-man3 \ + install-nodist_includeHEADERS install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool tags uninstall \ uninstall-am uninstall-includeHEADERS uninstall-info-am \ @@ -868,7 +942,7 @@ install-suid-programs: install-exec-hook: install-suid-programs install-build-headers:: $(include_HEADERS) $(build_HEADERZ) - @foo='$(include_HEADERS) $(build_HEADERZ)'; \ + @foo='$(include_HEADERS) $(nodist_include_HEADERS) $(build_HEADERZ)'; \ for f in $$foo; do \ f=`basename $$f`; \ if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \ @@ -881,6 +955,36 @@ install-build-headers:: $(include_HEADERS) $(build_HEADERZ) done all-local: install-build-headers + +check-local:: + @if test '$(CHECK_LOCAL)'; then \ + foo='$(CHECK_LOCAL)'; else \ + foo='$(PROGRAMS)'; fi; \ + if test "$$foo"; then \ + failed=0; all=0; \ + for i in $$foo; do \ + all=`expr $$all + 1`; \ + if ./$$i --version > /dev/null 2>&1; then \ + echo "PASS: $$i"; \ + else \ + echo "FAIL: $$i"; \ + failed=`expr $$failed + 1`; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="$$failed of $$all tests failed"; \ + fi; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + fi + +.x.c: + @cmp -s $< $@ 2> /dev/null || cp $< $@ #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ @@ -955,34 +1059,6 @@ install-data-local: install-cat-mans .et.c: $(COMPILE_ET) $< -.x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ - -check-local:: - @foo='$(CHECK_LOCAL)'; \ - if test "$$foo"; then \ - failed=0; all=0; \ - for i in $$foo; do \ - all=`expr $$all + 1`; \ - if ./$$i --version > /dev/null 2>&1; then \ - echo "PASS: $$i"; \ - else \ - echo "FAIL: $$i"; \ - failed=`expr $$failed + 1`; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="$$failed of $$all tests failed"; \ - fi; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - fi - $(LTLIBOBJS) $(libroken_la_OBJECTS): $(include_HEADERS) roken.h $(XHEADERS) .hin.h: cp $< $@ diff --git a/crypto/heimdal/lib/roken/base64.lo b/crypto/heimdal/lib/roken/base64.lo Binary files differnew file mode 100644 index 0000000..365de59 --- /dev/null +++ b/crypto/heimdal/lib/roken/base64.lo diff --git a/crypto/heimdal/lib/roken/bswap.lo b/crypto/heimdal/lib/roken/bswap.lo Binary files differnew file mode 100644 index 0000000..dc6617e --- /dev/null +++ b/crypto/heimdal/lib/roken/bswap.lo diff --git a/crypto/heimdal/lib/roken/concat.lo b/crypto/heimdal/lib/roken/concat.lo Binary files differnew file mode 100644 index 0000000..7450dd5 --- /dev/null +++ b/crypto/heimdal/lib/roken/concat.lo diff --git a/crypto/heimdal/lib/roken/copyhostent.lo b/crypto/heimdal/lib/roken/copyhostent.lo Binary files differnew file mode 100644 index 0000000..500605864 --- /dev/null +++ b/crypto/heimdal/lib/roken/copyhostent.lo diff --git a/crypto/heimdal/lib/roken/ecalloc.lo b/crypto/heimdal/lib/roken/ecalloc.lo Binary files differnew file mode 100644 index 0000000..ab53ebf --- /dev/null +++ b/crypto/heimdal/lib/roken/ecalloc.lo diff --git a/crypto/heimdal/lib/roken/emalloc.lo b/crypto/heimdal/lib/roken/emalloc.lo Binary files differnew file mode 100644 index 0000000..6a312f8 --- /dev/null +++ b/crypto/heimdal/lib/roken/emalloc.lo diff --git a/crypto/heimdal/lib/roken/environment.lo b/crypto/heimdal/lib/roken/environment.lo Binary files differnew file mode 100644 index 0000000..00c57ae --- /dev/null +++ b/crypto/heimdal/lib/roken/environment.lo diff --git a/crypto/heimdal/lib/roken/eread.lo b/crypto/heimdal/lib/roken/eread.lo Binary files differnew file mode 100644 index 0000000..92723d7 --- /dev/null +++ b/crypto/heimdal/lib/roken/eread.lo diff --git a/crypto/heimdal/lib/roken/erealloc.lo b/crypto/heimdal/lib/roken/erealloc.lo Binary files differnew file mode 100644 index 0000000..c670bac --- /dev/null +++ b/crypto/heimdal/lib/roken/erealloc.lo diff --git a/crypto/heimdal/lib/roken/esetenv.lo b/crypto/heimdal/lib/roken/esetenv.lo Binary files differnew file mode 100644 index 0000000..e41d544 --- /dev/null +++ b/crypto/heimdal/lib/roken/esetenv.lo diff --git a/crypto/heimdal/lib/roken/estrdup.lo b/crypto/heimdal/lib/roken/estrdup.lo Binary files differnew file mode 100644 index 0000000..6a75b9c --- /dev/null +++ b/crypto/heimdal/lib/roken/estrdup.lo diff --git a/crypto/heimdal/lib/roken/ewrite.lo b/crypto/heimdal/lib/roken/ewrite.lo Binary files differnew file mode 100644 index 0000000..12806ce --- /dev/null +++ b/crypto/heimdal/lib/roken/ewrite.lo diff --git a/crypto/heimdal/lib/roken/get_default_username.lo b/crypto/heimdal/lib/roken/get_default_username.lo Binary files differnew file mode 100644 index 0000000..1e584ea --- /dev/null +++ b/crypto/heimdal/lib/roken/get_default_username.lo diff --git a/crypto/heimdal/lib/roken/get_window_size.lo b/crypto/heimdal/lib/roken/get_window_size.lo Binary files differnew file mode 100644 index 0000000..5475800 --- /dev/null +++ b/crypto/heimdal/lib/roken/get_window_size.lo diff --git a/crypto/heimdal/lib/roken/getaddrinfo_hostspec.lo b/crypto/heimdal/lib/roken/getaddrinfo_hostspec.lo Binary files differnew file mode 100644 index 0000000..9bbeaee --- /dev/null +++ b/crypto/heimdal/lib/roken/getaddrinfo_hostspec.lo diff --git a/crypto/heimdal/lib/roken/getarg.3 b/crypto/heimdal/lib/roken/getarg.3 index e3b5c9f..25e2217 100644 --- a/crypto/heimdal/lib/roken/getarg.3 +++ b/crypto/heimdal/lib/roken/getarg.3 @@ -1,10 +1,10 @@ .\" Copyright (c) 1999 Kungliga Tekniska Högskolan -.\" $Id: getarg.3,v 1.3 2001/01/11 16:16:30 assar Exp $ +.\" $Id: getarg.3,v 1.4 2002/08/20 17:07:29 joda Exp $ .Dd September 24, 1999 .Dt GETARG 3 .Os ROKEN .Sh NAME -.Nm getarg , +.Nm getarg , .Nm arg_printusage .Nd collect command line options .Sh SYNOPSIS @@ -15,12 +15,12 @@ .Fn arg_printusage "struct getargs *args" "size_t num_args" "const char *progname" "const char *extra_string" .Sh DESCRIPTION .Fn getarg -collects any command line options given to a program in an easily used way. -.Fn arg_printusage +collects any command line options given to a program in an easily used way. +.Fn arg_printusage pretty-prints the available options, with a short help text. .Pp .Fa args -is the option specification to use, and it's an array of +is the option specification to use, and it's an array of .Fa struct getargs elements. .Fa num_args @@ -43,7 +43,7 @@ and .Fa num_args as getarg; .Fa progname -is the name of the program (to be used in the help text), and +is the name of the program (to be used in the help text), and .Fa extra_string is a string to print after the actual options to indicate more arguments. The usefulness of this function is realised only be people @@ -57,10 +57,10 @@ struct has the following elements. struct getargs{ const char *long_name; char short_name; - enum { arg_integer, - arg_string, - arg_flag, - arg_negative_flag, + enum { arg_integer, + arg_string, + arg_flag, + arg_negative_flag, arg_strings, arg_double, arg_collect @@ -72,14 +72,14 @@ struct getargs{ .Ed .Pp .Fa long_name -is the long name of the option, it can be +is the long name of the option, it can be .Dv NULL , if you don't want a long name. -.Fa short_name +.Fa short_name is the characted to use as short option, it can be zero. If the option has a value the .Fa value -field gets filled in with that value interpreted as specified by the +field gets filled in with that value interpreted as specified by the .Fa type field. .Fa help @@ -107,13 +107,13 @@ should point to a the argument is a flag, and .Fa value should point to a -.Fa int . +.Fa int . It gets filled in with either zero or one, depending on how the option is given, the normal case beeing one. Note that if the option isn't given, the value isn't altered, so it should be initialised to some useful default. .It Fa arg_negative_flag -this is the same as +this is the same as .Fa arg_flag but it reverses the meaning of the flag (a given short option clears the flag), and the synopsis of a long option is negated. @@ -121,7 +121,7 @@ the flag), and the synopsis of a long option is negated. the argument can be given multiple times, and the values are collected in an array; .Fa value -should be a pointer to a +should be a pointer to a .Fa struct getarg_strings structure, which holds a length and a string pointer. .It Fa arg_double @@ -132,7 +132,7 @@ should point to a .It Fa arg_collect allows more fine-grained control of the option parsing process. .Fa value -should be a pointer to a +should be a pointer to a .Fa getarg_collect_info structure: .Bd -literal @@ -151,7 +151,7 @@ typedef struct getarg_collect_info { .Pp With the .Fa func -member set to a function to call, and +member set to a function to call, and .Fa data to some application specific data. The parameters to the collect function are: .Bl -inset @@ -169,27 +169,27 @@ application specific data .Pp You can modify .Fa *optind , -and +and .Fa *optarg , but to do this correct you (more or less) have to know about the inner workings of getarg. -.Pp +.Pp You can skip parts of arguments by increasing .Fa *optarg (you could -implement the +implement the .Fl z Ns Ar 3 set of flags from .Nm gzip with this), or whole argument strings by increasing .Fa *optind -(let's say you want a flag +(let's say you want a flag .Fl c Ar x y z to specify a coordinate); if you also have to set .Fa *optarg to a sane value. .Pp -The collect function should return one of +The collect function should return one of .Dv ARG_ERR_NO_MATCH , ARG_ERR_BAD_ARG , ARG_ERR_NO_ARG on error, zero otherwise. .Pp @@ -201,7 +201,7 @@ arguments, sans data, that where given to the collection function. Don't use this more this unless you absolutely have to. .El .Pp -Option parsing is similar to what +Option parsing is similar to what .Xr getopt uses. Short options without arguments can be compressed .Pf ( Fl xyz @@ -217,18 +217,18 @@ or Long option names are prefixed with -- (double dash), and the value with a = (equal), .Fl -foo= Ns Ar bar . -Long option flags can either be specified as they are +Long option flags can either be specified as they are .Pf ( Fl -help ) , or with an (boolean parsable) option .Pf ( Fl -help= Ns Ar yes , .Fl -help= Ns Ar true , -or similar), or they can also be negated +or similar), or they can also be negated .Pf ( Fl -no-help -is the same as +is the same as .Fl -help= Ns no ) , and if you're really confused you can do it multiple times .Pf ( Fl -no-no-help= Ns Ar false , -or even +or even .Fl -no-no-help= Ns Ar maybe ) . .Sh EXAMPLE .Bd -literal @@ -243,13 +243,13 @@ int include_catalog = 1; int help_flag; struct getargs args[] = { - { "source", 's', arg_string, &source, + { "source", 's', arg_string, &source, "source of shippment", "city" }, - { "destination", 'd', arg_string, &destination, + { "destination", 'd', arg_string, &destination, "destination of shippment", "city" }, - { "weight", 'w', arg_integer, &weight, + { "weight", 'w', arg_integer, &weight, "weight of shippment", "tons" }, - { "catalog", 'c', arg_negative_flag, &include_catalog, + { "catalog", 'c', arg_negative_flag, &include_catalog, "include product catalog" }, { "help", 'h', arg_flag, &help_flag } }; @@ -285,7 +285,7 @@ main(int argc, char **argv) .Pp The output help output from this program looks like this: .Bd -literal -$ ship++ --help +$ ship++ --help Usage: ship++ [--source=city] [-s city] [--destination=city] [-d city] [--weight=tons] [-w tons] [--no-catalog] [-c] [--help] [-h] stuff... -s city, --source=city source of shippment @@ -297,7 +297,7 @@ Usage: ship++ [--source=city] [-s city] [--destination=city] [-d city] It should be more flexible, so it would be possible to use other more complicated option syntaxes, such as what .Xr ps 1 , -and +and .Xr tar 1 , uses, or the AFS model where you can skip the flag names as long as the options come in the correct order. diff --git a/crypto/heimdal/lib/roken/getarg.c b/crypto/heimdal/lib/roken/getarg.c index 90bc2cc..eff81f2 100644 --- a/crypto/heimdal/lib/roken/getarg.c +++ b/crypto/heimdal/lib/roken/getarg.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> -RCSID("$Id: getarg.c,v 1.44 2001/09/10 13:22:43 assar Exp $"); +RCSID("$Id: getarg.c,v 1.46 2002/08/20 16:23:07 joda Exp $"); #endif #include <stdio.h> @@ -158,7 +158,7 @@ mandoc_template(struct getargs *args, print_arg(buf, sizeof(buf), 1, 0, args + i); printf("%s", buf); if(args[i].long_name) - printf(" Ns ,"); + printf(" ,"); printf("\n"); } if(args[i].long_name){ @@ -317,16 +317,17 @@ add_string(getarg_strings *s, char *value) static int arg_match_long(struct getargs *args, size_t num_args, - char *argv, int argc, char **rargv, int *optind) + char *argv, int argc, char **rargv, int *goptind) { int i; - char *optarg = NULL; + char *goptarg = NULL; int negate = 0; int partial_match = 0; struct getargs *partial = NULL; struct getargs *current = NULL; int argv_len; char *p; + int p_len; argv_len = strlen(argv); p = strchr (argv, '='); @@ -336,8 +337,8 @@ arg_match_long(struct getargs *args, size_t num_args, for (i = 0; i < num_args; ++i) { if(args[i].long_name) { int len = strlen(args[i].long_name); - char *p = argv; - int p_len = argv_len; + p = argv; + p_len = argv_len; negate = 0; for (;;) { @@ -348,7 +349,7 @@ arg_match_long(struct getargs *args, size_t num_args, ++partial_match; partial = &args[i]; } - optarg = p + p_len; + goptarg = p + p_len; } else if (ISFLAG(args[i]) && strncmp (p, "no-", 3) == 0) { negate = !negate; p += 3; @@ -368,7 +369,7 @@ arg_match_long(struct getargs *args, size_t num_args, return ARG_ERR_NO_MATCH; } - if(*optarg == '\0' + if(*goptarg == '\0' && !ISFLAG(*current) && current->type != arg_collect && current->type != arg_counter) @@ -377,31 +378,31 @@ arg_match_long(struct getargs *args, size_t num_args, case arg_integer: { int tmp; - if(sscanf(optarg + 1, "%d", &tmp) != 1) + if(sscanf(goptarg + 1, "%d", &tmp) != 1) return ARG_ERR_BAD_ARG; *(int*)current->value = tmp; return 0; } case arg_string: { - *(char**)current->value = optarg + 1; + *(char**)current->value = goptarg + 1; return 0; } case arg_strings: { - add_string((getarg_strings*)current->value, optarg + 1); + add_string((getarg_strings*)current->value, goptarg + 1); return 0; } case arg_flag: case arg_negative_flag: { int *flag = current->value; - if(*optarg == '\0' || - strcmp(optarg + 1, "yes") == 0 || - strcmp(optarg + 1, "true") == 0){ + if(*goptarg == '\0' || + strcmp(goptarg + 1, "yes") == 0 || + strcmp(goptarg + 1, "true") == 0){ *flag = !negate; return 0; - } else if (*optarg && strcmp(optarg + 1, "maybe") == 0) { + } else if (*goptarg && strcmp(goptarg + 1, "maybe") == 0) { #ifdef HAVE_RANDOM *flag = random() & 1; #else @@ -417,9 +418,9 @@ arg_match_long(struct getargs *args, size_t num_args, { int val; - if (*optarg == '\0') + if (*goptarg == '\0') val = 1; - else if(sscanf(optarg + 1, "%d", &val) != 1) + else if(sscanf(goptarg + 1, "%d", &val) != 1) return ARG_ERR_BAD_ARG; *(int *)current->value += val; return 0; @@ -427,15 +428,15 @@ arg_match_long(struct getargs *args, size_t num_args, case arg_double: { double tmp; - if(sscanf(optarg + 1, "%lf", &tmp) != 1) + if(sscanf(goptarg + 1, "%lf", &tmp) != 1) return ARG_ERR_BAD_ARG; *(double*)current->value = tmp; return 0; } case arg_collect:{ struct getarg_collect_info *c = current->value; - int o = argv - rargv[*optind]; - return (*c->func)(FALSE, argc, rargv, optind, &o, c->data); + int o = argv - rargv[*goptind]; + return (*c->func)(FALSE, argc, rargv, goptind, &o, c->data); } default: @@ -445,13 +446,13 @@ arg_match_long(struct getargs *args, size_t num_args, static int arg_match_short (struct getargs *args, size_t num_args, - char *argv, int argc, char **rargv, int *optind) + char *argv, int argc, char **rargv, int *goptind) { int j, k; - for(j = 1; j > 0 && j < strlen(rargv[*optind]); j++) { + for(j = 1; j > 0 && j < strlen(rargv[*goptind]); j++) { for(k = 0; k < num_args; k++) { - char *optarg; + char *goptarg; if(args[k].short_name == 0) continue; @@ -471,36 +472,36 @@ arg_match_short (struct getargs *args, size_t num_args, if(args[k].type == arg_collect) { struct getarg_collect_info *c = args[k].value; - if((*c->func)(TRUE, argc, rargv, optind, &j, c->data)) + if((*c->func)(TRUE, argc, rargv, goptind, &j, c->data)) return ARG_ERR_BAD_ARG; break; } if(argv[j + 1]) - optarg = &argv[j + 1]; + goptarg = &argv[j + 1]; else { - ++*optind; - optarg = rargv[*optind]; + ++*goptind; + goptarg = rargv[*goptind]; } - if(optarg == NULL) { - --*optind; + if(goptarg == NULL) { + --*goptind; return ARG_ERR_NO_ARG; } if(args[k].type == arg_integer) { int tmp; - if(sscanf(optarg, "%d", &tmp) != 1) + if(sscanf(goptarg, "%d", &tmp) != 1) return ARG_ERR_BAD_ARG; *(int*)args[k].value = tmp; return 0; } else if(args[k].type == arg_string) { - *(char**)args[k].value = optarg; + *(char**)args[k].value = goptarg; return 0; } else if(args[k].type == arg_strings) { - add_string((getarg_strings*)args[k].value, optarg); + add_string((getarg_strings*)args[k].value, goptarg); return 0; } else if(args[k].type == arg_double) { double tmp; - if(sscanf(optarg, "%lf", &tmp) != 1) + if(sscanf(goptarg, "%lf", &tmp) != 1) return ARG_ERR_BAD_ARG; *(double*)args[k].value = tmp; return 0; @@ -516,7 +517,7 @@ arg_match_short (struct getargs *args, size_t num_args, int getarg(struct getargs *args, size_t num_args, - int argc, char **argv, int *optind) + int argc, char **argv, int *goptind) { int i; int ret = 0; @@ -528,8 +529,8 @@ getarg(struct getargs *args, size_t num_args, #else srand (time(NULL)); #endif - (*optind)++; - for(i = *optind; i < argc; i++) { + (*goptind)++; + for(i = *goptind; i < argc; i++) { if(argv[i][0] != '-') break; if(argv[i][1] == '-'){ @@ -546,7 +547,7 @@ getarg(struct getargs *args, size_t num_args, if(ret) break; } - *optind = i; + *goptind = i; return ret; } @@ -573,9 +574,9 @@ struct getargs args[] = { int main(int argc, char **argv) { - int optind = 0; - while(getarg(args, 5, argc, argv, &optind)) - printf("Bad arg: %s\n", argv[optind]); + int goptind = 0; + while(getarg(args, 5, argc, argv, &goptind)) + printf("Bad arg: %s\n", argv[goptind]); printf("flag1 = %d\n", flag1); printf("flag2 = %d\n", flag2); printf("foo_flag = %d\n", foo_flag); diff --git a/crypto/heimdal/lib/roken/getarg.h b/crypto/heimdal/lib/roken/getarg.h index 3892eb4..c68b66a1 100644 --- a/crypto/heimdal/lib/roken/getarg.h +++ b/crypto/heimdal/lib/roken/getarg.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: getarg.h,v 1.11 2001/04/25 12:06:37 assar Exp $ */ +/* $Id: getarg.h,v 1.12 2002/04/18 08:50:08 joda Exp $ */ #ifndef __GETARG_H__ #define __GETARG_H__ @@ -69,8 +69,8 @@ typedef struct getarg_strings { typedef int (*getarg_collect_func)(int short_opt, int argc, char **argv, - int *optind, - int *optarg, + int *goptind, + int *goptarg, void *data); typedef struct getarg_collect_info { @@ -79,7 +79,7 @@ typedef struct getarg_collect_info { } getarg_collect_info; int getarg(struct getargs *args, size_t num_args, - int argc, char **argv, int *optind); + int argc, char **argv, int *goptind); void arg_printusage (struct getargs *args, size_t num_args, diff --git a/crypto/heimdal/lib/roken/getarg.lo b/crypto/heimdal/lib/roken/getarg.lo Binary files differnew file mode 100644 index 0000000..9c5352a --- /dev/null +++ b/crypto/heimdal/lib/roken/getarg.lo diff --git a/crypto/heimdal/lib/roken/getnameinfo_verified.lo b/crypto/heimdal/lib/roken/getnameinfo_verified.lo Binary files differnew file mode 100644 index 0000000..9deac6c --- /dev/null +++ b/crypto/heimdal/lib/roken/getnameinfo_verified.lo diff --git a/crypto/heimdal/lib/roken/getprogname.lo b/crypto/heimdal/lib/roken/getprogname.lo Binary files differnew file mode 100644 index 0000000..52a2ade --- /dev/null +++ b/crypto/heimdal/lib/roken/getprogname.lo diff --git a/crypto/heimdal/lib/roken/h_errno.lo b/crypto/heimdal/lib/roken/h_errno.lo Binary files differnew file mode 100644 index 0000000..a5f25f7 --- /dev/null +++ b/crypto/heimdal/lib/roken/h_errno.lo diff --git a/crypto/heimdal/lib/roken/hostent_find_fqdn.lo b/crypto/heimdal/lib/roken/hostent_find_fqdn.lo Binary files differnew file mode 100644 index 0000000..0ee94ea --- /dev/null +++ b/crypto/heimdal/lib/roken/hostent_find_fqdn.lo diff --git a/crypto/heimdal/lib/roken/issuid.lo b/crypto/heimdal/lib/roken/issuid.lo Binary files differnew file mode 100644 index 0000000..51908b7 --- /dev/null +++ b/crypto/heimdal/lib/roken/issuid.lo diff --git a/crypto/heimdal/lib/roken/k_getpwnam.lo b/crypto/heimdal/lib/roken/k_getpwnam.lo Binary files differnew file mode 100644 index 0000000..18d7a3a --- /dev/null +++ b/crypto/heimdal/lib/roken/k_getpwnam.lo diff --git a/crypto/heimdal/lib/roken/k_getpwuid.lo b/crypto/heimdal/lib/roken/k_getpwuid.lo Binary files differnew file mode 100644 index 0000000..7c01790 --- /dev/null +++ b/crypto/heimdal/lib/roken/k_getpwuid.lo diff --git a/crypto/heimdal/lib/roken/libroken.la b/crypto/heimdal/lib/roken/libroken.la new file mode 100644 index 0000000..8551dda --- /dev/null +++ b/crypto/heimdal/lib/roken/libroken.la @@ -0,0 +1,32 @@ +# libroken.la - a libtool library file +# Generated by ltmain.sh - GNU libtool 1.4.2 (1.922.2.53 2001/09/11 03:18:52) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libroken.so.16' + +# Names of this library. +library_names='libroken.so.16 libroken.so libroken.so' + +# The name of the static archive. +old_library='libroken.a' + +# Libraries that this one depends upon. +dependency_libs='' + +# Version information for libroken. +current=16 +age=7 +revision=0 + +# Is this an already installed library? +installed=no + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/usr/heimdal/lib' diff --git a/crypto/heimdal/lib/roken/libtest.la b/crypto/heimdal/lib/roken/libtest.la new file mode 100644 index 0000000..2206a0e --- /dev/null +++ b/crypto/heimdal/lib/roken/libtest.la @@ -0,0 +1,32 @@ +# libtest.la - a libtool library file +# Generated by ltmain.sh - GNU libtool 1.4.2 (1.922.2.53 2001/09/11 03:18:52) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='' + +# Names of this library. +library_names='' + +# The name of the static archive. +old_library='libtest.al' + +# Libraries that this one depends upon. +dependency_libs='' + +# Version information for libtest. +current= +age= +revision= + +# Is this an already installed library? +installed=no + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='' diff --git a/crypto/heimdal/lib/roken/libtest_la-snprintf.lo b/crypto/heimdal/lib/roken/libtest_la-snprintf.lo Binary files differnew file mode 100644 index 0000000..fd9d594 --- /dev/null +++ b/crypto/heimdal/lib/roken/libtest_la-snprintf.lo diff --git a/crypto/heimdal/lib/roken/libtest_la-strftime.lo b/crypto/heimdal/lib/roken/libtest_la-strftime.lo Binary files differnew file mode 100644 index 0000000..be49eae --- /dev/null +++ b/crypto/heimdal/lib/roken/libtest_la-strftime.lo diff --git a/crypto/heimdal/lib/roken/libtest_la-strptime.lo b/crypto/heimdal/lib/roken/libtest_la-strptime.lo Binary files differnew file mode 100644 index 0000000..0f2ba79 --- /dev/null +++ b/crypto/heimdal/lib/roken/libtest_la-strptime.lo diff --git a/crypto/heimdal/lib/roken/localtime_r.c b/crypto/heimdal/lib/roken/localtime_r.c index 310e24b..4340234 100644 --- a/crypto/heimdal/lib/roken/localtime_r.c +++ b/crypto/heimdal/lib/roken/localtime_r.c @@ -33,10 +33,12 @@ #ifdef HAVE_CONFIG_H #include <config.h> -RCSID("$Id: localtime_r.c,v 1.1 2001/10/21 23:24:33 assar Exp $"); +RCSID("$Id: localtime_r.c,v 1.2 2002/08/20 13:00:35 joda Exp $"); #endif +#include <stdio.h> #include <time.h> +#include "roken.h" #ifndef HAVE_LOCALTIME_R diff --git a/crypto/heimdal/lib/roken/make-roken b/crypto/heimdal/lib/roken/make-roken Binary files differnew file mode 100755 index 0000000..d4eb7f3 --- /dev/null +++ b/crypto/heimdal/lib/roken/make-roken diff --git a/crypto/heimdal/lib/roken/make-roken.c b/crypto/heimdal/lib/roken/make-roken.c new file mode 100644 index 0000000..a6a8f1e --- /dev/null +++ b/crypto/heimdal/lib/roken/make-roken.c @@ -0,0 +1,699 @@ +#include <stdio.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +int main() +{ +puts("/* This is an OS dependent, generated file */"); +puts("\n"); +puts("#ifndef __ROKEN_H__"); +puts("#define __ROKEN_H__"); +puts(""); +puts("/* -*- C -*- */"); +puts("/*"); +puts(" * Copyright (c) 1995 - 2002 Kungliga Tekniska Högskolan"); +puts(" * (Royal Institute of Technology, Stockholm, Sweden)."); +puts(" * All rights reserved."); +puts(" * "); +puts(" * Redistribution and use in source and binary forms, with or without"); +puts(" * modification, are permitted provided that the following conditions"); +puts(" * are met:"); +puts(" * "); +puts(" * 1. Redistributions of source code must retain the above copyright"); +puts(" * notice, this list of conditions and the following disclaimer."); +puts(" * "); +puts(" * 2. Redistributions in binary form must reproduce the above copyright"); +puts(" * notice, this list of conditions and the following disclaimer in the"); +puts(" * documentation and/or other materials provided with the distribution."); +puts(" * "); +puts(" * 3. Neither the name of the Institute nor the names of its contributors"); +puts(" * may be used to endorse or promote products derived from this software"); +puts(" * without specific prior written permission."); +puts(" * "); +puts(" * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND"); +puts(" * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE"); +puts(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE"); +puts(" * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE"); +puts(" * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL"); +puts(" * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS"); +puts(" * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)"); +puts(" * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT"); +puts(" * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY"); +puts(" * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF"); +puts(" * SUCH DAMAGE."); +puts(" */"); +puts(""); +puts("/* $Id: roken.h.in,v 1.169 2002/08/26 21:43:38 assar Exp $ */"); +puts(""); +puts("#include <stdio.h>"); +puts("#include <stdlib.h>"); +puts("#include <stdarg.h>"); +puts("#include <string.h>"); +puts("#include <signal.h>"); +puts(""); +#ifdef _AIX +puts("struct ether_addr;"); +puts("struct sockaddr_dl;"); +#endif +#ifdef HAVE_SYS_PARAM_H +puts("#include <sys/param.h>"); +#endif +#ifdef HAVE_INTTYPES_H +puts("#include <inttypes.h>"); +#endif +#ifdef HAVE_SYS_TYPES_H +puts("#include <sys/types.h>"); +#endif +#ifdef HAVE_SYS_BITYPES_H +puts("#include <sys/bitypes.h>"); +#endif +#ifdef HAVE_BIND_BITYPES_H +puts("#include <bind/bitypes.h>"); +#endif +#ifdef HAVE_NETINET_IN6_MACHTYPES_H +puts("#include <netinet/in6_machtypes.h>"); +#endif +#ifdef HAVE_UNISTD_H +puts("#include <unistd.h>"); +#endif +#ifdef HAVE_SYS_SOCKET_H +puts("#include <sys/socket.h>"); +#endif +#ifdef HAVE_SYS_UIO_H +puts("#include <sys/uio.h>"); +#endif +#ifdef HAVE_GRP_H +puts("#include <grp.h>"); +#endif +#ifdef HAVE_SYS_STAT_H +puts("#include <sys/stat.h>"); +#endif +#ifdef HAVE_NETINET_IN_H +puts("#include <netinet/in.h>"); +#endif +#ifdef HAVE_NETINET_IN6_H +puts("#include <netinet/in6.h>"); +#endif +#ifdef HAVE_NETINET6_IN6_H +puts("#include <netinet6/in6.h>"); +#endif +#ifdef HAVE_ARPA_INET_H +puts("#include <arpa/inet.h>"); +#endif +#ifdef HAVE_NETDB_H +puts("#include <netdb.h>"); +#endif +#ifdef HAVE_ARPA_NAMESER_H +puts("#include <arpa/nameser.h>"); +#endif +#ifdef HAVE_RESOLV_H +puts("#include <resolv.h>"); +#endif +#ifdef HAVE_SYSLOG_H +puts("#include <syslog.h>"); +#endif +#ifdef HAVE_FCNTL_H +puts("#include <fcntl.h>"); +#endif +#ifdef HAVE_ERRNO_H +puts("#include <errno.h>"); +#endif +#ifdef HAVE_ERR_H +puts("#include <err.h>"); +#endif +#ifdef HAVE_TERMIOS_H +puts("#include <termios.h>"); +#endif +#if defined(HAVE_SYS_IOCTL_H) && SunOS != 40 +puts("#include <sys/ioctl.h>"); +#endif +#ifdef TIME_WITH_SYS_TIME +puts("#include <sys/time.h>"); +puts("#include <time.h>"); +#elif defined(HAVE_SYS_TIME_H) +puts("#include <sys/time.h>"); +#else +puts("#include <time.h>"); +#endif +puts(""); +#ifdef HAVE_PATHS_H +puts("#include <paths.h>"); +#endif +puts(""); +puts(""); +#ifndef ROKEN_LIB_FUNCTION +#if defined(__BORLANDC__) +puts("#define ROKEN_LIB_FUNCTION /* not-ready-definition-yet */"); +#elif defined(_MSC_VER) +puts("#define ROKEN_LIB_FUNCTION /* not-ready-definition-yet2 */"); +#else +puts("#define ROKEN_LIB_FUNCTION"); +#endif +#endif +puts(""); +#ifndef HAVE_SSIZE_T +puts("typedef int ssize_t;"); +#endif +puts(""); +puts("#include <roken-common.h>"); +puts(""); +puts("ROKEN_CPP_START"); +puts(""); +#if !defined(HAVE_SETSID) && defined(HAVE__SETSID) +puts("#define setsid _setsid"); +#endif +puts(""); +#ifndef HAVE_PUTENV +puts("int putenv(const char *string);"); +#endif +puts(""); +#if !defined(HAVE_SETENV) || defined(NEED_SETENV_PROTO) +puts("int setenv(const char *var, const char *val, int rewrite);"); +#endif +puts(""); +#if !defined(HAVE_UNSETENV) || defined(NEED_UNSETENV_PROTO) +puts("void unsetenv(const char *name);"); +#endif +puts(""); +#if !defined(HAVE_GETUSERSHELL) || defined(NEED_GETUSERSHELL_PROTO) +puts("char *getusershell(void);"); +puts("void endusershell(void);"); +#endif +puts(""); +#if !defined(HAVE_SNPRINTF) || defined(NEED_SNPRINTF_PROTO) +puts("int snprintf (char *str, size_t sz, const char *format, ...)"); +puts(" __attribute__ ((format (printf, 3, 4)));"); +#endif +puts(""); +#if !defined(HAVE_VSNPRINTF) || defined(NEED_VSNPRINTF_PROTO) +puts("int vsnprintf (char *str, size_t sz, const char *format, va_list ap)"); +puts(" __attribute__((format (printf, 3, 0)));"); +#endif +puts(""); +#if !defined(HAVE_ASPRINTF) || defined(NEED_ASPRINTF_PROTO) +puts("int asprintf (char **ret, const char *format, ...)"); +puts(" __attribute__ ((format (printf, 2, 3)));"); +#endif +puts(""); +#if !defined(HAVE_VASPRINTF) || defined(NEED_VASPRINTF_PROTO) +puts("int vasprintf (char **ret, const char *format, va_list ap)"); +puts(" __attribute__((format (printf, 2, 0)));"); +#endif +puts(""); +#if !defined(HAVE_ASNPRINTF) || defined(NEED_ASNPRINTF_PROTO) +puts("int asnprintf (char **ret, size_t max_sz, const char *format, ...)"); +puts(" __attribute__ ((format (printf, 3, 4)));"); +#endif +puts(""); +#if !defined(HAVE_VASNPRINTF) || defined(NEED_VASNPRINTF_PROTO) +puts("int vasnprintf (char **ret, size_t max_sz, const char *format, va_list ap)"); +puts(" __attribute__((format (printf, 3, 0)));"); +#endif +puts(""); +#ifndef HAVE_STRDUP +puts("char * strdup(const char *old);"); +#endif +puts(""); +#if !defined(HAVE_STRNDUP) || defined(NEED_STRNDUP_PROTO) +puts("char * strndup(const char *old, size_t sz);"); +#endif +puts(""); +#ifndef HAVE_STRLWR +puts("char * strlwr(char *);"); +#endif +puts(""); +#ifndef HAVE_STRNLEN +puts("size_t strnlen(const char*, size_t);"); +#endif +puts(""); +#if !defined(HAVE_STRSEP) || defined(NEED_STRSEP_PROTO) +puts("char *strsep(char**, const char*);"); +#endif +puts(""); +#if !defined(HAVE_STRSEP_COPY) || defined(NEED_STRSEP_COPY_PROTO) +puts("ssize_t strsep_copy(const char**, const char*, char*, size_t);"); +#endif +puts(""); +#ifndef HAVE_STRCASECMP +puts("int strcasecmp(const char *s1, const char *s2);"); +#endif +puts(""); +#ifdef NEED_FCLOSE_PROTO +puts("int fclose(FILE *);"); +#endif +puts(""); +#ifdef NEED_STRTOK_R_PROTO +puts("char *strtok_r(char *s1, const char *s2, char **lasts);"); +#endif +puts(""); +#ifndef HAVE_STRUPR +puts("char * strupr(char *);"); +#endif +puts(""); +#ifndef HAVE_STRLCPY +puts("size_t strlcpy (char *dst, const char *src, size_t dst_sz);"); +#endif +puts(""); +#ifndef HAVE_STRLCAT +puts("size_t strlcat (char *dst, const char *src, size_t dst_sz);"); +#endif +puts(""); +#ifndef HAVE_GETDTABLESIZE +puts("int getdtablesize(void);"); +#endif +puts(""); +#if !defined(HAVE_STRERROR) && !defined(strerror) +puts("char *strerror(int eno);"); +#endif +puts(""); +#if !defined(HAVE_HSTRERROR) || defined(NEED_HSTRERROR_PROTO) +puts("/* This causes a fatal error under Psoriasis */"); +#if !(defined(SunOS) && (SunOS >= 50)) +puts("const char *hstrerror(int herr);"); +#endif +#endif +puts(""); +#ifndef HAVE_H_ERRNO_DECLARATION +puts("extern int h_errno;"); +#endif +puts(""); +#if !defined(HAVE_INET_ATON) || defined(NEED_INET_ATON_PROTO) +puts("int inet_aton(const char *cp, struct in_addr *adr);"); +#endif +puts(""); +#ifndef HAVE_INET_NTOP +puts("const char *"); +puts("inet_ntop(int af, const void *src, char *dst, size_t size);"); +#endif +puts(""); +#ifndef HAVE_INET_PTON +puts("int"); +puts("inet_pton(int af, const char *src, void *dst);"); +#endif +puts(""); +#if !defined(HAVE_GETCWD) +puts("char* getcwd(char *path, size_t size);"); +#endif +puts(""); +#ifdef HAVE_PWD_H +puts("#include <pwd.h>"); +puts("struct passwd *k_getpwnam (const char *user);"); +puts("struct passwd *k_getpwuid (uid_t uid);"); +#endif +puts(""); +puts("const char *get_default_username (void);"); +puts(""); +#ifndef HAVE_SETEUID +puts("int seteuid(uid_t euid);"); +#endif +puts(""); +#ifndef HAVE_SETEGID +puts("int setegid(gid_t egid);"); +#endif +puts(""); +#ifndef HAVE_LSTAT +puts("int lstat(const char *path, struct stat *buf);"); +#endif +puts(""); +#if !defined(HAVE_MKSTEMP) || defined(NEED_MKSTEMP_PROTO) +puts("int mkstemp(char *);"); +#endif +puts(""); +#ifndef HAVE_CGETENT +puts("int cgetent(char **buf, char **db_array, const char *name);"); +puts("int cgetstr(char *buf, const char *cap, char **str);"); +#endif +puts(""); +#ifndef HAVE_INITGROUPS +puts("int initgroups(const char *name, gid_t basegid);"); +#endif +puts(""); +#ifndef HAVE_FCHOWN +puts("int fchown(int fd, uid_t owner, gid_t group);"); +#endif +puts(""); +#ifndef HAVE_DAEMON +puts("int daemon(int nochdir, int noclose);"); +#endif +puts(""); +#ifndef HAVE_INNETGR +puts("int innetgr(const char *netgroup, const char *machine, "); +puts(" const char *user, const char *domain);"); +#endif +puts(""); +#ifndef HAVE_CHOWN +puts("int chown(const char *path, uid_t owner, gid_t group);"); +#endif +puts(""); +#ifndef HAVE_RCMD +puts("int rcmd(char **ahost, unsigned short inport, const char *locuser,"); +puts(" const char *remuser, const char *cmd, int *fd2p);"); +#endif +puts(""); +#if !defined(HAVE_INNETGR) || defined(NEED_INNETGR_PROTO) +puts("int innetgr(const char*, const char*, const char*, const char*);"); +#endif +puts(""); +#ifndef HAVE_IRUSEROK +puts("int iruserok(unsigned raddr, int superuser, const char *ruser,"); +puts(" const char *luser);"); +#endif +puts(""); +#if !defined(HAVE_GETHOSTNAME) || defined(NEED_GETHOSTNAME_PROTO) +puts("int gethostname(char *name, int namelen);"); +#endif +puts(""); +#ifndef HAVE_WRITEV +puts("ssize_t"); +puts("writev(int d, const struct iovec *iov, int iovcnt);"); +#endif +puts(""); +#ifndef HAVE_READV +puts("ssize_t"); +puts("readv(int d, const struct iovec *iov, int iovcnt);"); +#endif +puts(""); +#ifndef HAVE_MKSTEMP +puts("int"); +puts("mkstemp(char *template);"); +#endif +puts(""); +#ifndef HAVE_PIDFILE +puts("void pidfile (const char*);"); +#endif +puts(""); +#ifndef HAVE_BSWAP32 +puts("unsigned int bswap32(unsigned int);"); +#endif +puts(""); +#ifndef HAVE_BSWAP16 +puts("unsigned short bswap16(unsigned short);"); +#endif +puts(""); +#ifndef HAVE_FLOCK +#ifndef LOCK_SH +puts("#define LOCK_SH 1 /* Shared lock */"); +#endif +#ifndef LOCK_EX +puts("#define LOCK_EX 2 /* Exclusive lock */"); +#endif +#ifndef LOCK_NB +puts("#define LOCK_NB 4 /* Don't block when locking */"); +#endif +#ifndef LOCK_UN +puts("#define LOCK_UN 8 /* Unlock */"); +#endif +puts(""); +puts("int flock(int fd, int operation);"); +#endif /* HAVE_FLOCK */ +puts(""); +puts("time_t tm2time (struct tm tm, int local);"); +puts(""); +puts("int unix_verify_user(char *user, char *password);"); +puts(""); +puts("int roken_concat (char *s, size_t len, ...);"); +puts(""); +puts("size_t roken_mconcat (char **s, size_t max_len, ...);"); +puts(""); +puts("int roken_vconcat (char *s, size_t len, va_list args);"); +puts(""); +puts("size_t roken_vmconcat (char **s, size_t max_len, va_list args);"); +puts(""); +puts("ssize_t net_write (int fd, const void *buf, size_t nbytes);"); +puts(""); +puts("ssize_t net_read (int fd, void *buf, size_t nbytes);"); +puts(""); +puts("int issuid(void);"); +puts(""); +#ifndef HAVE_STRUCT_WINSIZE +puts("struct winsize {"); +puts(" unsigned short ws_row, ws_col;"); +puts(" unsigned short ws_xpixel, ws_ypixel;"); +puts("};"); +#endif +puts(""); +puts("int get_window_size(int fd, struct winsize *);"); +puts(""); +#ifndef HAVE_VSYSLOG +puts("void vsyslog(int pri, const char *fmt, va_list ap);"); +#endif +puts(""); +#ifndef HAVE_OPTARG_DECLARATION +puts("extern char *optarg;"); +#endif +#ifndef HAVE_OPTIND_DECLARATION +puts("extern int optind;"); +#endif +#ifndef HAVE_OPTERR_DECLARATION +puts("extern int opterr;"); +#endif +puts(""); +#ifndef HAVE___PROGNAME_DECLARATION +puts("extern const char *__progname;"); +#endif +puts(""); +#ifndef HAVE_ENVIRON_DECLARATION +puts("extern char **environ;"); +#endif +puts(""); +#ifndef HAVE_GETIPNODEBYNAME +puts("struct hostent *"); +puts("getipnodebyname (const char *name, int af, int flags, int *error_num);"); +#endif +puts(""); +#ifndef HAVE_GETIPNODEBYADDR +puts("struct hostent *"); +puts("getipnodebyaddr (const void *src, size_t len, int af, int *error_num);"); +#endif +puts(""); +#ifndef HAVE_FREEHOSTENT +puts("void"); +puts("freehostent (struct hostent *h);"); +#endif +puts(""); +#ifndef HAVE_COPYHOSTENT +puts("struct hostent *"); +puts("copyhostent (const struct hostent *h);"); +#endif +puts(""); +#ifndef HAVE_SOCKLEN_T +puts("typedef int socklen_t;"); +#endif +puts(""); +#ifndef HAVE_STRUCT_SOCKADDR_STORAGE +puts(""); +#ifndef HAVE_SA_FAMILY_T +puts("typedef unsigned short sa_family_t;"); +#endif +puts(""); +#ifdef HAVE_IPV6 +puts("#define _SS_MAXSIZE sizeof(struct sockaddr_in6)"); +#else +puts("#define _SS_MAXSIZE sizeof(struct sockaddr_in)"); +#endif +puts(""); +puts("#define _SS_ALIGNSIZE sizeof(unsigned long)"); +puts(""); +#if HAVE_STRUCT_SOCKADDR_SA_LEN +puts(""); +puts("typedef unsigned char roken_sa_family_t;"); +puts(""); +puts("#define _SS_PAD1SIZE ((2 * _SS_ALIGNSIZE - sizeof (roken_sa_family_t) - sizeof(unsigned char)) % _SS_ALIGNSIZE)"); +puts("#define _SS_PAD2SIZE (_SS_MAXSIZE - (sizeof (roken_sa_family_t) + sizeof(unsigned char) + _SS_PAD1SIZE + _SS_ALIGNSIZE))"); +puts(""); +puts("struct sockaddr_storage {"); +puts(" unsigned char ss_len;"); +puts(" roken_sa_family_t ss_family;"); +puts(" char __ss_pad1[_SS_PAD1SIZE];"); +puts(" unsigned long __ss_align[_SS_PAD2SIZE / sizeof(unsigned long) + 1];"); +puts("};"); +puts(""); +#else /* !HAVE_STRUCT_SOCKADDR_SA_LEN */ +puts(""); +puts("typedef unsigned short roken_sa_family_t;"); +puts(""); +puts("#define _SS_PAD1SIZE ((2 * _SS_ALIGNSIZE - sizeof (roken_sa_family_t)) % _SS_ALIGNSIZE)"); +puts("#define _SS_PAD2SIZE (_SS_MAXSIZE - (sizeof (roken_sa_family_t) + _SS_PAD1SIZE + _SS_ALIGNSIZE))"); +puts(""); +puts("struct sockaddr_storage {"); +puts(" roken_sa_family_t ss_family;"); +puts(" char __ss_pad1[_SS_PAD1SIZE];"); +puts(" unsigned long __ss_align[_SS_PAD2SIZE / sizeof(unsigned long) + 1];"); +puts("};"); +puts(""); +#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */ +puts(""); +#endif /* HAVE_STRUCT_SOCKADDR_STORAGE */ +puts(""); +#ifndef HAVE_STRUCT_ADDRINFO +puts("struct addrinfo {"); +puts(" int ai_flags;"); +puts(" int ai_family;"); +puts(" int ai_socktype;"); +puts(" int ai_protocol;"); +puts(" size_t ai_addrlen;"); +puts(" char *ai_canonname;"); +puts(" struct sockaddr *ai_addr;"); +puts(" struct addrinfo *ai_next;"); +puts("};"); +#endif +puts(""); +#ifndef HAVE_GETADDRINFO +puts("int"); +puts("getaddrinfo(const char *nodename,"); +puts(" const char *servname,"); +puts(" const struct addrinfo *hints,"); +puts(" struct addrinfo **res);"); +#endif +puts(""); +#ifndef HAVE_GETNAMEINFO +puts("int getnameinfo(const struct sockaddr *sa, socklen_t salen,"); +puts(" char *host, size_t hostlen,"); +puts(" char *serv, size_t servlen,"); +puts(" int flags);"); +#endif +puts(""); +#ifndef HAVE_FREEADDRINFO +puts("void"); +puts("freeaddrinfo(struct addrinfo *ai);"); +#endif +puts(""); +#ifndef HAVE_GAI_STRERROR +puts("char *"); +puts("gai_strerror(int ecode);"); +#endif +puts(""); +puts("int"); +puts("getnameinfo_verified(const struct sockaddr *sa, socklen_t salen,"); +puts(" char *host, size_t hostlen,"); +puts(" char *serv, size_t servlen,"); +puts(" int flags);"); +puts(""); +puts("int roken_getaddrinfo_hostspec(const char *, int, struct addrinfo **); "); +puts("int roken_getaddrinfo_hostspec2(const char *, int, int, struct addrinfo **);"); +puts(""); +#ifndef HAVE_STRFTIME +puts("size_t"); +puts("strftime (char *buf, size_t maxsize, const char *format,"); +puts(" const struct tm *tm);"); +#endif +puts(""); +#ifndef HAVE_STRPTIME +puts("char *"); +puts("strptime (const char *buf, const char *format, struct tm *timeptr);"); +#endif +puts(""); +#ifndef HAVE_EMALLOC +puts("void *emalloc (size_t);"); +#endif +#ifndef HAVE_ECALLOC +puts("void *ecalloc(size_t num, size_t sz);"); +#endif +#ifndef HAVE_EREALLOC +puts("void *erealloc (void *, size_t);"); +#endif +#ifndef HAVE_ESTRDUP +puts("char *estrdup (const char *);"); +#endif +puts(""); +puts("/*"); +puts(" * kludges and such"); +puts(" */"); +puts(""); +#if 1 +puts("int roken_gethostby_setup(const char*, const char*);"); +puts("struct hostent* roken_gethostbyname(const char*);"); +puts("struct hostent* roken_gethostbyaddr(const void*, size_t, int);"); +#else +#ifdef GETHOSTBYNAME_PROTO_COMPATIBLE +puts("#define roken_gethostbyname(x) gethostbyname(x)"); +#else +puts("#define roken_gethostbyname(x) gethostbyname((char *)x)"); +#endif +puts(""); +#ifdef GETHOSTBYADDR_PROTO_COMPATIBLE +puts("#define roken_gethostbyaddr(a, l, t) gethostbyaddr(a, l, t)"); +#else +puts("#define roken_gethostbyaddr(a, l, t) gethostbyaddr((char *)a, l, t)"); +#endif +#endif +puts(""); +#ifdef GETSERVBYNAME_PROTO_COMPATIBLE +puts("#define roken_getservbyname(x,y) getservbyname(x,y)"); +#else +puts("#define roken_getservbyname(x,y) getservbyname((char *)x, (char *)y)"); +#endif +puts(""); +#ifdef OPENLOG_PROTO_COMPATIBLE +puts("#define roken_openlog(a,b,c) openlog(a,b,c)"); +#else +puts("#define roken_openlog(a,b,c) openlog((char *)a,b,c)"); +#endif +puts(""); +#ifdef GETSOCKNAME_PROTO_COMPATIBLE +puts("#define roken_getsockname(a,b,c) getsockname(a,b,c)"); +#else +puts("#define roken_getsockname(a,b,c) getsockname(a, b, (void*)c)"); +#endif +puts(""); +#ifndef HAVE_SETPROGNAME +puts("void setprogname(const char *argv0);"); +#endif +puts(""); +#ifndef HAVE_GETPROGNAME +puts("const char *getprogname(void);"); +#endif +puts(""); +puts("void mini_inetd_addrinfo (struct addrinfo*);"); +puts("void mini_inetd (int port);"); +puts(""); +puts("void set_progname(char *argv0);"); +puts("const char *get_progname(void);"); +puts(""); +#ifndef HAVE_LOCALTIME_R +puts("struct tm *"); +puts("localtime_r(const time_t *timer, struct tm *result);"); +#endif +puts(""); +#if !defined(HAVE_STRSVIS) || defined(NEED_STRSVIS_PROTO) +puts("int"); +puts("strsvis(char *dst, const char *src, int flag, const char *extra);"); +#endif +puts(""); +#if !defined(HAVE_STRUNVIS) || defined(NEED_STRUNVIS_PROTO) +puts("int"); +puts("strunvis(char *dst, const char *src);"); +#endif +puts(""); +#if !defined(HAVE_STRVIS) || defined(NEED_STRVIS_PROTO) +puts("int"); +puts("strvis(char *dst, const char *src, int flag);"); +#endif +puts(""); +#if !defined(HAVE_STRVISX) || defined(NEED_STRVISX_PROTO) +puts("int"); +puts("strvisx(char *dst, const char *src, size_t len, int flag);"); +#endif +puts(""); +#if !defined(HAVE_SVIS) || defined(NEED_SVIS_PROTO) +puts("char *"); +puts("svis(char *dst, int c, int flag, int nextc, const char *extra);"); +#endif +puts(""); +#if !defined(HAVE_UNVIS) || defined(NEED_UNVIS_PROTO) +puts("int"); +puts("unvis(char *cp, int c, int *astate, int flag);"); +#endif +puts(""); +#if !defined(HAVE_VIS) || defined(NEED_VIS_PROTO) +puts("char *"); +puts("vis(char *dst, int c, int flag, int nextc);"); +#endif +puts(""); +puts("ROKEN_CPP_END"); +puts("#define ROKEN_VERSION " VERSION ); +puts(""); +puts("#endif /* __ROKEN_H__ */"); +return 0; +} diff --git a/crypto/heimdal/lib/roken/mini_inetd.c b/crypto/heimdal/lib/roken/mini_inetd.c index 39dd046..8c8f72d 100644 --- a/crypto/heimdal/lib/roken/mini_inetd.c +++ b/crypto/heimdal/lib/roken/mini_inetd.c @@ -33,7 +33,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> -RCSID("$Id: mini_inetd.c,v 1.29 2001/08/01 14:48:54 assar Exp $"); +RCSID("$Id: mini_inetd.c,v 1.30 2002/02/18 19:08:55 joda Exp $"); #endif #include <err.h> @@ -59,31 +59,19 @@ accept_it (int s) } /* - * Listen on `port' emulating inetd. + * Listen on a specified port, emulating inetd. */ void -mini_inetd (int port) +mini_inetd_addrinfo (struct addrinfo *ai) { - int error, ret; - struct addrinfo *ai, *a, hints; - char portstr[NI_MAXSERV]; + int ret; + struct addrinfo *a; int n, nalloc, i; int *fds; fd_set orig_read_set, read_set; int max_fd = -1; - memset (&hints, 0, sizeof(hints)); - hints.ai_flags = AI_PASSIVE; - hints.ai_socktype = SOCK_STREAM; - hints.ai_family = PF_UNSPEC; - - snprintf (portstr, sizeof(portstr), "%d", ntohs(port)); - - error = getaddrinfo (NULL, portstr, &hints, &ai); - if (error) - errx (1, "getaddrinfo: %s", gai_strerror (error)); - for (nalloc = 0, a = ai; a != NULL; a = a->ai_next) ++nalloc; @@ -116,7 +104,6 @@ mini_inetd (int port) max_fd = max(max_fd, fds[i]); ++i; } - freeaddrinfo (ai); if (i == 0) errx (1, "no sockets"); n = i; @@ -136,3 +123,26 @@ mini_inetd (int port) } abort (); } + +void +mini_inetd (int port) +{ + int error; + struct addrinfo *ai, hints; + char portstr[NI_MAXSERV]; + + memset (&hints, 0, sizeof(hints)); + hints.ai_flags = AI_PASSIVE; + hints.ai_socktype = SOCK_STREAM; + hints.ai_family = PF_UNSPEC; + + snprintf (portstr, sizeof(portstr), "%d", ntohs(port)); + + error = getaddrinfo (NULL, portstr, &hints, &ai); + if (error) + errx (1, "getaddrinfo: %s", gai_strerror (error)); + + mini_inetd_addrinfo(ai); + + freeaddrinfo(ai); +} diff --git a/crypto/heimdal/lib/roken/mini_inetd.lo b/crypto/heimdal/lib/roken/mini_inetd.lo Binary files differnew file mode 100644 index 0000000..f2f233f --- /dev/null +++ b/crypto/heimdal/lib/roken/mini_inetd.lo diff --git a/crypto/heimdal/lib/roken/ndbm_wrap.c b/crypto/heimdal/lib/roken/ndbm_wrap.c new file mode 100644 index 0000000..2c24cd5 --- /dev/null +++ b/crypto/heimdal/lib/roken/ndbm_wrap.c @@ -0,0 +1,211 @@ +/* + * Copyright (c) 2002 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +RCSID("$Id: ndbm_wrap.c,v 1.1 2002/04/30 16:37:08 joda Exp $"); +#endif + +#include "ndbm_wrap.h" +#if defined(HAVE_DB4_DB_H) +#include <db4/db.h> +#elif defined(HAVE_DB3_DB_H) +#include <db3/db.h> +#else +#include <db.h> +#endif + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <fcntl.h> + + +#define DBT2DATUM(DBT, DATUM) do { (DATUM)->dptr = (DBT)->data; (DATUM)->dsize = (DBT)->size; } while(0) +#define DATUM2DBT(DATUM, DBT) do { (DBT)->data = (DATUM)->dptr; (DBT)->size = (DATUM)->dsize; } while(0) +#define RETURN(X) return ((X) == 0) ? 0 : -1 + +#ifdef HAVE_DB3 +static DBC *cursor; +#endif + +#define D(X) ((DB*)(X)) + +void +dbm_close (DBM *db) +{ +#ifdef HAVE_DB3 + D(db)->close(D(db), 0); + cursor = NULL; +#else + D(db)->close(D(db)); +#endif +} + +int +dbm_delete (DBM *db, datum dkey) +{ + DBT key; + DATUM2DBT(&dkey, &key); +#ifdef HAVE_DB3 + RETURN(D(db)->del(D(db), NULL, &key, 0)); +#else + RETURN(D(db)->del(D(db), &key, 0)); +#endif +} + +datum +dbm_fetch (DBM *db, datum dkey) +{ + datum dvalue; + DBT key, value; + DATUM2DBT(&dkey, &key); + if(D(db)->get(D(db), +#ifdef HAVE_DB3 + NULL, +#endif + &key, &value, 0) != 0) + dvalue.dptr = NULL; + else + DBT2DATUM(&value, &dvalue); + + return dvalue; +} + +static datum +dbm_get (DB *db, int flags) +{ + DBT key, value; + datum datum; +#ifdef HAVE_DB3 + if(cursor == NULL) + db->cursor(db, NULL, &cursor, 0); + if(cursor->c_get(cursor, &key, &value, flags) != 0) + datum.dptr = NULL; + else + DBT2DATUM(&value, &datum); +#else + db->seq(db, &key, &value, flags); +#endif + return datum; +} + +#ifndef DB_FIRST +#define DB_FIRST R_FIRST +#define DB_NEXT R_NEXT +#define DB_NOOVERWRITE R_NOOVERWRITE +#define DB_KEYEXIST 1 +#endif + +datum +dbm_firstkey (DBM *db) +{ + return dbm_get(D(db), DB_FIRST); +} + +datum +dbm_nextkey (DBM *db) +{ + return dbm_get(D(db), DB_NEXT); +} + +DBM* +dbm_open (const char *file, int flags, mode_t mode) +{ + DB *db; + int myflags = 0; + char *fn = malloc(strlen(file) + 4); + if(fn == NULL) + return NULL; + strcpy(fn, file); + strcat(fn, ".db"); +#ifdef HAVE_DB3 + if (flags & O_CREAT) + myflags |= DB_CREATE; + + if (flags & O_EXCL) + myflags |= DB_EXCL; + + if (flags & O_RDONLY) + myflags |= DB_RDONLY; + + if (flags & O_TRUNC) + myflags |= DB_TRUNCATE; + if(db_create(&db, NULL, 0) != 0) { + free(fn); + return NULL; + } + if(db->open(db, fn, NULL, DB_BTREE, myflags, mode) != 0) { + free(fn); + db->close(db, 0); + return NULL; + } +#else + db = dbopen(fn, flags, mode, DB_BTREE, NULL); +#endif + free(fn); + return (DBM*)db; +} + +int +dbm_store (DBM *db, datum dkey, datum dvalue, int flags) +{ + int ret; + DBT key, value; + int myflags = 0; + if((flags & DBM_REPLACE) == 0) + myflags |= DB_NOOVERWRITE; + DATUM2DBT(&dkey, &key); + DATUM2DBT(&dvalue, &value); + ret = D(db)->put(D(db), +#ifdef HAVE_DB3 + NULL, +#endif +&key, &value, myflags); + if(ret == DB_KEYEXIST) + return 1; + RETURN(ret); +} + +int +dbm_error (DBM *db) +{ + return 0; +} + +int +dbm_clearerr (DBM *db) +{ + return 0; +} + diff --git a/crypto/heimdal/lib/roken/ndbm_wrap.h b/crypto/heimdal/lib/roken/ndbm_wrap.h new file mode 100644 index 0000000..77c88b4 --- /dev/null +++ b/crypto/heimdal/lib/roken/ndbm_wrap.h @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2002 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* $Id: ndbm_wrap.h,v 1.1 2002/04/30 16:37:20 joda Exp $ */ + +#ifndef __ndbm_wrap_h__ +#define __ndbm_wrap_h__ + +#include <stdio.h> +#include <sys/types.h> + +#ifndef dbm_rename +#define dbm_rename(X) __roken_ ## X +#endif + +#define dbm_open dbm_rename(dbm_open) +#define dbm_close dbm_rename(dbm_close) +#define dbm_delete dbm_rename(dbm_delete) +#define dbm_fetch dbm_rename(dbm_fetch) +#define dbm_get dbm_rename(dbm_get) +#define dbm_firstkey dbm_rename(dbm_firstkey) +#define dbm_nextkey dbm_rename(dbm_nextkey) +#define dbm_store dbm_rename(dbm_store) +#define dbm_error dbm_rename(dbm_error) +#define dbm_clearerr dbm_rename(dbm_clearerr) + +#define datum dbm_rename(datum) + +typedef struct { + void *dptr; + size_t dsize; +} datum; + +#define DBM_REPLACE 1 +typedef struct DBM DBM; + +#if 0 +typedef struct { + int dummy; +} DBM; +#endif + +int dbm_clearerr (DBM*); +void dbm_close (DBM*); +int dbm_delete (DBM*, datum); +int dbm_error (DBM*); +datum dbm_fetch (DBM*, datum); +datum dbm_firstkey (DBM*); +datum dbm_nextkey (DBM*); +DBM* dbm_open (const char*, int, mode_t); +int dbm_store (DBM*, datum, datum, int); + +#endif /* __ndbm_wrap_h__ */ diff --git a/crypto/heimdal/lib/roken/net_read.lo b/crypto/heimdal/lib/roken/net_read.lo Binary files differnew file mode 100644 index 0000000..c89ace9 --- /dev/null +++ b/crypto/heimdal/lib/roken/net_read.lo diff --git a/crypto/heimdal/lib/roken/net_write.lo b/crypto/heimdal/lib/roken/net_write.lo Binary files differnew file mode 100644 index 0000000..baba57f --- /dev/null +++ b/crypto/heimdal/lib/roken/net_write.lo diff --git a/crypto/heimdal/lib/roken/parse_bytes.lo b/crypto/heimdal/lib/roken/parse_bytes.lo Binary files differnew file mode 100644 index 0000000..3722d32 --- /dev/null +++ b/crypto/heimdal/lib/roken/parse_bytes.lo diff --git a/crypto/heimdal/lib/roken/parse_time.lo b/crypto/heimdal/lib/roken/parse_time.lo Binary files differnew file mode 100644 index 0000000..aa0e5e0 --- /dev/null +++ b/crypto/heimdal/lib/roken/parse_time.lo diff --git a/crypto/heimdal/lib/roken/parse_units.lo b/crypto/heimdal/lib/roken/parse_units.lo Binary files differnew file mode 100644 index 0000000..e010857 --- /dev/null +++ b/crypto/heimdal/lib/roken/parse_units.lo diff --git a/crypto/heimdal/lib/roken/resolve.c b/crypto/heimdal/lib/roken/resolve.c index eddaa7d..f17ae4c 100644 --- a/crypto/heimdal/lib/roken/resolve.c +++ b/crypto/heimdal/lib/roken/resolve.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 1995 - 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -45,7 +45,7 @@ #include <assert.h> -RCSID("$Id: resolve.c,v 1.30 2001/10/02 15:39:41 joda Exp $"); +RCSID("$Id: resolve.c,v 1.33 2002/08/28 20:07:24 joda Exp $"); #if defined(HAVE_RES_SEARCH) && defined(HAVE_DN_EXPAND) @@ -113,10 +113,10 @@ dns_free_data(struct dns_reply *r) static struct dns_reply* parse_reply(unsigned char *data, int len) { - unsigned char *p; + const unsigned char *p; char host[128]; int status; - + const unsigned char *end_data = data + len; struct dns_reply *r; struct resource_record **rr; @@ -133,7 +133,7 @@ parse_reply(unsigned char *data, int len) memcpy(&r->h, p, 12); /* XXX this will probably be mostly garbage */ p += 12; #endif - status = dn_expand(data, data + len, p, host, sizeof(host)); + status = dn_expand(data, end_data, p, host, sizeof(host)); if(status < 0){ dns_free_data(r); return NULL; @@ -143,19 +143,27 @@ parse_reply(unsigned char *data, int len) dns_free_data(r); return NULL; } + if (p + status + 4 > end_data) { + dns_free_data(r); + return NULL; + } p += status; r->q.type = (p[0] << 8 | p[1]); p += 2; r->q.class = (p[0] << 8 | p[1]); p += 2; rr = &r->head; - while(p < data + len){ + while(p < end_data){ int type, class, ttl, size; - status = dn_expand(data, data + len, p, host, sizeof(host)); + status = dn_expand(data, end_data, p, host, sizeof(host)); if(status < 0){ dns_free_data(r); return NULL; } + if (p + status + 10 > end_data) { + dns_free_data(r); + return NULL; + } p += status; type = (p[0] << 8) | p[1]; p += 2; @@ -165,6 +173,12 @@ parse_reply(unsigned char *data, int len) p += 4; size = (p[0] << 8) | p[1]; p += 2; + + if (p + size > end_data) { + dns_free_data(r); + return NULL; + } + *rr = (struct resource_record*)calloc(1, sizeof(struct resource_record)); if(*rr == NULL) { @@ -184,7 +198,7 @@ parse_reply(unsigned char *data, int len) case T_NS: case T_CNAME: case T_PTR: - status = dn_expand(data, data + len, p, host, sizeof(host)); + status = dn_expand(data, end_data, p, host, sizeof(host)); if(status < 0){ dns_free_data(r); return NULL; @@ -197,11 +211,16 @@ parse_reply(unsigned char *data, int len) break; case T_MX: case T_AFSDB:{ - status = dn_expand(data, data + len, p + 2, host, sizeof(host)); + status = dn_expand(data, end_data, p + 2, host, sizeof(host)); if(status < 0){ dns_free_data(r); return NULL; } + if (status + 2 > size) { + dns_free_data(r); + return NULL; + } + (*rr)->u.mx = (struct mx_record*)malloc(sizeof(struct mx_record) + strlen(host)); if((*rr)->u.mx == NULL) { @@ -213,11 +232,16 @@ parse_reply(unsigned char *data, int len) break; } case T_SRV:{ - status = dn_expand(data, data + len, p + 6, host, sizeof(host)); + status = dn_expand(data, end_data, p + 6, host, sizeof(host)); if(status < 0){ dns_free_data(r); return NULL; } + if (status + 6 > size) { + dns_free_data(r); + return NULL; + } + (*rr)->u.srv = (struct srv_record*)malloc(sizeof(struct srv_record) + strlen(host)); @@ -244,6 +268,11 @@ parse_reply(unsigned char *data, int len) case T_KEY : { size_t key_len; + if (size < 4) { + dns_free_data (r); + return NULL; + } + key_len = size - 4; (*rr)->u.key = malloc (sizeof(*(*rr)->u.key) + key_len - 1); if ((*rr)->u.key == NULL) { @@ -261,11 +290,16 @@ parse_reply(unsigned char *data, int len) case T_SIG : { size_t sig_len; - status = dn_expand (data, data + len, p + 18, host, sizeof(host)); + status = dn_expand (data, end_data, p + 18, host, sizeof(host)); if (status < 0) { dns_free_data (r); return NULL; } + if (status + 18 > size) { + dns_free_data(r); + return NULL; + } + sig_len = len - 18 - status; (*rr)->u.sig = malloc(sizeof(*(*rr)->u.sig) + strlen(host) + sig_len); @@ -293,6 +327,11 @@ parse_reply(unsigned char *data, int len) case T_CERT : { size_t cert_len; + if (size < 5) { + dns_free_data(r); + return NULL; + } + cert_len = size - 5; (*rr)->u.cert = malloc (sizeof(*(*rr)->u.cert) + cert_len - 1); if ((*rr)->u.cert == NULL) { @@ -327,24 +366,32 @@ dns_lookup_int(const char *domain, int rr_class, int rr_type) { unsigned char reply[1024]; int len; - struct dns_reply *r = NULL; +#ifdef HAVE__RES u_long old_options = 0; +#endif if (_resolve_debug) { +#ifdef HAVE__RES old_options = _res.options; _res.options |= RES_DEBUG; +#endif fprintf(stderr, "dns_lookup(%s, %d, %s)\n", domain, rr_class, dns_type_to_string(rr_type)); } len = res_search(domain, rr_class, rr_type, reply, sizeof(reply)); if (_resolve_debug) { +#ifdef HAVE__RES _res.options = old_options; +#endif fprintf(stderr, "dns_lookup(%s, %d, %s) --> %d\n", domain, rr_class, dns_type_to_string(rr_type), len); } - if (len >= 0) - r = parse_reply(reply, len); - return r; + if(len < 0) { + return NULL; + } else { + len = min(len, sizeof(reply)); + return parse_reply(reply, len); + } } struct dns_reply * @@ -385,7 +432,8 @@ dns_srv_order(struct dns_reply *r) int num_srv = 0; #if defined(HAVE_INITSTATE) && defined(HAVE_SETSTATE) - char state[256], *oldstate; + int state[256 / sizeof(int)]; + char *oldstate; #endif for(rr = r->head; rr; rr = rr->next) @@ -414,7 +462,7 @@ dns_srv_order(struct dns_reply *r) qsort(srvs, num_srv, sizeof(*srvs), compare_srv); #if defined(HAVE_INITSTATE) && defined(HAVE_SETSTATE) - oldstate = initstate(time(NULL), state, sizeof(state)); + oldstate = initstate(time(NULL), (char*)state, sizeof(state)); #endif headp = &r->head; diff --git a/crypto/heimdal/lib/roken/resolve.h b/crypto/heimdal/lib/roken/resolve.h index 6267214..cb25b7a 100644 --- a/crypto/heimdal/lib/roken/resolve.h +++ b/crypto/heimdal/lib/roken/resolve.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 1995 - 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: resolve.h,v 1.13 2001/06/09 01:35:04 joda Exp $ */ +/* $Id: resolve.h,v 1.15 2002/08/26 13:30:16 assar Exp $ */ #ifndef __RESOLVE_H__ #define __RESOLVE_H__ @@ -50,6 +50,9 @@ #ifndef T_KEY #define T_KEY 25 #endif +#ifndef T_AAAA +#define T_AAAA 28 +#endif #ifndef T_SRV #define T_SRV 33 #endif @@ -60,6 +63,21 @@ #define T_CERT 37 #endif +#define dns_query rk_dns_query +#define mx_record rk_mx_record +#define srv_record rk_srv_record +#define key_record rk_key_record +#define sig_record rk_sig_record +#define cert_record rk_cert_record +#define resource_record rk_resource_record +#define dns_reply rk_dns_reply + +#define dns_lookup rk_dns_lookup +#define dns_free_data rk_dns_free_data +#define dns_string_to_type rk_dns_string_to_type +#define dns_type_to_string rk_dns_type_to_string +#define dns_srv_order rk_dns_srv_order + struct dns_query{ char *domain; unsigned type; diff --git a/crypto/heimdal/lib/roken/resolve.lo b/crypto/heimdal/lib/roken/resolve.lo Binary files differnew file mode 100644 index 0000000..3a8b01a --- /dev/null +++ b/crypto/heimdal/lib/roken/resolve.lo diff --git a/crypto/heimdal/lib/roken/roken-common.h b/crypto/heimdal/lib/roken/roken-common.h index 99add53..2e604ac 100644 --- a/crypto/heimdal/lib/roken/roken-common.h +++ b/crypto/heimdal/lib/roken/roken-common.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: roken-common.h,v 1.48 2001/09/03 12:04:34 joda Exp $ */ +/* $Id: roken-common.h,v 1.49 2002/08/20 11:55:04 joda Exp $ */ #ifndef __ROKEN_COMMON_H__ #define __ROKEN_COMMON_H__ @@ -191,13 +191,14 @@ /* flags for getaddrinfo() */ #ifndef AI_PASSIVE - #define AI_PASSIVE 0x01 #define AI_CANONNAME 0x02 -#define AI_NUMERICHOST 0x04 - #endif /* AI_PASSIVE */ +#ifndef AI_NUMERICHOST +#define AI_NUMERICHOST 0x04 +#endif + /* flags for getnameinfo() */ #ifndef NI_DGRAM diff --git a/crypto/heimdal/lib/roken/roken.h b/crypto/heimdal/lib/roken/roken.h new file mode 100644 index 0000000..4be5be5 --- /dev/null +++ b/crypto/heimdal/lib/roken/roken.h @@ -0,0 +1,244 @@ +/* This is an OS dependent, generated file */ + + +#ifndef __ROKEN_H__ +#define __ROKEN_H__ + +/* -*- C -*- */ +/* + * Copyright (c) 1995 - 2002 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* $Id: roken.h.in,v 1.169 2002/08/26 21:43:38 assar Exp $ */ + +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> +#include <string.h> +#include <signal.h> + +#include <sys/param.h> +#include <inttypes.h> +#include <sys/types.h> +#include <unistd.h> +#include <sys/socket.h> +#include <sys/uio.h> +#include <grp.h> +#include <sys/stat.h> +#include <netinet/in.h> +#include <arpa/inet.h> +#include <netdb.h> +#include <arpa/nameser.h> +#include <resolv.h> +#include <syslog.h> +#include <fcntl.h> +#include <errno.h> +#include <err.h> +#include <termios.h> +#include <sys/ioctl.h> +#include <sys/time.h> +#include <time.h> + +#include <paths.h> + + +#define ROKEN_LIB_FUNCTION + + +#include <roken-common.h> + +ROKEN_CPP_START + + + + + + + + + + +int asnprintf (char **ret, size_t max_sz, const char *format, ...) + __attribute__ ((format (printf, 3, 4))); + +int vasnprintf (char **ret, size_t max_sz, const char *format, va_list ap) + __attribute__((format (printf, 3, 0))); + + +char * strndup(const char *old, size_t sz); + +char * strlwr(char *); + +size_t strnlen(const char*, size_t); + + +ssize_t strsep_copy(const char**, const char*, char*, size_t); + + + + +char * strupr(char *); + + + + + + + + + + + +#include <pwd.h> +struct passwd *k_getpwnam (const char *user); +struct passwd *k_getpwuid (uid_t uid); + +const char *get_default_username (void); + + + + + + + + + + + + + + + + + + +void pidfile (const char*); + +unsigned int bswap32(unsigned int); + +unsigned short bswap16(unsigned short); + + +time_t tm2time (struct tm tm, int local); + +int unix_verify_user(char *user, char *password); + +int roken_concat (char *s, size_t len, ...); + +size_t roken_mconcat (char **s, size_t max_len, ...); + +int roken_vconcat (char *s, size_t len, va_list args); + +size_t roken_vmconcat (char **s, size_t max_len, va_list args); + +ssize_t net_write (int fd, const void *buf, size_t nbytes); + +ssize_t net_read (int fd, void *buf, size_t nbytes); + +int issuid(void); + + +int get_window_size(int fd, struct winsize *); + + + +extern const char *__progname; + +extern char **environ; + + + + +struct hostent * +copyhostent (const struct hostent *h); + + + + + + + + +int +getnameinfo_verified(const struct sockaddr *sa, socklen_t salen, + char *host, size_t hostlen, + char *serv, size_t servlen, + int flags); + +int roken_getaddrinfo_hostspec(const char *, int, struct addrinfo **); +int roken_getaddrinfo_hostspec2(const char *, int, int, struct addrinfo **); + + + +void *emalloc (size_t); +void *ecalloc(size_t num, size_t sz); +void *erealloc (void *, size_t); +char *estrdup (const char *); + +/* + * kludges and such + */ + +int roken_gethostby_setup(const char*, const char*); +struct hostent* roken_gethostbyname(const char*); +struct hostent* roken_gethostbyaddr(const void*, size_t, int); + +#define roken_getservbyname(x,y) getservbyname(x,y) + +#define roken_openlog(a,b,c) openlog(a,b,c) + +#define roken_getsockname(a,b,c) getsockname(a,b,c) + + + +void mini_inetd_addrinfo (struct addrinfo*); +void mini_inetd (int port); + +void set_progname(char *argv0); +const char *get_progname(void); + + +int +strsvis(char *dst, const char *src, int flag, const char *extra); + + + + +char * +svis(char *dst, int c, int flag, int nextc, const char *extra); + + + +ROKEN_CPP_END +#define ROKEN_VERSION 0.4f + +#endif /* __ROKEN_H__ */ diff --git a/crypto/heimdal/lib/roken/roken.h.in b/crypto/heimdal/lib/roken/roken.h.in index c70097b..16fc6d8 100644 --- a/crypto/heimdal/lib/roken/roken.h.in +++ b/crypto/heimdal/lib/roken/roken.h.in @@ -1,6 +1,6 @@ /* -*- C -*- */ /* - * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 1995 - 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -32,7 +32,7 @@ * SUCH DAMAGE. */ -/* $Id: roken.h.in,v 1.162 2001/10/21 23:24:33 assar Exp $ */ +/* $Id: roken.h.in,v 1.169 2002/08/26 21:43:38 assar Exp $ */ #include <stdio.h> #include <stdlib.h> @@ -140,6 +140,10 @@ struct sockaddr_dl; #endif #endif +#ifndef HAVE_SSIZE_T +typedef int ssize_t; +#endif + #include <roken-common.h> ROKEN_CPP_START @@ -199,7 +203,7 @@ int vasnprintf (char **ret, size_t max_sz, const char *format, va_list ap) char * strdup(const char *old); #endif -#ifndef HAVE_STRNDUP +#if !defined(HAVE_STRNDUP) || defined(NEED_STRNDUP_PROTO) char * strndup(const char *old, size_t sz); #endif @@ -396,8 +400,6 @@ time_t tm2time (struct tm tm, int local); int unix_verify_user(char *user, char *password); -void mini_inetd (int port); - int roken_concat (char *s, size_t len, ...); size_t roken_mconcat (char **s, size_t max_len, ...); @@ -631,6 +633,9 @@ void setprogname(const char *argv0); const char *getprogname(void); #endif +void mini_inetd_addrinfo (struct addrinfo*); +void mini_inetd (int port); + void set_progname(char *argv0); const char *get_progname(void); @@ -639,4 +644,39 @@ struct tm * localtime_r(const time_t *timer, struct tm *result); #endif +#if !defined(HAVE_STRSVIS) || defined(NEED_STRSVIS_PROTO) +int +strsvis(char *dst, const char *src, int flag, const char *extra); +#endif + +#if !defined(HAVE_STRUNVIS) || defined(NEED_STRUNVIS_PROTO) +int +strunvis(char *dst, const char *src); +#endif + +#if !defined(HAVE_STRVIS) || defined(NEED_STRVIS_PROTO) +int +strvis(char *dst, const char *src, int flag); +#endif + +#if !defined(HAVE_STRVISX) || defined(NEED_STRVISX_PROTO) +int +strvisx(char *dst, const char *src, size_t len, int flag); +#endif + +#if !defined(HAVE_SVIS) || defined(NEED_SVIS_PROTO) +char * +svis(char *dst, int c, int flag, int nextc, const char *extra); +#endif + +#if !defined(HAVE_UNVIS) || defined(NEED_UNVIS_PROTO) +int +unvis(char *cp, int c, int *astate, int flag); +#endif + +#if !defined(HAVE_VIS) || defined(NEED_VIS_PROTO) +char * +vis(char *dst, int c, int flag, int nextc); +#endif + ROKEN_CPP_END diff --git a/crypto/heimdal/lib/roken/roken_gethostby.lo b/crypto/heimdal/lib/roken/roken_gethostby.lo Binary files differnew file mode 100644 index 0000000..b5387c4 --- /dev/null +++ b/crypto/heimdal/lib/roken/roken_gethostby.lo diff --git a/crypto/heimdal/lib/roken/rtbl.lo b/crypto/heimdal/lib/roken/rtbl.lo Binary files differnew file mode 100644 index 0000000..f565991 --- /dev/null +++ b/crypto/heimdal/lib/roken/rtbl.lo diff --git a/crypto/heimdal/lib/roken/setprogname.lo b/crypto/heimdal/lib/roken/setprogname.lo Binary files differnew file mode 100644 index 0000000..7429f1f --- /dev/null +++ b/crypto/heimdal/lib/roken/setprogname.lo diff --git a/crypto/heimdal/lib/roken/signal.lo b/crypto/heimdal/lib/roken/signal.lo Binary files differnew file mode 100644 index 0000000..d5a1dd4 --- /dev/null +++ b/crypto/heimdal/lib/roken/signal.lo diff --git a/crypto/heimdal/lib/roken/simple_exec.lo b/crypto/heimdal/lib/roken/simple_exec.lo Binary files differnew file mode 100644 index 0000000..340cba6 --- /dev/null +++ b/crypto/heimdal/lib/roken/simple_exec.lo diff --git a/crypto/heimdal/lib/roken/snprintf-test b/crypto/heimdal/lib/roken/snprintf-test new file mode 100755 index 0000000..393a711 --- /dev/null +++ b/crypto/heimdal/lib/roken/snprintf-test @@ -0,0 +1,121 @@ +#! /bin/sh + +# snprintf-test - temporary wrapper script for .libs/snprintf-test +# Generated by ltmain.sh - GNU libtool 1.4.2 (1.922.2.53 2001/09/11 03:18:52) +# +# The snprintf-test program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi + +relink_command="cd /usr/home/nectar/devel/heimdal/lib/roken; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/local/bin:/usr/local/sbin:/usr/X11R6/bin:/usr/X11R6/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/usr/games:/home/nectar/bin\"; export PATH; gcc -Wall -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast -Wmissing-declarations -Wnested-externs -DINET6 -g -O2 -o \$progdir/\$file snprintf_test-snprintf-test.o ./.libs/libtest.al ./.libs/libroken.so -lcrypt -Wl,--rpath -Wl,/usr/home/nectar/devel/heimdal/lib/roken/.libs -Wl,--rpath -Wl,/usr/heimdal/lib" + +# This environment variable determines our operation mode. +if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then + # install mode needs the following variable: + notinst_deplibs=' libroken.la' +else + # When we are sourced in execute mode, $file and $echo are already set. + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + echo="echo" + file="$0" + # Make sure echo works. + if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then + # Yippee, $echo works! + : + else + # Restart under the correct shell, and then maybe $echo will work. + exec /bin/sh "$0" --no-reexec ${1+"$@"} + fi + fi + + # Find the directory that this script lives in. + thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` + test "x$thisdir" = "x$file" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=`ls -ld "$file" | sed -n 's/.*-> //p'` + while test -n "$file"; do + destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` + + # If there was a directory component, then change thisdir. + if test "x$destdir" != "x$file"; then + case "$destdir" in + [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; + *) thisdir="$thisdir/$destdir" ;; + esac + fi + + file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + file=`ls -ld "$thisdir/$file" | sed -n 's/.*-> //p'` + done + + # Try to get the absolute directory name. + absdir=`cd "$thisdir" && pwd` + test -n "$absdir" && thisdir="$absdir" + + program=lt-'snprintf-test' + progdir="$thisdir/.libs" + + if test ! -f "$progdir/$program" || \ + { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | sed 1q`; \ + test "X$file" != "X$progdir/$program"; }; then + + file="$$-$program" + + if test ! -d "$progdir"; then + mkdir "$progdir" + else + rm -f "$progdir/$file" + fi + + # relink executable if necessary + if test -n "$relink_command"; then + if relink_command_output=`eval $relink_command 2>&1`; then : + else + echo "$relink_command_output" >&2 + rm -f "$progdir/$file" + exit 1 + fi + fi + + mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null || + { rm -f "$progdir/$program"; + mv -f "$progdir/$file" "$progdir/$program"; } + rm -f "$progdir/$file" + fi + + if test -f "$progdir/$program"; then + if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then + # Run the actual program with our arguments. + + # Export the path to the program. + PATH="$progdir:$PATH" + export PATH + + exec $program ${1+"$@"} + + $echo "$0: cannot exec $program ${1+"$@"}" + exit 1 + fi + else + # The program doesn't exist. + $echo "$0: error: $progdir/$program does not exist" 1>&2 + $echo "This script is just a wrapper for $program." 1>&2 + echo "See the libtool documentation for more information." 1>&2 + exit 1 + fi +fi diff --git a/crypto/heimdal/lib/roken/snprintf.c b/crypto/heimdal/lib/roken/snprintf.c index afb9754..1a3b7be 100644 --- a/crypto/heimdal/lib/roken/snprintf.c +++ b/crypto/heimdal/lib/roken/snprintf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-2001 Kungliga Tekniska Högskolan + * Copyright (c) 1995-2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> -RCSID("$Id: snprintf.c,v 1.33 2001/09/24 12:16:37 joda Exp $"); +RCSID("$Id: snprintf.c,v 1.34 2002/04/18 08:50:57 joda Exp $"); #endif #include <stdio.h> #include <stdarg.h> @@ -135,7 +135,7 @@ use_alternative (int flags, u_longest num, unsigned base) static int append_number(struct snprintf_state *state, - u_longest num, unsigned base, char *rep, + u_longest num, unsigned base, const char *rep, int width, int prec, int flags, int minusp) { int len = 0; diff --git a/crypto/heimdal/lib/roken/snprintf.lo b/crypto/heimdal/lib/roken/snprintf.lo Binary files differnew file mode 100644 index 0000000..ecaa7e7 --- /dev/null +++ b/crypto/heimdal/lib/roken/snprintf.lo diff --git a/crypto/heimdal/lib/roken/socket.lo b/crypto/heimdal/lib/roken/socket.lo Binary files differnew file mode 100644 index 0000000..69d71e7 --- /dev/null +++ b/crypto/heimdal/lib/roken/socket.lo diff --git a/crypto/heimdal/lib/roken/strcollect.lo b/crypto/heimdal/lib/roken/strcollect.lo Binary files differnew file mode 100644 index 0000000..befd266 --- /dev/null +++ b/crypto/heimdal/lib/roken/strcollect.lo diff --git a/crypto/heimdal/lib/roken/strftime.c b/crypto/heimdal/lib/roken/strftime.c index dcd279b..985b38a 100644 --- a/crypto/heimdal/lib/roken/strftime.c +++ b/crypto/heimdal/lib/roken/strftime.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 1999 - 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -35,7 +35,7 @@ #endif #include "roken.h" -RCSID("$Id: strftime.c,v 1.12 2001/09/04 09:53:51 assar Exp $"); +RCSID("$Id: strftime.c,v 1.13 2002/08/20 12:42:37 joda Exp $"); static const char *abb_weekdays[] = { "Sun", @@ -348,8 +348,10 @@ strftime (char *buf, size_t maxsize, const char *format, #if defined(HAVE_STRUCT_TM_TM_GMTOFF) (long)tm->tm_gmtoff #elif defined(HAVE_TIMEZONE) +#ifdef HAVE_ALTZONE tm->tm_isdst ? (long)altzone : +#endif (long)timezone #else #error Where in timezone chaos are you? diff --git a/crypto/heimdal/lib/roken/strlcat.c b/crypto/heimdal/lib/roken/strlcat.c index d3c8baa..1366e88 100644 --- a/crypto/heimdal/lib/roken/strlcat.c +++ b/crypto/heimdal/lib/roken/strlcat.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995 - 1999 Kungliga Tekniska Högskolan + * Copyright (c) 1995-2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -36,7 +36,7 @@ #endif #include "roken.h" -RCSID("$Id: strlcat.c,v 1.5 1999/12/02 16:58:53 joda Exp $"); +RCSID("$Id: strlcat.c,v 1.6 2002/08/20 09:46:20 joda Exp $"); #ifndef HAVE_STRLCAT @@ -45,6 +45,12 @@ strlcat (char *dst, const char *src, size_t dst_sz) { size_t len = strlen(dst); + if (dst_sz < len) + /* the total size of dst is less than the string it contains; + this could be considered bad input, but we might as well + handle it */ + return len + strlen(src); + return len + strlcpy (dst + len, src, dst_sz - len); } #endif diff --git a/crypto/heimdal/lib/roken/strlcpy.c b/crypto/heimdal/lib/roken/strlcpy.c index 33cd9cb..b43dbde 100644 --- a/crypto/heimdal/lib/roken/strlcpy.c +++ b/crypto/heimdal/lib/roken/strlcpy.c @@ -1,23 +1,23 @@ /* - * Copyright (c) 1995 - 1999 Kungliga Tekniska Högskolan + * Copyright (c) 1995-2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * 3. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -36,7 +36,7 @@ #endif #include "roken.h" -RCSID("$Id: strlcpy.c,v 1.5 1999/12/02 16:58:53 joda Exp $"); +RCSID("$Id: strlcpy.c,v 1.6 2002/08/20 09:42:08 joda Exp $"); #ifndef HAVE_STRLCPY @@ -44,17 +44,17 @@ size_t strlcpy (char *dst, const char *src, size_t dst_sz) { size_t n; - char *p; - for (p = dst, n = 0; - n + 1 < dst_sz && *src != '\0'; - ++p, ++src, ++n) - *p = *src; - *p = '\0'; - if (*src == '\0') + for (n = 0; n < dst_sz; n++) { + if ((*dst++ = *src++) == '\0') + break; + } + + if (n < dst_sz) return n; - else - return n + strlen (src); + if (n > 0) + *(dst - 1) = '\0'; + return n + strlen (src); } #endif diff --git a/crypto/heimdal/lib/roken/strlwr.lo b/crypto/heimdal/lib/roken/strlwr.lo Binary files differnew file mode 100644 index 0000000..3b3ab2d --- /dev/null +++ b/crypto/heimdal/lib/roken/strlwr.lo diff --git a/crypto/heimdal/lib/roken/strndup.lo b/crypto/heimdal/lib/roken/strndup.lo Binary files differnew file mode 100644 index 0000000..38d1424 --- /dev/null +++ b/crypto/heimdal/lib/roken/strndup.lo diff --git a/crypto/heimdal/lib/roken/strnlen.lo b/crypto/heimdal/lib/roken/strnlen.lo Binary files differnew file mode 100644 index 0000000..2ebb756 --- /dev/null +++ b/crypto/heimdal/lib/roken/strnlen.lo diff --git a/crypto/heimdal/lib/roken/strsep_copy.c b/crypto/heimdal/lib/roken/strsep_copy.c index f097022..abe9731 100644 --- a/crypto/heimdal/lib/roken/strsep_copy.c +++ b/crypto/heimdal/lib/roken/strsep_copy.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Kungliga Tekniska Högskolan + * Copyright (c) 2000, 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> -RCSID("$Id: strsep_copy.c,v 1.3 2000/06/29 03:13:36 assar Exp $"); +RCSID("$Id: strsep_copy.c,v 1.4 2002/08/14 17:20:40 joda Exp $"); #endif #include <string.h> @@ -53,8 +53,10 @@ strsep_copy(const char **stringp, const char *delim, char *buf, size_t len) return -1; *stringp = *stringp + strcspn(*stringp, delim); l = min(len, *stringp - save); - memcpy(buf, save, l); - buf[l] = '\0'; + if(len > 0) { + memcpy(buf, save, l); + buf[l] = '\0'; + } l = *stringp - save; if(**stringp == '\0') diff --git a/crypto/heimdal/lib/roken/strsep_copy.lo b/crypto/heimdal/lib/roken/strsep_copy.lo Binary files differnew file mode 100644 index 0000000..8263576 --- /dev/null +++ b/crypto/heimdal/lib/roken/strsep_copy.lo diff --git a/crypto/heimdal/lib/roken/strupr.lo b/crypto/heimdal/lib/roken/strupr.lo Binary files differnew file mode 100644 index 0000000..e602c16 --- /dev/null +++ b/crypto/heimdal/lib/roken/strupr.lo diff --git a/crypto/heimdal/lib/roken/timeval.lo b/crypto/heimdal/lib/roken/timeval.lo Binary files differnew file mode 100644 index 0000000..a0d4624 --- /dev/null +++ b/crypto/heimdal/lib/roken/timeval.lo diff --git a/crypto/heimdal/lib/roken/tm2time.lo b/crypto/heimdal/lib/roken/tm2time.lo Binary files differnew file mode 100644 index 0000000..c889ad2 --- /dev/null +++ b/crypto/heimdal/lib/roken/tm2time.lo diff --git a/crypto/heimdal/lib/roken/unvis.lo b/crypto/heimdal/lib/roken/unvis.lo Binary files differnew file mode 100644 index 0000000..7202b35 --- /dev/null +++ b/crypto/heimdal/lib/roken/unvis.lo diff --git a/crypto/heimdal/lib/roken/verify.lo b/crypto/heimdal/lib/roken/verify.lo Binary files differnew file mode 100644 index 0000000..b250d56 --- /dev/null +++ b/crypto/heimdal/lib/roken/verify.lo diff --git a/crypto/heimdal/lib/roken/vis.lo b/crypto/heimdal/lib/roken/vis.lo Binary files differnew file mode 100644 index 0000000..03df67a --- /dev/null +++ b/crypto/heimdal/lib/roken/vis.lo diff --git a/crypto/heimdal/lib/roken/warnerr.lo b/crypto/heimdal/lib/roken/warnerr.lo Binary files differnew file mode 100644 index 0000000..953d363 --- /dev/null +++ b/crypto/heimdal/lib/roken/warnerr.lo diff --git a/crypto/heimdal/lib/roken/write_pid.lo b/crypto/heimdal/lib/roken/write_pid.lo Binary files differnew file mode 100644 index 0000000..0c1b652 --- /dev/null +++ b/crypto/heimdal/lib/roken/write_pid.lo diff --git a/crypto/heimdal/lib/roken/xdbm.h b/crypto/heimdal/lib/roken/xdbm.h index 4a7bc07..6e65217 100644 --- a/crypto/heimdal/lib/roken/xdbm.h +++ b/crypto/heimdal/lib/roken/xdbm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 1995 - 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: xdbm.h,v 1.14 2001/09/03 05:03:00 assar Exp $ */ +/* $Id: xdbm.h,v 1.15 2002/05/17 16:02:22 joda Exp $ */ /* Generic *dbm include file */ @@ -46,32 +46,7 @@ #include <gdbm/ndbm.h> #elif defined(HAVE_NDBM_H) #include <ndbm.h> -#elif defined(HAVE_DBM_H) -#include <dbm.h> #endif #endif /* HAVE_NDBM */ -#if 0 -/* Macros to convert ndbm names to dbm names. - * Note that dbm_nextkey() cannot be simply converted using a macro, since - * it is invoked giving the database, and nextkey() needs the previous key. - * - * Instead, all routines call "dbm_next" instead. - */ - -#if !defined(NDBM) && !defined(HAVE_DB_H) -typedef char DBM; - -#define dbm_open(file, flags, mode) ((dbminit(file) == 0)?"":((char *)0)) -#define dbm_fetch(db, key) fetch(key) -#define dbm_store(db, key, content, flag) store(key, content) -#define dbm_delete(db, key) delete(key) -#define dbm_firstkey(db) firstkey() -#define dbm_next(db,key) nextkey(key) -#define dbm_close(db) dbmclose() -#else -#define dbm_next(db,key) dbm_nextkey(db) -#endif -#endif - #endif /* __XDBM_H__ */ |
