From e690b88d758978b0a7e5704f6cec4ab9159d344e Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Sat, 24 Nov 2001 09:46:28 +0000
Subject: [PATCH] Fix to text2pcap to handle colons after offset field, from
 Gordon McKinney.

svn path=/trunk/; revision=4256
---
 AUTHORS             | 1 +
 text2pcap-scanner.l | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 9d24db3db1..ff9c494832 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -851,6 +851,7 @@ Marc Milgram <mmilgram[AT]arrayinc.com> {
 Gordon McKinney <gordon[AT]night-ray.com> {
 	Enhanced Ethereal icon for Windows
 	Support for time stamping packets in text2pcap
+	Fix to text2pcap to handle colons after offset field
 }
 
 Pavel Novotny <Pavel.Novotny[AT]icn.siemens.de> {
diff --git a/text2pcap-scanner.l b/text2pcap-scanner.l
index 954c8dfae0..0f20ba70b3 100644
--- a/text2pcap-scanner.l
+++ b/text2pcap-scanner.l
@@ -10,7 +10,7 @@
  *
  * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
  *
- * $Id: text2pcap-scanner.l,v 1.2 2001/11/24 02:13:34 guy Exp $
+ * $Id: text2pcap-scanner.l,v 1.3 2001/11/24 09:46:28 guy Exp $
  * 
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -46,7 +46,7 @@ directive #TEXT2PCAP.*
 comment #[^W].*
 byte [0-9A-Fa-f][0-9A-Fa-f][ \t]
 byte_eol [0-9A-Fa-f][0-9A-Fa-f]\n
-offset [0-9A-Fa-f]+[ \t]
+offset [0-9A-Fa-f]+[: \t]
 offset_eol [0-9A-Fa-f]+\n
 text [^ \n\t]+
 mailfwd >