- Move setting _U_ into config.h, because

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

diff --git a/alert_box.c b/alert_box.c
index 3dca87a893132428b07e4252fe1cffd3d2a35d40..148f35689c944e2bb843b8cf2428f1ca8c3aed99 100644 (file)
--- a/alert_box.c
+++ b/alert_box.c
@@ -2,10 +2,10 @@
  * Routines to put up various "standard" alert boxes used in multiple
  * places
  *
- * $Id: alert_box.c,v 1.6 2004/04/16 23:16:28 guy Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -34,9 +34,9 @@
 #include <epan/filesystem.h>
 #include <epan/dfilter/dfilter.h>
 
-#include "alert_box.h"
+#include "ui/alert_box.h"
 
-#include "simple_dialog.h"
+#include "ui/simple_dialog.h"
 
 /*
  * Alert box for general errors.
@@ -57,7 +57,7 @@ failure_alert_box(const char *msg_format, va_list ap)
  * various HIGs suggest that you should, for example, suggest that the
  * user remove files if the file system is full.  Perhaps that's because
  * they're providing guidelines for people less sophisticated than the
- * typical Ethereal user is, but....
+ * typical Wireshark user is, but....
  */
 void
 open_failure_alert_box(const char *filename, int err, gboolean for_writing)
@@ -75,24 +75,42 @@ read_failure_alert_box(const char *filename, int err)
 {
   simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
                 "An error occurred while reading from the file \"%s\": %s.",
-                filename, strerror(err));
+                filename, g_strerror(err));
 }
 
 /*
  * Alert box for a failed attempt to write to a file.
- * "err" is assumed to be a UNIX-style errno.
+ * "err" is assumed to be a UNIX-style errno if positive and a
+ * Wiretap error if negative.
  *
  * XXX - add explanatory secondary text for at least some of the errors;
  * various HIGs suggest that you should, for example, suggest that the
  * user remove files if the file system is full.  Perhaps that's because
  * they're providing guidelines for people less sophisticated than the
- * typical Ethereal user is, but....
+ * typical Wireshark user is, but....
  */
 void
 write_failure_alert_box(const char *filename, int err)
 {
-  simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                file_write_error_message(err), filename);
+  if (err < 0) {
+    switch (err) {
+
+    case WTAP_ERR_SHORT_WRITE:
+      simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+                    "A full write couldn't be done to the file \"%s\".",
+                    filename);
+      break;
+    
+    default:
+      simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+                    "An error occurred while writing to the file \"%s\": %s.",
+                    filename, wtap_strerror(err));
+      break;
+    }
+  } else {
+    simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+                  file_write_error_message(err), filename);
+  }
 }
 
 /*
@@ -109,7 +127,7 @@ bad_dfilter_alert_box(const char *dftext)
   simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, 
                 "%s%s%s\n"
                 "\n"
-                "The filter expression \"%s\" is not a valid display filter.\n"
+                "The filter expression \"%s\" isn't a valid display filter.\n"
                 "See the help for a description of the display filter syntax.",
                 simple_dialog_primary_start(), dfilter_error_msg,
                 simple_dialog_primary_end(), dftext);