Restoring authorship annotation for Anton Samokhvalov <pg83@yandex.ru>. Commit 2 of 2.

17 files changed, 238 insertions, 238 deletions

diff --git a/contrib/tools/bison/gnulib/platform/posix/config.h b/contrib/tools/bison/gnulib/platform/posix/config.h
index 31241faf2d..8fa4b4f092 100644
--- a/contrib/tools/bison/gnulib/platform/posix/config.h
+++ b/contrib/tools/bison/gnulib/platform/posix/config.h
@@ -78,7 +78,7 @@
    # define _FORTIFY_SOURCE 2
    #endif
 
- 
+
 /* Define to 1 if the system's ftello function has the Solaris bug. */
 /* #undef FTELLO_BROKEN_AFTER_SWITCHING_FROM_READ_TO_WRITE */
 
@@ -475,19 +475,19 @@
    */
 #define HAVE_DECL_ALARM 1
 
-#if defined(__linux__) 
-    #define HAVE_UNLOCKED_IO 1 
-#else 
-    #define HAVE_UNLOCKED_IO 0 
-#endif 
- 
+#if defined(__linux__)
+    #define HAVE_UNLOCKED_IO 1
+#else
+    #define HAVE_UNLOCKED_IO 0
+#endif
+
 /* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if
    you don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_CLEARERR_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_CLEARERR_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_CLEARERR_UNLOCKED 1
+#else
+    #define HAVE_DECL_CLEARERR_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `copysign', and to 0 if you
    don't. */
@@ -503,35 +503,35 @@
 
 /* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
    don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_FEOF_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_FEOF_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_FEOF_UNLOCKED 1
+#else
+    #define HAVE_DECL_FEOF_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if
    you don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_FERROR_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_FERROR_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_FERROR_UNLOCKED 1
+#else
+    #define HAVE_DECL_FERROR_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if
    you don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_FFLUSH_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_FFLUSH_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_FFLUSH_UNLOCKED 1
+#else
+    #define HAVE_DECL_FFLUSH_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
    you don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_FGETS_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_FGETS_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_FGETS_UNLOCKED 1
+#else
+    #define HAVE_DECL_FGETS_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `fpurge', and to 0 if you don't.
    */
@@ -539,27 +539,27 @@
 
 /* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if
    you don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_FPUTC_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_FPUTC_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_FPUTC_UNLOCKED 1
+#else
+    #define HAVE_DECL_FPUTC_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if
    you don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_FPUTS_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_FPUTS_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_FPUTS_UNLOCKED 1
+#else
+    #define HAVE_DECL_FPUTS_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if
    you don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_FREAD_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_FREAD_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_FREAD_UNLOCKED 1
+#else
+    #define HAVE_DECL_FREAD_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `fseeko', and to 0 if you don't.
    */
@@ -571,27 +571,27 @@
 
 /* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if
    you don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_FWRITE_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_FWRITE_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_FWRITE_UNLOCKED 1
+#else
+    #define HAVE_DECL_FWRITE_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if
    you don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_GETCHAR_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_GETCHAR_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_GETCHAR_UNLOCKED 1
+#else
+    #define HAVE_DECL_GETCHAR_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
    don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_GETC_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_GETC_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_GETC_UNLOCKED 1
+#else
+    #define HAVE_DECL_GETC_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
    */
@@ -609,7 +609,7 @@
    don't. */
 /* #undef HAVE_DECL_MBSINIT */
 
-#if defined(__linux__) 
+#if defined(__linux__)
 /* Define to 1 if you have the declaration of `program_invocation_name', and
    to 0 if you don't. */
 #define HAVE_DECL_PROGRAM_INVOCATION_NAME 1
@@ -617,31 +617,31 @@
 /* Define to 1 if you have the declaration of `program_invocation_short_name',
    and to 0 if you don't. */
 #define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 1
-#else 
-/* Define to 1 if you have the declaration of `program_invocation_name', and 
-   to 0 if you don't. */ 
-#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0 
-
-/* Define to 1 if you have the declaration of `program_invocation_short_name', 
-   and to 0 if you don't. */ 
-#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 0 
-#endif 
- 
+#else
+/* Define to 1 if you have the declaration of `program_invocation_name', and
+   to 0 if you don't. */
+#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0
+
+/* Define to 1 if you have the declaration of `program_invocation_short_name',
+   and to 0 if you don't. */
+#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 0
+#endif
+
 /* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if
    you don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_PUTCHAR_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_PUTCHAR_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_PUTCHAR_UNLOCKED 1
+#else
+    #define HAVE_DECL_PUTCHAR_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you
    don't. */
