No need to replace vfprintf().

1988 called; it wants its pre-standard version of C back.  As the
comment in vfprintf.c said, "Stock 4.3 doesn't have vfprintf."; it's
been a while since 4.3BSD was the latest shiniest BSD-flavored OS.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 039fc481a1ea89ea24d3e02297b17c9ce65b023a..2f55440ae5cca25f647194e2cd7b989d2e17c553 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,7 +249,6 @@ check_include_file(limits.h HAVE_LIMITS_H)
 #
 # Functions.
 #
-check_function_exists(vfprintf HAVE_VFPRINTF)
 check_function_exists(strlcat HAVE_STRLCAT)
 check_function_exists(strlcpy HAVE_STRLCPY)
 check_function_exists(strdup HAVE_STRDUP)
@@ -582,7 +581,7 @@ endif(ENABLE_SMB)
 #
 # Replace missing functions
 #
-foreach(FUNC vfprintf strlcat strlcpy strdup strsep getservent getopt_long)
+foreach(FUNC strlcat strlcpy strdup strsep getservent getopt_long)
     string(TOUPPER ${FUNC} FUNC_UPPERCASE)
     set(HAVE_FUNC_UPPERCASE HAVE_${FUNC_UPPERCASE})
     if(NOT ${HAVE_FUNC_UPPERCASE})

diff --git a/INSTALL.txt b/INSTALL.txt
index c8a8eb7da065a8f0fd0de62b583716d563d38138..aea35d6feae81cc1347b9f645e5607fcbf241fad 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -119,5 +119,4 @@ tcpdump.c   - main program
 timeval-operations.h - timeval operations macros
 udp.h          - UDP definitions
 util-print.c   - utility routines for protocol printers
-vfprintf.c     - emulation routine
 win32          - headers and routines for building on Win32 systems

diff --git a/Makefile.in b/Makefile.in
index 6842b60b4a3419574a4c9eaebd47a45fcaa49a4f..749f24eba00e60cd5b1e760d1e5c8d4b515db520 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -362,7 +362,6 @@ EXTRA_DIST = \
        smbutil.c \
        stime.awk \
        tcpdump.1.in \
-       vfprintf.c \
        win32/prj/GNUmakefile \
        win32/prj/WinDump.dsp \
        win32/prj/WinDump.dsw \

diff --git a/configure.ac b/configure.ac
index 55dd3512b788a2cf8bd49b7c76cb6a44cc53d97f..b8e8958b8030f02f0522aed4316dcafce5d81504 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -428,7 +428,7 @@ AC_INCLUDES_DEFAULT
        fi
 ])
 
-AC_REPLACE_FUNCS(vfprintf strlcat strlcpy strdup strsep getservent getopt_long)
+AC_REPLACE_FUNCS(strlcat strlcpy strdup strsep getservent getopt_long)
 AC_CHECK_FUNCS(fork vfork strftime)
 AC_CHECK_FUNCS(setlinebuf)
 

diff --git a/vfprintf.c b/vfprintf.c
deleted file mode 100644 (file)
index 8ab2fe8..0000000
--- a/vfprintf.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1995
- *     The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "netdissect.h"
-
-/*
- * Stock 4.3 doesn't have vfprintf.
- * This routine is due to Chris Torek.
- */
-vfprintf(f, fmt, args)
-       FILE *f;
-       char *fmt;
-       va_list args;
-{
-       int ret;
-
-       if ((f->_flag & _IOWRT) == 0) {
-               if (f->_flag & _IORW)
-                       f->_flag |= _IOWRT;
-               else
-                       return EOF;
-       }
-       ret = _doprnt(fmt, args, f);
-       return ferror(f) ? EOF : ret;
-}