diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-01-24 01:44:29 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-01-24 01:44:29 +0000 |
| commit | 46848f0a9ef2b8ceefdf75d8c75339778cd70e8c (patch) | |
| tree | d4316f905060985bfa20d83b9b46102334975bb6 /epan | |
| parent | 49093048ac524c7eb2124c15a8db11d21c7fbab4 (diff) | |
| download | wireshark-46848f0a9ef2b8ceefdf75d8c75339778cd70e8c.tar.gz wireshark-46848f0a9ef2b8ceefdf75d8c75339778cd70e8c.tar.bz2 wireshark-46848f0a9ef2b8ceefdf75d8c75339778cd70e8c.zip | |
Add a new "file_open_error_message()" routine in "epan/filesystem.c", to
translate UNIX errno values to a somewhat friendly message format
string.
Rename "file_open_error_message()" in "file.c" to
"cf_open_error_message()", make "cf_open_error_message()" use the new
"file_open_error_message()" for UNIX errno values, have "do_capture()"
in "capture.c" use "file_open_error_message()" to report errors from
"open()", and make "cf_open_error_message()" static as nothing outside
"file.c" uses it.
Do similar stuff in "tethereal.c".
svn path=/trunk/; revision=9821
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/filesystem.c | 41 | ||||
| -rw-r--r-- | epan/filesystem.h | 9 |
2 files changed, 47 insertions, 3 deletions
diff --git a/epan/filesystem.c b/epan/filesystem.c index c6d7c2b606..2debf626a4 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -1,7 +1,7 @@ /* filesystem.c * Filesystem utility routines * - * $Id: filesystem.c,v 1.27 2003/11/03 22:32:36 guy Exp $ + * $Id: filesystem.c,v 1.28 2004/01/24 01:44:29 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -643,3 +643,42 @@ char *get_tempfile_path(const char *filename) return path; } +/* + * Return an error message for UNIX-style errno indications. + */ +char * +file_open_error_message(int err, gboolean for_writing) +{ + char *errmsg; + static char errmsg_errno[1024+1]; + + switch (err) { + + case ENOENT: + if (for_writing) + errmsg = "The path to the file \"%s\" does not exist."; + else + errmsg = "The file \"%s\" does not exist."; + break; + + case EACCES: + if (for_writing) + errmsg = "You do not have permission to create or write to the file \"%s\"."; + else + errmsg = "You do not have permission to read the file \"%s\"."; + break; + + case EISDIR: + errmsg = "\"%s\" is a directory (folder), not a file."; + break; + + default: + snprintf(errmsg_errno, sizeof(errmsg_errno), + "The file \"%%s\" could not be %s: %s.", + for_writing ? "created" : "opened", + strerror(err)); + errmsg = errmsg_errno; + break; + } + return errmsg; +} diff --git a/epan/filesystem.h b/epan/filesystem.h index d4a32118f9..1148ba1fd6 100644 --- a/epan/filesystem.h +++ b/epan/filesystem.h @@ -1,7 +1,7 @@ /* filesystem.h * Filesystem utility definitions * - * $Id: filesystem.h,v 1.15 2003/11/18 19:20:36 guy Exp $ + * $Id: filesystem.h,v 1.16 2004/01/24 01:44:29 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -119,7 +119,12 @@ char *get_persconffile_path(const char *filename, gboolean for_writing); */ extern char *get_tempfile_path(const char *filename); - /* Delete a file */ gboolean deletefile (const char *path); + +/* + * Return an error message for UNIX-style errno indications. + */ +char *file_open_error_message(int err, gboolean for_writing); + #endif /* FILESYSTEM_H */ |