mirror of
https://github.com/postgres/postgres.git
synced 2025-11-03 09:13:20 +03:00
Convert elog.c's useful_strerror() into a globally-used strerror wrapper.
elog.c has long had a private strerror wrapper that handles assorted possible failures or deficiencies of the platform's strerror. On Windows, it also knows how to translate Winsock error codes, which the native strerror does not. Move all this code into src/port/strerror.c and define strerror() as a macro that invokes it, so that both our frontend and backend code will have all of this behavior. I believe this constitutes an actual bug fix on Windows, since AFAICS our frontend code did not report Winsock error codes properly before this. However, the main point is to lay the groundwork for implementing %m in src/port/snprintf.c: the behavior we want %m to have is this one, not the native strerror's. Note that this throws away the prior use of src/port/strerror.c, which was to implement strerror() on platforms lacking it. That's been dead code for nigh twenty years now, since strerror() was already required by C89. We should likewise cause strerror_r to use this behavior, but I'll tackle that separately. Patch by me, reviewed by Michael Paquier Discussion: https://postgr.es/m/2975.1526862605@sss.pgh.pa.us
This commit is contained in:
Tom Lane
@@ -178,8 +178,6 @@ static void send_message_to_server_log(ErrorData *edata);
|
||||
static void write_pipe_chunks(char *data, int len, int dest);
|
||||
static void send_message_to_frontend(ErrorData *edata);
|
||||
static char *expand_fmt_string(const char *fmt, ErrorData *edata);
|
||||
static const char *useful_strerror(int errnum);
|
||||
static const char *get_errno_symbol(int errnum);
|
||||
static const char *error_severity(int elevel);
|
||||
static void append_with_tabs(StringInfo buf, const char *str);
|
||||
static bool is_log_level_output(int elevel, int log_min_level);
|
||||
@@ -3360,7 +3358,7 @@ expand_fmt_string(const char *fmt, ErrorData *edata)
|
||||
*/
|
||||
const char *cp2;
|
||||
|
||||
cp2 = useful_strerror(edata->saved_errno);
|
||||
cp2 = strerror(edata->saved_errno);
|
||||
for (; *cp2; cp2++)
|
||||
{
|
||||
if (*cp2 == '%')
|
||||
@@ -3383,219 +3381,6 @@ expand_fmt_string(const char *fmt, ErrorData *edata)
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* A slightly cleaned-up version of strerror()
|
||||
*/
|
||||
static const char *
|
||||
useful_strerror(int errnum)
|
||||
{
|
||||
/* this buffer is only used if strerror() and get_errno_symbol() fail */
|
||||
static char errorstr_buf[48];
|
||||
const char *str;
|
||||
|
||||
#ifdef WIN32
|
||||
/* Winsock error code range, per WinError.h */
|
||||
if (errnum >= 10000 && errnum <= 11999)
|
||||
return pgwin32_socket_strerror(errnum);
|
||||
#endif
|
||||
str = strerror(errnum);
|
||||
|
||||
/*
|
||||
* Some strerror()s return an empty string for out-of-range errno. This
|
||||
* is ANSI C spec compliant, but not exactly useful. Also, we may get
|
||||
* back strings of question marks if libc cannot transcode the message to
|
||||
* the codeset specified by LC_CTYPE. If we get nothing useful, first try
|
||||
* get_errno_symbol(), and if that fails, print the numeric errno.
|
||||
*/
|
||||
if (str == NULL || *str == '\0' || *str == '?')
|
||||
str = get_errno_symbol(errnum);
|
||||
|
||||
if (str == NULL)
|
||||
{
|
||||
snprintf(errorstr_buf, sizeof(errorstr_buf),
|
||||
/*------
|
||||
translator: This string will be truncated at 47
|
||||
characters expanded. */
|
||||
_("operating system error %d"), errnum);
|
||||
str = errorstr_buf;
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns a symbol (e.g. "ENOENT") for an errno code.
|
||||
* Returns NULL if the code is unrecognized.
|
||||
*/
|
||||
static const char *
|
||||
get_errno_symbol(int errnum)
|
||||
{
|
||||
switch (errnum)
|
||||
{
|
||||
case E2BIG:
|
||||
return "E2BIG";
|
||||
case EACCES:
|
||||
return "EACCES";
|
||||
#ifdef EADDRINUSE
|
||||
case EADDRINUSE:
|
||||
return "EADDRINUSE";
|
||||
#endif
|
||||
#ifdef EADDRNOTAVAIL
|
||||
case EADDRNOTAVAIL:
|
||||
return "EADDRNOTAVAIL";
|
||||
#endif
|
||||
case EAFNOSUPPORT:
|
||||
return "EAFNOSUPPORT";
|
||||
#ifdef EAGAIN
|
||||
case EAGAIN:
|
||||
return "EAGAIN";
|
||||
#endif
|
||||
#ifdef EALREADY
|
||||
case EALREADY:
|
||||
return "EALREADY";
|
||||
#endif
|
||||
case EBADF:
|
||||
return "EBADF";
|
||||
#ifdef EBADMSG
|
||||
case EBADMSG:
|
||||
return "EBADMSG";
|
||||
#endif
|
||||
case EBUSY:
|
||||
return "EBUSY";
|
||||
case ECHILD:
|
||||
return "ECHILD";
|
||||
#ifdef ECONNABORTED
|
||||
case ECONNABORTED:
|
||||
return "ECONNABORTED";
|
||||
#endif
|
||||
case ECONNREFUSED:
|
||||
return "ECONNREFUSED";
|
||||
#ifdef ECONNRESET
|
||||
case ECONNRESET:
|
||||
return "ECONNRESET";
|
||||
#endif
|
||||
case EDEADLK:
|
||||
return "EDEADLK";
|
||||
case EDOM:
|
||||
return "EDOM";
|
||||
case EEXIST:
|
||||
return "EEXIST";
|
||||
case EFAULT:
|
||||
return "EFAULT";
|
||||
case EFBIG:
|
||||
return "EFBIG";
|
||||
#ifdef EHOSTUNREACH
|
||||
case EHOSTUNREACH:
|
||||
return "EHOSTUNREACH";
|
||||
#endif
|
||||
case EIDRM:
|
||||
return "EIDRM";
|
||||
case EINPROGRESS:
|
||||
return "EINPROGRESS";
|
||||
case EINTR:
|
||||
return "EINTR";
|
||||
case EINVAL:
|
||||
return "EINVAL";
|
||||
case EIO:
|
||||
return "EIO";
|
||||
#ifdef EISCONN
|
||||
case EISCONN:
|
||||
return "EISCONN";
|
||||
#endif
|
||||
case EISDIR:
|
||||
return "EISDIR";
|
||||
#ifdef ELOOP
|
||||
case ELOOP:
|
||||
return "ELOOP";
|
||||
#endif
|
||||
case EMFILE:
|
||||
return "EMFILE";
|
||||
case EMLINK:
|
||||
return "EMLINK";
|
||||
case EMSGSIZE:
|
||||
return "EMSGSIZE";
|
||||
case ENAMETOOLONG:
|
||||
return "ENAMETOOLONG";
|
||||
case ENFILE:
|
||||
return "ENFILE";
|
||||
case ENOBUFS:
|
||||
return "ENOBUFS";
|
||||
case ENODEV:
|
||||
return "ENODEV";
|
||||
case ENOENT:
|
||||
return "ENOENT";
|
||||
case ENOEXEC:
|
||||
return "ENOEXEC";
|
||||
case ENOMEM:
|
||||
return "ENOMEM";
|
||||
case ENOSPC:
|
||||
return "ENOSPC";
|
||||
case ENOSYS:
|
||||
return "ENOSYS";
|
||||
#ifdef ENOTCONN
|
||||
case ENOTCONN:
|
||||
return "ENOTCONN";
|
||||
#endif
|
||||
case ENOTDIR:
|
||||
return "ENOTDIR";
|
||||
#if defined(ENOTEMPTY) && (ENOTEMPTY != EEXIST) /* same code on AIX */
|
||||
case ENOTEMPTY:
|
||||
return "ENOTEMPTY";
|
||||
#endif
|
||||
#ifdef ENOTSOCK
|
||||
case ENOTSOCK:
|
||||
return "ENOTSOCK";
|
||||
#endif
|
||||
#ifdef ENOTSUP
|
||||
case ENOTSUP:
|
||||
return "ENOTSUP";
|
||||
#endif
|
||||
case ENOTTY:
|
||||
return "ENOTTY";
|
||||
case ENXIO:
|
||||
return "ENXIO";
|
||||
#if defined(EOPNOTSUPP) && (!defined(ENOTSUP) || (EOPNOTSUPP != ENOTSUP))
|
||||
case EOPNOTSUPP:
|
||||
return "EOPNOTSUPP";
|
||||
#endif
|
||||
#ifdef EOVERFLOW
|
||||
case EOVERFLOW:
|
||||
return "EOVERFLOW";
|
||||
#endif
|
||||
case EPERM:
|
||||
return "EPERM";
|
||||
case EPIPE:
|
||||
return "EPIPE";
|
||||
case EPROTONOSUPPORT:
|
||||
return "EPROTONOSUPPORT";
|
||||
case ERANGE:
|
||||
return "ERANGE";
|
||||
#ifdef EROFS
|
||||
case EROFS:
|
||||
return "EROFS";
|
||||
#endif
|
||||
case ESRCH:
|
||||
return "ESRCH";
|
||||
#ifdef ETIMEDOUT
|
||||
case ETIMEDOUT:
|
||||
return "ETIMEDOUT";
|
||||
#endif
|
||||
#ifdef ETXTBSY
|
||||
case ETXTBSY:
|
||||
return "ETXTBSY";
|
||||
#endif
|
||||
#if defined(EWOULDBLOCK) && (!defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
|
||||
case EWOULDBLOCK:
|
||||
return "EWOULDBLOCK";
|
||||
#endif
|
||||
case EXDEV:
|
||||
return "EXDEV";
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* error_severity --- get string representing elevel
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user