wbtiger
/
ByConity
mirror of https://github.com/ByConity/ByConity
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix "check style" tool

This commit is contained in:
Alexey Milovidov 2020-04-06 02:57:24 +03:00
parent 646f409b8e
commit 110eb599c1
6 changed files with 153 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

260
programs/client/readpassphrase/readpassphrase.c
View File

@ -1,8 +1,8 @@
/* $OpenBSD: readpassphrase.c,v 1.26 2016/10/18 12:47:18 millert Exp $ */ /* $OpenBSD: readpassphrase.c,v 1.26 2016/10/18 12:47:18 millert Exp $ */
/* /*
* Copyright (c) 2000-2002, 2007, 2010 * Copyright (c) 2000-2002, 2007, 2010
* Todd C. Miller <Todd.Miller@courtesan.com> * Todd C. Miller <Todd.Miller@courtesan.com>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -53,143 +53,143 @@ static void handler(int);
char * char *
readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags) readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
{ {
ssize_t nr; ssize_t nr;
int input, output, save_errno, i, need_restart; int input, output, save_errno, i, need_restart;
char ch, *p, *end; char ch, *p, *end;
struct termios term, oterm; struct termios term, oterm;
struct sigaction sa, savealrm, saveint, savehup, savequit, saveterm; struct sigaction sa, savealrm, saveint, savehup, savequit, saveterm;
struct sigaction savetstp, savettin, savettou, savepipe; struct sigaction savetstp, savettin, savettou, savepipe;
/* I suppose we could alloc on demand in this case (XXX). */ /* I suppose we could alloc on demand in this case (XXX). */
if (bufsiz == 0) { if (bufsiz == 0) {
errno = EINVAL; errno = EINVAL;
return(NULL); return(NULL);
} }
restart: restart:
for (i = 0; i < NSIG; i++) for (i = 0; i < NSIG; i++)
signo[i] = 0; signo[i] = 0;
nr = -1; nr = -1;
save_errno = 0; save_errno = 0;
need_restart = 0; need_restart = 0;
/* /*
* Read and write to /dev/tty if available. If not, read from * Read and write to /dev/tty if available. If not, read from
* stdin and write to stderr unless a tty is required. * stdin and write to stderr unless a tty is required.
*/ */
if ((flags & RPP_STDIN) || if ((flags & RPP_STDIN) ||
(input = output = open(_PATH_TTY, O_RDWR)) == -1) { (input = output = open(_PATH_TTY, O_RDWR)) == -1) {
if (flags & RPP_REQUIRE_TTY) { if (flags & RPP_REQUIRE_TTY) {
errno = ENOTTY; errno = ENOTTY;
return(NULL); return(NULL);
} }
input = STDIN_FILENO; input = STDIN_FILENO;
output = STDERR_FILENO; output = STDERR_FILENO;
} }
/* /*
* Turn off echo if possible. * Turn off echo if possible.
* If we are using a tty but are not the foreground pgrp this will * If we are using a tty but are not the foreground pgrp this will
* generate SIGTTOU, so do it *before* installing the signal handlers. * generate SIGTTOU, so do it *before* installing the signal handlers.
*/ */
if (input != STDIN_FILENO && tcgetattr(input, &oterm) == 0) { if (input != STDIN_FILENO && tcgetattr(input, &oterm) == 0) {
memcpy(&term, &oterm, sizeof(term)); memcpy(&term, &oterm, sizeof(term));
if (!(flags & RPP_ECHO_ON)) if (!(flags & RPP_ECHO_ON))
term.c_lflag &= ~(ECHO | ECHONL); term.c_lflag &= ~(ECHO | ECHONL);
#ifdef VSTATUS #ifdef VSTATUS
if (term.c_cc[VSTATUS] != _POSIX_VDISABLE) if (term.c_cc[VSTATUS] != _POSIX_VDISABLE)
term.c_cc[VSTATUS] = _POSIX_VDISABLE; term.c_cc[VSTATUS] = _POSIX_VDISABLE;
#endif #endif
(void)tcsetattr(input, TCSAFLUSH|TCSASOFT, &term); (void)tcsetattr(input, TCSAFLUSH|TCSASOFT, &term);
} else { } else {
memset(&term, 0, sizeof(term)); memset(&term, 0, sizeof(term));
term.c_lflag |= ECHO; term.c_lflag |= ECHO;
memset(&oterm, 0, sizeof(oterm)); memset(&oterm, 0, sizeof(oterm));
oterm.c_lflag |= ECHO; oterm.c_lflag |= ECHO;
} }
/* /*
* Catch signals that would otherwise cause the user to end * Catch signals that would otherwise cause the user to end
* up with echo turned off in the shell. Don't worry about * up with echo turned off in the shell. Don't worry about
* things like SIGXCPU and SIGVTALRM for now. * things like SIGXCPU and SIGVTALRM for now.
*/ */
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
sa.sa_flags = 0; /* don't restart system calls */ sa.sa_flags = 0; /* don't restart system calls */
sa.sa_handler = handler; sa.sa_handler = handler;
(void)sigaction(SIGALRM, &sa, &savealrm); (void)sigaction(SIGALRM, &sa, &savealrm);
(void)sigaction(SIGHUP, &sa, &savehup); (void)sigaction(SIGHUP, &sa, &savehup);
(void)sigaction(SIGINT, &sa, &saveint); (void)sigaction(SIGINT, &sa, &saveint);
(void)sigaction(SIGPIPE, &sa, &savepipe); (void)sigaction(SIGPIPE, &sa, &savepipe);
(void)sigaction(SIGQUIT, &sa, &savequit); (void)sigaction(SIGQUIT, &sa, &savequit);
(void)sigaction(SIGTERM, &sa, &saveterm); (void)sigaction(SIGTERM, &sa, &saveterm);
(void)sigaction(SIGTSTP, &sa, &savetstp); (void)sigaction(SIGTSTP, &sa, &savetstp);
(void)sigaction(SIGTTIN, &sa, &savettin); (void)sigaction(SIGTTIN, &sa, &savettin);
(void)sigaction(SIGTTOU, &sa, &savettou); (void)sigaction(SIGTTOU, &sa, &savettou);
if (!(flags & RPP_STDIN)) if (!(flags & RPP_STDIN))
(void)write(output, prompt, strlen(prompt)); (void)write(output, prompt, strlen(prompt));
end = buf + bufsiz - 1; end = buf + bufsiz - 1;
p = buf; p = buf;
while ((nr = read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r') { while ((nr = read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r') {
if (p < end) { if (p < end) {
if ((flags & RPP_SEVENBIT)) if ((flags & RPP_SEVENBIT))
ch &= 0x7f; ch &= 0x7f;
if (isalpha((unsigned char)ch)) { if (isalpha((unsigned char)ch)) {
if ((flags & RPP_FORCELOWER)) if ((flags & RPP_FORCELOWER))
ch = (char)tolower((unsigned char)ch); ch = (char)tolower((unsigned char)ch);
if ((flags & RPP_FORCEUPPER)) if ((flags & RPP_FORCEUPPER))
ch = (char)toupper((unsigned char)ch); ch = (char)toupper((unsigned char)ch);
} }
*p++ = ch; *p++ = ch;
} }
} }
*p = '\0'; *p = '\0';
save_errno = errno; save_errno = errno;
if (!(term.c_lflag & ECHO)) if (!(term.c_lflag & ECHO))
(void)write(output, "\n", 1); (void)write(output, "\n", 1);
/* Restore old terminal settings and signals. */ /* Restore old terminal settings and signals. */
if (memcmp(&term, &oterm, sizeof(term)) != 0) { if (memcmp(&term, &oterm, sizeof(term)) != 0) {
const int sigttou = signo[SIGTTOU]; const int sigttou = signo[SIGTTOU];
/* Ignore SIGTTOU generated when we are not the fg pgrp. */ /* Ignore SIGTTOU generated when we are not the fg pgrp. */
while (tcsetattr(input, TCSAFLUSH|TCSASOFT, &oterm) == -1 && while (tcsetattr(input, TCSAFLUSH|TCSASOFT, &oterm) == -1 &&
errno == EINTR && !signo[SIGTTOU]) errno == EINTR && !signo[SIGTTOU])
continue; continue;
signo[SIGTTOU] = sigttou; signo[SIGTTOU] = sigttou;
} }
(void)sigaction(SIGALRM, &savealrm, NULL); (void)sigaction(SIGALRM, &savealrm, NULL);
(void)sigaction(SIGHUP, &savehup, NULL); (void)sigaction(SIGHUP, &savehup, NULL);
(void)sigaction(SIGINT, &saveint, NULL); (void)sigaction(SIGINT, &saveint, NULL);
(void)sigaction(SIGQUIT, &savequit, NULL); (void)sigaction(SIGQUIT, &savequit, NULL);
(void)sigaction(SIGPIPE, &savepipe, NULL); (void)sigaction(SIGPIPE, &savepipe, NULL);
(void)sigaction(SIGTERM, &saveterm, NULL); (void)sigaction(SIGTERM, &saveterm, NULL);
(void)sigaction(SIGTSTP, &savetstp, NULL); (void)sigaction(SIGTSTP, &savetstp, NULL);
(void)sigaction(SIGTTIN, &savettin, NULL); (void)sigaction(SIGTTIN, &savettin, NULL);
(void)sigaction(SIGTTOU, &savettou, NULL); (void)sigaction(SIGTTOU, &savettou, NULL);
if (input != STDIN_FILENO) if (input != STDIN_FILENO)
(void)close(input); (void)close(input);
/* /*
* If we were interrupted by a signal, resend it to ourselves * If we were interrupted by a signal, resend it to ourselves
* now that we have restored the signal handlers. * now that we have restored the signal handlers.
*/ */
for (i = 0; i < NSIG; i++) { for (i = 0; i < NSIG; i++) {
if (signo[i]) { if (signo[i]) {
kill(getpid(), i); kill(getpid(), i);
switch (i) { switch (i) {
case SIGTSTP: case SIGTSTP:
case SIGTTIN: case SIGTTIN:
case SIGTTOU: case SIGTTOU:
need_restart = 1; need_restart = 1;
} }
} }
} }
if (need_restart) if (need_restart)
goto restart; goto restart;
if (save_errno) if (save_errno)
errno = save_errno; errno = save_errno;
return(nr == -1 ? NULL : buf); return(nr == -1 ? NULL : buf);
} }
//DEF_WEAK(readpassphrase); //DEF_WEAK(readpassphrase);
@ -197,15 +197,15 @@ restart:
char * char *
getpass(const char *prompt) getpass(const char *prompt)
{ {
static char buf[_PASSWORD_LEN + 1]; static char buf[_PASSWORD_LEN + 1];
return(readpassphrase(prompt, buf, sizeof(buf), RPP_ECHO_OFF)); return(readpassphrase(prompt, buf, sizeof(buf), RPP_ECHO_OFF));
} }
#endif #endif
static void handler(int s) static void handler(int s)
{ {
signo[s] = 1; signo[s] = 1;
} }
#endif /* HAVE_READPASSPHRASE */ #endif /* HAVE_READPASSPHRASE */

