| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CACqU3MX51UOt6b9uB=M+ak-qRwO74gUj6MBRgjNEv=dXf+sxKw@mail.gmail.com>
Date: Sat, 20 Aug 2011 18:12:05 -0400
From: Arnaud Lacombe <lacombar@...il.com>
To: dave@....org
Cc: Michal Marek <mmarek@...e.cz>, lkml <linux-kernel@...r.kernel.org>,
linux-kbuild@...r.kernel.org
Subject: Re: [PATCH] kconfig: handle SIGINT in menuconfig
Hi,
On Sat, Aug 20, 2011 at 4:50 PM, Davidlohr Bueso <dave@....org> wrote:
> From: Davidlohr Bueso <dave@....org>
>
> I recently got bitten in the ass when pressing Ctrl-C and lost all my current configuration changes. This patch captures SIGINT and allows the user to save any changes.
Pretty much all front-ends have that behavior.
> Some code refactoring was made in order to handle the exit behavior.
>
beside a few nits, that look good.
- Arnaud
> CC: Roman Zippel <zippel@...ux-m68k.org>
Roman has been reported MIA for more than 2 years now, I do not think
this is needed anylonger.
> Signed-off-by: Davidlohr Bueso <dave@....org>
> ---
> scripts/kconfig/mconf.c | 76 ++++++++++++++++++++++++++++++++---------------
> 1 files changed, 52 insertions(+), 24 deletions(-)
>
> diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
> index 820d2b6..7ca3bb7 100644
> --- a/scripts/kconfig/mconf.c
> +++ b/scripts/kconfig/mconf.c
> @@ -6,6 +6,7 @@
> * 2002-11-06 Petr Baudis <pasky@....cz>
> *
> * i18n, 2005, Arnaldo Carvalho de Melo <acme@...ectiva.com.br>
> + * Handle SIGINT (Ctrl-C), 2011, Davidlohr Bueso <dave@....org>
> */
>
FWIW, I do not really see the point of that, if you are looking for
code history git does a better job, as well as for who deserve
copyright on the code.
> #include <ctype.h>
> @@ -15,6 +16,7 @@
> #include <stdarg.h>
> #include <stdlib.h>
> #include <string.h>
> +#include <signal.h>
> #include <unistd.h>
> #include <locale.h>
>
> @@ -272,6 +274,7 @@ static struct menu *current_menu;
> static int child_count;
> static int single_menu_mode;
> static int show_all_options;
> +static int saved_x, saved_y;
>
> static void conf(struct menu *menu);
> static void conf_choice(struct menu *menu);
> @@ -792,9 +795,54 @@ static void conf_save(void)
> }
> }
>
> +static int handle_exit(int res)
> +{
> + switch (res) {
> + case 0:
> + if (conf_write(filename)) {
> + fprintf(stderr, _("\n\n"
> + "Error while writing of the configuration.\n"
> + "Your configuration changes were NOT saved."
> + "\n\n"));
> + return 1;
> + }
> + /* fall through */
> + case -1:
> + printf(_("\n\n"
> + "*** End of the configuration.\n"
> + "*** Execute 'make' to start the build or try 'make help'."
> + "\n\n"));
> + break;
> + default:
> + fprintf(stderr, _("\n\n"
> + "Your configuration changes were NOT saved."
> + "\n\n"));
> + }
> +
> + return 0;
> +}
> +
> +static void sig_handler(int signo __attribute__((__unused__)))
__attribute__(()) is useless here, it is not used once across the file
and gcc will not warn unless you ask it to be really verbose, which we
do not.
> +{
> + int res;
> +
> + do {
> + dialog_clear();
> + if (conf_get_changed())
> + res = dialog_yesno(NULL,
> + _("Do you wish to save your "
> + "new configuration?\n"),
> + 6, 60);
> + else
> + res = -1;
> + } while (res == KEY_ESC);
> +
I do not really see the point of the loop here.
I'd suggest to have a single termination handling path. How about the
attached patch ?
The message displayed might need tweaking.
Thanks,
- Arnaud
> + end_dialog(saved_x, saved_y);
> + exit(handle_exit(res));
> +}
> +
> int main(int ac, char **av)
> {
> - int saved_x, saved_y;
> char *mode;
> int res;
>
> @@ -802,6 +850,8 @@ int main(int ac, char **av)
> bindtextdomain(PACKAGE, LOCALEDIR);
> textdomain(PACKAGE);
>
> + signal(SIGINT, sig_handler);
> +
> conf_parse(av[1]);
> conf_read(NULL);
>
> @@ -835,28 +885,6 @@ int main(int ac, char **av)
> } while (res == KEY_ESC);
> end_dialog(saved_x, saved_y);
>
> - switch (res) {
> - case 0:
> - if (conf_write(filename)) {
> - fprintf(stderr, _("\n\n"
> - "Error while writing of the configuration.\n"
> - "Your configuration changes were NOT saved."
> - "\n\n"));
> - return 1;
> - }
> - /* fall through */
> - case -1:
> - printf(_("\n\n"
> - "*** End of the configuration.\n"
> - "*** Execute 'make' to start the build or try 'make help'."
> - "\n\n"));
> - break;
> - default:
> - fprintf(stderr, _("\n\n"
> - "Your configuration changes were NOT saved."
> - "\n\n"));
> - }
> -
> - return 0;
> + return handle_exit(res);
> }
>
> --
> 1.7.4.1
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
View attachment "sigint.diff" of type "text/x-patch" (1838 bytes)
Powered by blists - more mailing lists