-#if HAVE_UNLOCKED_IO 
-    #define HAVE_DECL_PUTC_UNLOCKED 1 
-#else 
-    #define HAVE_DECL_PUTC_UNLOCKED 0 
-#endif 
+#if HAVE_UNLOCKED_IO
+    #define HAVE_DECL_PUTC_UNLOCKED 1
+#else
+    #define HAVE_DECL_PUTC_UNLOCKED 0
+#endif
 
 /* Define to 1 if you have the declaration of `setenv', and to 0 if you don't.
    */
@@ -681,11 +681,11 @@
 
 /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
    don't. */
-#if defined(_musl_) 
-    #define HAVE_DECL_SYS_SIGLIST 0 
-#else 
-    #define HAVE_DECL_SYS_SIGLIST 1 
-#endif 
+#if defined(_musl_)
+    #define HAVE_DECL_SYS_SIGLIST 0
+#else
+    #define HAVE_DECL_SYS_SIGLIST 1
+#endif
 
 /* Define to 1 if you have the declaration of `towlower', and to 0 if you
    don't. */
@@ -728,11 +728,11 @@
 #define HAVE_FCNTL 1
 
 /* Define to 1 if you have the <features.h> header file. */
-#if defined(__linux__) 
-    #define HAVE_FEATURES_H 1 
-#else 
-    #define HAVE_FEATURES_H 0 
-#endif 
+#if defined(__linux__)
+    #define HAVE_FEATURES_H 1
+#else
+    #define HAVE_FEATURES_H 0
+#endif
 
 /* Define to 1 if you have the `fpurge' function. */
 /* #undef HAVE_FPURGE */
@@ -777,16 +777,16 @@
 /* Define to 1 if you have the `isblank' function. */
 #define HAVE_ISBLANK 1
 
-#if defined(_musl_) 
-#define HAVE_ISNAND_IN_LIBC 0 
-#define HAVE_ISNANF_IN_LIBC 0 
-#else 
+#if defined(_musl_)
+#define HAVE_ISNAND_IN_LIBC 0
+#define HAVE_ISNANF_IN_LIBC 0
+#else
 /* Define if the isnan(double) function is available in libc. */
 #define HAVE_ISNAND_IN_LIBC 1
 
 /* Define if the isnan(float) function is available in libc. */
 #define HAVE_ISNANF_IN_LIBC 1
-#endif 
+#endif
 
 /* Define if the isnan(long double) function is available in libc. */
 /* #undef HAVE_ISNANL_IN_LIBC */
@@ -857,9 +857,9 @@
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the `mempcpy' function. */
-#if defined(__linux__) 
+#if defined(__linux__)
 #define HAVE_MEMPCPY 1
-#endif 
+#endif
 
 /* Define to 1 if you have the `mkdtemp' function. */
 #define HAVE_MKDTEMP 1
@@ -881,9 +881,9 @@
 #define HAVE_NL_LANGINFO 1
 
 /* Define to 1 if libc includes obstacks. */
-#if !defined(_musl_) 
+#if !defined(_musl_)
 #define HAVE_OBSTACK 1
-#endif 
+#endif
 
 /* Define to 1 if you have the `opendir' function. */
 #define HAVE_OPENDIR 1
@@ -1020,10 +1020,10 @@
 
 /* Define to 1 if you have the <stdio_ext.h> header file. */
 #if defined(__FreeBSD__) || defined(__MACH__)
-#define HAVE_STDIO_EXT_H 0 
-#else 
+#define HAVE_STDIO_EXT_H 0
+#else
 #define HAVE_STDIO_EXT_H 1
-#endif 
+#endif
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
@@ -1194,26 +1194,26 @@
 /* #undef HAVE__SET_INVALID_PARAMETER_HANDLER */
 
 /* Define to 1 if you have the `__fpurge' function. */
