util-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Martin Steigerwald <Martin@lichtvoll.de>
To: util-linux@vger.kernel.org
Subject: [PATCH] Fix re-enabling of cursor with slang also after pressing Ctrl-C
Date: Mon, 04 Aug 2014 13:28:11 +0200	[thread overview]
Message-ID: <1419379.tzkKhjxti9@merkaba> (raw)

[-- Attachment #1: Type: text/plain, Size: 1410 bytes --]

According to curs_set(0) in ui_init() I think curs_set(1) belongs into
ui_end with in die_on_signal() also gets called on SIGINT or SIGTERM.

This should complete the fix made by Andreas in commit 4f4daf8f.

I could not yet test the fix as building current git fails with:

/usr/bin/ld: sys-utils/swapoff-swapon-common.o: undefined reference to symbol 'blkid_probe_lookup_value@@BLKID_2.15'
//home/martin/Linux/util-linux/util-linux/.libs/libblkid.so.1: error adding symbols: DSO missing from command line

Will test as soon as I found out how to fix this build issue. Benno
reported it already on mailing list.

Addresses-Debian-Bug: #757000
BCC´d there for reference.
---
 disk-utils/cfdisk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index dfdaaf0..536132a 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -525,6 +525,7 @@ static int ui_end(void)
 #else
        mvcur(0, COLS - 1, LINES-1, 0);
 #endif
+       curs_set(1);
        nl();
        endwin();
        printf("\n");
@@ -1966,7 +1967,6 @@ static int ui_run(struct cfdisk *cf)
 
        menu_pop(cf);
 
-       curs_set(1);
        DBG(FRONTEND, ul_debug("ui: end"));
 
        return 0;
-- 
2.0.1


Thanks,
-- 
Martin 'Helios' Steigerwald - http://www.Lichtvoll.de
GPG: 03B0 0D6C 0040 0710 4AFA  B82F 991B EAAC A599 84C7

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

             reply	other threads:[~2014-08-04 11:28 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-04 11:28 Martin Steigerwald [this message]
2014-08-04 11:53 ` [PATCH] Fix re-enabling of cursor with slang also after pressing Ctrl-C Martin Steigerwald
2014-08-04 12:01   ` Martin Steigerwald
2014-08-06 13:49     ` Karel Zak
2014-08-06 14:37       ` Martin Steigerwald
2014-08-06 17:15         ` Andreas Henriksson
  -- strict thread matches above, loose matches on Subject: below --
2014-08-04 11:31 Martin Steigerwald

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1419379.tzkKhjxti9@merkaba \
    --to=martin@lichtvoll.de \
    --cc=util-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).