Merge tag 'debian/1.8.5p2-1' into squeeze

[debian/sudo] / error.c

diff --git a/error.c b/error.c
deleted file mode 100644 (file)
index 317f105..0000000
--- a/error.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2004-2005 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <config.h>
-#include <compat.h>
-#include "error.h"
-
-static void _warning   __P((int, const char *, va_list));
-       void cleanup    __P((int));
-
-void
-#ifdef __STDC__
-error(int eval, const char *fmt, ...)
-#else
-error(eval, fmt, va_alist)
-       int eval;
-       const char *fmt;
-       va_dcl
-#endif
-{
-       va_list ap;
-#ifdef __STDC__
-       va_start(ap, fmt);
-#else
-       va_start(ap);
-#endif
-       _warning(1, fmt, ap);
-       va_end(ap);
-       cleanup(0);
-       exit(eval);
-}
-
-void
-#ifdef __STDC__
-errorx(int eval, const char *fmt, ...)
-#else
-errorx(eval, fmt, va_alist)
-       int eval;
-       const char *fmt;
-       va_dcl
-#endif
-{
-       va_list ap;
-#ifdef __STDC__
-       va_start(ap, fmt);
-#else
-       va_start(ap);
-#endif
-       _warning(0, fmt, ap);
-       va_end(ap);
-       cleanup(0);
-       exit(eval);
-}
-
-void
-#ifdef __STDC__
-warning(const char *fmt, ...)
-#else
-warning(fmt, va_alist)
-       const char *fmt;
-       va_dcl
-#endif
-{
-       va_list ap;
-#ifdef __STDC__
-       va_start(ap, fmt);
-#else
-       va_start(ap);
-#endif
-       _warning(1, fmt, ap);
-       va_end(ap);
-}
-
-void
-#ifdef __STDC__
-warningx(const char *fmt, ...)
-#else
-warningx(fmt, va_alist)
-       const char *fmt;
-       va_dcl
-#endif
-{
-       va_list ap;
-#ifdef __STDC__
-       va_start(ap, fmt);
-#else
-       va_start(ap);
-#endif
-       _warning(0, fmt, ap);
-       va_end(ap);
-}
-
-static void
-_warning(use_errno, fmt, ap)
-       int use_errno;
-       const char *fmt;
-       va_list ap;
-{
-       int serrno = errno;
-
-       fputs(getprogname(), stderr);
-       if (fmt != NULL) {
-               fputs(": ", stderr);
-               vfprintf(stderr, fmt, ap);
-       }
-       if (use_errno) {
-           fputs(": ", stderr);
-           fputs(strerror(serrno), stderr);
-       }
-       putc('\n', stderr);
-}