2
programs/client/readpassphrase/readpassphrase.h
View File

@ -1,4 +1,4 @@
// /* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */ // /* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */
/* /*
* Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com>

4
src/Common/Arena.h
View File

@ -179,8 +179,8 @@ public:
/** Rollback just performed allocation. /** Rollback just performed allocation.
* Must pass size not more that was just allocated. * Must pass size not more that was just allocated.
* Return the resulting head pointer, so that the caller can assert that * Return the resulting head pointer, so that the caller can assert that
* the allocation it intended to roll back was indeed the last one. * the allocation it intended to roll back was indeed the last one.
*/ */
void * rollback(size_t size) void * rollback(size_t size)
{ {

22
src/Functions/FunctionsBitmap.h
View File

@ -31,13 +31,13 @@ namespace ErrorCodes
* bitmapBuild: integer[] -> bitmap * bitmapBuild: integer[] -> bitmap
* *
* Convert bitmap to integer array: * Convert bitmap to integer array:
* bitmapToArray: bitmap -> integer[] * bitmapToArray: bitmap -> integer[]
* *
* Retrun the smallest value in the set: * Retrun the smallest value in the set:
* bitmapMin: bitmap -> integer * bitmapMin: bitmap -> integer
* *
* Retrun the greatest value in the set: * Retrun the greatest value in the set:
* bitmapMax: bitmap -> integer * bitmapMax: bitmap -> integer
* *
* Return subset in specified range (not include the range_end): * Return subset in specified range (not include the range_end):
* bitmapSubsetInRange: bitmap,integer,integer -> bitmap * bitmapSubsetInRange: bitmap,integer,integer -> bitmap
@ -49,28 +49,28 @@ namespace ErrorCodes
* bitmapTransform: bitmap,integer[],integer[] -> bitmap * bitmapTransform: bitmap,integer[],integer[] -> bitmap
* *
* Two bitmap and calculation: * Two bitmap and calculation:
* bitmapAnd: bitmap,bitmap -> bitmap * bitmapAnd: bitmap,bitmap -> bitmap
* *
* Two bitmap or calculation: * Two bitmap or calculation:
* bitmapOr: bitmap,bitmap -> bitmap * bitmapOr: bitmap,bitmap -> bitmap
* *
* Two bitmap xor calculation: * Two bitmap xor calculation:
* bitmapXor: bitmap,bitmap -> bitmap * bitmapXor: bitmap,bitmap -> bitmap
* *
* Two bitmap andnot calculation: * Two bitmap andnot calculation:
* bitmapAndnot: bitmap,bitmap -> bitmap * bitmapAndnot: bitmap,bitmap -> bitmap
* *
* Retrun bitmap cardinality: * Retrun bitmap cardinality:
* bitmapCardinality: bitmap -> integer * bitmapCardinality: bitmap -> integer
* *
* Two bitmap and calculation, return cardinality: * Two bitmap and calculation, return cardinality:
* bitmapAndCardinality: bitmap,bitmap -> integer * bitmapAndCardinality: bitmap,bitmap -> integer
* *
* Two bitmap or calculation, return cardinality: * Two bitmap or calculation, return cardinality:
* bitmapOrCardinality: bitmap,bitmap -> integer * bitmapOrCardinality: bitmap,bitmap -> integer
* *
* Two bitmap xor calculation, return cardinality: * Two bitmap xor calculation, return cardinality:
* bitmapXorCardinality: bitmap,bitmap -> integer * bitmapXorCardinality: bitmap,bitmap -> integer
* *
* Two bitmap andnot calculation, return cardinality: * Two bitmap andnot calculation, return cardinality:
* bitmapAndnotCardinality: bitmap,bitmap -> integer * bitmapAndnotCardinality: bitmap,bitmap -> integer

4
src/Storages/StorageTinyLog.cpp
View File

@ -402,8 +402,8 @@ Pipes StorageTinyLog::read(
Pipes pipes; Pipes pipes;
// When reading, we lock the entire storage, because we only have one file // When reading, we lock the entire storage, because we only have one file
// per column and can't modify it concurrently. // per column and can't modify it concurrently.
pipes.emplace_back(std::make_shared<TinyLogSource>( pipes.emplace_back(std::make_shared<TinyLogSource>(
max_block_size, Nested::collect(getColumns().getAllPhysical().addTypes(column_names)), *this, context.getSettingsRef().max_read_buffer_size)); max_block_size, Nested::collect(getColumns().getAllPhysical().addTypes(column_names)), *this, context.getSettingsRef().max_read_buffer_size));

9
utils/check-style/check-style
View File

@ -17,11 +17,16 @@ EXCLUDE_DIRS='build/|integration/|widechar_width/|glibc-compatibility/|memcpy/|c
find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' 2>/dev/null | find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' 2>/dev/null |
grep -vP $EXCLUDE_DIRS | grep -vP $EXCLUDE_DIRS |
xargs grep $@ -P '((class|struct|namespace|enum|if|for|while|else|throw|switch).*|\)(\s*const)?(\s*override)?\s*)\{$|\s$|\t|^ {1,3}[^\* ]\S|\t|^\s*(if|else if|if constexpr|else if constexpr|for|while|catch|switch)\(|\( [^\s\\]|\S \)' | xargs grep $@ -P '((class|struct|namespace|enum|if|for|while|else|throw|switch).*|\)(\s*const)?(\s*override)?\s*)\{$|\s$|^ {1,3}[^\* ]\S|\t|^\s*(if|else if|if constexpr|else if constexpr|for|while|catch|switch)\(|\( [^\s\\]|\S \)' |
# a curly brace not in a new line, but not for the case of C++11 init or agg. initialization | trailing whitespace | number of ws not a multiple of 4, but not in the case of comment continuation | a tab character | missing whitespace after for/if/while... before opening brace | whitespaces inside braces # a curly brace not in a new line, but not for the case of C++11 init or agg. initialization | trailing whitespace | number of ws not a multiple of 4, but not in the case of comment continuation | missing whitespace after for/if/while... before opening brace | whitespaces inside braces
grep -v -P '(//|:\s+\*|\$\(\()| \)"' grep -v -P '(//|:\s+\*|\$\(\()| \)"'
# single-line comment | continuation of a multiline comment | a typical piece of embedded shell code | something like ending of raw string literal # single-line comment | continuation of a multiline comment | a typical piece of embedded shell code | something like ending of raw string literal
# Tabs
find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' 2>/dev/null |
grep -vP $EXCLUDE_DIRS |
xargs grep $@ -F $'\t'
# // namespace comments are unneeded # // namespace comments are unneeded
find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' 2>/dev/null | find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' 2>/dev/null |
grep -vP $EXCLUDE_DIRS | grep -vP $EXCLUDE_DIRS |