* errno.cc: Change EPERM associated text to "Operation not permitted"

throughout.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 525167c..ef02345 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
 2002-03-05  Christopher Faylor  <cgf@redhat.com>
 
+       * errno.cc: Change EPERM associated text to "Operation not permitted"
+       throughout.
+
+2002-03-05  Christopher Faylor  <cgf@redhat.com>
+
        * fhandler_socket.cc (fhandler_socket::close): Respond to signals while
        looping, waiting for socket to close.  Superstitiously clear last error
        when WSAEWOULDBLOCK.

diff --git a/winsup/cygwin/errno.cc b/winsup/cygwin/errno.cc
index 0643647..fc9a455 100644 (file)
--- a/winsup/cygwin/errno.cc
+++ b/winsup/cygwin/errno.cc
@@ -153,7 +153,7 @@ extern "C" {
 const NO_COPY char __declspec(dllexport) * const _sys_errlist[]=
 {
 /*      NOERROR 0       */ "No error",
-/*     EPERM 1         */ "Not super-user",
+/*     EPERM 1         */ "Operation not permitted",
 /*     ENOENT 2        */ "No such file or directory",
 /*     ESRCH 3         */ "No such process",
 /*     EINTR 4         */ "Interrupted system call",
@@ -308,10 +308,13 @@ extern "C" char *
 strerror (int errnum)
 {
   const char *error;
+  if (errnum < _sys_nerr)
+    error = _sys_errlist [errnum];
+  else
   switch (errnum)
     {
     case EPERM:
-      error = "Not owner";
+      error = "Operation not permitted";
       break;
     case ENOENT:
       error = "No such file or directory";