[Git][NTPsec/ntpsec][master] ntpd/ntp_scanner.c: Remove tabs, Single line /* comments to //
Hal Murray (@hal.murray)
gitlab at mg.gitlab.com
Thu Aug 6 19:14:08 UTC 2026
Hal Murray pushed to branch master at NTPsec / ntpsec
Commits:
778ca3dc by Gary E. Miller at 2026-08-06T12:10:30-07:00
ntpd/ntp_scanner.c: Remove tabs, Single line /* comments to //
- - - - -
1 changed file:
- ntpd/ntp_scanner.c
Changes:
=====================================
ntpd/ntp_scanner.c
=====================================
@@ -3,9 +3,9 @@
*
* The source code for a simple lexical analyzer.
*
- * Written By: Sachin Kamboj
- * University of Delaware
- * Newark, DE 19711
+ * Written By: Sachin Kamboj
+ * University of Delaware
+ * Newark, DE 19711
* Copyright Sachin Kamboj
* Copyright the NTPsec project contributors
* SPDX-License-Identifier: BSD-2-Clause
@@ -29,24 +29,24 @@
#include "ntp_scanner.h"
#include "ntp_debug.h"
#include "ntp_parser.tab.h"
-#include "timespecops.h" /* for D_ISZERO_NS() */
+#include "timespecops.h" // for D_ISZERO_NS()
-/* ntp_keyword.h declares finite state machine and token text */
+// ntp_keyword.h declares finite state machine and token text
#include "ntp_keyword.h"
-/* used to implement g and G suffixes for numeric literals in fudge offset declarations */
-#define SECONDS_IN_WEEK (unsigned long long)(7 * 24 * 60 * 60) /* 32bit systems*/
-#define GPS_ERA_10BIT (1024L * SECONDS_IN_WEEK)
-#define GPS_ERA_13BIT (8192L * SECONDS_IN_WEEK)
-#define ERA_SUFFIX(c) ((c) == 'g' || (c) == 'G')
+// used to implement g and G suffixes for numeric literals in fudge offset declarations
+#define SECONDS_IN_WEEK (unsigned long long)(7 * 24 * 60 * 60) // 32bit systems
+#define GPS_ERA_10BIT (1024L * SECONDS_IN_WEEK)
+#define GPS_ERA_13BIT (8192L * SECONDS_IN_WEEK)
+#define ERA_SUFFIX(c) ((c) == 'g' || (c) == 'G')
/* SCANNER GLOBAL VARIABLES
* ------------------------
*/
-#define MAX_LEXEME (1024 + 1) /* The maximum size of a lexeme */
-static char yytext[MAX_LEXEME]; /* Buffer for storing the input text/lexeme */
-static uint32_t conf_file_sum; /* Simple sum of characters read */
+#define MAX_LEXEME (1024 + 1) // The maximum size of a lexeme
+static char yytext[MAX_LEXEME]; // Buffer for storing the input text/lexeme
+static uint32_t conf_file_sum; // Simple sum of characters read
static struct FILE_INFO * lex_stack = NULL;
@@ -54,7 +54,7 @@ static struct FILE_INFO * lex_stack = NULL;
* --------------------
*/
#define ENDSWITH(str, suff) (strcmp(str + strlen(str) - strlen(suff), suff)==0)
-#define CONF_ENABLE(s) ENDSWITH(s, ".conf")
+#define CONF_ENABLE(s) ENDSWITH(s, ".conf")
/* SCANNER GLOBAL VARIABLES
@@ -72,29 +72,29 @@ static int is_keyword(char *lexeme, follby *pfollowedby);
/*
* keyword() - Return the keyword associated with token T_ identifier.
- * See also token_name() for the string-ized T_ identifier.
- * Example: keyword(T_Server) returns "server"
- * token_name(T_Server) returns "T_Server"
+ * See also token_name() for the string-ized T_ identifier.
+ * Example: keyword(T_Server) returns "server"
+ * token_name(T_Server) returns "T_Server"
*/
const char *
keyword(
- int token
- )
+ int token
+ )
{
- size_t i;
- const char *text;
+ size_t i;
+ const char *text;
- i = (size_t)(token - LOWEST_KEYWORD_ID);
+ i = (size_t)(token - LOWEST_KEYWORD_ID);
- if (i < COUNTOF(keyword_text)) {
- text = keyword_text[i];
- } else {
- text = NULL;
- }
+ if (i < COUNTOF(keyword_text)) {
+ text = keyword_text[i];
+ } else {
+ text = NULL;
+ }
- return (text != NULL)
- ? text
- : "(keyword not found)";
+ return (text != NULL)
+ ? text
+ : "(keyword not found)";
}
@@ -135,30 +135,30 @@ keyword(
*/
static struct FILE_INFO *
lex_open(
- const char *path,
- const char *mode
- )
+ const char *path,
+ const char *mode
+ )
{
- struct FILE_INFO *stream;
- size_t nnambuf;
-
- nnambuf = strlen(path);
- stream = emalloc_zero(sizeof(*stream) + nnambuf);
- stream->curpos.nline = 1;
- stream->backch = EOF;
- /* copy name with memcpy -- trailing NUL already there! */
- memcpy(stream->fname, path, nnambuf);
-
- if (NULL != mode) {
- stream->fpi = fopen(path, mode);
- if (NULL == stream->fpi) {
- free(stream);
- msyslog(LOG_ERR, "CONFIG: failed to open \'%s\': %s",
- path, strerror(errno));
- stream = NULL;
- }
- }
- return stream;
+ struct FILE_INFO *stream;
+ size_t nnambuf;
+
+ nnambuf = strlen(path);
+ stream = emalloc_zero(sizeof(*stream) + nnambuf);
+ stream->curpos.nline = 1;
+ stream->backch = EOF;
+ // copy name with memcpy -- trailing NUL already there!
+ memcpy(stream->fname, path, nnambuf);
+
+ if (NULL != mode) {
+ stream->fpi = fopen(path, mode);
+ if (NULL == stream->fpi) {
+ free(stream);
+ msyslog(LOG_ERR, "CONFIG: failed to open \'%s\': %s",
+ path, strerror(errno));
+ stream = NULL;
+ }
+ }
+ return stream;
}
/* get next character from buffer or file. This will return any putback
@@ -167,62 +167,62 @@ lex_open(
*/
static int
lex_getch(
- struct FILE_INFO *stream
- )
+ struct FILE_INFO *stream
+ )
{
- int ch;
-
- if (NULL == stream || stream->force_eof)
- return EOF;
-
- if (EOF != stream->backch) {
- ch = stream->backch;
- stream->backch = EOF;
- if (stream->fpi)
- conf_file_sum += (unsigned int)ch;
- } else if (stream->fpi) {
- /* fetch next 7-bit ASCII char (or EOF) from file */
- /* coverity[tainted_scalar] */
- while ((ch = fgetc(stream->fpi)) != EOF && ch > SCHAR_MAX) {
- stream->curpos.ncol++;
- }
- if (EOF != ch) {
- conf_file_sum += (unsigned int)ch;
- stream->curpos.ncol++;
- }
- } else {
- /* fetch next 7-bit ASCII char from buffer */
- const char * scan;
- scan = &remote_config.buffer[remote_config.pos];
- while ((ch = (uint8_t)*scan) > SCHAR_MAX) {
- scan++;
- stream->curpos.ncol++;
- }
- if ('\0' != ch) {
- scan++;
- stream->curpos.ncol++;
- } else {
- ch = EOF;
- }
- remote_config.pos = (int)(scan - remote_config.buffer);
- }
-
- /* If the last line ends without '\n', generate one. This
- * happens most likely on Windows, where editors often have a
- * sloppy concept of a line.
- */
- if (EOF == ch && stream->curpos.ncol != 0) {
- ch = '\n';
- }
-
- /* update scan position tallies */
- if (ch == '\n') {
- stream->bakpos = stream->curpos;
- stream->curpos.nline++;
- stream->curpos.ncol = 0;
- }
-
- return ch;
+ int ch;
+
+ if (NULL == stream || stream->force_eof)
+ return EOF;
+
+ if (EOF != stream->backch) {
+ ch = stream->backch;
+ stream->backch = EOF;
+ if (stream->fpi)
+ conf_file_sum += (unsigned int)ch;
+ } else if (stream->fpi) {
+ // fetch next 7-bit ASCII char (or EOF) from file
+ // coverity[tainted_scalar]
+ while ((ch = fgetc(stream->fpi)) != EOF && ch > SCHAR_MAX) {
+ stream->curpos.ncol++;
+ }
+ if (EOF != ch) {
+ conf_file_sum += (unsigned int)ch;
+ stream->curpos.ncol++;
+ }
+ } else {
+ // fetch next 7-bit ASCII char from buffer
+ const char * scan;
+ scan = &remote_config.buffer[remote_config.pos];
+ while ((ch = (uint8_t)*scan) > SCHAR_MAX) {
+ scan++;
+ stream->curpos.ncol++;
+ }
+ if ('\0' != ch) {
+ scan++;
+ stream->curpos.ncol++;
+ } else {
+ ch = EOF;
+ }
+ remote_config.pos = (int)(scan - remote_config.buffer);
+ }
+
+ /* If the last line ends without '\n', generate one. This
+ * happens most likely on Windows, where editors often have a
+ * sloppy concept of a line.
+ */
+ if (EOF == ch && stream->curpos.ncol != 0) {
+ ch = '\n';
+ }
+
+ // update scan position tallies
+ if (ch == '\n') {
+ stream->bakpos = stream->curpos;
+ stream->curpos.nline++;
+ stream->curpos.ncol = 0;
+ }
+
+ return ch;
}
/* Note: lex_ungetch will fail to track more than one line of push
@@ -231,29 +231,29 @@ lex_getch(
*/
static int
lex_ungetch(
- int ch,
- struct FILE_INFO *stream
- )
+ int ch,
+ struct FILE_INFO *stream
+ )
{
- /* check preconditions */
- if (NULL == stream || stream->force_eof)
- return EOF;
- if (EOF != stream->backch || EOF == ch) {
- return EOF;
- }
-
- /* keep for later reference and update checksum */
- stream->backch = (uint8_t)ch;
- if (stream->fpi)
- conf_file_sum -= (unsigned int)stream->backch;
-
- /* update position */
- if (stream->backch == '\n') {
- stream->curpos = stream->bakpos;
- stream->bakpos.ncol = -1;
- }
- stream->curpos.ncol--;
- return stream->backch;
+ // check preconditions
+ if (NULL == stream || stream->force_eof)
+ return EOF;
+ if (EOF != stream->backch || EOF == ch) {
+ return EOF;
+ }
+
+ // keep for later reference and update checksum
+ stream->backch = (uint8_t)ch;
+ if (stream->fpi)
+ conf_file_sum -= (unsigned int)stream->backch;
+
+ // update position
+ if (stream->backch == '\n') {
+ stream->curpos = stream->bakpos;
+ stream->bakpos.ncol = -1;
+ }
+ stream->curpos.ncol--;
+ return stream->backch;
}
/* dispose of an input structure. If the file pointer is not NULL, close
@@ -261,15 +261,15 @@ lex_ungetch(
*/
static void
lex_close(
- struct FILE_INFO *stream
- )
+ struct FILE_INFO *stream
+ )
{
- if (NULL != stream) {
- if (NULL != stream->fpi) {
- fclose(stream->fpi);
- }
- free(stream);
- }
+ if (NULL != stream) {
+ if (NULL != stream->fpi) {
+ fclose(stream->fpi);
+ }
+ free(stream);
+ }
}
/* INPUT STACK
@@ -287,16 +287,16 @@ lex_close(
static struct FILE_INFO *
_drop_stack_do(
- struct FILE_INFO * head
- )
+ struct FILE_INFO * head
+ )
{
- struct FILE_INFO * tail;
- while (NULL != head) {
- tail = head->st_next;
- lex_close(head);
- head = tail;
- }
- return head;
+ struct FILE_INFO * tail;
+ while (NULL != head) {
+ tail = head->st_next;
+ lex_close(head);
+ head = tail;
+ }
+ return head;
}
@@ -309,16 +309,16 @@ _drop_stack_do(
*/
bool
lex_init_stack(
- const char * path,
- const char * mode
- )
+ const char * path,
+ const char * mode
+ )
{
- if (NULL != lex_stack || NULL == path)
- return false;
+ if (NULL != lex_stack || NULL == path)
+ return false;
- //fprintf(stderr, "lex_init_stack(%s)\n", path);
- lex_stack = lex_open(path, mode);
- return (NULL != lex_stack);
+ //fprintf(stderr, "lex_init_stack(%s)\n", path);
+ lex_stack = lex_open(path, mode);
+ return (NULL != lex_stack);
}
/* This removes *all* input sources from the stack, leaving the head
@@ -331,7 +331,7 @@ lex_init_stack(
void
lex_drop_stack(void)
{
- lex_stack = _drop_stack_do(lex_stack);
+ lex_stack = _drop_stack_do(lex_stack);
}
/* Flush the lexer input stack: This will nip all input objects on the
@@ -344,43 +344,43 @@ lex_drop_stack(void)
*/
bool
lex_flush_stack(void) {
- bool retv = false;
-
- if (NULL != lex_stack) {
- retv = !lex_stack->force_eof;
- lex_stack->force_eof = true;
- lex_stack->st_next = _drop_stack_do(
- lex_stack->st_next);
- }
- return retv;
+ bool retv = false;
+
+ if (NULL != lex_stack) {
+ retv = !lex_stack->force_eof;
+ lex_stack->force_eof = true;
+ lex_stack->st_next = _drop_stack_do(
+ lex_stack->st_next);
+ }
+ return retv;
}
/* Reversed string comparison - we want to LIFO directory subfiles so they
* actually get evaluated in sort order.
*/
static int rcmpstring(const void *p1, const void *p2) {
- return strcmp(*(const char * const *)p1, *(const char * const *)p2);
+ return strcmp(*(const char * const *)p1, *(const char * const *)p2);
}
bool is_directory(const char *path) {
- struct stat sb;
- return stat(path, &sb) == 0 && S_ISDIR(sb.st_mode);
+ struct stat sb;
+ return stat(path, &sb) == 0 && S_ISDIR(sb.st_mode);
}
void reparent(char *fullpath, size_t fullpathsize,
- const char *dir, const char *base)
+ const char *dir, const char *base)
{
- fullpath[0] = '\0';
- if (base[0] != DIR_SEP) {
- char *dirpart = strdup(dir);
- char *end;
- strlcpy(fullpath, dirname(dirpart), fullpathsize-2);
- end = fullpath + strlen(fullpath);
- *end++ = DIR_SEP;
- *end++ = '\0';
- free(dirpart);
- }
- strlcat(fullpath, base, fullpathsize);
+ fullpath[0] = '\0';
+ if (base[0] != DIR_SEP) {
+ char *dirpart = strdup(dir);
+ char *end;
+ strlcpy(fullpath, dirname(dirpart), fullpathsize-2);
+ end = fullpath + strlen(fullpath);
+ *end++ = DIR_SEP;
+ *end++ = '\0';
+ free(dirpart);
+ }
+ strlcat(fullpath, base, fullpathsize);
}
/* Push another file on the parsing stack. If the mode is NULL, create a
@@ -400,40 +400,40 @@ void reparent(char *fullpath, size_t fullpathsize,
* Returns true if a new info record was pushed onto the stack.
*/
bool lex_push_file(
- const char * path
- )
+ const char * path
+ )
{
- struct FILE_INFO * next = NULL;
-
- if (NULL != path) {
- char fullpath[PATH_MAX];
- if (lex_stack != NULL) {
- reparent(fullpath, sizeof(fullpath), lex_stack->fname, path);
- } else {
- strlcpy(fullpath, path, sizeof(fullpath));
- }
- //fprintf(stderr, "lex_push_file(%s)\n", fullpath);
- if (is_directory(fullpath)) {
- /* directory scanning */
- DIR *dfd;
- struct dirent *dp;
- char **baselist;
- int basecount = 0;
- if ((dfd = opendir(fullpath)) == NULL)
- return false;
- baselist = (char **)malloc(sizeof(char *));
- if (NULL == baselist) {
- msyslog(LOG_ERR,
+ struct FILE_INFO * next = NULL;
+
+ if (NULL != path) {
+ char fullpath[PATH_MAX];
+ if (lex_stack != NULL) {
+ reparent(fullpath, sizeof(fullpath), lex_stack->fname, path);
+ } else {
+ strlcpy(fullpath, path, sizeof(fullpath));
+ }
+ //fprintf(stderr, "lex_push_file(%s)\n", fullpath);
+ if (is_directory(fullpath)) {
+ // directory scanning
+ DIR *dfd;
+ struct dirent *dp;
+ char **baselist;
+ int basecount = 0;
+ if ((dfd = opendir(fullpath)) == NULL)
+ return false;
+ baselist = (char **)malloc(sizeof(char *));
+ if (NULL == baselist) {
+ msyslog(LOG_ERR,
"CONFIG: lex_push_file: NULL from malloc");
- exit(3);
- }
- while ((dp = readdir(dfd)) != NULL)
- {
- if (!CONF_ENABLE(dp->d_name)) {
- continue;
- }
- baselist[basecount++] = strdup(dp->d_name);
- baselist = realloc(baselist,
+ exit(3);
+ }
+ while ((dp = readdir(dfd)) != NULL)
+ {
+ if (!CONF_ENABLE(dp->d_name)) {
+ continue;
+ }
+ baselist[basecount++] = strdup(dp->d_name);
+ baselist = realloc(baselist,
(size_t)(basecount+1) * sizeof(char *));
if (NULL == baselist) {
msyslog(LOG_ERR,
@@ -441,43 +441,43 @@ bool lex_push_file(
"NULL from realloc");
exit(3);
}
- }
- closedir(dfd);
- qsort(baselist, (size_t)basecount, sizeof(char *),
+ }
+ closedir(dfd);
+ qsort(baselist, (size_t)basecount, sizeof(char *),
rcmpstring);
- for (int i = 0; i < basecount; i++) {
- char subpath[PATH_MAX];
- size_t pathlen = strlcpy(subpath, fullpath, PATH_MAX);
- if ((pathlen < PATH_MAX - 1) &&
- (subpath[pathlen -1] != DIR_SEP)
- ) {
- char *ep = subpath + strlen(subpath);
- *ep++ = DIR_SEP;
- *ep = '\0';
- }
- strlcat(subpath, baselist[i], PATH_MAX);
- /* This should barf safely if the complete
- * filename was too long to fit in the buffer.
- */
- msyslog(LOG_NOTICE,
- "CONFIG: opening <%s> from dir <%s>",
- subpath, fullpath);
- lex_push_file(subpath);
- }
- for (int i = 0; i < basecount; i++) {
- free(baselist[i]);
- }
- free(baselist);
- return basecount > 0;
- } else {
- next = lex_open(fullpath, "r");
- if (NULL != next) {
- next->st_next = lex_stack;
- lex_stack = next;
- }
- }
- }
- return (NULL != next);
+ for (int i = 0; i < basecount; i++) {
+ char subpath[PATH_MAX];
+ size_t pathlen = strlcpy(subpath, fullpath, PATH_MAX);
+ if ((pathlen < PATH_MAX - 1) &&
+ (subpath[pathlen -1] != DIR_SEP)
+ ) {
+ char *ep = subpath + strlen(subpath);
+ *ep++ = DIR_SEP;
+ *ep = '\0';
+ }
+ strlcat(subpath, baselist[i], PATH_MAX);
+ /* This should barf safely if the complete
+ * filename was too long to fit in the buffer.
+ */
+ msyslog(LOG_NOTICE,
+ "CONFIG: opening <%s> from dir <%s>",
+ subpath, fullpath);
+ lex_push_file(subpath);
+ }
+ for (int i = 0; i < basecount; i++) {
+ free(baselist[i]);
+ }
+ free(baselist);
+ return basecount > 0;
+ } else {
+ next = lex_open(fullpath, "r");
+ if (NULL != next) {
+ next->st_next = lex_stack;
+ lex_stack = next;
+ }
+ }
+ }
+ return (NULL != next);
}
/* Pop, close & free the top of the include stack, unless the stack
@@ -490,17 +490,17 @@ bool lex_push_file(
bool
lex_pop_file(void)
{
- struct FILE_INFO * head = lex_stack;
- struct FILE_INFO * tail = NULL;
-
- if (NULL != head) {
- tail = head->st_next;
- if (NULL != tail) {
- lex_stack = tail;
- lex_close(head);
- }
- }
- return (NULL != tail);
+ struct FILE_INFO * head = lex_stack;
+ struct FILE_INFO * tail = NULL;
+
+ if (NULL != head) {
+ tail = head->st_next;
+ if (NULL != tail) {
+ lex_stack = tail;
+ lex_close(head);
+ }
+ }
+ return (NULL != tail);
}
/* Get include nesting level. This currently loops over the stack and
@@ -516,30 +516,30 @@ lex_pop_file(void)
size_t
lex_level(void)
{
- size_t cnt = 0;
- struct FILE_INFO *ipf = lex_stack;
-
- while (NULL != ipf) {
- cnt++;
- ipf = ipf->st_next;
- }
- return cnt;
+ size_t cnt = 0;
+ struct FILE_INFO *ipf = lex_stack;
+
+ while (NULL != ipf) {
+ cnt++;
+ ipf = ipf->st_next;
+ }
+ return cnt;
}
-/* check if the current input is from a file */
+// check if the current input is from a file
bool
lex_from_file(void)
{
- return (NULL != lex_stack) && (NULL != lex_stack->fpi);
+ return (NULL != lex_stack) && (NULL != lex_stack->fpi);
}
struct FILE_INFO *
lex_current(void)
{
- /* this became so simple, it could be a macro. But then,
- * lex_stack needed to be global...
- */
- return lex_stack;
+ /* this became so simple, it could be a macro. But then,
+ * lex_stack needed to be global...
+ */
+ return lex_stack;
}
@@ -547,239 +547,239 @@ lex_current(void)
* --------------
*/
-/* Keywords */
+// Keywords
static int
is_keyword(
- char *lexeme,
- follby *pfollowedby
- )
+ char *lexeme,
+ follby *pfollowedby
+ )
{
- follby fb;
- int curr_s; /* current state index */
- int token;
-
- curr_s = SCANNER_INIT_S;
- token = 0;
-
- for (int i = 0; lexeme[i]; i++) {
- while (curr_s && (lexeme[i] != SS_CH(sst[curr_s])))
- curr_s = (int)SS_OTHER_N(sst[curr_s]);
-
- if (curr_s && (lexeme[i] == SS_CH(sst[curr_s]))) {
- if ('\0' == lexeme[i + 1]
- && FOLLBY_NON_ACCEPTING
- != SS_FB(sst[curr_s])) {
- fb = SS_FB(sst[curr_s]);
- *pfollowedby = fb;
- token = curr_s;
- break;
- }
- curr_s = SS_MATCH_N(sst[curr_s]);
- } else
- break;
- }
-
- return token;
+ follby fb;
+ int curr_s; // current state index
+ int token;
+
+ curr_s = SCANNER_INIT_S;
+ token = 0;
+
+ for (int i = 0; lexeme[i]; i++) {
+ while (curr_s && (lexeme[i] != SS_CH(sst[curr_s])))
+ curr_s = (int)SS_OTHER_N(sst[curr_s]);
+
+ if (curr_s && (lexeme[i] == SS_CH(sst[curr_s]))) {
+ if ('\0' == lexeme[i + 1]
+ && FOLLBY_NON_ACCEPTING
+ != SS_FB(sst[curr_s])) {
+ fb = SS_FB(sst[curr_s]);
+ *pfollowedby = fb;
+ token = curr_s;
+ break;
+ }
+ curr_s = SS_MATCH_N(sst[curr_s]);
+ } else
+ break;
+ }
+
+ return token;
}
-/* Integer */
+// Integer
static int
is_integer(
- char *lexeme
- )
+ char *lexeme
+ )
{
- int i;
- int is_neg;
- unsigned int u_val;
-
- i = 0;
-
- /* Allow a leading minus sign */
- if (lexeme[i] == '-') {
- i++;
- is_neg = true;
- } else {
- is_neg = false;
- }
-
- /* Check that all the remaining characters are digits */
- for (; lexeme[i] != '\0'; i++) {
- if (!isdigit((uint8_t)lexeme[i]))
- return false;
- }
-
- if (is_neg)
- return true;
-
- /* Reject numbers that fit in unsigned but not in signed int */
- if (1 == sscanf(lexeme, "%u", &u_val)) {
- return (u_val <= INT_MAX);
- } else {
- return false;
- }
+ int i;
+ int is_neg;
+ unsigned int u_val;
+
+ i = 0;
+
+ // Allow a leading minus sign
+ if (lexeme[i] == '-') {
+ i++;
+ is_neg = true;
+ } else {
+ is_neg = false;
+ }
+
+ // Check that all the remaining characters are digits
+ for (; lexeme[i] != '\0'; i++) {
+ if (!isdigit((uint8_t)lexeme[i]))
+ return false;
+ }
+
+ if (is_neg)
+ return true;
+
+ // Reject numbers that fit in unsigned but not in signed int
+ if (1 == sscanf(lexeme, "%u", &u_val)) {
+ return (u_val <= INT_MAX);
+ } else {
+ return false;
+ }
}
-/* unsigned int -- assumes is_integer() has returned false */
+// unsigned int -- assumes is_integer() has returned false
static int
is_u_int(
- char *lexeme
- )
+ char *lexeme
+ )
{
- int i;
- int is_hex;
-
- i = 0;
- if ('0' == lexeme[i] && 'x' == tolower((uint8_t)lexeme[i + 1])) {
- i += 2;
- is_hex = true;
- } else {
- is_hex = false;
- }
-
- /* Check that all the remaining characters are digits */
- for (; lexeme[i] != '\0'; i++) {
- if (is_hex && !isxdigit((uint8_t)lexeme[i]))
- return false;
- if (!is_hex && !isdigit((uint8_t)lexeme[i]))
- return false;
- }
-
- return true;
+ int i;
+ int is_hex;
+
+ i = 0;
+ if ('0' == lexeme[i] && 'x' == tolower((uint8_t)lexeme[i + 1])) {
+ i += 2;
+ is_hex = true;
+ } else {
+ is_hex = false;
+ }
+
+ // Check that all the remaining characters are digits
+ for (; lexeme[i] != '\0'; i++) {
+ if (is_hex && !isxdigit((uint8_t)lexeme[i]))
+ return false;
+ if (!is_hex && !isdigit((uint8_t)lexeme[i]))
+ return false;
+ }
+
+ return true;
}
-/* Double */
+// Double
static bool
is_double(
- char *lexeme
- )
+ char *lexeme
+ )
{
- unsigned int num_digits = 0; /* Number of digits read */
- unsigned int i;
-
- i = 0;
-
- /* Check for an optional '+' or '-' */
- if ('+' == lexeme[i] || '-' == lexeme[i]) {
- i++;
- }
-
- /* Read the integer part */
- for (; lexeme[i] && isdigit((uint8_t)lexeme[i]); i++)
- num_digits++;
-
- /* Check for the optional decimal point */
- if ('.' == lexeme[i]) {
- i++;
- /* Check for any digits after the decimal point */
- for (; lexeme[i] && isdigit((uint8_t)lexeme[i]); i++)
- num_digits++;
- }
-
- /*
- * The number of digits in both the decimal part and the
- * fraction part must not be zero at this point
- */
- if (!num_digits)
- return false;
-
- /* Check if we are done */
- if (!lexeme[i])
- return true;
-
- /* There is still more input, read the exponent */
- if ('e' == tolower((uint8_t)lexeme[i])) {
- i++;
-
- /* Read an optional Sign */
- if ('+' == lexeme[i] || '-' == lexeme[i]) {
- i++;
- }
-
- /* Now read the exponent part */
- while (lexeme[i] && isdigit((uint8_t)lexeme[i]))
- i++;
-
- }
-
- /* Allow trailing multipliers */
- while (lexeme[i] && ERA_SUFFIX(lexeme[i])) {
- i++;
- }
-
- /* Check if we are done */
- if (!lexeme[i])
- return true;
- else
- return false;
+ unsigned int num_digits = 0; // Number of digits read
+ unsigned int i;
+
+ i = 0;
+
+ // Check for an optional '+' or '-'
+ if ('+' == lexeme[i] || '-' == lexeme[i]) {
+ i++;
+ }
+
+ // Read the integer part
+ for (; lexeme[i] && isdigit((uint8_t)lexeme[i]); i++)
+ num_digits++;
+
+ // Check for the optional decimal point
+ if ('.' == lexeme[i]) {
+ i++;
+ // Check for any digits after the decimal point
+ for (; lexeme[i] && isdigit((uint8_t)lexeme[i]); i++)
+ num_digits++;
+ }
+
+ /*
+ * The number of digits in both the decimal part and the
+ * fraction part must not be zero at this point
+ */
+ if (!num_digits)
+ return false;
+
+ // Check if we are done
+ if (!lexeme[i])
+ return true;
+
+ // There is still more input, read the exponent
+ if ('e' == tolower((uint8_t)lexeme[i])) {
+ i++;
+
+ // Read an optional Sign
+ if ('+' == lexeme[i] || '-' == lexeme[i]) {
+ i++;
+ }
+
+ // Now read the exponent part
+ while (lexeme[i] && isdigit((uint8_t)lexeme[i]))
+ i++;
+
+ }
+
+ // Allow trailing multipliers
+ while (lexeme[i] && ERA_SUFFIX(lexeme[i])) {
+ i++;
+ }
+
+ // Check if we are done
+ if (!lexeme[i])
+ return true;
+ else
+ return false;
}
-/* is_special() - Test whether a character is a token */
+// is_special() - Test whether a character is a token
static inline bool
is_special(
- int ch
- )
+ int ch
+ )
{
- return strchr(special_chars, ch) != NULL;
+ return strchr(special_chars, ch) != NULL;
}
static bool
is_EOC(
- int ch
- )
+ int ch
+ )
{
- if ( ch == '\n')
- return true;
- return false;
+ if ( ch == '\n')
+ return true;
+ return false;
}
char *
quote_if_needed(char *str) {
- char *ret;
- size_t len;
- size_t octets;
-
- len = strlen(str);
- octets = len + 2 + 1;
- ret = emalloc(octets);
- if ('"' != str[0]
- && (strcspn(str, special_chars) < len
- || strchr(str, ' ') != NULL)) {
- snprintf(ret, octets, "\"%s\"", str);
- } else {
- strlcpy(ret, str, octets);
- }
-
- return ret;
+ char *ret;
+ size_t len;
+ size_t octets;
+
+ len = strlen(str);
+ octets = len + 2 + 1;
+ ret = emalloc(octets);
+ if ('"' != str[0]
+ && (strcspn(str, special_chars) < len
+ || strchr(str, ' ') != NULL)) {
+ snprintf(ret, octets, "\"%s\"", str);
+ } else {
+ strlcpy(ret, str, octets);
+ }
+
+ return ret;
}
static int
create_string_token(
- char *lexeme
- )
+ char *lexeme
+ )
{
- char *pch;
-
- /*
- * ignore end of line whitespace
- */
- pch = lexeme;
- while (*pch && isspace((uint8_t)*pch))
- pch++;
-
- if (!*pch) {
- yylval.Integer = T_EOC;
- return yylval.Integer;
- }
-
- yylval.String = estrdup(lexeme);
- return T_String;
+ char *pch;
+
+ /*
+ * ignore end of line whitespace
+ */
+ pch = lexeme;
+ while (*pch && isspace((uint8_t)*pch))
+ pch++;
+
+ if (!*pch) {
+ yylval.Integer = T_EOC;
+ return yylval.Integer;
+ }
+
+ yylval.String = estrdup(lexeme);
+ return T_String;
}
@@ -793,277 +793,277 @@ create_string_token(
int
yylex(void)
{
- static follby followedby = FOLLBY_TOKEN;
- int i;
- bool instring;
- bool yylval_was_set;
- int converted;
- int token; /* The return value */
- int ch;
-
- instring = false;
- yylval_was_set = false;
-
- do {
- /* Ignore whitespace at the beginning */
- while (EOF != (ch = lex_getch(lex_stack)) &&
- isspace(ch) &&
- !is_EOC(ch))
-
- ; /* Null Statement */
-
- if (EOF == ch) {
-
- if ( ! lex_pop_file())
- return 0;
- token = T_EOC;
- goto normal_return;
-
- } else if (is_EOC(ch)) {
-
- /* end FOLLBY_STRINGS_TO_EOC effect */
- followedby = FOLLBY_TOKEN;
- token = T_EOC;
- goto normal_return;
-
- } else if (is_special(ch) && FOLLBY_TOKEN == followedby) {
- /* special chars are their own token values */
- token = ch;
- /*
- * '=' outside simulator configuration implies
- * a single string following as in:
- * setvar Owner = "The Boss" default
- */
- if ('=' == ch ) {
- followedby = FOLLBY_STRING;
- }
- yytext[0] = (char)ch;
- yytext[1] = '\0';
- goto normal_return;
- } else
- lex_ungetch(ch, lex_stack);
-
- /* save the position of start of the token */
- lex_stack->tokpos = lex_stack->curpos;
-
- /* Read in the lexeme */
- i = 0;
- while (EOF != (ch = lex_getch(lex_stack))) {
-
- yytext[i] = (char)ch;
-
- /* Break on whitespace or a special character */
- if (isspace(ch) || is_EOC(ch)
- || '"' == ch
- || (FOLLBY_TOKEN == followedby
- && is_special(ch)))
- break;
-
- /* Read the rest of the line on reading a start
- of comment character */
- if ('#' == ch) {
- while (EOF != (ch = lex_getch(lex_stack))
- && '\n' != ch) {
- ; /* Null Statement */
- }
- break;
- }
-
- i++;
- if (i >= (int)COUNTOF(yytext)) {
- goto lex_too_long;
- }
- }
- /* Pick up all of the string inside between " marks, to
- * end of line. If we make it to EOL without a
- * terminating " assume it for them.
- *
- * XXX - HMS: I'm not sure we want to assume the closing "
- */
- if ('"' == ch) {
- instring = true;
- while (EOF != (ch = lex_getch(lex_stack)) &&
- ch != '"' && ch != '\n') {
- yytext[i++] = (char)ch;
- if (i >= (int)COUNTOF(yytext)) {
- goto lex_too_long;
- }
- }
- /*
- * yytext[i] will be pushed back as not part of
- * this lexeme, but any closing quote should
- * not be pushed back, so we read another char.
- */
- if ('"' == ch) {
- ch = lex_getch(lex_stack);
- }
- }
- /* Pushback the last character read that is not a part
- * of this lexeme. This fails silently if ch is EOF,
- * but then the EOF condition persists and is handled on
- * the next turn by the include stack mechanism.
- */
- lex_ungetch(ch, lex_stack);
-
- yytext[i] = '\0';
- } while (i == 0);
-
- /* Now return the desired token */
-
- /* First make sure that the parser is *not* expecting a string
- * as the next token (based on the previous token that was
- * returned) and that we haven't read a string.
- */
-
- if (followedby == FOLLBY_TOKEN && !instring) {
- token = is_keyword(yytext, &followedby);
- if (token) {
- goto normal_return;
- } else if (is_integer(yytext)) {
- yylval_was_set = true;
- errno = 0;
- yylval.Integer = (int)strtol(yytext, NULL, 10);
- if (yylval.Integer == 0
- && ((errno == EINVAL) || (errno == ERANGE))) {
- msyslog(LOG_ERR,
- "CONFIG: Integer cannot be represented: %s",
- yytext);
- if (lex_from_file()) {
- exit(1);
- } else {
- /* force end of parsing */
- yylval.Integer = 0;
- return 0;
- }
- }
- token = T_Integer;
- goto normal_return;
- } else if (is_u_int(yytext)) {
- yylval_was_set = true;
- if ('0' == yytext[0] &&
- 'x' == tolower((int)yytext[1]))
- converted = sscanf(&yytext[2], "%x",
- &yylval.U_int);
- else
- converted = sscanf(yytext, "%u",
- &yylval.U_int);
- if (1 != converted) {
- msyslog(LOG_ERR,
- "CONFIG: U_int cannot be represented: %s",
- yytext);
- if (lex_from_file()) {
- exit(1);
- } else {
- /* force end of parsing */
- yylval.Integer = 0;
- return 0;
- }
- }
- token = T_U_int;
- goto normal_return;
- } else if (is_double(yytext)) {
- double era_offset = 0;
- yylval_was_set = true;
- errno = 0;
- while (ERA_SUFFIX(yytext[strlen(yytext)-1])) {
- if (yytext[strlen(yytext)-1] == 'g') {
- era_offset += GPS_ERA_10BIT;
- }
- if (yytext[strlen(yytext)-1] == 'G') {
- era_offset += GPS_ERA_13BIT;
- }
- yytext[strlen(yytext)-1] = '\0';
- }
- yylval.Double = era_offset + atof(yytext);
- if ( D_ISZERO_NS(yylval.Double) && errno == ERANGE) {
- /* FIXME, POSIX says atof() never returns errors */
- msyslog(LOG_ERR,
- "CONFIG: Double too large to represent: %s",
- yytext);
- exit(1);
- } else {
- token = T_Double;
- goto normal_return;
- }
- } else {
- /* Default: Everything is a string */
- yylval_was_set = true;
- token = create_string_token(yytext);
- goto normal_return;
- }
- }
-
- /*
- * Either followedby is not FOLLBY_TOKEN or this lexeme is part
- * of a string. Hence, we need to return T_String.
- *
- * _Except_ we might have a -4 or -6 flag on a an association
- * configuration line (server, peer, pool, etc.).
- *
- * This is a terrible hack, but the grammar is ambiguous so we
- * don't have a choice. [SK]
- *
- * The ambiguity is in the keyword scanner, not ntp_parser.y.
- * We do not require server addresses be quoted in ntp.conf,
- * complicating the scanner's job. To avoid trying (and
- * failing) to match an IP address or DNS name to a keyword,
- * the association keywords use FOLLBY_STRING in the keyword
- * table, which tells the scanner to force the next token to be
- * a T_String, so it does not try to match a keyword but rather
- * expects a string when -4/-6 modifiers to server, peer, etc.
- * are encountered.
- * restrict -4 and restrict -6 parsing works correctly without
- * this hack, as restrict uses FOLLBY_TOKEN. [DH]
- */
- if ('-' == yytext[0]) {
- if ('4' == yytext[1]) {
- token = T_Ipv4_flag;
- goto normal_return;
- } else if ('6' == yytext[1]) {
- token = T_Ipv6_flag;
- goto normal_return;
- }
- }
-
- instring = false;
- if (FOLLBY_STRING == followedby) {
- followedby = FOLLBY_TOKEN;
- }
-
- yylval_was_set = true;
- token = create_string_token(yytext);
+ static follby followedby = FOLLBY_TOKEN;
+ int i;
+ bool instring;
+ bool yylval_was_set;
+ int converted;
+ int token; // The return value
+ int ch;
+
+ instring = false;
+ yylval_was_set = false;
+
+ do {
+ // Ignore whitespace at the beginning
+ while (EOF != (ch = lex_getch(lex_stack)) &&
+ isspace(ch) &&
+ !is_EOC(ch))
+
+ ; // Null Statement
+
+ if (EOF == ch) {
+
+ if ( ! lex_pop_file())
+ return 0;
+ token = T_EOC;
+ goto normal_return;
+
+ } else if (is_EOC(ch)) {
+
+ // end FOLLBY_STRINGS_TO_EOC effect
+ followedby = FOLLBY_TOKEN;
+ token = T_EOC;
+ goto normal_return;
+
+ } else if (is_special(ch) && FOLLBY_TOKEN == followedby) {
+ // special chars are their own token values
+ token = ch;
+ /*
+ * '=' outside simulator configuration implies
+ * a single string following as in:
+ * setvar Owner = "The Boss" default
+ */
+ if ('=' == ch ) {
+ followedby = FOLLBY_STRING;
+ }
+ yytext[0] = (char)ch;
+ yytext[1] = '\0';
+ goto normal_return;
+ } else
+ lex_ungetch(ch, lex_stack);
+
+ // save the position of start of the token
+ lex_stack->tokpos = lex_stack->curpos;
+
+ // Read in the lexeme
+ i = 0;
+ while (EOF != (ch = lex_getch(lex_stack))) {
+
+ yytext[i] = (char)ch;
+
+ // Break on whitespace or a special character
+ if (isspace(ch) || is_EOC(ch)
+ || '"' == ch
+ || (FOLLBY_TOKEN == followedby
+ && is_special(ch)))
+ break;
+
+ /* Read the rest of the line on reading a start
+ of comment character */
+ if ('#' == ch) {
+ while (EOF != (ch = lex_getch(lex_stack))
+ && '\n' != ch) {
+ ; // Null Statement
+ }
+ break;
+ }
+
+ i++;
+ if (i >= (int)COUNTOF(yytext)) {
+ goto lex_too_long;
+ }
+ }
+ /* Pick up all of the string inside between " marks, to
+ * end of line. If we make it to EOL without a
+ * terminating " assume it for them.
+ *
+ * XXX - HMS: I'm not sure we want to assume the closing "
+ */
+ if ('"' == ch) {
+ instring = true;
+ while (EOF != (ch = lex_getch(lex_stack)) &&
+ ch != '"' && ch != '\n') {
+ yytext[i++] = (char)ch;
+ if (i >= (int)COUNTOF(yytext)) {
+ goto lex_too_long;
+ }
+ }
+ /*
+ * yytext[i] will be pushed back as not part of
+ * this lexeme, but any closing quote should
+ * not be pushed back, so we read another char.
+ */
+ if ('"' == ch) {
+ ch = lex_getch(lex_stack);
+ }
+ }
+ /* Pushback the last character read that is not a part
+ * of this lexeme. This fails silently if ch is EOF,
+ * but then the EOF condition persists and is handled on
+ * the next turn by the include stack mechanism.
+ */
+ lex_ungetch(ch, lex_stack);
+
+ yytext[i] = '\0';
+ } while (i == 0);
+
+ // Now return the desired token
+
+ /* First make sure that the parser is *not* expecting a string
+ * as the next token (based on the previous token that was
+ * returned) and that we haven't read a string.
+ */
+
+ if (followedby == FOLLBY_TOKEN && !instring) {
+ token = is_keyword(yytext, &followedby);
+ if (token) {
+ goto normal_return;
+ } else if (is_integer(yytext)) {
+ yylval_was_set = true;
+ errno = 0;
+ yylval.Integer = (int)strtol(yytext, NULL, 10);
+ if (yylval.Integer == 0
+ && ((errno == EINVAL) || (errno == ERANGE))) {
+ msyslog(LOG_ERR,
+ "CONFIG: Integer cannot be represented: %s",
+ yytext);
+ if (lex_from_file()) {
+ exit(1);
+ } else {
+ // force end of parsing
+ yylval.Integer = 0;
+ return 0;
+ }
+ }
+ token = T_Integer;
+ goto normal_return;
+ } else if (is_u_int(yytext)) {
+ yylval_was_set = true;
+ if ('0' == yytext[0] &&
+ 'x' == tolower((int)yytext[1]))
+ converted = sscanf(&yytext[2], "%x",
+ &yylval.U_int);
+ else
+ converted = sscanf(yytext, "%u",
+ &yylval.U_int);
+ if (1 != converted) {
+ msyslog(LOG_ERR,
+ "CONFIG: U_int cannot be represented: %s",
+ yytext);
+ if (lex_from_file()) {
+ exit(1);
+ } else {
+ // force end of parsing
+ yylval.Integer = 0;
+ return 0;
+ }
+ }
+ token = T_U_int;
+ goto normal_return;
+ } else if (is_double(yytext)) {
+ double era_offset = 0;
+ yylval_was_set = true;
+ errno = 0;
+ while (ERA_SUFFIX(yytext[strlen(yytext)-1])) {
+ if (yytext[strlen(yytext)-1] == 'g') {
+ era_offset += GPS_ERA_10BIT;
+ }
+ if (yytext[strlen(yytext)-1] == 'G') {
+ era_offset += GPS_ERA_13BIT;
+ }
+ yytext[strlen(yytext)-1] = '\0';
+ }
+ yylval.Double = era_offset + atof(yytext);
+ if ( D_ISZERO_NS(yylval.Double) && errno == ERANGE) {
+ // FIXME, POSIX says atof() never returns errors
+ msyslog(LOG_ERR,
+ "CONFIG: Double too large to represent: %s",
+ yytext);
+ exit(1);
+ } else {
+ token = T_Double;
+ goto normal_return;
+ }
+ } else {
+ // Default: Everything is a string
+ yylval_was_set = true;
+ token = create_string_token(yytext);
+ goto normal_return;
+ }
+ }
+
+ /*
+ * Either followedby is not FOLLBY_TOKEN or this lexeme is part
+ * of a string. Hence, we need to return T_String.
+ *
+ * _Except_ we might have a -4 or -6 flag on a an association
+ * configuration line (server, peer, pool, etc.).
+ *
+ * This is a terrible hack, but the grammar is ambiguous so we
+ * don't have a choice. [SK]
+ *
+ * The ambiguity is in the keyword scanner, not ntp_parser.y.
+ * We do not require server addresses be quoted in ntp.conf,
+ * complicating the scanner's job. To avoid trying (and
+ * failing) to match an IP address or DNS name to a keyword,
+ * the association keywords use FOLLBY_STRING in the keyword
+ * table, which tells the scanner to force the next token to be
+ * a T_String, so it does not try to match a keyword but rather
+ * expects a string when -4/-6 modifiers to server, peer, etc.
+ * are encountered.
+ * restrict -4 and restrict -6 parsing works correctly without
+ * this hack, as restrict uses FOLLBY_TOKEN. [DH]
+ */
+ if ('-' == yytext[0]) {
+ if ('4' == yytext[1]) {
+ token = T_Ipv4_flag;
+ goto normal_return;
+ } else if ('6' == yytext[1]) {
+ token = T_Ipv6_flag;
+ goto normal_return;
+ }
+ }
+
+ instring = false;
+ if (FOLLBY_STRING == followedby) {
+ followedby = FOLLBY_TOKEN;
+ }
+
+ yylval_was_set = true;
+ token = create_string_token(yytext);
normal_return:
- if (T_EOC == token)
- DPRINT(4,("\t<end of command>\n"));
- else
- DPRINT(4, ("yylex: lexeme '%s' -> %s\n", yytext,
- token_name(token)));
+ if (T_EOC == token)
+ DPRINT(4,("\t<end of command>\n"));
+ else
+ DPRINT(4, ("yylex: lexeme '%s' -> %s\n", yytext,
+ token_name(token)));
- if (!yylval_was_set)
- yylval.Integer = token;
+ if (!yylval_was_set)
+ yylval.Integer = token;
- return token;
+ return token;
lex_too_long:
- yytext[min(sizeof(yytext) - 1, 50)] = 0;
- msyslog(LOG_ERR,
- "CONFIG: configuration item on line %d longer than limit of %lu, began with '%s'",
- lex_stack->curpos.nline, (unsigned long)min(sizeof(yytext) - 1, 50),
- yytext);
-
- /*
- * If we hit the length limit reading the startup configuration
- * file, abort.
- */
- if (lex_from_file())
- exit(sizeof(yytext) - 1);
-
- /*
- * If it's runtime configuration via ntpq :config treat it as
- * if the configuration text ended before the too-long lexeme,
- * hostname, or string.
- */
- yylval.Integer = 0;
- return 0;
+ yytext[min(sizeof(yytext) - 1, 50)] = 0;
+ msyslog(LOG_ERR,
+ "CONFIG: configuration item on line %d longer than limit of %lu, began with '%s'",
+ lex_stack->curpos.nline, (unsigned long)min(sizeof(yytext) - 1, 50),
+ yytext);
+
+ /*
+ * If we hit the length limit reading the startup configuration
+ * file, abort.
+ */
+ if (lex_from_file())
+ exit(sizeof(yytext) - 1);
+
+ /*
+ * If it's runtime configuration via ntpq :config treat it as
+ * if the configuration text ended before the too-long lexeme,
+ * hostname, or string.
+ */
+ yylval.Integer = 0;
+ return 0;
}
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/778ca3dc249f914376a16b608defeda40968e980
--
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/778ca3dc249f914376a16b608defeda40968e980
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20260806/34aa9172/attachment-0001.htm>
More information about the vc
mailing list