diff mbox

[Ada] Fix runtime build failure on vxworks 653 2.5

Message ID 20160427124807.GA124119@adacore.com
State New
Headers show

Commit Message

Arnaud Charlet April 27, 2016, 12:48 p.m. UTC 
The current conditional compilation directives for vxworks
lead to a call with a single argument on some versions, and
to a call with two arguments on others.

We currently end up in the single argument case for all
versions of vxworks 653. This was fine for e.g. 2.2. This
isn't fine any more with 2.5, where the underlying mkdir
implementation was changed to expect the second argument.

This change reworks the code so we always issue a call with
two arguments, the second one to be ignored by implementations
that don't expect it.

Tested on x86_64-pc-linux-gnu, committed on trunk

2016-04-27  Olivier Hainque  <hainque@adacore.com>

	* mkdir.c (__gnat_mkdir): Rework the vxworks section to use a
	consistent posix interface on the caller side.
diff mbox

Patch

Index: mkdir.c
===================================================================
--- mkdir.c	(revision 235481)
+++ mkdir.c	(working copy)
@@ -6,7 +6,7 @@ 
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *             Copyright (C) 2002-2014, Free Software Foundation, Inc.      *
+ *             Copyright (C) 2002-2016, Free Software Foundation, Inc.      *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
@@ -60,8 +60,18 @@ 
 int
 __gnat_mkdir (char *dir_name, int encoding ATTRIBUTE_UNUSED)
 {
-#if defined (__vxworks) && !(defined (__RTP__) && ((_WRS_VXWORKS_MAJOR == 7) || (_WRS_VXWORKS_MINOR != 0)))
-  return mkdir (dir_name);
+#if defined (__vxworks)
+
+  /* Pretend that the system mkdir is posix compliant even though it
+     sometimes is not, not expecting the second argument in some
+     configurations (e.g. vxworks 653 2.2, difference from 2.5). The
+     second actual argument will just be ignored in this case.  */
+
+  typedef int posix_mkdir (const char * name, mode_t mode);
+
+  posix_mkdir * vxmkdir = (posix_mkdir *)&mkdir;
+  return vxmkdir (dir_name, S_IRWXU | S_IRWXG | S_IRWXO);
+
 #elif defined (__MINGW32__)
   TCHAR wname [GNAT_MAX_PATH_LEN + 2];