diff options
| author | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-22 17:43:43 -0300 |
|---|---|---|
| committer | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-22 17:43:43 -0300 |
| commit | a926878ddbd5a98b272c22171ce58663fc04c3e0 (patch) | |
| tree | 86af256e5d9a9c06263c00adc90e5fe348008c43 /gcc/ada/adaint.c | |
| parent | 542730f087133690b47e036dfd43eb0db8a650ce (diff) | |
| parent | 07cbaed8ba7d1b6e4ab3a9f44175502a4e1ecdb1 (diff) | |
| download | gcc-devel/autopar_devel.zip gcc-devel/autopar_devel.tar.gz gcc-devel/autopar_devel.tar.bz2 | |
Merge branch 'autopar_rebase2' into autopar_develdevel/autopar_devel
Quickly commit changes in the rebase branch.
Diffstat (limited to 'gcc/ada/adaint.c')
| -rw-r--r-- | gcc/ada/adaint.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 595abf8..c44d193 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -6,7 +6,7 @@ * * * C Implementation File * * * - * Copyright (C) 1992-2019, Free Software Foundation, Inc. * + * Copyright (C) 1992-2020, 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- * @@ -264,6 +264,9 @@ UINT __gnat_current_ccs_encoding; #ifndef DIR_SEPARATOR #define DIR_SEPARATOR '/' +#define IS_DIRECTORY_SEPARATOR(c) ((c) == DIR_SEPARATOR) +#else +#define IS_DIRECTORY_SEPARATOR(c) ((c) == '/' || (c) == DIR_SEPARATOR) #endif /* Check for cross-compilation. */ @@ -1709,9 +1712,10 @@ __gnat_is_absolute_path (char *name, int length) return 0; #else return (length != 0) && - (*name == '/' || *name == DIR_SEPARATOR + (IS_DIRECTORY_SEPARATOR(*name) #if defined (WINNT) || defined(__DJGPP__) - || (length > 1 && ISALPHA (name[0]) && name[1] == ':') + || (length > 2 && ISALPHA (name[0]) && name[1] == ':' + && IS_DIRECTORY_SEPARATOR(name[2])) #endif ); #endif @@ -2845,7 +2849,7 @@ __gnat_locate_file_with_predicate (char *file_name, char *path_val, /* If file_name include directory separator(s), try it first as a path name relative to the current directory */ - for (ptr = file_name; *ptr && *ptr != '/' && *ptr != DIR_SEPARATOR; ptr++) + for (ptr = file_name; *ptr && !IS_DIRECTORY_SEPARATOR(*ptr); ptr++) ; if (*ptr != 0) @@ -2886,7 +2890,7 @@ __gnat_locate_file_with_predicate (char *file_name, char *path_val, if (*ptr == '"') ptr--; - if (*ptr != '/' && *ptr != DIR_SEPARATOR) + if (!IS_DIRECTORY_SEPARATOR(*ptr)) *++ptr = DIR_SEPARATOR; strcpy (++ptr, file_name); |