Get rid of -Wshadow warning - I guess we're including something that
[metze/wireshark/wip.git] / capinfos.c
index b9ddb9838ddea49100255ae7ef76c74280461ee8..976ec63ab10efb2845deaf17cc98dd526f8dad0f 100644 (file)
@@ -21,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /*
@@ -32,7 +32,7 @@
  * Continue processing additional files after
  * a wiretap open failure.  The new -C option
  * reverts to capinfos' original behavior which
- * is to cancels any further file processing at
+ * is to cancel any further file processing at
  * first file open failure.
  *
  * Change the behavior of how the default display
  * into a tab delimited text file, or to a comma
  * separated variables file (*.csv) instead of the
  * original "long" format.
+ *
+ * 2011-04-05: wmeier
+ * behaviour changed: Upon exit capinfos will return
+ *  an error status if an error occurred at any
+ *  point during "continuous" file processing.
+ *  (Previously a success status was always
+ *   returned if the -C option was not used).
+ *
+
  */
 
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <locale.h>
 #include <errno.h>
 
 #ifdef HAVE_UNISTD_H
 
 #include <glib.h>
 
-#include <epan/packet.h>
+#include <wsutil/privileges.h>
+
+/*
+ * The symbols declared in the below are exported from libwireshark,
+ * but we don't want to link whole libwireshark to editcap.
+ * We link the object directly instead and this needs a little trick
+ * with the WS_BUILD_DLL #define.
+ */
+#define WS_BUILD_DLL
+#define RESET_SYMBOL_EXPORT
 #include <epan/filesystem.h>
 #include <epan/plugins.h>
-#include <epan/report_err.h>
+#undef WS_BUILD_DLL
+#define RESET_SYMBOL_EXPORT
+
 #include "wtap.h"
+#include <wsutil/report_err.h>
 #include <wsutil/privileges.h>
+#include <wsutil/str_util.h>
 
 #ifdef HAVE_LIBGCRYPT
-#include <gcrypt.h>
+#include <wsutil/wsgcrypt.h>
 #include <wsutil/file_util.h>
 #endif
 
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#else
-#include "wsgetopt.h"
+#ifndef HAVE_GETOPT
+#include "wsutil/wsgetopt.h"
 #endif
 
+#ifdef _WIN32
+#include <wsutil/unicode-utils.h>
+#endif /* _WIN32 */
+
 #include "svnversion.h"
 
 /*
@@ -107,6 +130,7 @@ static gboolean long_report = TRUE;         /* By default generate long report
 static gchar table_report_header = TRUE;    /* Generate column header by default     */
 static gchar field_separator = '\t';        /* Use TAB as field separator by default */
 static gchar quote_char = '\0';             /* Do NOT quote fields by default        */
+static gboolean machine_readable = FALSE;   /* Display machine-readable numbers      */
 
 /*
  * capinfos has the ability to report on a number of
@@ -126,6 +150,7 @@ static gboolean cap_file_encap = TRUE;      /* Report encapsulation       */
 static gboolean cap_snaplen = TRUE;         /* Packet size limit (snaplen)*/
 static gboolean cap_packet_count = TRUE;    /* Report packet count        */
 static gboolean cap_file_size = TRUE;       /* Report file size           */
+static gboolean cap_comment = TRUE;         /* Display the capture comment */
 
 static gboolean cap_data_size = TRUE;       /* Report packet byte size    */
 static gboolean cap_duration = TRUE;        /* Report capture duration    */
@@ -137,10 +162,109 @@ static gboolean cap_data_rate_byte = TRUE;  /* Report data rate bytes/sec */
 static gboolean cap_data_rate_bit = TRUE;   /* Report data rate bites/sec */
 static gboolean cap_packet_size = TRUE;     /* Report average packet size */
 static gboolean cap_packet_rate = TRUE;     /* Report average packet rate */
+static gboolean cap_order = TRUE;           /* Report if packets are in chronological order (True/False) */
+
 #ifdef HAVE_LIBGCRYPT
 static gboolean cap_file_hashes = TRUE;     /* Calculate file hashes */
 #endif
 
