Restoring authorship annotation for <axc@yandex-team.ru>. Commit 2 of 2.

1 files changed, 41 insertions, 41 deletions

diff --git a/contrib/tools/bison/gnulib/src/filenamecat.c b/contrib/tools/bison/gnulib/src/filenamecat.c
index f56dfe1326..8809b571f5 100644
--- a/contrib/tools/bison/gnulib/src/filenamecat.c
+++ b/contrib/tools/bison/gnulib/src/filenamecat.c
@@ -1,41 +1,41 @@
-/* Concatenate two arbitrary file names. 
- 
-   Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc. 
- 
-   This program is free software: you can redistribute it and/or modify 
-   it under the terms of the GNU General Public License as published by 
-   the Free Software Foundation; either version 3 of the License, or 
-   (at your option) any later version. 
- 
-   This program is distributed in the hope that it will be useful, 
-   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-   GNU General Public License for more details. 
- 
-   You should have received a copy of the GNU General Public License 
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */ 
- 
-/* Written by Jim Meyering.  */ 
- 
-#include <config.h> 
- 
-/* Specification.  */ 
-#include "filenamecat.h" 
- 
-#include <stdlib.h> 
-#include <string.h> 
- 
-#include "xalloc.h" 
- 
-/* Just like mfile_name_concat (filenamecat-lgpl.c), except, rather than 
-   returning NULL upon malloc failure, here, we report the 
-   "memory exhausted" condition and exit.  */ 
- 
-char * 
-file_name_concat (char const *dir, char const *abase, char **base_in_result) 
-{ 
-  char *p = mfile_name_concat (dir, abase, base_in_result); 
-  if (p == NULL) 
-    xalloc_die (); 
-  return p; 
-} 
+/* Concatenate two arbitrary file names.
+
+   Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Jim Meyering.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "filenamecat.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "xalloc.h"
+
+/* Just like mfile_name_concat (filenamecat-lgpl.c), except, rather than
+   returning NULL upon malloc failure, here, we report the
+   "memory exhausted" condition and exit.  */
+
+char *
+file_name_concat (char const *dir, char const *abase, char **base_in_result)
+{
+  char *p = mfile_name_concat (dir, abase, base_in_result);
+  if (p == NULL)
+    xalloc_die ();
+  return p;
+}