-#if HAVE_STDIO_EXT_H 
-    #define HAVE___FPURGE 1 
-#else 
-    #define HAVE___FPURGE 0 
-#endif 
+#if HAVE_STDIO_EXT_H
+    #define HAVE___FPURGE 1
+#else
+    #define HAVE___FPURGE 0
+#endif
 
-#if defined(_musl_) 
-    /* Define to 1 if you have the `__freadahead' function. */ 
-    #define HAVE___FREADAHEAD 1 
-#endif 
+#if defined(_musl_)
+    /* Define to 1 if you have the `__freadahead' function. */
+    #define HAVE___FREADAHEAD 1
+#endif
 
 /* Define to 1 if you have the `__freading' function. */
-#if HAVE_STDIO_EXT_H 
-    #define HAVE___FREADING 1 
-#else 
-    #define HAVE___FREADING 0 
-#endif 
+#if HAVE_STDIO_EXT_H
+    #define HAVE___FREADING 1
+#else
+    #define HAVE___FREADING 0
+#endif
 
 /* Define to 1 if you have the `__secure_getenv' function. */
-//#define HAVE___SECURE_GETENV 1 
+//#define HAVE___SECURE_GETENV 1
 
 /* Define as the bit index in the word where to find bit 0 of the exponent of
    'long double'. */
@@ -1438,7 +1438,7 @@
 
 /* Define to the prefix of C symbols at the assembler and linker level, either
    an underscore or empty. */
-#define USER_LABEL_PREFIX 
+#define USER_LABEL_PREFIX
 
 /* Define if the POSIX multithreading library can be used. */
 /* #undef USE_POSIX_THREADS */
diff --git a/contrib/tools/bison/gnulib/src/canonicalize-lgpl.c b/contrib/tools/bison/gnulib/src/canonicalize-lgpl.c
index 74a381325e..5cc9c5b4a0 100644
--- a/contrib/tools/bison/gnulib/src/canonicalize-lgpl.c
+++ b/contrib/tools/bison/gnulib/src/canonicalize-lgpl.c
@@ -29,7 +29,7 @@
 /* Specification.  */
 #include <stdlib.h>
 
-#include "palloca.h" 
+#include "palloca.h"
 #include <string.h>
 #include <unistd.h>
 #include <limits.h>
diff --git a/contrib/tools/bison/gnulib/src/execute.c b/contrib/tools/bison/gnulib/src/execute.c
index 7df28682b3..1bb577100e 100644
--- a/contrib/tools/bison/gnulib/src/execute.c
+++ b/contrib/tools/bison/gnulib/src/execute.c
@@ -28,7 +28,7 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "penviron.h" 
+#include "penviron.h"
 #include "error.h"
 #include "fatal-signal.h"
 #include "wait-process.h"
diff --git a/contrib/tools/bison/gnulib/src/fpending.c b/contrib/tools/bison/gnulib/src/fpending.c
index f6db79f891..1bc4568923 100644
--- a/contrib/tools/bison/gnulib/src/fpending.c
+++ b/contrib/tools/bison/gnulib/src/fpending.c
@@ -26,9 +26,9 @@
 size_t
 __fpending (FILE *fp)
 {
-#if defined(PENDING_OUTPUT_N_BYTES) 
+#if defined(PENDING_OUTPUT_N_BYTES)
   return PENDING_OUTPUT_N_BYTES;
-#endif 
- 
-  return 0; 
+#endif
+
+  return 0;
 }
diff --git a/contrib/tools/bison/gnulib/src/malloca.h b/contrib/tools/bison/gnulib/src/malloca.h
index 0d8cad0582..8ec4465dc7 100644
--- a/contrib/tools/bison/gnulib/src/malloca.h
+++ b/contrib/tools/bison/gnulib/src/malloca.h
@@ -18,7 +18,7 @@
 #ifndef _MALLOCA_H
 #define _MALLOCA_H
 
-#include "palloca.h" 
+#include "palloca.h"
 #include <stddef.h>
 #include <stdlib.h>
 
