Catching SIGCONT correctly

Author: amissael95

src/libltfs/ltfs.c

@@ -222,6 +222,29 @@ bool ltfs_caught_sigcont(void)
 	return caught_sigcont;
 }
 
+int ltfs_extra_signal_handlers(void)
+{
+	ltfs_sighandler_t ret;
+	ret = signal(SIGCONT, _ltfs_sigcont);
+	if (ret == SIG_ERR) {
+		return -LTFS_SIG_HANDLER_ERR;
+	}
+
+	return 0;
+}
+
+int ltfs_unset_extra_signal_handler(void)
+{
+	ltfs_sighandler_t rc;
+	int ret = 0;
+
+	rc = signal(SIGCONT, SIG_DFL);
+	if (rc == SIG_ERR)
+		ret = -LTFS_SIG_HANDLER_ERR;
+
+	return ret;
+}
+
 /**
  * This function can be used to enable libltfs signal handler
  * to kill ltfs, mkltfs, ltfsck cleanly
@@ -266,15 +289,6 @@ int ltfs_set_signal_handlers(void)
 		return -LTFS_SIG_HANDLER_ERR;
 	}
 
-	ret = signal(SIGCONT, _ltfs_sigcont);
-	if (ret == SIG_ERR) {
-		signal(SIGINT, SIG_DFL);
-		signal(SIGHUP, SIG_DFL);
-		signal(SIGQUIT, SIG_DFL);
-		signal(SIGTERM, SIG_DFL);
-		return -LTFS_SIG_HANDLER_ERR;
-	}
-
 	return 0;
 }
 #endif
@@ -309,10 +323,6 @@ int ltfs_unset_signal_handlers(void)
 	if (rc == SIG_ERR)
 		ret = -LTFS_SIG_HANDLER_ERR;
 
-	rc = signal(SIGCONT, SIG_DFL);
-	if (rc == SIG_ERR)
-		ret = -LTFS_SIG_HANDLER_ERR;
-
 	return ret;
 }
 #endif

src/libltfs/ltfs.h

@@ -596,6 +596,8 @@ bool ltfs_caught_sigcont(void);
 void ltfs_sigcont_set(bool sig_val);
 int ltfs_set_signal_handlers(void);
 int ltfs_unset_signal_handlers(void);
+int ltfs_extra_signal_handlers(void);
+int ltfs_unset_extra_signal_handler(void);
 int ltfs_finish();
 
 /* Public wrappers for tape_* functions */

src/libltfs/tape.c

@@ -1245,15 +1245,13 @@ ssize_t tape_write(struct device_data *dev, const char *buf, size_t count, bool
 	}
 
 	if (ltfs_caught_sigcont()) {
-		ltfsmsg(LTFS_DEBUG, 16503D, "ltfs_caught_sigcont", "tape_write");
 		ret_for_update_position = tape_get_position_from_drive(dev, &current_position);
 		if (ret_for_update_position) {
 			/* Return error since the current tape position was unable to be determined, so there could be an undetected position mismatch */
 			ltfsmsg(LTFS_ERR, 11081E, ret);
 			return -LTFS_WRITE_ERROR;
 		}
 
-		ltfsmsg(LTFS_INFO, 11334I, "compare offset in tape_write", (unsigned long long)dev->position.block, (unsigned long long)current_position.block);
 		diff = ((unsigned long long)dev->position.block - (unsigned long long)current_position.block);
 		if (diff) {
 			/* Position mismatch, diff not equal zero */

src/main.c

@@ -1241,10 +1241,14 @@ int single_drive_main(struct fuse_args *args, struct ltfs_fuse_data *priv)
 	ltfsmsg(LTFS_INFO, 14111I);
 	ltfsmsg(LTFS_INFO, 14112I);
 	ltfsmsg(LTFS_INFO, 14113I);
+	/* Set handlers for signals that need to be caught while fuse main is running*/
+	ltfs_extra_signal_handlers();
 	ret = fuse_main(args->argc, args->argv, &ltfs_ops, priv);
 	if (ret != 0) {
 		ltfsmsg(LTFS_WARN, 14123W, ret);
 	}
+	/* Unset extra handlers once fuse main exits */
+	ltfs_unset_extra_signal_handler();
 
 	/*  Setup signal handler again to terminate cleanly */
 	ret = ltfs_set_signal_handlers();