From 18f98bae214437264c6610ad56f57baef89be334 Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Fri, 10 Feb 2017 00:22:18 +0000 Subject: [PATCH] Remove -cleanup-during-uninstall option. It was never a documented option, and hasn't been used for anything since d0399966. --- windows/window.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/windows/window.c b/windows/window.c index abb2b8ec..01487522 100644 --- a/windows/window.c +++ b/windows/window.c @@ -509,39 +509,22 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) i++; /* skip next argument */ } else if (ret == 1) { continue; /* nothing further needs doing */ - } else if (!strcmp(p, "-cleanup") || - !strcmp(p, "-cleanup-during-uninstall")) { + } else if (!strcmp(p, "-cleanup")) { /* * `putty -cleanup'. Remove all registry * entries associated with PuTTY, and also find * and delete the random seed file. */ char *s1, *s2; - /* Are we being invoked from an uninstaller? */ - if (!strcmp(p, "-cleanup-during-uninstall")) { - s1 = dupprintf("Remove saved sessions and random seed file?\n" - "\n" - "If you hit Yes, ALL Registry entries associated\n" - "with %s will be removed, as well as the\n" - "random seed file. THIS PROCESS WILL\n" - "DESTROY YOUR SAVED SESSIONS.\n" - "(This only affects the currently logged-in user.)\n" - "\n" - "If you hit No, uninstallation will proceed, but\n" - "saved sessions etc will be left on the machine.", - appname); - s2 = dupprintf("%s Uninstallation", appname); - } else { - s1 = dupprintf("This procedure will remove ALL Registry entries\n" - "associated with %s, and will also remove\n" - "the random seed file. (This only affects the\n" - "currently logged-in user.)\n" - "\n" - "THIS PROCESS WILL DESTROY YOUR SAVED SESSIONS.\n" - "Are you really sure you want to continue?", - appname); - s2 = dupprintf("%s Warning", appname); - } + s1 = dupprintf("This procedure will remove ALL Registry entries\n" + "associated with %s, and will also remove\n" + "the random seed file. (This only affects the\n" + "currently logged-in user.)\n" + "\n" + "THIS PROCESS WILL DESTROY YOUR SAVED SESSIONS.\n" + "Are you really sure you want to continue?", + appname); + s2 = dupprintf("%s Warning", appname); if (message_box(s1, s2, MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2, HELPCTXID(option_cleanup)) == IDYES) { -- 2.45.2