Clean-up exits (no Ctrl-C/Alt-Q) (Tlf#249)

* clean exits (no Ctrl-C/Alt-Q)

Author: zcsahok

share/help.txt

@@ -8,18 +8,18 @@ Alt-T     Tune                          Alt-N   Note in log
 Alt-V     Band down (CW Speed?)         Alt-P   Turn PTT on/off
 Alt-H     Show help.txt                 Alt-W   CW Weight
 Alt-I     Show talk messages            Alt-J   See QRG's
-Alt-K     CW from Keyboard              Alt-X   Exit program (Alt-q)
-Alt-M     Multi display (Alt-c)         Alt-S   Score window (Alt-r)
-Alt-,     Show bandmap                  Alt-J   Show frequency
+Alt-K     CW from Keyboard              Alt-X   Exit program
+Alt-M     Multi display (Alt-C)         Alt-S   Score window (Alt-R)
 Alt-Z     Show worked zones             Alt-G   Grab call (min. 2 letters from bandmap)
+Alt-,     Show bandmap
 
 <CTRL+?>
 Ctrl-A      Add a spot to list          Ctrl-B    Cluster send
-Ctrl-C      Quit Tlf                    Ctrl-P    MUF display
 Ctrl-G      Grab a bandmap spot         Ctrl-V    Toggle grab direction
 Ctrl-PgUp   Auto CQ delay +             Ctrl-PgDn Auto CQ delay -
 Ctrl-K      CW from keyboard            Ctrl-F    Frequency control window
 Ctrl-T      Show talk messages          Ctrl-R    LPT0 pin 14 on/off (SSB mic)
+Ctrl-P      MUF display
 
 
 <direct keyboard commands>
@@ -77,6 +77,7 @@ $         Switch to MEM and clear it (pop)
 :MAP      Filter band map content
 :SYNc     Synchronize log in network
 :EXIt     Exit program
+:QUIt     Exit program
 :MULt     Toggle remaining multi display
 :CONtest  Toggle contest mode on/off
 :SCOre    Toggle score window on/off
@@ -87,7 +88,6 @@ $         Switch to MEM and clear it (pop)
 :TRXcont  Toggle TRX control on/off
 :CHAR     Autosend: number of chars before starting to send
 :SOUnd    Record sound files
-:WRIte    Write cabrillo
-:ADIf     Write Adif
-:EXIt     Exit tlf
+:WRIte    Write Cabrillo
+:ADIf     Write ADIF
 :TONe     Set sidetone (0 = off)

src/callinput.c

@@ -148,7 +148,6 @@ int callinput(void) {
     char instring[2] = { '\0', '\0' };
     static int lastwindow;
 
-
     attron(modify_attr(COLOR_PAIR(NORMCOLOR)));
 
     printcall();	/* print call input field */
@@ -779,20 +778,15 @@ int callinput(void) {
 		break;
 	    }
 
-	    // Alt-q (M-q) or Alt-x (M-x), Exit
-	    case ALT_Q:
+	    // Alt-x (M-x), Exit
 	    case ALT_X: {
-		mvprintw(13, 29, "You want to leave tlf? (y/n): ");
-		while (x != 'n' && x != 'N') {
-
-		    x = key_get();
+		mvprintw(13, 29, "Do you want to leave Tlf? (y/n): ");
+		while (x != 'N') {
 
-		    if (x == 'y' || x == 'Y') {
-			cleanup_telnet();
-			endwin();
+		    x = toupper(key_get());
 
-			puts("\n\nThanks for using TLF.. 73\n");
-			exit(0);
+		    if (x == 'Y') {
+			exit(EXIT_SUCCESS);
 		    }
 		}
 		x = ESCAPE;

src/changepars.c

@@ -275,14 +275,9 @@ int changepars(void) {
 
 	    break;
 	}
-	case 19:			/* EXIT */
+	case 19:		/* EXIT */
 	case 38: {		/* QUIT */
-	    clear();
-	    cleanup_telnet();
-	    endwin();
-	    puts("\n\nThanks for using TLF.. 73\n");
-	    exit(0);
-	    break;
+	    exit(EXIT_SUCCESS);
 	}
 	case 20: {		/*  TXFILE   */
 	    break;

src/main.c

@@ -474,7 +474,7 @@ const static struct argp argp = { options, parse_opt, NULL, program_description
 
 
 /** initialize user interface */
-void ui_init() {
+static void ui_init() {
 
     /* modify stdin terminals attributes to allow Ctrl-Q/S key recognition */
     tcgetattr(STDIN_FILENO, &oldt);
@@ -557,7 +557,7 @@ void ui_init() {
 
 
 /* setup colors */
-void ui_color_init() {
+static void ui_color_init() {
 
     if (use_rxvt == 1) {	// use rxvt colours
 	init_pair(COLOR_BLACK, COLOR_BLACK, COLOR_RED);
@@ -629,7 +629,7 @@ static void init_variables() {
 /** load all databases
  *
  * \return EXIT_FAILURE if not successful */
-int databases_load() {
+static int databases_load() {
     int status;
 
     showmsg("Reading country data");
@@ -700,7 +700,7 @@ int databases_load() {
     return EXIT_SUCCESS;
 }
 
-void hamlib_init() {
+static void hamlib_init() {
 
     if (no_trx_control) {
 	trx_control = false;
@@ -729,7 +729,7 @@ void hamlib_init() {
     }
 }
 
-void fldigi_init() {
+static void fldigi_init() {
 #ifdef HAVE_LIBXMLRPC
     int status;
 
@@ -743,7 +743,7 @@ void fldigi_init() {
 #endif
 }
 
-void lan_init() {
+static void lan_init() {
     if (lan_active) {
 	if (lan_recv_init() < 0)	/* set up the network */
 	    showmsg("LAN receive  init failed");
@@ -758,7 +758,7 @@ void lan_init() {
 }
 
 
-void packet_init() {
+static void packet_init() {
     if (nopacket)
 	packetinterface = 0;
 
@@ -776,7 +776,7 @@ void packet_init() {
 }
 
 
-void keyer_init() {
+static void keyer_init() {
     char keyerbuff[3];
 
     if (cwkeyer == NET_KEYER) {
@@ -822,7 +822,7 @@ void keyer_init() {
 }
 
 
-void show_GPL() {
+static void show_GPL() {
     printw("\n\n\n");
     printw("           TTTTT  L      FFFFF\n");
     printw("             T    L      F    \n");
@@ -842,7 +842,7 @@ void show_GPL() {
 }
 
 
-int isFirstStart() {
+static int isFirstStart() {
     FILE *fp;
 
     if ((fp = fopen(".paras", "r")) == NULL) {
@@ -856,7 +856,7 @@ int isFirstStart() {
 /* write empty .paras file to remember that tlf got already started once
  * in these directory and GPL has been shown
  */
-void mark_GPL_seen() {
+static void mark_GPL_seen() {
 
     FILE *fp = fopen(".paras", "w");
     if (fp) {
@@ -870,7 +870,7 @@ void mark_GPL_seen() {
  * Cleanup initialisations made by tlf. Will be called after exit() from
  * logit() or background_process()
  */
-void tlf_cleanup() {
+static void tlf_cleanup() {
     if (pthread_self() != background_thread) {
 	pthread_cancel(background_thread);
 	pthread_join(background_thread, NULL);
@@ -895,8 +895,13 @@ void tlf_cleanup() {
 
     endwin();
     tcsetattr(STDIN_FILENO, TCSANOW, &oldt);
+
+    puts("\n\nThanks for using Tlf.. 73\n");
 }
 
+static void ignore(int sig) {
+    // no action except ignoring Ctrl-C
+}
 
 /* ------------------------------------------------------------------------*/
 /*     Main loop of the program			                           */
@@ -1002,6 +1007,9 @@ int main(int argc, char *argv[]) {
 
     bm_init();			/* initialize bandmap */
 
+    if (signal(SIGINT, SIG_IGN) != SIG_IGN) {   /* ignore Ctrl-C */
+	signal(SIGINT, ignore);
+    }
     atexit(tlf_cleanup); 	/* register cleanup function */
 
     /* Create the background thread */

src/parse_logcfg.c

@@ -492,7 +492,7 @@ static int cfg_thisnode(const cfg_arg_t arg) {
 
     if (strlen(str) != 1 || str[0] < 'A' || str[0] > 'A' + MAXNODES) {
 	g_free(str);
-	error_details = g_strdup_printf("name name is A..%c", 'A' + MAXNODES - 1);
+	error_details = g_strdup_printf("name is A..%c", 'A' + MAXNODES - 1);
 	return PARSE_WRONG_PARAMETER;
     }
 

tlf.1.in

@@ -205,8 +205,6 @@ You can exit and close @PACKAGE_NAME@ with the
 or
 .BR :QUI t
 commands or with
-.BR Ctrl\-C ,
-.BR Alt\-Q \ or
 .BR Alt\-X \.
 .P
 At restart @PACKAGE_NAME@ recalculates the score, which may take some time
@@ -289,10 +287,7 @@ Edit the log with your favourite editor. Be careful!
 .TQ
 .BR :QUI t
 Exit @PACKAGE_NAME@ (synonym to
-.BR Ctrl\-C ,
-.BR Alt\-Q ,
-and
-.BR Alt\-X ")."
+.BR Alt\-X ", but without asking for confirmation)."
 .
 .TP
 .BR :FIL ter
@@ -787,15 +782,6 @@ Add a spot to bandmap and broadcast it on the local network.
 Send a spot to the DX Cluster (a connection to a DX cluster must exit).
 .
 .TP
-.B Ctrl-C
-Exit @PACKAGE_NAME@ (synonyms to
-.BR :EXI t,
-.BR :QUI t,
-.BR Alt-Q ,
-and
-.BR Alt-X ")."
-.
-.TP
 .B Ctrl-E
 Ends modem capture for RTTY mode in QTC window (started with
 .BR Ctrl-S ).
@@ -935,15 +921,11 @@ Add Note to log.
 Toggle PTT (via \fBcwdaemon\fR).
 .
 .TP
-.B Alt-Q
-.TQ
 .B Alt-X
 Exit @PACKAGE_NAME@ (synonym to
-.BR :EXI "t ,"
-.BR :QUI "t ,"
-.BR Ctrl-C ,
+.BR :EXI "t "
 and
-.BR Ctrl-D ")."
+.BR :QUI "t, but asks for confirmation)."
 .
 .TP
 .B Alt-R