cd ../gtk ==> cd ../ui/gtk

[obnox/wireshark/wip.git] / capinfos.c

diff --git a/capinfos.c b/capinfos.c
index 88af0b5237d253ccc7cbf734ef66c4f5940b1f7d..c2f2e8ed4c04da18cc7eb57256684514bc7fbf98 100644 (file)
--- a/capinfos.c
+++ b/capinfos.c
@@ -88,9 +88,7 @@
 #include <wsutil/file_util.h>
 #endif
 
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#else
+#ifndef HAVE_GETOPT
 #include "wsutil/wsgetopt.h"
 #endif
 
@@ -254,42 +252,41 @@ disable_all_infos(void)
 #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)
-{
-  gchar *time_string;
-  time_string = ctime(timer);
-  time_string[24] = '\0';
-  return(time_string);
-}
-
-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 (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);
+#ifdef _MSC_VER
+      /* 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;
     }
   }
 
@@ -348,8 +345,8 @@ print_stats(const gchar *filename, capture_info *cf_info)
   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_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);
   if (cap_packet_size)    printf     ("Average packet size: %.2f bytes\n",        cf_info->packet_size);
@@ -360,8 +357,8 @@ print_stats(const gchar *filename, capture_info *cf_info)
                           printf     ("RIPEMD160:           %s\n", file_rmd160);
                           printf     ("MD5:                 %s\n", file_md5);
   }
-  if (cap_in_order)       printf     ("Strict time order:   %s\n", (cf_info->in_order) ? "True" : "False");
 #endif /* HAVE_LIBGCRYPT */
+  if (cap_in_order)       printf     ("Strict time order:   %s\n", (cf_info->in_order) ? "True" : "False");
 }
 
 static void
@@ -518,14 +515,14 @@ print_stats_table(const gchar *filename, capture_info *cf_info)
   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();
   }
 
@@ -661,7 +658,7 @@ process_cap_file(wtap *wth, const char *filename)
 
     case WTAP_ERR_UNSUPPORTED:
     case WTAP_ERR_UNSUPPORTED_ENCAP:
-    case WTAP_ERR_BAD_RECORD:
+    case WTAP_ERR_BAD_FILE:
     case WTAP_ERR_DECOMPRESS:
       fprintf(stderr, "(%s)\n", err_info);
       g_free(err_info);
@@ -676,7 +673,7 @@ process_cap_file(wtap *wth, const char *filename)
   if (size == -1) {
     fprintf(stderr,
             "capinfos: Can't get size of \"%s\": %s.\n",
-            filename, strerror(err));
+            filename, g_strerror(err));
     g_free(cf_info.encap_counts);
     return 1;
   }
@@ -1081,7 +1078,7 @@ main(int argc, char *argv[])
 
       case WTAP_ERR_UNSUPPORTED:
       case WTAP_ERR_UNSUPPORTED_ENCAP:
-      case WTAP_ERR_BAD_RECORD:
+      case WTAP_ERR_BAD_FILE:
         fprintf(stderr, "(%s)\n", err_info);
         g_free(err_info);
         break;