Author: tridge Date: 2005-07-13 13:55:06 +0000 (Wed, 13 Jul 2005) New Revision: 8425
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8425 Log: add err() and errx() functions needed by for compile_et on some systems Added: branches/SAMBA_4_0/source/heimdal_build/replace.c Modified: branches/SAMBA_4_0/source/extra_cflags.txt branches/SAMBA_4_0/source/heimdal_build/config.m4 branches/SAMBA_4_0/source/heimdal_build/config.mk branches/SAMBA_4_0/source/heimdal_build/glue.c Changeset: Modified: branches/SAMBA_4_0/source/extra_cflags.txt =================================================================== --- branches/SAMBA_4_0/source/extra_cflags.txt 2005-07-13 12:35:21 UTC (rev 8424) +++ branches/SAMBA_4_0/source/extra_cflags.txt 2005-07-13 13:55:06 UTC (rev 8425) @@ -1 +1,2 @@ heimdal -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des -Iheimdal/lib/roken -Iheimdal/include -DNO_PRINTF_ATTRIBUTE +heimdal_build/replace.o -Iheimdal_build -Iheimdal/lib/roken Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4 =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/config.m4 2005-07-13 12:35:21 UTC (rev 8424) +++ branches/SAMBA_4_0/source/heimdal_build/config.m4 2005-07-13 13:55:06 UTC (rev 8425) @@ -85,6 +85,8 @@ unsetenv \ closefrom \ hstrerror \ + err \ + errx \ writev ]) Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/config.mk 2005-07-13 12:35:21 UTC (rev 8424) +++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2005-07-13 13:55:06 UTC (rev 8425) @@ -326,7 +326,8 @@ heimdal/lib/roken/strupr.o \ heimdal/lib/roken/getprogname.o \ heimdal/lib/roken/get_window_size.o \ - heimdal/lib/asn1/symbol.o + heimdal/lib/asn1/symbol.o \ + heimdal_build/replace.o NOPROTO = YES # End SUBSYSTEM ASN1_COMPILER ####################### @@ -351,7 +352,8 @@ heimdal/lib/roken/getprogname.o \ heimdal/lib/roken/strupr.o \ heimdal/lib/roken/print_version.o \ - heimdal/lib/roken/setprogname.o + heimdal/lib/roken/setprogname.o \ + heimdal_build/replace.o NOPROTO = YES # End SUBSYSTEM COMPILE_ET ####################### Modified: branches/SAMBA_4_0/source/heimdal_build/glue.c =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/glue.c 2005-07-13 12:35:21 UTC (rev 8424) +++ branches/SAMBA_4_0/source/heimdal_build/glue.c 2005-07-13 13:55:06 UTC (rev 8425) @@ -23,6 +23,7 @@ #include "includes.h" #include "system/network.h" #include "system/kerberos.h" +#include "err.h" /* get the list of IP addresses for configured interfaces @@ -48,3 +49,12 @@ return 0; } + + +void errx(int eval, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + verrx(eval, fmt, ap); + va_end(ap); +} Added: branches/SAMBA_4_0/source/heimdal_build/replace.c =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/replace.c 2005-07-13 12:35:21 UTC (rev 8424) +++ branches/SAMBA_4_0/source/heimdal_build/replace.c 2005-07-13 13:55:06 UTC (rev 8425) @@ -0,0 +1,49 @@ +/* + Unix SMB/CIFS implementation. + + some replacement functions for parts of roken that don't fit easily into + our build system + + Copyright (C) Andrew Tridgell 2005 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "config.h" +#include <stdio.h> +#include "err.h" + +#ifndef HAVE_ERR + void err(int eval, const char *format, ...) +{ + va_list ap; + va_start(ap, format); + vfprintf(stderr, format, ap); + perror(""); + va_end(ap); + exit(eval); +} +#endif + +#ifndef HAVE_ERRX + void errx(int eval, const char *format, ...) +{ + va_list ap; + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); + exit(eval); +} +#endif
