mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-15 21:30:23 +02:00
c7b8998ebb
Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.
Commit e3860ffa4d wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code. The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there. BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs. So the
net result is that in about half the cases, such comments are placed
one tab stop left of before. This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.
Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
91 lines
2.2 KiB
C
91 lines
2.2 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* pqsignal.c
|
|
* reliable BSD-style signal(2) routine stolen from RWW who stole it
|
|
* from Stevens...
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
*
|
|
* IDENTIFICATION
|
|
* src/port/pqsignal.c
|
|
*
|
|
* We now assume that all Unix-oid systems have POSIX sigaction(2)
|
|
* with support for restartable signals (SA_RESTART). We used to also
|
|
* support BSD-style signal(2), but there really shouldn't be anything
|
|
* out there anymore that doesn't have the POSIX API.
|
|
*
|
|
* Windows, of course, is resolutely in a class by itself. In the backend,
|
|
* we don't use this file at all; src/backend/port/win32/signal.c provides
|
|
* pqsignal() for the backend environment. Frontend programs can use
|
|
* this version of pqsignal() if they wish, but beware that this does
|
|
* not provide restartable signals on Windows.
|
|
*
|
|
* ------------------------------------------------------------------------
|
|
*/
|
|
|
|
#include "c.h"
|
|
|
|
#include <signal.h>
|
|
|
|
#if !defined(WIN32) || defined(FRONTEND)
|
|
|
|
/*
|
|
* Set up a signal handler, with SA_RESTART, for signal "signo"
|
|
*
|
|
* Returns the previous handler.
|
|
*/
|
|
pqsigfunc
|
|
pqsignal(int signo, pqsigfunc func)
|
|
{
|
|
#ifndef WIN32
|
|
struct sigaction act,
|
|
oact;
|
|
|
|
act.sa_handler = func;
|
|
sigemptyset(&act.sa_mask);
|
|
act.sa_flags = SA_RESTART;
|
|
#ifdef SA_NOCLDSTOP
|
|
if (signo == SIGCHLD)
|
|
act.sa_flags |= SA_NOCLDSTOP;
|
|
#endif
|
|
if (sigaction(signo, &act, &oact) < 0)
|
|
return SIG_ERR;
|
|
return oact.sa_handler;
|
|
#else /* WIN32 */
|
|
return signal(signo, func);
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* Set up a signal handler, without SA_RESTART, for signal "signo"
|
|
*
|
|
* Returns the previous handler.
|
|
*
|
|
* On Windows, this would be identical to pqsignal(), so don't bother.
|
|
*/
|
|
#ifndef WIN32
|
|
|
|
pqsigfunc
|
|
pqsignal_no_restart(int signo, pqsigfunc func)
|
|
{
|
|
struct sigaction act,
|
|
oact;
|
|
|
|
act.sa_handler = func;
|
|
sigemptyset(&act.sa_mask);
|
|
act.sa_flags = 0;
|
|
#ifdef SA_NOCLDSTOP
|
|
if (signo == SIGCHLD)
|
|
act.sa_flags |= SA_NOCLDSTOP;
|
|
#endif
|
|
if (sigaction(signo, &act, &oact) < 0)
|
|
return SIG_ERR;
|
|
return oact.sa_handler;
|
|
}
|
|
|
|
#endif /* !WIN32 */
|
|
|
|
#endif /* !defined(WIN32) || defined(FRONTEND) */
|