+#ifdef USE_GOPTION
+static gboolean cap_help = FALSE;
+static gboolean table_report = FALSE;
+
+static GOptionEntry general_entries[] =
+{
+  /* General */
+  { "type", 't', 0, G_OPTION_ARG_NONE, &cap_file_type,
+    "display the capture file type", NULL },
+  { "Encapsulation", 'E', 0, G_OPTION_ARG_NONE, &cap_file_encap,
+    "display the capture file encapsulation", NULL },
+#ifdef HAVE_LIBGCRYPT
+  { "Hash", 'H', 0, G_OPTION_ARG_NONE, &cap_file_hashes,
+    "display the SHA1, RMD160, and MD5 hashes of the file", NULL },
+#endif /* HAVE_LIBGCRYPT */
+  { "capture-comment", 'k', 0, G_OPTION_ARG_NONE, &cap_comment,
+    "display the capture comment ", NULL },
+  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
+};
+static GOptionEntry size_entries[] =
+{
+  /* Size */
+  { "packets", 'c', 0, G_OPTION_ARG_NONE, &cap_packet_count,
+    "display the number of packets", NULL },
+  { "size", 's', 0, G_OPTION_ARG_NONE, &cap_file_size,
+    "display the size of the file (in bytes)", NULL },
+  { "tot-len-of-pkts", 'd', 0, G_OPTION_ARG_NONE, &cap_data_size,
+    "display the total length of all packets (in bytes)", NULL },
+  { "snap", 'l', 0, G_OPTION_ARG_NONE, &cap_snaplen,
+    "display the packet size limit (snapshot length)", NULL },
+  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
+};
+static GOptionEntry time_entries[] =
+{
+  /* Time */
+  { "duration", 'u', 0, G_OPTION_ARG_NONE, &cap_duration,
+    "display the capture duration (in seconds)", NULL },
+  { "start", 'a', 0, G_OPTION_ARG_NONE, &cap_start_time,
+    "display the capture start time", NULL },
+  { "end", 'e', 0, G_OPTION_ARG_NONE, &cap_end_time,
+    "display the capture end time", NULL },
+  { "cron", 'o', 0, G_OPTION_ARG_NONE, &cap_order,
+    "display the capture file chronological status (True/False)", NULL },
+  { "start-end-time-sec", 'S', 0, G_OPTION_ARG_NONE, &time_as_secs,
+    "display start and end times as seconds", NULL },
+  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
+};
+
+static GOptionEntry stats_entries[] =
+{
+  /* Statistics */
+  { "bytes", 'y', 0, G_OPTION_ARG_NONE, &cap_data_rate_byte,
+    "display average data rate (in bytes/s)", NULL },
+  { "bits", 'i', 0, G_OPTION_ARG_NONE, &cap_data_rate_bit,
+    "display average data rate (in bits/s)", NULL },
+  { "packet-bytes", 'z', 0, G_OPTION_ARG_NONE, &cap_packet_size,
+    "display average packet size (in bytes)", NULL },
+  { "packets", 'x', 0, G_OPTION_ARG_NONE, &cap_packet_rate,
+    "display average packet rate (in packets/s)", NULL },
+  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
+};
+
+static GOptionEntry output_format_entries[] =
+{
+  /* Output format */
+  { "long", 'L', 0, G_OPTION_ARG_NONE, &long_report,
+    "generate long report (default)", NULL },
+  { "Table", 'T', 0, G_OPTION_ARG_NONE, &table_report,
+    "generate table report", NULL },
+  { "machine-readable", 'M', 0, G_OPTION_ARG_NONE, &machine_readable,
+    "display machine-readable (unabbreviated) values in long reports", NULL },
+  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
+};
+
+static GOptionEntry table_report_entries[] =
+{
+  /* Table report */
+  { "header-rec", 'R', 0, G_OPTION_ARG_NONE, &table_report_header,
+    "generate header record (default)", NULL },
+  { "no-table", 'r', 0, G_OPTION_ARG_NONE, &table_report_header,
+    "do not generate header record", NULL },
+  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
+};
+
+static GOptionEntry misc_entries[] =
+{
+  { "helpcompat", 'h', 0, G_OPTION_ARG_NONE, &cap_help,
+    "display help", NULL },
+  { NULL,'\0',0,G_OPTION_ARG_NONE,NULL,NULL,NULL }
+};
+
+GOptionContext *ctx;
+GOptionGroup *general_grp, *size_grp, *time_grp, *stats_grp, *output_grp, *table_report_grp;
+GError *parse_err = NULL;
+
+#endif /* USE_GOPTION */
+
 #ifdef HAVE_LIBGCRYPT
 #define HASH_SIZE_SHA1 20
 #define HASH_SIZE_RMD160 20
@@ -159,27 +283,53 @@ static gchar file_md5[HASH_STR_SIZE];
 #define FILE_HASH_OPT ""
 #endif /* HAVE_LIBGCRYPT */
 
+/*
+ * If we have at least two packets with time stamps, and they're not in
+ * order - i.e., the later packet has a time stamp older than the earlier
+ * packet - the time stamps are known not to be in order.
+ *
+ * If every packet has a time stamp, and they're all in order, the time
+ * stamp is known to be in order.
+ *
+ * Otherwise, we have no idea.
+ */
+typedef enum {
+  IN_ORDER,
+  NOT_IN_ORDER,
+  ORDER_UNKNOWN
+} order_t;
+
 typedef struct _capture_info {
-       const char              *filename;
-       guint16                 file_type;
-       int                     file_encap;
-       gint64                  filesize;
-
-       guint64                 packet_bytes;
-       double                  start_time;
-       double                  stop_time;
-       guint32                 packet_count;
-       gboolean                snap_set;
-       guint32                 snaplen;
-       gboolean                drops_known;
-       guint32                 drop_count;
-
-       double                  duration;
-       double                  packet_rate;
-       double                  packet_size;
-       double                  data_rate;              /* in bytes */
+  const char    *filename;
+  guint16       file_type;
+  gboolean      iscompressed;
+  int           file_encap;
+  gint64        filesize;
+  gchar         *comment;
+
+  guint64       packet_bytes;
+  gboolean      times_known;
+  double        start_time;
+  double        stop_time;
+  guint32       packet_count;
+  gboolean      snap_set;                /* If set in capture file header      */
+  guint32       snaplen;                 /* value from the capture file header */
+  guint32       snaplen_min_inferred;    /* If caplen < len for 1 or more rcds */
+  guint32       snaplen_max_inferred;    /*  ...                               */
+  gboolean      drops_known;
+  guint32       drop_count;
+
+  double        duration;
+  double        packet_rate;
+  double        packet_size;
+  double        data_rate;              /* in bytes */
+  gboolean      know_order;
+  order_t       order;
+
+  int          *encap_counts;           /* array of per_packet encap counts; array has one entry per wtap_encap type */
 } capture_info;
 
