Fix various issues:

[metze/wireshark/wip.git] / captype.c

diff --git a/captype.c b/captype.c
index 0065f83b6fb3d7b269be5c511a921fdbe0bfb8fc..4b54f99482e8ddff926ecacdc07b60114e677ca6 100644 (file)
--- a/captype.c
+++ b/captype.c
@@ -46,6 +46,7 @@
 
 #include <wsutil/privileges.h>
 #include <wsutil/filesystem.h>
+#include <wsutil/file_util.h>
 
 #ifdef HAVE_PLUGINS
 #include <wsutil/plugins.h>
@@ -114,7 +115,7 @@ main(int argc, char *argv[])
 
 #ifdef HAVE_PLUGINS
   if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) {
-    g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
+    g_warning("captype: init_progfile_dir(): %s", init_progfile_dir_error);
     g_free(init_progfile_dir_error);
   } else {
     /* Register all the plugin types we have. */
@@ -134,7 +135,7 @@ main(int argc, char *argv[])
   /* Set the C-language locale to the native environment. */
   setlocale(LC_ALL, "");
 
-  if ((argc - optind) < 1) {
+  if (argc < 2) {
     usage();
     return 1;
   }
@@ -145,7 +146,7 @@ main(int argc, char *argv[])
     wth = wtap_open_offline(argv[i], &err, &err_info, FALSE);
 
     if (!wth) {
-      fprintf(stderr, "capinfos: Can't open %s: %s\n", argv[i],
+      fprintf(stderr, "captype: Can't open %s: %s\n", argv[i],
           wtap_strerror(err));
       switch (err) {