home: hub: mkinitfs

Info  •  Files  •  Log

nlplug-findfs: verify that stdin is TTY

--- a/nlplug-findfs.c

+++ b/nlplug-findfs.c

@@ -516,11 +516,15 @@

 	new_flags.c_lflag &= ~ECHO;

 	new_flags.c_lflag |= ECHONL;

-	r = tcsetattr(STDIN_FILENO, TCSANOW, &new_flags);

-	if (r < 0) {

-		warn("tcsetattr");

-		return r;

-	}

+	if (isatty(STDIN_FILENO)) {

+		r = tcsetattr(STDIN_FILENO, TCSANOW, &new_flags);

+		if (r < 0) {

+			warn("tcsetattr");

+			return r;

+		}

+	}// else {

+	//	fprintf(stderr, "The program isn't executed in a TTY, the echo-disabling has been skipped.\n");

+	//}

 	if (fgets(pass, pass_size, stdin) == NULL) {

 		warn("fgets");

@@ -528,10 +532,14 @@

 	}

 	pass[strlen(pass) - 1] = '\0';

-	if (tcsetattr(STDIN_FILENO, TCSANOW, &old_flags) < 0) {

-		warn("tcsetattr");

-		return r;

-	}

+	if (isatty(STDIN_FILENO)) {

+		if (tcsetattr(STDIN_FILENO, TCSANOW, &old_flags) < 0) {

+			warn("tcsetattr");

+			return r;

+		}

+	}// else {

+	//	fprintf(stderr, "The program isn't executed in a TTY, the echo-reenabling has been skipped.\n");

+	//}

 	return 0;

 }