diff --git a/contrib/tools/bison/gnulib/src/palloca.h b/contrib/tools/bison/gnulib/src/palloca.h
index 08eef69d76..a7ed8a2f9c 100644
--- a/contrib/tools/bison/gnulib/src/palloca.h
+++ b/contrib/tools/bison/gnulib/src/palloca.h
@@ -1,7 +1,7 @@
-#pragma once 
- 
-#if defined(__FreeBSD__) 
-    #include <stdlib.h> 
-#else 
-    #include <alloca.h> 
-#endif 
+#pragma once
+
+#if defined(__FreeBSD__)
+    #include <stdlib.h>
+#else
+    #include <alloca.h>
+#endif
diff --git a/contrib/tools/bison/gnulib/src/penviron.h b/contrib/tools/bison/gnulib/src/penviron.h
index a6e378b888..fd83197378 100644
--- a/contrib/tools/bison/gnulib/src/penviron.h
+++ b/contrib/tools/bison/gnulib/src/penviron.h
@@ -1,5 +1,5 @@
-#pragma once 
- 
+#pragma once
+
 #if defined(__FreeBSD__) || defined(__MACH__)
-    extern char** environ; 
-#endif 
+    extern char** environ;
+#endif
diff --git a/contrib/tools/bison/gnulib/src/regex_internal.h b/contrib/tools/bison/gnulib/src/regex_internal.h
index 61f50d1e70..6205dbe726 100644
--- a/contrib/tools/bison/gnulib/src/regex_internal.h
+++ b/contrib/tools/bison/gnulib/src/regex_internal.h
@@ -482,7 +482,7 @@ static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
 #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
 
 #if defined _LIBC || HAVE_ALLOCA
-# include "palloca.h" 
+# include "palloca.h"
 #endif
 
 #ifndef _LIBC
diff --git a/contrib/tools/bison/gnulib/src/spawn-pipe.c b/contrib/tools/bison/gnulib/src/spawn-pipe.c
index e14fad3a07..86b929a7f4 100644
--- a/contrib/tools/bison/gnulib/src/spawn-pipe.c
+++ b/contrib/tools/bison/gnulib/src/spawn-pipe.c
@@ -27,7 +27,7 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "penviron.h" 
+#include "penviron.h"
 #include "error.h"
 #include "fatal-signal.h"
 #include "unistd-safer.h"
diff --git a/contrib/tools/bison/gnulib/src/spawni.c b/contrib/tools/bison/gnulib/src/spawni.c
index 47c890210b..e2f7b45b60 100644
--- a/contrib/tools/bison/gnulib/src/spawni.c
+++ b/contrib/tools/bison/gnulib/src/spawni.c
@@ -21,7 +21,7 @@
 #include <spawn.h>
 #include "spawn_int.h"
 
-#include "palloca.h" 
+#include "palloca.h"
 #include <errno.h>
 
 #include <fcntl.h>
diff --git a/contrib/tools/bison/gnulib/src/stpcpy.c b/contrib/tools/bison/gnulib/src/stpcpy.c
index 7a262efd04..f5aa8d67e9 100644
--- a/contrib/tools/bison/gnulib/src/stpcpy.c
+++ b/contrib/tools/bison/gnulib/src/stpcpy.c
@@ -21,7 +21,7 @@
 #include <config.h>
 
 #include <string.h>
-#include <stdlib.h> 
+#include <stdlib.h>
 
 #undef __stpcpy
 #if defined(_LIBC) || (defined(__MACH__) && defined(stpcpy))
diff --git a/contrib/tools/bison/gnulib/src/strsignal.c b/contrib/tools/bison/gnulib/src/strsignal.c
index bb2046c92c..20d604ff38 100644
--- a/contrib/tools/bison/gnulib/src/strsignal.c
+++ b/contrib/tools/bison/gnulib/src/strsignal.c
@@ -44,11 +44,11 @@
 # define __libc_key_t gl_tls_key_t
 # define __libc_getspecific(NAME) gl_tls_get ((NAME))
 # define __libc_setspecific(NAME, POINTER) gl_tls_set ((NAME), (POINTER))
-#if defined(_MSC_VER) 
-# define __snprintf _snprintf 
-#else 
+#if defined(_MSC_VER)
+# define __snprintf _snprintf
+#else
 # define __snprintf snprintf
-#endif 
+#endif
 #endif /* _LIBC */
 
 #ifdef _LIBC