+
 static void
 enable_all_infos(void)
 {
@@ -190,11 +340,13 @@ enable_all_infos(void)
   cap_snaplen = TRUE;
   cap_packet_count = TRUE;
   cap_file_size = TRUE;
+  cap_comment = TRUE;
 
   cap_data_size = TRUE;
   cap_duration = TRUE;
   cap_start_time = TRUE;
   cap_end_time = TRUE;
+  cap_order = TRUE;
 
   cap_data_rate_byte = TRUE;
   cap_data_rate_bit = TRUE;
@@ -209,65 +361,85 @@ enable_all_infos(void)
 static void
 disable_all_infos(void)
 {
-  report_all_infos = FALSE;
+  report_all_infos   = FALSE;
 
-  cap_file_type = FALSE;
-  cap_file_encap = FALSE;
-  cap_snaplen = FALSE;
-  cap_packet_count = FALSE;
-  cap_file_size = FALSE;
+  cap_file_type      = FALSE;
+  cap_file_encap     = FALSE;
+  cap_snaplen        = FALSE;
+  cap_packet_count   = FALSE;
+  cap_file_size      = FALSE;
+  cap_comment        = FALSE;
 
-  cap_data_size = FALSE;
-  cap_duration = FALSE;
-  cap_start_time = FALSE;
-  cap_end_time = FALSE;
+  cap_data_size      = FALSE;
+  cap_duration       = FALSE;
+  cap_start_time     = FALSE;
+  cap_end_time       = FALSE;
+  cap_order          = FALSE;
 
   cap_data_rate_byte = FALSE;
-  cap_data_rate_bit = FALSE;
-  cap_packet_size = FALSE;
-  cap_packet_rate = FALSE;
+  cap_data_rate_bit  = FALSE;
+  cap_packet_size    = FALSE;
+  cap_packet_rate    = FALSE;
 
 #ifdef HAVE_LIBGCRYPT
   cap_file_hashes = FALSE;
 #endif /* HAVE_LIBGCRYPT */
 }
 
-/*
- * ctime_no_lf()
- *
- * This function simply truncates the string returned
- * from the ctime() function to remove the trailing
- * '\n' character.
- *
- * The ctime() function returns a string formatted as:
- *   "Www Mmm dd hh:mm:ss yyyy\n"
- * The unwanted '\n' is the 24th character.
- */
-
-static gchar *
-ctime_no_lf(const time_t* timer)
+static const gchar *
+order_string(order_t order)
 {
-  gchar *time_string;
-  time_string = ctime(timer);
-  time_string[24] = '\0';
-  return(time_string);
+  switch (order) {
+
+    case IN_ORDER:
+      return "True";
+
+    case NOT_IN_ORDER:
+      return "False";
+
+    case ORDER_UNKNOWN:
+      return "Unknown";
+
+    default:
+      return "???";  /* "cannot happen" (the next step is "Profit!") */
+  }
 }
 
 static gchar *
-time_string(const time_t *timer, capture_info *cf_info, gboolean want_lf)
+time_string(time_t timer, capture_info *cf_info, gboolean want_lf)
 {
   const gchar *lf = want_lf ? "\n" : "";
-  static gchar time_string_buf[15];
+  static gchar time_string_buf[20];
+  char *time_string_ctime;
 
-  if (cf_info->packet_count > 0) {
+  if (cf_info->times_known && cf_info->packet_count > 0) {
     if (time_as_secs) {
       /* XXX - Would it be useful to show sub-second precision? */
-      g_snprintf(time_string_buf, 15, "%lu%s", (unsigned long) *timer, lf);
+      g_snprintf(time_string_buf, 20, "%lu%s", (unsigned long)timer, lf);
       return time_string_buf;
-    } else if (want_lf) {
-      return ctime(timer);
     } else {
-      return ctime_no_lf(timer);
+#if (defined _WIN32) && (_MSC_VER < 1500)
+      /* calling localtime(), and thus ctime(), on MSVC 2005 with huge values causes it to crash */
+      /* XXX - find the exact value that still does work */
+      /* XXX - using _USE_32BIT_TIME_T might be another way to circumvent this problem */
+      if (timer > 2000000000) {
+        time_string_ctime = NULL;
+      } else
+#endif
+        time_string_ctime = ctime(&timer);
+      if (time_string_ctime == NULL) {
+        g_snprintf(time_string_buf, 20, "Not representable%s", lf);
+        return time_string_buf;
+      }
+      if (!want_lf) {
+        /*
+         * The ctime() function returns a string formatted as:
+         *   "Www Mmm dd hh:mm:ss yyyy\n"
+         * The unwanted '\n' is the 24th character.
+         */
+        time_string_ctime[24] = '\0';
+      }
+      return time_string_ctime;
     }
   }
 
@@ -291,9 +463,10 @@ static void print_value(const gchar *text_p1, gint width, const gchar *text_p2,
 static void
 print_stats(const gchar *filename, capture_info *cf_info)
 {
-  const gchar          *file_type_string, *file_encap_string;
-  time_t               start_time_t;
-  time_t               stop_time_t;
+  const gchar           *file_type_string, *file_encap_string;
+  time_t                start_time_t;
+  time_t                stop_time_t;
+  gchar                 *size_string;
 
   /* Build printable strings for various stats */
   file_type_string = wtap_file_type_string(cf_info->file_type);
@@ -302,29 +475,109 @@ print_stats(const gchar *filename, capture_info *cf_info)
   stop_time_t = (time_t)cf_info->stop_time;
 
   if (filename)           printf     ("File name:           %s\n", filename);
-  if (cap_file_type)      printf     ("File type:           %s\n", file_type_string);
+  if (cap_file_type)      printf     ("File type:           %s%s\n",
+      file_type_string,
+      cf_info->iscompressed ? " (gzip compressed)" : "");
   if (cap_file_encap)     printf     ("File encapsulation:  %s\n", file_encap_string);
+  if (cap_file_encap && (cf_info->file_encap == WTAP_ENCAP_PER_PACKET)) {
+    int i;
+    for (i=0; i<WTAP_NUM_ENCAP_TYPES; i++) {
+      if (cf_info->encap_counts[i] > 0)
+        printf("                       %s\n", wtap_encap_string(i));
+    }
+  }
   if (cap_snaplen && cf_info->snap_set)
-                          printf     ("Packet size limit:   %u bytes\n", cf_info->snaplen);
+    printf     ("Packet size limit:   file hdr: %u bytes\n", cf_info->snaplen);
   else if(cap_snaplen && !cf_info->snap_set)
-                          printf     ("Packet size limit:   (not set)\n");
-  if (cap_packet_count)   printf     ("Number of packets:   %u\n", cf_info->packet_count);
-  if (cap_file_size)      printf     ("File size:           %" G_GINT64_MODIFIER "d bytes\n", cf_info->filesize);
-  if (cap_data_size)      printf     ("Data size:           %" G_GINT64_MODIFIER "u bytes\n", cf_info->packet_bytes);
-  if (cap_duration)       print_value("Capture duration:    ", 0, " seconds",   cf_info->duration);
-  if (cap_start_time)     printf     ("Start time:          %s", time_string(&start_time_t, cf_info, TRUE));
-  if (cap_end_time)       printf     ("End time:            %s", time_string(&stop_time_t, cf_info, TRUE));
-  if (cap_data_rate_byte) print_value("Data byte rate:      ", 2, " bytes/sec",   cf_info->data_rate);
-  if (cap_data_rate_bit)  print_value("Data bit rate:       ", 2, " bits/sec",    cf_info->data_rate*8);
+    printf     ("Packet size limit:   file hdr: (not set)\n");
+  if (cf_info->snaplen_max_inferred > 0) {
+    if (cf_info->snaplen_min_inferred == cf_info->snaplen_max_inferred)
+      printf     ("Packet size limit:   inferred: %u bytes\n", cf_info->snaplen_min_inferred);
+    else
+      printf     ("Packet size limit:   inferred: %u bytes - %u bytes (range)\n",
+          cf_info->snaplen_min_inferred, cf_info->snaplen_max_inferred);
+  }
+  if (cap_packet_count) {
+    printf     ("Number of packets:   ");
+    if (machine_readable) {
+      printf ("%u\n", cf_info->packet_count);
+    } else {
+      size_string = format_size(cf_info->packet_count, format_size_unit_none);
+      printf ("%s\n", size_string);
+      g_free(size_string);
+    }
+  }
+  if (cap_file_size) {
+    printf     ("File size:           ");
+    if (machine_readable) {
+      printf     ("%" G_GINT64_MODIFIER "d bytes\n", cf_info->filesize);
+    } else {
+      size_string = format_size(cf_info->filesize, format_size_unit_bytes);
+      printf ("%s\n", size_string);
+      g_free(size_string);
+    }
+  }
+  if (cap_data_size) {
+    printf     ("Data size:           ");
+    if (machine_readable) {
+      printf     ("%" G_GINT64_MODIFIER "u bytes\n", cf_info->packet_bytes);
+    } else {
+      size_string = format_size(cf_info->packet_bytes, format_size_unit_bytes);
+      printf ("%s\n", size_string);
+      g_free(size_string);
+    }
+  }
+  if (cf_info->times_known) {
+    if (cap_duration) /* XXX - shorten to hh:mm:ss */
+                          print_value("Capture duration:    ", 0, " seconds",   cf_info->duration);
+    if (cap_start_time)
+                          printf     ("Start time:          %s", time_string(start_time_t, cf_info, TRUE));
+    if (cap_end_time)
+                          printf     ("End time:            %s", time_string(stop_time_t, cf_info, TRUE));
+    if (cap_data_rate_byte) {
+                          printf     ("Data byte rate:      ");
+      if (machine_readable) {
+        print_value("", 2, " bytes/sec",   cf_info->data_rate);
+      } else {
+        size_string = format_size((gint64)cf_info->data_rate, format_size_unit_bytes_s);
+        printf ("%s\n", size_string);
+        g_free(size_string);
+      }
+    }
+    if (cap_data_rate_bit) {
+                          printf     ("Data bit rate:       ");
+      if (machine_readable) {
+        print_value("", 2, " bits/sec",    cf_info->data_rate*8);
+      } else {
+        size_string = format_size((gint64)(cf_info->data_rate*8), format_size_unit_bits_s);
+        printf ("%s\n", size_string);
+        g_free(size_string);
+      }
+    }
+  }
   if (cap_packet_size)    printf     ("Average packet size: %.2f bytes\n",        cf_info->packet_size);
-  if (cap_packet_rate)    print_value("Average packet rate: ", 2, " packets/sec", cf_info->packet_rate);
+  if (cf_info->times_known) {
+    if (cap_packet_rate) {
+                          printf     ("Average packet rate: ");
+      if (machine_readable) {
+        print_value("", 2, " packets/sec", cf_info->packet_rate);
+      } else {
+        size_string = format_size((gint64)cf_info->packet_rate, format_size_unit_none);
+        printf ("%spackets/sec\n", size_string);
+        g_free(size_string);
+      }
+    }
+  }
 #ifdef HAVE_LIBGCRYPT
   if (cap_file_hashes) {
-                          printf     ("SHA1:                %s\n", file_sha1);
-                          printf     ("RIPEMD160:           %s\n", file_rmd160);
-                          printf     ("MD5:                 %s\n", file_md5);
+    printf     ("SHA1:                %s\n", file_sha1);
+    printf     ("RIPEMD160:           %s\n", file_rmd160);
+    printf     ("MD5:                 %s\n", file_md5);
   }
 #endif /* HAVE_LIBGCRYPT */
+  if (cap_order)          printf     ("Strict time order:   %s\n", order_string(cf_info->order));
+  if (cap_comment && cf_info->comment)
+    printf     ("Capture comment:     %s\n", cf_info->comment);
 }
 
 static void
@@ -358,6 +611,8 @@ print_stats_table_header(void)
   if (cap_file_type)      print_stats_table_header_label("File type");
   if (cap_file_encap)     print_stats_table_header_label("File encapsulation");
   if (cap_snaplen)        print_stats_table_header_label("Packet size limit");
+  if (cap_snaplen)        print_stats_table_header_label("Packet size limit min (inferred)");
+  if (cap_snaplen)        print_stats_table_header_label("Packet size limit max (inferred)");
   if (cap_packet_count)   print_stats_table_header_label("Number of packets");
   if (cap_file_size)      print_stats_table_header_label("File size (bytes)");
   if (cap_data_size)      print_stats_table_header_label("Data size (bytes)");
@@ -370,11 +625,13 @@ print_stats_table_header(void)
   if (cap_packet_rate)    print_stats_table_header_label("Average packet rate (packets/sec)");
 #ifdef HAVE_LIBGCRYPT
   if (cap_file_hashes) {
-                          print_stats_table_header_label("SHA1");
-                          print_stats_table_header_label("RIPEMD160");
-                          print_stats_table_header_label("MD5");
+    print_stats_table_header_label("SHA1");
+    print_stats_table_header_label("RIPEMD160");
+    print_stats_table_header_label("MD5");
   }
 #endif /* HAVE_LIBGCRYPT */
+  if (cap_order)          print_stats_table_header_label("Strict time order");
+  if (cap_comment)        print_stats_table_header_label("Capture comment");
 
   printf("\n");
 }
@@ -382,9 +639,9 @@ print_stats_table_header(void)
 static void
 print_stats_table(const gchar *filename, capture_info *cf_info)
 {
-  const gchar          *file_type_string, *file_encap_string;
-  time_t               start_time_t;
-  time_t               stop_time_t;
+  const gchar           *file_type_string, *file_encap_string;
+  time_t                start_time_t;
+  time_t                stop_time_t;
 
   /* Build printable strings for various stats */
   file_type_string = wtap_file_type_string(cf_info->file_type);
@@ -405,6 +662,11 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
     putquote();
   }
 
+  /* ToDo: If WTAP_ENCAP_PER_PACKET, show the list of encapsulations encountered;
+   *       Output a line for each different encap with all fields repeated except
+   *        the encapsulation field which has "Per Packet: ..." for each
+   *        encapsulation type seen ?
+   */
   if (cap_file_encap) {
     putsep();
     putquote();
@@ -419,6 +681,27 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
       printf("%u", cf_info->snaplen);
     else
       printf("(not set)");
+    putquote();
+    if (cf_info->snaplen_max_inferred > 0) {
+      putsep();
+      putquote();
+      printf("%u", cf_info->snaplen_min_inferred);
+      putquote();
+      putsep();
+      putquote();
+      printf("%u", cf_info->snaplen_max_inferred);
+      putquote();
+    }
+    else {
+      putsep();
+      putquote();
+      printf("n/a");
+      putquote();
+      putsep();
+      putquote();
+      printf("n/a");
+      putquote();
+    }
   }
 
   if (cap_packet_count) {
@@ -445,35 +728,44 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
   if (cap_duration) {
     putsep();
     putquote();
-    printf("%f", cf_info->duration);
+    if (cf_info->times_known)
+      printf("%f", cf_info->duration);
+    else
+      printf("n/a");
     putquote();
   }
 
   if (cap_start_time) {
     putsep();
     putquote();
-    printf("%s", time_string(&start_time_t, cf_info, FALSE));
+    printf("%s", time_string(start_time_t, cf_info, FALSE));
     putquote();
   }
 
   if (cap_end_time) {
     putsep();
     putquote();
-    printf("%s", time_string(&stop_time_t, cf_info, FALSE));
+    printf("%s", time_string(stop_time_t, cf_info, FALSE));
     putquote();
   }
 
   if (cap_data_rate_byte) {
     putsep();
     putquote();
-    printf("%.2f", cf_info->data_rate);
+    if (cf_info->times_known)
+      printf("%.2f", cf_info->data_rate);
+    else
+      printf("n/a");
     putquote();
   }
 
   if (cap_data_rate_bit) {
     putsep();
     putquote();
-    printf("%.2f", cf_info->data_rate*8);
+    if (cf_info->times_known)
+      printf("%.2f", cf_info->data_rate*8);
+    else
+      printf("n/a");
     putquote();
   }
 
@@ -487,7 +779,10 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
   if (cap_packet_rate) {
     putsep();
     putquote();
-    printf("%.2f", cf_info->packet_rate);
+    if (cf_info->times_known)
+      printf("%.2f", cf_info->packet_rate);
+    else
+      printf("n/a");
     putquote();
   }
 
@@ -510,56 +805,117 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
   }
 #endif /* HAVE_LIBGCRYPT */
 
+  if (cap_order) {
+    putsep();
+    putquote();
+    printf("%s", order_string(cf_info->order));
+    putquote();
+  }
+
+  if (cap_comment) {
+    putsep();
+    putquote();
+    printf("%s", cf_info->comment);
+    putquote();
+  }
+
+
   printf("\n");
 }
 
 static int
 process_cap_file(wtap *wth, const char *filename)
 {
-  int                  err;
-  gchar                        *err_info;
-  gint64               size;
-  gint64               data_offset;
-
-  guint32              packet = 0;
-  gint64               bytes = 0;
+  int                   err;
+  gchar                *err_info;
+  gint64                size;
+  gint64                data_offset;
+
+  guint32               packet = 0;
+  gint64                bytes  = 0;
+  guint32               snaplen_min_inferred = 0xffffffff;
+  guint32               snaplen_max_inferred =          0;
   const struct wtap_pkthdr *phdr;
-  capture_info         cf_info;
-  double               start_time = 0;
-  double               stop_time = 0;
-  double               cur_time = 0;
+  capture_info          cf_info;
+  gboolean              have_times = TRUE;
+  double                start_time = 0;
+  double                stop_time  = 0;
+  double                cur_time   = 0;
+  double                prev_time = 0;
+  gboolean              know_order = FALSE;
+  order_t               order = IN_ORDER;
+  wtapng_section_t     *shb_inf;
+  gchar                *p;
+
+
+  cf_info.encap_counts = g_new0(int,WTAP_NUM_ENCAP_TYPES);
 
   /* Tally up data that we need to parse through the file to find */
   while (wtap_read(wth, &err, &err_info, &data_offset))  {
     phdr = wtap_phdr(wth);
-    cur_time = secs_nsecs(&phdr->ts);
-    if(packet==0) {
-      start_time = cur_time;
-      stop_time = cur_time;
-    }
-    if (cur_time < start_time) {
-      start_time = cur_time;
-    }
-    if (cur_time > stop_time) {
-      stop_time = cur_time;
+    if (phdr->presence_flags & WTAP_HAS_TS) {
+      prev_time = cur_time;
+      cur_time = secs_nsecs(&phdr->ts);
+      if(packet==0) {
+        start_time = cur_time;
+        stop_time = cur_time;
+        prev_time = cur_time;
+      }
+      if (cur_time < prev_time) {
+        order = NOT_IN_ORDER;
+      }
+      if (cur_time < start_time) {
+        start_time = cur_time;
+      }
+      if (cur_time > stop_time) {
+        stop_time = cur_time;
+      }
+    } else {
+      have_times = FALSE; /* at least one packet has no time stamp */
+      if (order != NOT_IN_ORDER)
+        order = ORDER_UNKNOWN;
     }
+
     bytes+=phdr->len;
     packet++;
-  }
+
+    /* If caplen < len for a rcd, then presumably           */
+    /* 'Limit packet capture length' was done for this rcd. */
+    /* Keep track as to the min/max actual snapshot lengths */
+    /*  seen for this file.                                 */
+    if (phdr->caplen < phdr->len) {
+      if (phdr->caplen < snaplen_min_inferred)
+        snaplen_min_inferred = phdr->caplen;
+      if (phdr->caplen > snaplen_max_inferred)
+        snaplen_max_inferred = phdr->caplen;
+    }
+
+    /* Per-packet encapsulation */
+    if (wtap_file_encap(wth) == WTAP_ENCAP_PER_PACKET) {
+      if ((phdr->pkt_encap > 0) && (phdr->pkt_encap < WTAP_NUM_ENCAP_TYPES)) {
+        cf_info.encap_counts[phdr->pkt_encap] += 1;
+      } else {
+        fprintf(stderr, "capinfos: Unknown per-packet encapsulation: %d [frame number: %d]\n", phdr->pkt_encap, packet);
+      }
+    }
+
+  } /* while */
 
   if (err != 0) {
     fprintf(stderr,
-            "capinfos: An error occurred after reading %u packets from \"%s\": %s.\n",
-           packet, filename, wtap_strerror(err));
+        "capinfos: An error occurred after reading %u packets from \"%s\": %s.\n",
+        packet, filename, wtap_strerror(err));
     switch (err) {
 
-    case WTAP_ERR_UNSUPPORTED:
-    case WTAP_ERR_UNSUPPORTED_ENCAP:
-    case WTAP_ERR_BAD_RECORD:
-      fprintf(stderr, "(%s)\n", err_info);
-      g_free(err_info);
-      break;
+      case WTAP_ERR_UNSUPPORTED:
+      case WTAP_ERR_UNSUPPORTED_ENCAP:
+      case WTAP_ERR_BAD_FILE:
+      case WTAP_ERR_DECOMPRESS:
+        fprintf(stderr, "(%s)\n", err_info);
+        g_free(err_info);
+        break;
     }
+    g_free(cf_info.encap_counts);
     return 1;
   }
 
@@ -567,8 +923,9 @@ process_cap_file(wtap *wth, const char *filename)
   size = wtap_file_size(wth, &err);
   if (size == -1) {
     fprintf(stderr,
-            "capinfos: Can't get size of \"%s\": %s.\n",
-           filename, strerror(err));
+        "capinfos: Can't get size of \"%s\": %s.\n",
+        filename, g_strerror(err));
+    g_free(cf_info.encap_counts);
     return 1;
   }
 
@@ -576,6 +933,7 @@ process_cap_file(wtap *wth, const char *filename)
 
   /* File Type */
   cf_info.file_type = wtap_file_type(wth);
+  cf_info.iscompressed = wtap_iscompressed(wth);
 
   /* File Encapsulation */
   cf_info.file_encap = wtap_file_encap(wth);
@@ -587,13 +945,19 @@ process_cap_file(wtap *wth, const char *filename)
   else
     cf_info.snap_set = FALSE;
 
+  cf_info.snaplen_min_inferred = snaplen_min_inferred;
+  cf_info.snaplen_max_inferred = snaplen_max_inferred;
+
   /* # of packets */
   cf_info.packet_count = packet;
 
   /* File Times */
+  cf_info.times_known = have_times;
   cf_info.start_time = start_time;
   cf_info.stop_time = stop_time;
   cf_info.duration = stop_time-start_time;
+  cf_info.know_order = know_order;
+  cf_info.order = order;
 
   /* Number of packet bytes */
   cf_info.packet_bytes = bytes;
@@ -610,12 +974,33 @@ process_cap_file(wtap *wth, const char *filename)
     cf_info.packet_size = (double)bytes / packet;                  /* Avg packet size      */
   }
 
