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

[debian/sudo] / getprogname.c

diff --git a/getprogname.c b/getprogname.c
deleted file mode 100644 (file)
index f269405..0000000
--- a/getprogname.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2003-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.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <config.h>
-#include <compat.h>
-
-const char *
-getprogname()
-{
-    static const char *progname;
-    extern int Argc;
-    extern char **Argv;
-
-    if (progname == NULL) {
-       if (Argc < 0)
-           progname = "sudo";
-       else if ((progname = strrchr(Argv[0], '/')) != NULL)
-           progname++;
-       else
-           progname = Argv[0];
-    }
-    return(progname);
-}