diff --git a/contrib/tools/bison/gnulib/src/timevar.c b/contrib/tools/bison/gnulib/src/timevar.c
index 7044e18b9e..a9dbdbdee5 100644
--- a/contrib/tools/bison/gnulib/src/timevar.c
+++ b/contrib/tools/bison/gnulib/src/timevar.c
@@ -28,12 +28,12 @@
 
 #else
 
-#if defined(_musl_) 
-    #define HAVE_SYS_TIMES_H 1 
-    #define HAVE_STRUCT_TMS 1 
-    #define HAVE_CLOCK_T 1 
-#endif 
- 
+#if defined(_musl_)
+    #define HAVE_SYS_TIMES_H 1
+    #define HAVE_STRUCT_TMS 1
+    #define HAVE_CLOCK_T 1
+#endif
+
 /* This source file is taken from the GCC source code, with slight
    modifications that are under control of the IN_GCC preprocessor
    variable.  The !IN_GCC part of this file is specific to Bison.  */
diff --git a/contrib/tools/bison/gnulib/src/vasnprintf.c b/contrib/tools/bison/gnulib/src/vasnprintf.c
index a8b305cd61..4de22819fa 100644
--- a/contrib/tools/bison/gnulib/src/vasnprintf.c
+++ b/contrib/tools/bison/gnulib/src/vasnprintf.c
@@ -54,7 +54,7 @@
 # include <config.h>
 #endif
 #ifndef IN_LIBINTL
-# include "palloca.h" 
+# include "palloca.h"
 #endif
 
 /* Specification.  */
diff --git a/contrib/tools/bison/gnulib/src/xstrndup.c b/contrib/tools/bison/gnulib/src/xstrndup.c
index 9c490ab3e1..741d5a1b05 100644
--- a/contrib/tools/bison/gnulib/src/xstrndup.c
+++ b/contrib/tools/bison/gnulib/src/xstrndup.c
@@ -21,25 +21,25 @@
 #include "xstrndup.h"
 
 #include <string.h>
-#include <stdlib.h> 
- 
+#include <stdlib.h>
+
 #include "xalloc.h"
 
-#if defined(_MSC_VER) 
-static char * 
-strndup(char const *s, size_t n) 
-{ 
-	size_t len = strnlen(s, n); 
-	char *new = malloc(len + 1); 
- 
-	if (new == NULL) 
-		return NULL; 
- 
-	new[len] = '\0'; 
-	return memcpy(new, s, len); 
-} 
-#endif 
- 
+#if defined(_MSC_VER)
+static char *
+strndup(char const *s, size_t n)
+{
+	size_t len = strnlen(s, n);
+	char *new = malloc(len + 1);
+
+	if (new == NULL)
+		return NULL;
+
+	new[len] = '\0';
+	return memcpy(new, s, len);
+}
+#endif
+
 /* Return a newly allocated copy of at most N bytes of STRING.
    In other words, return a copy of the initial segment of length N of
    STRING.  */
diff --git a/contrib/tools/bison/gnulib/src/xvasprintf.c b/contrib/tools/bison/gnulib/src/xvasprintf.c
index fba46653ee..9c93492b80 100644
--- a/contrib/tools/bison/gnulib/src/xvasprintf.c
+++ b/contrib/tools/bison/gnulib/src/xvasprintf.c
@@ -75,10 +75,10 @@ xstrcat (size_t argcount, va_list args)
   return result;
 }
 