+  cf_info.comment = NULL;
+  shb_inf = wtap_file_get_shb_info(wth);
+  if (shb_inf) {
+    /* opt_comment is always 0-terminated by pcapng_read_section_header_block */
+    cf_info.comment = g_strdup(shb_inf->opt_comment);
+  }
+  g_free(shb_inf);
+  if (cf_info.comment) {
+    /* multi-line comments would conflict with the formatting that capinfos uses
+       we replace linefeeds with spaces */
+    p = cf_info.comment;
+    while (*p != '\0') {
+      if (*p=='\n')
+        *p=' ';
+      p++;
+    }
+  }
+
   if(long_report) {
     print_stats(filename, &cf_info);
   } else {
     print_stats_table(filename, &cf_info);
   }
 
+  g_free(cf_info.encap_counts);
+  g_free(cf_info.comment);
+
   return 0;
 }
 
@@ -634,9 +1019,9 @@ usage(gboolean is_error)
 
   fprintf(output, "Capinfos %s"
 #ifdef SVNVERSION
-         " (" SVNVERSION " from " SVNPATH ")"
+      " (" SVNVERSION " from " SVNPATH ")"
 #endif
-         "\n", VERSION);
+      "\n", VERSION);
   fprintf(output, "Prints various information (infos) about capture files.\n");
   fprintf(output, "See http://www.wireshark.org for more information.\n");
   fprintf(output, "\n");
