projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable'
[gnulib.git]
/
lib
/
strerror.c
diff --git
a/lib/strerror.c
b/lib/strerror.c
index
798d854
..
5dae111
100644
(file)
--- a/
lib/strerror.c
+++ b/
lib/strerror.c
@@
-1,6
+1,6
@@
/* strerror.c --- POSIX compatible system error routine
/* strerror.c --- POSIX compatible system error routine
- Copyright (C) 2007-20
09
Free Software Foundation, Inc.
+ Copyright (C) 2007-20
11
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-32,6
+32,9
@@
# include "intprops.h"
# include "intprops.h"
+/* Use the system functions, not the gnulib overrides in this file. */
+# undef sprintf
+
# undef strerror
# if ! HAVE_DECL_STRERROR
# define strerror(n) NULL
# undef strerror
# if ! HAVE_DECL_STRERROR
# define strerror(n) NULL
@@
-313,7
+316,19
@@
rpl_strerror (int n)
break;
# endif
break;
# endif
-# if GNULIB_defined_
+# if GNULIB_defined_ESTALE
+ case ESTALE:
+ msg = "Stale NFS file handle";
+ break;
+# endif
+
+# if GNULIB_defined_EDQUOT
+ case EDQUOT:
+ msg = "Disk quota exceeded";
+ break;
+# endif
+
+# if GNULIB_defined_ECANCELED
case ECANCELED:
msg = "Operation canceled";
break;
case ECANCELED:
msg = "Operation canceled";
break;
@@
-328,10
+343,10
@@
rpl_strerror (int n)
if (result == NULL || result[0] == '\0')
{
if (result == NULL || result[0] == '\0')
{
- static char const fmt[] = "Unknown error (%d)";
- static char msg_buf[sizeof fmt + INT_STRLEN_BOUND (n)];
- sprintf (msg_buf, fmt, n);
- return msg_buf;
+
static char const fmt[] = "Unknown error (%d)";
+
static char msg_buf[sizeof fmt + INT_STRLEN_BOUND (n)];
+
sprintf (msg_buf, fmt, n);
+
return msg_buf;
}
return result;
}
return result;