X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Ferror.c;h=5fd57057705ad69f62a1c9fdb9719097f5485aa5;hp=480c944c88020b0cd14821b636c3c81b2489fb1a;hb=93cfabb56a0b85cffca9c75cfac59e687157d0cc;hpb=6e54f6179cb9e9d5706901a06744b8f4667c24e7

diff --git a/utils/mount/error.c b/utils/mount/error.c
index 480c944..5fd5705 100644
--- a/utils/mount/error.c
+++ b/utils/mount/error.c
@@ -23,7 +23,10 @@
  *  + Proper support for internationalization
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdio.h>
@@ -185,7 +188,7 @@ void sys_mount_errors(char *server, int error, int will_retry, int bg)
 		fprintf(stderr, "%s\n", errbuf);
 }
 
-/*
+/**
  * mount_error - report a foreground mount error
  * @spec: C string containing the device name being mounted
  * @mount_point: C string containing the pathname of the local mounted on dir
@@ -195,12 +198,24 @@ void sys_mount_errors(char *server, int error, int will_retry, int bg)
 void mount_error(const char *spec, const char *mount_point, int error)
 {
 	switch(error) {
+	case EACCES:
+		nfs_error(_("%s: access denied by server while mounting %s"),
+				progname, spec);
+		break;
+	case EINVAL:
+		nfs_error(_("%s: an incorrect mount option was specified"), progname);
+		break;
+	case EOPNOTSUPP:
+		nfs_error(_("%s: requested NFS version or transport"
+				" protocol is not supported"),
+				progname);
+		break;
 	case ENOTDIR:
 		nfs_error(_("%s: mount point %s is not a directory"),
 				progname, mount_point);
 		break;
 	case EBUSY:
-		nfs_error(_("%s: %s is already mounted or busy"),
+		nfs_error(_("%s: %s is busy or already mounted"),
 			progname, mount_point);
 		break;
 	case ENOENT:
@@ -212,6 +227,18 @@ void mount_error(const char *spec, const char *mount_point, int error)
 			nfs_error(_("%s: mount point %s does not exist"),
 				progname, mount_point);
 		break;
+	case ESPIPE:
+		rpc_mount_errors((char *)spec, 0, 0);
+		break;
+	case EIO:
+		nfs_error(_("%s: mount system call failed"), progname);
+		break;
+	case EFAULT:
+		nfs_error(_("%s: encountered unexpected error condition."),
+				progname);
+		nfs_error(_("%s: please report the error to" PACKAGE_BUGREPORT),
+				progname);
+		break;
 	default:
 		nfs_error(_("%s: %s"),
 			progname, strerror(error));