Merge branch 'upstream' into dfsg-orig

[tar] / gnu / strerror.c

diff --git a/gnu/strerror.c b/gnu/strerror.c
index 26ef483e4b3288fc09a9422eca81529ecaf6cd73..ad29c7112b0a094ecc6aeea2caa08699c42c01cf 100644 (file)
--- a/gnu/strerror.c
+++ b/gnu/strerror.c
@@ -34,6 +34,9 @@
 
 # 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
@@ -321,6 +324,12 @@ rpl_strerror (int n)
       break;
 # endif
 
+# if GNULIB_defined_EDQUOT
+    case EDQUOT:
+      msg = "Disk quota exceeded";
+      break;
+# endif
+
 # if GNULIB_defined_ECANCELED
     case ECANCELED:
       msg = "Operation canceled";