mount.nfs: error message clean up.

[nfs-utils.git] / utils / mount / error.c

diff --git a/utils/mount/error.c b/utils/mount/error.c
index 4cc9e0949e3645dbbd6b17c077161e3adb5ab2f5..f8fc13fea3d794048e73cd05a2eaa9d2d0bd27c3 100644 (file)
--- a/utils/mount/error.c
+++ b/utils/mount/error.c
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA
  *
  * To Do:
  *  + Proper support for internationalization
@@ -70,9 +70,15 @@ static int rpc_strerror(int spos)
                        pos = snprintf(tmp, (erreob - tmp),
                                        _("System Error: %s"),
                                                strerror(cf_errno));
-               else
-                       pos = snprintf(tmp, (erreob - tmp),
-                                       _("RPC Error:%s"), estr);
+               else {
+                       if (cf_errno) 
+                               pos = snprintf(tmp, (erreob - tmp),
+                                       _("RPC Error:%s; errno = %s"), 
+                                       estr, strerror(cf_errno));
+                       else
+                               pos = snprintf(tmp, (erreob - tmp),
+                                               _("RPC Error:%s"), estr);
+               }
        }
        return pos;
 }
@@ -219,7 +225,7 @@ void mount_error(const char *spec, const char *mount_point, int error)
        case ENOENT:
                if (spec)
                        nfs_error(_("%s: mounting %s failed, "
-                               "reason given by server:\n  %s"),
+                               "reason given by server: %s"),
                                progname, spec, strerror(error));
                else
                        nfs_error(_("%s: mount point %s does not exist"),