nmap/ncat_reg_stdin.diff
2012-11-29 14:48:33 +01:00

35 lines
979 B
Diff

diff -up nmap-6.01/ncat/ncat_connect.c.ncat_reg_stdin nmap-6.01/ncat/ncat_connect.c
--- nmap-6.01/ncat/ncat_connect.c.ncat_reg_stdin 2012-03-01 07:53:35.000000000 +0100
+++ nmap-6.01/ncat/ncat_connect.c 2012-08-08 18:34:36.971502138 +0200
@@ -458,10 +458,30 @@ bail:
return -1;
}
+#if defined(LINUX)
+static int stdin_is_reg(void) {
+ struct stat buf;
+
+ if (fstat(STDIN_FILENO, &buf) < 0)
+ fatal("fstat(): %s", strerror(errno));
+
+ return S_ISREG(buf.st_mode);
+}
+#endif
+
int ncat_connect(void) {
nsock_pool mypool;
int rc;
+#if defined(LINUX)
+ /* -- Hack!!
+ * epoll(7) doesn't support regular files (e.g.: ncat < file.c)
+ * If we detect that STDIN is a regular file, then we enforce
+ * the use of the select-based engine. */
+ //if (stdin_is_reg())
+ nsock_set_default_engine("select");
+#endif
+
/* Create an nsock pool */
if ((mypool = nsp_new(NULL)) == NULL)
bye("Failed to create nsock_pool.");