--- embedaddon/sudo/src/sesh.c	2012/10/09 09:29:52	1.1.1.3
+++ embedaddon/sudo/src/sesh.c	2014/06/15 16:12:55	1.1.1.6
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2008, 2010-2013 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
@@ -25,54 +25,44 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
 # include "compat/stdbool.h"
 #endif /* HAVE_STDBOOL_H */
 
+#include "gettext.h"		/* must be included before missing.h */
+
 #include "missing.h"
 #include "alloc.h"
-#include "error.h"
-#include "gettext.h"
+#include "fatal.h"
 #include "sudo_conf.h"
 #include "sudo_debug.h"
 #include "sudo_exec.h"
 #include "sudo_plugin.h"
 
-sudo_conv_t sudo_conv;  /* NULL in non-plugin */
+__dso_public int main(int argc, char *argv[], char *envp[]);
 
-/*
- * Cleanup hook for error()/errorx()
- */
-void
-cleanup(int gotsignal)
-{
-    return;
-}
-
 int
 main(int argc, char *argv[], char *envp[])
 {
     char *cp, *cmnd;
-    int noexec = 0;
+    bool login_shell, noexec = false;
     debug_decl(main, SUDO_DEBUG_MAIN)
 
-#ifdef HAVE_SETLOCALE 
     setlocale(LC_ALL, "");
-#endif
     bindtextdomain(PACKAGE_NAME, LOCALEDIR);
     textdomain(PACKAGE_NAME);
 
     if (argc < 2)
-	errorx(EXIT_FAILURE, _("requires at least one argument"));
+	fatalx(U_("requires at least one argument"));
 
     /* Read sudo.conf. */
-    sudo_conf_read();
+    sudo_conf_read(NULL);
 
+    /* If the first char of argv[0] is '-', we are running as a login shell. */
+    login_shell = argv[0][0] == '-';
+
     /* If argv[0] ends in -noexec, pass the flag to sudo_execve() */
     if ((cp = strrchr(argv[0], '-')) != NULL && cp != argv[0])
 	noexec = strcmp(cp, "-noexec") == 0;
@@ -83,13 +73,13 @@ main(int argc, char *argv[], char *envp[])
     cmnd = estrdup(argv[0]);
 
     /* If invoked as a login shell, modify argv[0] accordingly. */
-    if (argv[-1][0] == '-') {
+    if (login_shell) {
 	if ((cp = strrchr(argv[0], '/')) == NULL)
 	    cp = argv[0];
 	*cp = '-';
     }
     sudo_execve(cmnd, argv, envp, noexec);
-    warning(_("unable to execute %s"), argv[0]);
+    warning(U_("unable to execute %s"), argv[0]);
     sudo_debug_exit_int(__func__, __FILE__, __LINE__, sudo_debug_subsys, EXIT_FAILURE);                
     _exit(EXIT_FAILURE);
 }