From b150b431d0a9b4dc0c3302b4257ecc209c33fba1 Mon Sep 17 00:00:00 2001 From: Nicolas Roche Date: Fri, 6 Apr 2007 11:18:36 +0200 Subject: [PATCH] cstreams.c (__gnat_full_name): Fix issues on VxWorks 6.x for which absolute path can have the following form... 2007-04-06 Nicolas Roche * cstreams.c (__gnat_full_name): Fix issues on VxWorks 6.x for which absolute path can have the following form: device:/a/b. In this case '/' should be inserted between the path and the filename. From-SVN: r123556 --- gcc/ada/cstreams.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/ada/cstreams.c b/gcc/ada/cstreams.c index 8f283d4c4fc..a45487b41b5 100644 --- a/gcc/ada/cstreams.c +++ b/gcc/ada/cstreams.c @@ -6,7 +6,7 @@ * * * Auxiliary C functions for Interfaces.C.Streams * * * - * Copyright (C) 1992-2003 Free Software Foundation, Inc. * + * Copyright (C) 1992-2006, 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- * @@ -211,10 +211,20 @@ __gnat_full_name (char *nam, char *buffer) return 0; } +#ifdef __vxworks + /* On VxWorks, getcwd always returns an absolute path. But this path + can be also a device name like "serial:". In this case '/' should not + be appended. As on VxWorks 6.x the returned path can starts with + the device name (ex: machine:/directory), we need to test if the last + character of the path is ':' to know if '/' should be appended. */ + if (buffer[strlen (buffer) - 1] != ':') + strcat (buffer, "/"); +#else /* If the name returned is an absolute path, it is safe to append '/' to the path and concatenate the name of the file. */ if (buffer[0] == '/') strcat (buffer, "/"); +#endif strcat (buffer, nam); }