@@ -648,6 +1033,7 @@ usage(gboolean is_error)
 #ifdef HAVE_LIBGCRYPT
   fprintf(output, "  -H display the SHA1, RMD160, and MD5 hashes of the file\n");
 #endif
+  fprintf(output, "  -k display the capture comment\n");
   fprintf(output, "\n");
   fprintf(output, "Size infos:\n");
   fprintf(output, "  -c display the number of packets\n");
@@ -659,6 +1045,7 @@ usage(gboolean is_error)
   fprintf(output, "  -u display the capture duration (in seconds)\n");
   fprintf(output, "  -a display the capture start time\n");
   fprintf(output, "  -e display the capture end time\n");
+  fprintf(output, "  -o display the capture file chronological status (True/False)\n");
   fprintf(output, "  -S display start and end times as seconds\n");
   fprintf(output, "\n");
   fprintf(output, "Statistic infos:\n");
@@ -670,6 +1057,7 @@ usage(gboolean is_error)
   fprintf(output, "Output format:\n");
   fprintf(output, "  -L generate long report (default)\n");
   fprintf(output, "  -T generate table report\n");
+  fprintf(output, "  -M display machine-readable values in long reports\n");
   fprintf(output, "\n");
   fprintf(output, "Table report options:\n");
   fprintf(output, "  -R generate header record (default)\n");
