1. Remove \r from tshark output so output OK on Windows cygwin bash.

2. Error messsages to stderr.
3. Check capinfos return value to verify that file is a valid capture file.

svn path=/trunk/; revision=36478

1 files changed, 16 insertions, 4 deletions

diff --git a/tools/list_protos_in_cap.sh b/tools/list_protos_in_cap.sh
index 5aff287f41..e831caeb77 100755
--- a/tools/list_protos_in_cap.sh
+++ b/tools/list_protos_in_cap.sh
@@ -27,7 +27,7 @@ for i in "$TSHARK" "$CAPINFOS"
 do
     if [ ! -x $i ]
     then
-        echo "Couldn't find $i"
+        echo "Couldn't find $i"  1>&2
         NOTFOUND=1
     fi
 done
@@ -61,15 +61,27 @@ FIN
 fi
 
 for CF in "$@" ; do
-    "$CAPINFOS" "$CF" > /dev/null
     if [ "$OSTYPE" == "cygwin" ] ; then
 	CF=`cygpath --windows "$CF"`
     fi
+
+    if [ ! -f "$CF" ] ; then
+        echo "Doesn't exist or not a file: $CF"  1>&2
+        continue
+    fi
+
+    "$CAPINFOS" "$CF" > /dev/null
+    RETVAL=$?
+    if [ $RETVAL -ne 0 ] ; then
+	echo "Not a valid capture file (or some other problem)" 1>&2
+	continue
+    fi
+
     printf "$CF "
 
     # Extract the protocol names.
-    $TSHARK -T fields -eframe.protocols -nr "$CF" 2>/dev/null | tr ':' '\n' \
-	| sort -u | tr '\n' ' '
+    $TSHARK -T fields -eframe.protocols -nr "$CF" 2>/dev/null | tr ':\r' '\n' \
+	| sort -u | tr '\n\r' ' '
 
     printf "\n"
 done