Don't include io.h in Flex scanners - they're not interactive.

We don't have any Flex scanners that support an interactive command-line
interface, so none of our scanners are, or need to be, interactive.
Mark text2pcap's scanner as not interactive.

That means none of our scanners should call isatty(), so they don't have
any need to include <io.h> on Windows; remove that include from the
Lucent/Ascent text capture scanner.

Update a comment to reflect that what matters isn't whether we can read
from a terminal or whether we actually do so, what matters is whether
they read *interactively* from a terminal (if you want to run text2pcap
reading from the standard input and type at it, be my guest).

Change-Id: I59979d1fdb37e1913125a400963ff7a3fa6b9bbd
Reviewed-on: https://code.wireshark.org/review/11587
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-11-05 15:35:04 -08:00
parent d02104c9a6
commit ce22578996
12 changed files with 16 additions and 15 deletions

View File

@ -9,7 +9,7 @@
%option nounput
/*
* We don't read from the terminal.
* We don't read interactively from the terminal.
*/
%option never-interactive

View File

@ -9,7 +9,7 @@
%option nounput
/*
* We don't read from the terminal.
* We don't read interactively from the terminal.
*/
%option never-interactive

View File

@ -9,7 +9,7 @@
%option nounput
/*
* We don't read from the terminal.
* We don't read interactively from the terminal.
*/
%option never-interactive

View File

@ -9,7 +9,7 @@
%option nounput
/*
* We don't read from the terminal.
* We don't read interactively from the terminal.
*/
%option never-interactive

View File

@ -9,7 +9,7 @@
%option nounput
/*
* We don't read from the terminal.
* We don't read interactively from the terminal.
*/
%option never-interactive

View File

@ -9,7 +9,7 @@
%option nounput
/*
* We don't read from the terminal.
* We don't read interactively from the terminal.
*/
%option never-interactive

View File

@ -9,7 +9,7 @@
%option nounput
/*
* We don't read from the terminal.
* We don't read interactively from the terminal.
*/
%option never-interactive

View File

@ -9,7 +9,7 @@
%option nounput
/*
* We don't read from the terminal.
* We don't read interactively from the terminal.
*/
%option never-interactive

View File

@ -10,6 +10,11 @@
*/
%option nounput
/*
* We don't read interactively from the terminal.
*/
%option never-interactive
%{
/********************************************************************************

View File

@ -6,7 +6,7 @@
%option nounput noinput
/*
* We don't read from the terminal.
* We don't read interactively from the terminal.
*/
%option never-interactive

View File

@ -1,5 +1,5 @@
/*
* We don't read from the terminal.
* We don't read interactively from the terminal.
*/
%option never-interactive
@ -36,10 +36,6 @@
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_IO_H
#include <io.h> /* for isatty() on win32 */
#endif
#include "wtap-int.h"
#include "ascendtext.h"
#include "ascend.h"

View File

@ -9,7 +9,7 @@
%option nounput
/*
* We don't read from the terminal.
* We don't read interactively from the terminal.
*/
%option never-interactive