@@ -688,7 +1076,7 @@ usage(gboolean is_error)
   fprintf(output, "  -C cancel processing if file open fails (default is to continue)\n");
   fprintf(output, "  -A generate all infos (default)\n");
   fprintf(output, "\n");
-  fprintf(output, "Options are processed from left to right order with later options superceeding\n");
+  fprintf(output, "Options are processed from left to right order with later options superceding\n");
   fprintf(output, "or adding to earlier options.\n");
   fprintf(output, "\n");
   fprintf(output, "If no options are given the default is to display all infos in long report\n");
@@ -707,7 +1095,7 @@ usage(gboolean is_error)
 static void
 failure_message(const char *msg_format _U_, va_list ap _U_)
 {
-       return;
+  return;
 }
 #endif
 
@@ -717,7 +1105,7 @@ hash_to_str(const unsigned char *hash, size_t length, char *str) {
   int i;
 
   for (i = 0; i < (int) length; i++) {
-    sprintf(str+(i*2), "%02x", hash[i]);
+    g_snprintf(str+(i*2), 3, "%02x", hash[i]);
   }
 }
 #endif /* HAVE_LIBGCRYPT */
@@ -725,180 +1113,255 @@ hash_to_str(const unsigned char *hash, size_t length, char *str) {
 int
 main(int argc, char *argv[])
 {
-  wtap *wth;
-  int err;
+  wtap  *wth;
+  int    err;
   gchar *err_info;
-  int opt;
+  int    opt;
+  int    overall_error_status;
+
   int status = 0;
 #ifdef HAVE_PLUGINS
-  charinit_progfile_dir_error;
+  char  *init_progfile_dir_error;
 #endif
 #ifdef HAVE_LIBGCRYPT
-  FILE *fh;
-  char *hash_buf = NULL;
+  FILE  *fh;
+  char  *hash_buf = NULL;
   gcry_md_hd_t hd = NULL;
   size_t hash_bytes;
 #endif
 
+#ifdef _WIN32
+  arg_list_utf_16to8(argc, argv);
+  create_app_running_mutex();
+#endif /* _WIN32 */
+
   /*
    * Get credential information for later use.
    */
-  get_credential_info();
+  init_process_policies();
 
 #ifdef HAVE_PLUGINS
   /* Register wiretap plugins */
 
-    if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) {
-               g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
-               g_free(init_progfile_dir_error);
-    } else {
-               init_report_err(failure_message,NULL,NULL,NULL);
-               init_plugins();
-    }
+  if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) {
+    g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
+    g_free(init_progfile_dir_error);
+  } else {
+    init_report_err(failure_message,NULL,NULL,NULL);
+    init_plugins();
+  }
 #endif
 
   /* Process the options */