-#if defined(_MSC_VER) 
-int vasprintf(char **resultp, const char *format, va_list args); 
-#endif 
- 
+#if defined(_MSC_VER)
+int vasprintf(char **resultp, const char *format, va_list args);
+#endif
+
 char *
 xvasprintf (const char *format, va_list args)
 {
diff --git a/contrib/tools/bison/gnulib/ya.make b/contrib/tools/bison/gnulib/ya.make
index 102942d0ef..b674fd9ada 100644
--- a/contrib/tools/bison/gnulib/ya.make
+++ b/contrib/tools/bison/gnulib/ya.make
@@ -37,14 +37,14 @@ IF (OS_DARWIN)
 ENDIF()
 
 IF (NOT OS_WINDOWS)
-    CFLAGS( 
-        GLOBAL -Dregcomp=gnu_regcomp 
-        GLOBAL -Dregerror=gnu_regerror 
-        GLOBAL -Dregfree=gnu_regfree 
-        GLOBAL -Dregexec=gnu_regexec 
-    ) 
-ENDIF() 
- 
+    CFLAGS(
+        GLOBAL -Dregcomp=gnu_regcomp
+        GLOBAL -Dregerror=gnu_regerror
+        GLOBAL -Dregfree=gnu_regfree
+        GLOBAL -Dregexec=gnu_regexec
+    )
+ENDIF()
+
 SRCS(
     src/abitset.c
     src/argmatch.c
@@ -168,21 +168,21 @@ SRCS(
     src/xvasprintf.c
 )
 
-IF (NOT MUSL) 
-    SRCS( 
-        src/freadahead.c 
-        src/fseterr.c 
+IF (NOT MUSL)
+    SRCS(
+        src/freadahead.c
+        src/fseterr.c
         #        src/fseek.c
-    ) 
+    )
 ENDIF()
- 
+
 IF (NOT OS_LINUX)
-    SRCS( 
-        src/pipe2.c 
-        src/strverscmp.c 
-    ) 
+    SRCS(
+        src/pipe2.c
+        src/strverscmp.c
+    )
 ENDIF()
- 
+
 IF (NOT OS_WINDOWS)
     SRCS(
         src/stdio-write.c
@@ -191,56 +191,56 @@ ENDIF()
 
 IF (OS_WINDOWS)
     SRCS(
-        src/frexp.c 
-        src/wcrtomb.c 
-        src/perror.c 
-        src/strstr.c 
-        src/mkstemp.c 
-        src/vasprintf.c 
-        src/strsignal.c 
-        src/mkdtemp.c 
-        src/fseeko.c 
-        src/fopen.c 
-        src/ftello.c 
-        src/gettimeofday.c 
-        src/localeconv.c 
-        src/msvc-inval.c 
-        src/msvc-nothrow.c 
-        src/open.c 
-        src/sigaction.c 
-        src/sigprocmask.c 
-        src/snprintf.c 
-        src/spawn_faction_addclose.c 
-        src/spawn_faction_adddup2.c 
-        src/spawn_faction_addopen.c 
-        src/spawn_faction_destroy.c 
-        src/spawn_faction_init.c 
-        src/spawnattr_destroy.c 
-        src/spawnattr_init.c 
-        src/spawnattr_setflags.c 
-        src/spawnattr_setsigmask.c 
-        src/spawni.c 
-        src/spawnp.c 
-        src/strndup.c 
-        src/waitpid.c 
-        src/wcwidth.c 
-        src/uniwidth/width.c 
+        src/frexp.c
+        src/wcrtomb.c
+        src/perror.c
+        src/strstr.c
+        src/mkstemp.c
+        src/vasprintf.c
+        src/strsignal.c
+        src/mkdtemp.c
+        src/fseeko.c
+        src/fopen.c
+        src/ftello.c
+        src/gettimeofday.c
+        src/localeconv.c
+        src/msvc-inval.c
+        src/msvc-nothrow.c
+        src/open.c
+        src/sigaction.c
+        src/sigprocmask.c
+        src/snprintf.c
+        src/spawn_faction_addclose.c
+        src/spawn_faction_adddup2.c
+        src/spawn_faction_addopen.c
+        src/spawn_faction_destroy.c
+        src/spawn_faction_init.c
+        src/spawnattr_destroy.c
+        src/spawnattr_init.c
+        src/spawnattr_setflags.c
+        src/spawnattr_setsigmask.c
+        src/spawni.c
+        src/spawnp.c
+        src/strndup.c
+        src/waitpid.c
+        src/wcwidth.c
+        src/uniwidth/width.c
     )
 ENDIF()
 
 IF (NOT OS_LINUX OR MUSL)
-    SRCS( 
-        src/obstack.c 
-        src/obstack_printf.c 
-    ) 
+    SRCS(
+        src/obstack.c
+        src/obstack_printf.c
+    )
 ENDIF()
- 
+
 IF (OS_CYGWIN OR OS_LINUX)
-    #not need it 
+    #not need it
 ELSE()
-    SRCS( 
-        src/fpending.c 
-    ) 
+    SRCS(
+        src/fpending.c
+    )
 ENDIF()
- 
+
 END()