+#ifdef USE_GOPTION
+  ctx = g_option_context_new(" <infile> ... - print information about capture file(s)");
+  general_grp = g_option_group_new("gen", "General infos:",
+      "Show general options", NULL, NULL);
+  size_grp = g_option_group_new("size", "Size infos:",
+      "Show size options", NULL, NULL);
+  time_grp = g_option_group_new("time", "Time infos:",
+      "Show time options", NULL, NULL);
+  stats_grp = g_option_group_new("stats", "Statistics infos:",
+      "Show statistics options", NULL, NULL);
+  output_grp = g_option_group_new("output", "Output format:",
+      "Show output format options", NULL, NULL);
+  table_report_grp = g_option_group_new("table", "Table report options:",
+      "Show table report options", NULL, NULL);
+  g_option_group_add_entries(general_grp, general_entries);
+  g_option_group_add_entries(size_grp, size_entries);
+  g_option_group_add_entries(time_grp, time_entries);
+  g_option_group_add_entries(stats_grp, stats_entries);
+  g_option_group_add_entries(output_grp, output_format_entries);
+  g_option_group_add_entries(table_report_grp, table_report_entries);
+  g_option_context_add_main_entries(ctx, misc_entries, NULL);
+  g_option_context_add_group(ctx, general_grp);
+  g_option_context_add_group(ctx, size_grp);
+  g_option_context_add_group(ctx, time_grp);
+  g_option_context_add_group(ctx, stats_grp);
+  g_option_context_add_group(ctx, output_grp);
+  g_option_context_add_group(ctx, table_report_grp);
+  /* There's probably a better way to do this, but this works for now.
+     GOptions displays the name in argv[0] as the name of the
+     application.  This is reasonable, but because we actually have a
+     script wrapper that calls the executable.  The name that gets
+     displayed is not exactly the same as the command the user used
+     ran.
+   */
+  argv[0] = (char *)"capinfos";
+
+  /* if we have at least one cmdline option, we disable printing all infos */
+  if (argc>=2 && report_all_infos)
+    disable_all_infos();
+
+  if( !g_option_context_parse(ctx, &argc, &argv, &parse_err) ) {
+    if(parse_err) g_print ("option parsing failed: %s\n", parse_err->message);
+    g_print("%s", g_option_context_get_help (ctx, TRUE, NULL));
+    exit(1);
+  }
+  if( cap_help || (argc < 2) ) {
+    g_print("%s", g_option_context_get_help (ctx, FALSE, NULL));
+    exit(0);
+  }
+  g_option_context_free(ctx);
 
-  while ((opt = getopt(argc, argv, "tEcs" FILE_HASH_OPT "dluaeyizvhxCALTRrSNqQBmb")) !=-1) {
+#endif /* USE_GOPTION */
+  while ((opt = getopt(argc, argv, "tEcs" FILE_HASH_OPT "dluaeyizvhxokCALTMRrSNqQBmb")) !=-1) {
 
     switch (opt) {
 
-    case 't':
-      if (report_all_infos) disable_all_infos();
-      cap_file_type = TRUE;
-      break;
-
-    case 'E':
-      if (report_all_infos) disable_all_infos();
-      cap_file_encap = TRUE;
-      break;
-
-    case 'l':
-      if (report_all_infos) disable_all_infos();
-      cap_snaplen = TRUE;
-      break;
-
-    case 'c':
-      if (report_all_infos) disable_all_infos();
-      cap_packet_count = TRUE;
-      break;
-
-    case 's':
-      if (report_all_infos) disable_all_infos();
-      cap_file_size = TRUE;
-      break;
-
-    case 'd':
-      if (report_all_infos) disable_all_infos();
-      cap_data_size = TRUE;
-      break;
-
-    case 'u':
-      if (report_all_infos) disable_all_infos();
-      cap_duration = TRUE;
-      break;
-
-    case 'a':
-      if (report_all_infos) disable_all_infos();
-      cap_start_time = TRUE;
-      break;
-
-    case 'e':
-      if (report_all_infos) disable_all_infos();
-      cap_end_time = TRUE;
-      break;
-
-    case 'S':
-      time_as_secs = TRUE;
-      break;
-
-    case 'y':
-      if (report_all_infos) disable_all_infos();
-      cap_data_rate_byte = TRUE;
-      break;
-
-    case 'i':
-      if (report_all_infos) disable_all_infos();
-      cap_data_rate_bit = TRUE;
-      break;
-
-    case 'z':
-      if (report_all_infos) disable_all_infos();
-      cap_packet_size = TRUE;
-      break;
-
-    case 'x':
-      if (report_all_infos) disable_all_infos();
-      cap_packet_rate = TRUE;
-      break;
+      case 't':
+        if (report_all_infos) disable_all_infos();
+        cap_file_type = TRUE;
+        break;
+
+      case 'E':
+        if (report_all_infos) disable_all_infos();
+        cap_file_encap = TRUE;
+        break;
+
+      case 'l':
+        if (report_all_infos) disable_all_infos();
+        cap_snaplen = TRUE;
+        break;
+
+      case 'c':
+        if (report_all_infos) disable_all_infos();
+        cap_packet_count = TRUE;
+        break;
+
+      case 's':
+        if (report_all_infos) disable_all_infos();
+        cap_file_size = TRUE;
+        break;
+
+      case 'd':
+        if (report_all_infos) disable_all_infos();
+        cap_data_size = TRUE;
+        break;
+
+      case 'u':
+        if (report_all_infos) disable_all_infos();
+        cap_duration = TRUE;
+        break;
+
+      case 'a':
+        if (report_all_infos) disable_all_infos();
+        cap_start_time = TRUE;
+        break;
+
+      case 'e':
+        if (report_all_infos) disable_all_infos();
+        cap_end_time = TRUE;
+        break;
+
+      case 'S':
+        time_as_secs = TRUE;
+        break;
+
+      case 'y':
+        if (report_all_infos) disable_all_infos();
+        cap_data_rate_byte = TRUE;
+        break;
+
+      case 'i':
+        if (report_all_infos) disable_all_infos();
+        cap_data_rate_bit = TRUE;
+        break;
+
+      case 'z':
+        if (report_all_infos) disable_all_infos();
+        cap_packet_size = TRUE;
+        break;
+
+      case 'x':
+        if (report_all_infos) disable_all_infos();
+        cap_packet_rate = TRUE;
+        break;
 
 #ifdef HAVE_LIBGCRYPT
-    case 'H':
-      if (report_all_infos) disable_all_infos();
-      cap_file_hashes = TRUE;
-      break;
+      case 'H':
+        if (report_all_infos) disable_all_infos();
+        cap_file_hashes = TRUE;
+        break;
 #endif
 
-    case 'C':
-      continue_after_wtap_open_offline_failure = FALSE;
-      break;
+      case 'o':
+        if (report_all_infos) disable_all_infos();
+        cap_order = TRUE;
+        break;
+
+      case 'k':
+        if (report_all_infos) disable_all_infos();
+        cap_comment = TRUE;
+        break;
+
+      case 'C':
+        continue_after_wtap_open_offline_failure = FALSE;
+        break;
+
+      case 'A':
+        enable_all_infos();
+        break;
 
-    case 'A':
-      enable_all_infos();
-      break;
+      case 'L':
+        long_report = TRUE;
+        break;
 
-    case 'L':
-      long_report = TRUE;
-      break;
+      case 'T':
+        long_report = FALSE;
+        break;
 
-    case 'T':
-      long_report = FALSE;
-      break;
+      case 'M':
+        machine_readable = TRUE;
+        break;
 
-    case 'R':
-      table_report_header = TRUE;
-      break;
+      case 'R':
+        table_report_header = TRUE;
+        break;
 
-    case 'r':
-      table_report_header = FALSE;
-      break;
+      case 'r':
+        table_report_header = FALSE;
+        break;
 
-    case 'N':
-      quote_char = '\0';
-      break;
+      case 'N':
+        quote_char = '\0';
+        break;
 
-    case 'q':
-      quote_char = '\'';
-      break;
+      case 'q':
+        quote_char = '\'';
+        break;
 
-    case 'Q':
-      quote_char = '"';
-      break;
+      case 'Q':
+        quote_char = '"';
+        break;
 
-    case 'B':
-      field_separator = '\t';
-      break;
+      case 'B':
+        field_separator = '\t';
+        break;
 
-    case 'm':
-      field_separator = ',';
-      break;
+      case 'm':
+        field_separator = ',';
+        break;
 
-    case 'b':
-      field_separator = ' ';
-      break;
+      case 'b':
+        field_separator = ' ';
+        break;
 
-    case 'h':
-      usage(FALSE);
-      exit(1);
-      break;
+      case 'h':
+        usage(FALSE);
+        exit(1);
+        break;
 
-    case '?':              /* Bad flag - print usage message */
-      usage(TRUE);
-      exit(1);
-      break;
+      case '?':              /* Bad flag - print usage message */
+        usage(TRUE);
+        exit(1);
+        break;
     }
   }
 
+  /* Set the C-language locale to the native environment. */
+  setlocale(LC_ALL, "");
+
   if ((argc - optind) < 1) {
     usage(TRUE);
     exit(1);
@@ -920,12 +1383,14 @@ main(int argc, char *argv[])
   }
 #endif
 
+  overall_error_status = 0;
+
   for (opt = optind; opt < argc; opt++) {
 
 #ifdef HAVE_LIBGCRYPT
-    strcpy(file_sha1, "<unknown>");
-    strcpy(file_rmd160, "<unknown>");
-    strcpy(file_md5, "<unknown>");
+    g_strlcpy(file_sha1, "<unknown>", HASH_STR_SIZE);
+    g_strlcpy(file_rmd160, "<unknown>", HASH_STR_SIZE);
+    g_strlcpy(file_md5, "<unknown>", HASH_STR_SIZE);
 
     if (cap_file_hashes) {
       fh = ws_fopen(argv[opt], "rb");
@@ -947,18 +1412,19 @@ main(int argc, char *argv[])
 
     if (!wth) {
       fprintf(stderr, "capinfos: Can't open %s: %s\n", argv[opt],
-       wtap_strerror(err));
+          wtap_strerror(err));
       switch (err) {
 
-      case WTAP_ERR_UNSUPPORTED:
-      case WTAP_ERR_UNSUPPORTED_ENCAP:
-      case WTAP_ERR_BAD_RECORD:
-        fprintf(stderr, "(%s)\n", err_info);
-        g_free(err_info);
-        break;
+        case WTAP_ERR_UNSUPPORTED:
+        case WTAP_ERR_UNSUPPORTED_ENCAP:
+        case WTAP_ERR_BAD_FILE:
+          fprintf(stderr, "(%s)\n", err_info);
+          g_free(err_info);
+          break;
       }
+      overall_error_status = 1; /* remember that an error has occurred */
       if(!continue_after_wtap_open_offline_failure)
-        exit(1);
+        exit(1); /* error status */
     }
 
     if(wth) {
@@ -971,6 +1437,19 @@ main(int argc, char *argv[])
         exit(status);
     }
   }
-  return 0;
+
+  return overall_error_status;
 }
 
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 2
+ * tab-width: 2
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=2 tabstop=2 expandtab:
+ * :indentSize=2:tabSize=2:noTabs=true:
+ */