diff options
Diffstat (limited to 'gcc/ada/adaint.c')
| -rw-r--r-- | gcc/ada/adaint.c | 648 |
1 files changed, 411 insertions, 237 deletions
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 864e9dc1141..44fd3357868 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -4,7 +4,6 @@ * * * A D A I N T * * * - * * * C Implementation File * * * * Copyright (C) 1992-2003, Free Software Foundation, Inc. * @@ -54,6 +53,7 @@ #ifdef IN_RTS #include "tconfig.h" #include "tsystem.h" + #include <sys/stat.h> #include <fcntl.h> #include <time.h> @@ -65,7 +65,23 @@ #include "config.h" #include "system.h" #endif + +#ifdef __MINGW32__ +#include "mingw32.h" +#include <sys/utime.h> +#else +#ifndef VMS +#include <utime.h> +#endif +#endif + +#ifdef __MINGW32__ +#if OLD_MINGW #include <sys/wait.h> +#endif +#else +#include <sys/wait.h> +#endif #if defined (__EMX__) || defined (MSDOS) || defined (_WIN32) #elif defined (VMS) @@ -98,7 +114,7 @@ struct dsc$descriptor_fib /* I/O Status Block. */ struct IOSB -{ +{ unsigned short status, count; unsigned long devdep; }; @@ -213,34 +229,56 @@ const int __gnat_vmsp = 1; const int __gnat_vmsp = 0; #endif -/* This variable is used to export the maximum length of a path name to - Ada code. */ - #ifdef __EMX__ -int __gnat_max_path_len = _MAX_PATH; +#define GNAT_MAX_PATH_LEN MAX_PATH #elif defined (VMS) -int __gnat_max_path_len = 4096; /* PATH_MAX */ +#define GNAT_MAX_PATH_LEN 256 /* PATH_MAX */ #elif defined (__vxworks) || defined (__OPENNT) -int __gnat_max_path_len = PATH_MAX; +#define GNAT_MAX_PATH_LEN PATH_MAX + +#else + +#if defined (__MINGW32__) +#include "mingw32.h" + +#if OLD_MINGW +#include <sys/param.h> +#endif #else #include <sys/param.h> -int __gnat_max_path_len = MAXPATHLEN; +#endif + +#define GNAT_MAX_PATH_LEN MAXPATHLEN #endif +/* The __gnat_max_path_len variable is used to export the maximum + length of a path name to Ada code. max_path_len is also provided + for compatibility with older GNAT versions, please do not use + it. */ + +int __gnat_max_path_len = GNAT_MAX_PATH_LEN; +int max_path_len = GNAT_MAX_PATH_LEN; + /* The following macro HAVE_READDIR_R should be defined if the system provides the routine readdir_r. */ #undef HAVE_READDIR_R void -__gnat_to_gm_time (p_time, p_year, p_month, p_day, p_hours, p_mins, p_secs) - int *p_time, *p_year, *p_month, *p_day, *p_hours, *p_mins, *p_secs; +__gnat_to_gm_time + (OS_Time *p_time, + int *p_year, + int *p_month, + int *p_day, + int *p_hours, + int *p_mins, + int *p_secs) { struct tm *res; - time_t time = *p_time; + time_t time = (time_t) *p_time; #ifdef _WIN32 /* On Windows systems, the time is sometimes rounded up to the nearest @@ -249,7 +287,11 @@ __gnat_to_gm_time (p_time, p_year, p_month, p_day, p_hours, p_mins, p_secs) time++; #endif +#ifdef VMS + res = localtime (&time); +#else res = gmtime (&time); +#endif if (res) { @@ -269,11 +311,8 @@ __gnat_to_gm_time (p_time, p_year, p_month, p_day, p_hours, p_mins, p_secs) of characters of its content in BUF. Otherwise, return -1. For Windows, OS/2 and vxworks, always return -1. */ -int -__gnat_readlink (path, buf, bufsiz) - char *path; - char *buf; - size_t bufsiz; +int +__gnat_readlink (char *path, char *buf, size_t bufsiz) { #if defined (MSDOS) || defined (_WIN32) || defined (__EMX__) return -1; @@ -291,9 +330,7 @@ __gnat_readlink (path, buf, bufsiz) Interix and VMS, always return -1. */ int -__gnat_symlink (oldpath, newpath) - char *oldpath; - char *newpath; +__gnat_symlink (char *oldpath, char *newpath) { #if defined (MSDOS) || defined (_WIN32) || defined (__EMX__) return -1; @@ -313,9 +350,7 @@ __gnat_symlink (oldpath, newpath) /* Version that does not use link. */ int -__gnat_try_lock (dir, file) - char *dir; - char *file; +__gnat_try_lock (char *dir, char *file) { char full_path[256]; int fd; @@ -335,9 +370,7 @@ __gnat_try_lock (dir, file) line problem ??? */ int -__gnat_try_lock (dir, file) - char *dir; - char *file; +__gnat_try_lock (char *dir, char *file) { char full_path[256]; int fd; @@ -354,11 +387,10 @@ __gnat_try_lock (dir, file) #else /* Version using link(), more secure over NFS. */ +/* See TN 6913-016 for discussion ??? */ int -__gnat_try_lock (dir, file) - char *dir; - char *file; +__gnat_try_lock (char *dir, char *file) { char full_path[256]; char temp_file[256]; @@ -428,9 +460,7 @@ __gnat_get_default_identifier_character_set () /* Return the current working directory. */ void -__gnat_get_current_dir (dir, length) - char *dir; - int *length; +__gnat_get_current_dir (char *dir, int *length) { #ifdef VMS /* Force Unix style, which is what GNAT uses internally. */ @@ -441,17 +471,18 @@ __gnat_get_current_dir (dir, length) *length = strlen (dir); - dir[*length] = DIR_SEPARATOR; - ++*length; + if (dir [*length - 1] != DIR_SEPARATOR) + { + dir [*length] = DIR_SEPARATOR; + ++(*length); + } dir[*length] = '\0'; } /* Return the suffix for object files. */ void -__gnat_get_object_suffix_ptr (len, value) - int *len; - const char **value; +__gnat_get_object_suffix_ptr (int *len, const char **value) { *value = HOST_OBJECT_SUFFIX; @@ -466,9 +497,7 @@ __gnat_get_object_suffix_ptr (len, value) /* Return the suffix for executable files. */ void -__gnat_get_executable_suffix_ptr (len, value) - int *len; - const char **value; +__gnat_get_executable_suffix_ptr (int *len, const char **value) { *value = HOST_EXECUTABLE_SUFFIX; if (!*value) @@ -483,9 +512,7 @@ __gnat_get_executable_suffix_ptr (len, value) executable extension. */ void -__gnat_get_debuggable_suffix_ptr (len, value) - int *len; - const char **value; +__gnat_get_debuggable_suffix_ptr (int *len, const char **value) { #ifndef MSDOS *value = HOST_EXECUTABLE_SUFFIX; @@ -503,9 +530,7 @@ __gnat_get_debuggable_suffix_ptr (len, value) } int -__gnat_open_read (path, fmode) - char *path; - int fmode; +__gnat_open_read (char *path, int fmode) { int fd; int o_fmode = O_BINARY; @@ -526,16 +551,23 @@ __gnat_open_read (path, fmode) return fd < 0 ? -1 : fd; } -#if defined (__EMX__) +#if defined (__EMX__) || defined (__MINGW32__) #define PERM (S_IREAD | S_IWRITE) +#elif defined (VMS) +/* Excerpt from DECC C RTL Reference Manual: + To create files with OpenVMS RMS default protections using the UNIX + system-call functions umask, mkdir, creat, and open, call mkdir, creat, + and open with a file-protection mode argument of 0777 in a program + that never specifically calls umask. These default protections include + correctly establishing protections based on ACLs, previous versions of + files, and so on. */ +#define PERM 0777 #else #define PERM (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH) #endif int -__gnat_open_rw (path, fmode) - char *path; - int fmode; +__gnat_open_rw (char *path, int fmode) { int fd; int o_fmode = O_BINARY; @@ -554,9 +586,7 @@ __gnat_open_rw (path, fmode) } int -__gnat_open_create (path, fmode) - char *path; - int fmode; +__gnat_open_create (char *path, int fmode) { int fd; int o_fmode = O_BINARY; @@ -575,9 +605,7 @@ __gnat_open_create (path, fmode) } int -__gnat_open_append (path, fmode) - char *path; - int fmode; +__gnat_open_append (char *path, int fmode) { int fd; int o_fmode = O_BINARY; @@ -598,9 +626,7 @@ __gnat_open_append (path, fmode) /* Open a new file. Return error (-1) if the file already exists. */ int -__gnat_open_new (path, fmode) - char *path; - int fmode; +__gnat_open_new (char *path, int fmode) { int fd; int o_fmode = O_BINARY; @@ -623,9 +649,7 @@ __gnat_open_new (path, fmode) processes, however they really slow down output. Used in gnatchop. */ int -__gnat_open_new_temp (path, fmode) - char *path; - int fmode; +__gnat_open_new_temp (char *path, int fmode) { int fd; int o_fmode = O_BINARY; @@ -658,8 +682,7 @@ __gnat_open_new_temp (path, fmode) /* Return the number of bytes in the specified file. */ long -__gnat_file_length (fd) - int fd; +__gnat_file_length (int fd) { int ret; struct stat statbuf; @@ -675,8 +698,7 @@ __gnat_file_length (fd) TMP_FILENAME. */ void -__gnat_tmp_name (tmp_filename) - char *tmp_filename; +__gnat_tmp_name (char *tmp_filename) { #ifdef __MINGW32__ { @@ -689,10 +711,16 @@ __gnat_tmp_name (tmp_filename) pname = (char *) tempnam ("c:\\temp", "gnat-"); + /* if pname is NULL, the file was not created properly, the disk is full + or there is no more free temporary files */ + + if (pname == NULL) + *tmp_filename = '\0'; + /* If pname start with a back slash and not path information it means that the filename is valid for the current working directory. */ - if (pname[0] == '\\') + else if (pname[0] == '\\') { strcpy (tmp_filename, ".\\"); strcat (tmp_filename, pname+1); @@ -704,12 +732,15 @@ __gnat_tmp_name (tmp_filename) } #elif defined (linux) +#define MAX_SAFE_PATH 1000 char *tmpdir = getenv ("TMPDIR"); - if (tmpdir == NULL) + /* If tmpdir is longer than MAX_SAFE_PATH, revert to default value to avoid + a buffer overflow. */ + if (tmpdir == NULL || strlen (tmpdir) > MAX_SAFE_PATH) strcpy (tmp_filename, "/tmp/gnat-XXXXXX"); else - sprintf (tmp_filename, "%.200s/gnat-XXXXXX", tmpdir); + sprintf (tmp_filename, "%s/gnat-XXXXXX", tmpdir); close (mkstemp(tmp_filename)); #else @@ -721,9 +752,7 @@ __gnat_tmp_name (tmp_filename) in the buffer. */ char * -__gnat_readdir (dirp, buffer) - DIR *dirp; - char* buffer; +__gnat_readdir (DIR *dirp, char *buffer) { /* If possible, try to use the thread-safe version. */ #ifdef HAVE_READDIR_R @@ -766,8 +795,7 @@ __gnat_readdir_is_thread_safe () stat structure. */ static time_t -win32_filetime (h) - HANDLE h; +win32_filetime (HANDLE h) { BOOL res; FILETIME t_create; @@ -784,7 +812,7 @@ win32_filetime (h) res = GetFileTime (h, &t_create, &t_access, &t_write); - timestamp = (((long long) t_write.dwHighDateTime << 32) + timestamp = (((long long) t_write.dwHighDateTime << 32) + t_write.dwLowDateTime); timestamp = timestamp / 10000000 - offset; @@ -796,8 +824,7 @@ win32_filetime (h) /* Return a GNAT time stamp given a file name. */ time_t -__gnat_file_time_name (name) - char *name; +__gnat_file_time_name (char *name) { struct stat statbuf; @@ -828,8 +855,7 @@ __gnat_file_time_name (name) /* Return a GNAT time stamp given a file descriptor. */ time_t -__gnat_file_time_fd (fd) - int fd; +__gnat_file_time_fd (int fd) { /* The following workaround code is due to the fact that under EMX and DJGPP fstat attempts to convert time values to GMT rather than keep the @@ -920,9 +946,7 @@ __gnat_file_time_fd (fd) /* Set the file time stamp. */ void -__gnat_set_file_time_name (name, time_stamp) - char *name; - time_t time_stamp; +__gnat_set_file_time_name (char *name, time_t time_stamp) { #if defined (__EMX__) || defined (MSDOS) || defined (_WIN32) \ || defined (__vxworks) @@ -1051,18 +1075,14 @@ __gnat_set_file_time_name (name, time_stamp) { time_t t; - struct tm *ts; - - ts = localtime (&time_stamp); /* Set creation time to requested time. */ - unix_time_to_vms (time_stamp + ts->tm_gmtoff, newtime); + unix_time_to_vms (time_stamp, newtime); t = time ((time_t) 0); - ts = localtime (&t); /* Set revision time to now in local time. */ - unix_time_to_vms (t + ts->tm_gmtoff, revtime); + unix_time_to_vms (t, revtime); } /* Reopen the file, modify the times and then close. */ @@ -1105,10 +1125,7 @@ __gnat_set_file_time_name (name, time_stamp) } void -__gnat_get_env_value_ptr (name, len, value) - char *name; - int *len; - char **value; +__gnat_get_env_value_ptr (char *name, int *len, char **value) { *value = getenv (name); if (!*value) @@ -1123,7 +1140,7 @@ __gnat_get_env_value_ptr (name, len, value) #ifdef VMS -static char *to_host_path_spec PARAMS ((char *)); +static char *to_host_path_spec (char *); struct descriptor_s { @@ -1141,9 +1158,7 @@ typedef struct _ile3 #endif void -__gnat_set_env_value (name, value) - char *name; - char *value; +__gnat_set_env_value (char *name, char *value) { #ifdef MSDOS @@ -1151,18 +1166,25 @@ __gnat_set_env_value (name, value) struct descriptor_s name_desc; /* Put in JOB table for now, so that the project stuff at least works. */ struct descriptor_s table_desc = {7, 0, "LNM$JOB"}; - char *host_pathspec = to_host_path_spec (value); + char *host_pathspec = value; char *copy_pathspec; int num_dirs_in_pathspec = 1; char *ptr; - - if (*host_pathspec == 0) - return; + long status; name_desc.len = strlen (name); name_desc.mbz = 0; name_desc.adr = name; + if (*host_pathspec == 0) + /* deassign */ + { + status = LIB$DELETE_LOGICAL (&name_desc, &table_desc); + /* no need to check status; if the logical name is not + defined, that's fine. */ + return; + } + ptr = host_pathspec; while (*ptr++) if (*ptr == ',') @@ -1280,9 +1302,7 @@ __gnat_get_libraries_from_registry () } int -__gnat_stat (name, statbuf) - char *name; - struct stat *statbuf; +__gnat_stat (char *name, struct stat *statbuf) { #ifdef _WIN32 /* Under Windows the directory name for the stat function must not be @@ -1311,17 +1331,15 @@ __gnat_stat (name, statbuf) } int -__gnat_file_exists (name) - char *name; +__gnat_file_exists (char *name) { struct stat statbuf; return !__gnat_stat (name, &statbuf); } -int -__gnat_is_absolute_path (name) - char *name; +int +__gnat_is_absolute_path (char *name) { return (*name == '/' || *name == DIR_SEPARATOR #if defined (__EMX__) || defined (MSDOS) || defined (WINNT) @@ -1331,8 +1349,7 @@ __gnat_is_absolute_path (name) } int -__gnat_is_regular_file (name) - char *name; +__gnat_is_regular_file (char *name) { int ret; struct stat statbuf; @@ -1342,8 +1359,7 @@ __gnat_is_regular_file (name) } int -__gnat_is_directory (name) - char *name; +__gnat_is_directory (char *name) { int ret; struct stat statbuf; @@ -1353,8 +1369,19 @@ __gnat_is_directory (name) } int -__gnat_is_writable_file (name) - char *name; +__gnat_is_readable_file (char *name) +{ + int ret; + int mode; + struct stat statbuf; + + ret = __gnat_stat (name, &statbuf); + mode = statbuf.st_mode & S_IRUSR; + return (!ret && mode); +} + +int +__gnat_is_writable_file (char *name) { int ret; int mode; @@ -1365,6 +1392,52 @@ __gnat_is_writable_file (name) return (!ret && mode); } +void +__gnat_set_writable (char *name) +{ +#ifndef __vxworks + struct stat statbuf; + + if (stat (name, &statbuf) == 0) + { + statbuf.st_mode = statbuf.st_mode | S_IWUSR; + chmod (name, statbuf.st_mode); + } +#endif +} + +void +__gnat_set_readonly (char *name) +{ +#ifndef __vxworks + struct stat statbuf; + + if (stat (name, &statbuf) == 0) + { + statbuf.st_mode = statbuf.st_mode & 07577; + chmod (name, statbuf.st_mode); + } +#endif +} + +int +__gnat_is_symbolic_link (char *name) +{ +#if defined (__vxworks) + return 0; + +#elif defined (_AIX) || defined (unix) + int ret; + struct stat statbuf; + + ret = lstat (name, &statbuf); + return (!ret && S_ISLNK (statbuf.st_mode)); + +#else + return 0; +#endif +} + #ifdef VMS /* Defined in VMS header files. */ #define fork() (decc$$alloc_vfork_blocks() >= 0 ? \ @@ -1379,8 +1452,7 @@ __gnat_is_writable_file (name) #endif int -__gnat_portable_spawn (args) - char *args[]; +__gnat_portable_spawn (char *args[]) { int status = 0; int finished; @@ -1468,8 +1540,7 @@ static Process_List *PLIST = NULL; static int plist_length = 0; static void -add_handle (h) - HANDLE h; +add_handle (HANDLE h) { Process_List *pl; @@ -1487,8 +1558,7 @@ add_handle (h) plist_leave(); } -void remove_handle (h) - HANDLE h; +void remove_handle (HANDLE h) { Process_List *pl, *prev; @@ -1521,9 +1591,7 @@ void remove_handle (h) } static int -win32_no_block_spawn (command, args) - char *command; - char *args[]; +win32_no_block_spawn (char *command, char *args[]) { BOOL result; STARTUPINFO SI; @@ -1586,8 +1654,7 @@ win32_no_block_spawn (command, args) } static int -win32_wait (status) - int *status; +win32_wait (int *status) { DWORD exitcode; HANDLE *hl; @@ -1634,8 +1701,7 @@ win32_wait (status) #endif int -__gnat_portable_no_block_spawn (args) - char *args[]; +__gnat_portable_no_block_spawn (char *args[]) { int pid = 0; @@ -1669,7 +1735,7 @@ __gnat_portable_no_block_spawn (args) if (execv (args[0], args) != 0) #if defined (VMS) return -1; /* execv is in parent context on VMS. */ -#else +#else _exit (1); #endif } @@ -1680,8 +1746,7 @@ __gnat_portable_no_block_spawn (args) } int -__gnat_portable_wait (process_status) - int *process_status; +__gnat_portable_wait (int *process_status) { int status = 0; int pid = 0; @@ -1707,8 +1772,7 @@ __gnat_portable_wait (process_status) } int -__gnat_waitpid (pid) - int pid; +__gnat_waitpid (int pid) { int status = 0; @@ -1725,8 +1789,7 @@ __gnat_waitpid (pid) } void -__gnat_os_exit (status) - int status; +__gnat_os_exit (int status) { #ifdef VMS /* Exit without changing 0 to 1. */ @@ -1739,26 +1802,29 @@ __gnat_os_exit (status) /* Locate a regular file, give a Path value. */ char * -__gnat_locate_regular_file (file_name, path_val) - char *file_name; - char *path_val; +__gnat_locate_regular_file (char *file_name, char *path_val) { char *ptr; + int absolute = __gnat_is_absolute_path (file_name); /* Handle absolute pathnames. */ + if (absolute) + { + if (__gnat_is_regular_file (file_name)) + return xstrdup (file_name); + + return 0; + } + + /* 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++) ; - if (*ptr != 0 -#if defined (__EMX__) || defined (MSDOS) || defined (WINNT) - || isalpha (file_name[0]) && file_name[1] == ':' -#endif - ) + if (*ptr != 0) { if (__gnat_is_regular_file (file_name)) return xstrdup (file_name); - - return 0; } if (path_val == 0) @@ -1798,9 +1864,7 @@ __gnat_locate_regular_file (file_name, path_val) instead. */ char * -__gnat_locate_exec (exec_name, path_val) - char *exec_name; - char *path_val; +__gnat_locate_exec (char *exec_name, char *path_val) { if (!strstr (exec_name, HOST_EXECUTABLE_SUFFIX)) { @@ -1818,17 +1882,31 @@ __gnat_locate_exec (exec_name, path_val) /* Locate an executable using the Systems default PATH. */ char * -__gnat_locate_exec_on_path (exec_name) - char *exec_name; +__gnat_locate_exec_on_path (char *exec_name) { + char *apath_val; #ifdef VMS char *path_val = "/VAXC$PATH"; #else char *path_val = getenv ("PATH"); #endif - char *apath_val = alloca (strlen (path_val) + 1); +#ifdef _WIN32 + /* In Win32 systems we expand the PATH as for XP environment + variables are not automatically expanded. */ + int len = strlen (path_val) * 3; + char *expanded_path_val = alloca (len + 1); + + DWORD res = ExpandEnvironmentStrings (path_val, expanded_path_val, len); + + if (res != 0) + { + path_val = expanded_path_val; + } +#endif + apath_val = alloca (strlen (path_val) + 1); strcpy (apath_val, path_val); + return __gnat_locate_exec (exec_name, apath_val); } @@ -1837,32 +1915,33 @@ __gnat_locate_exec_on_path (exec_name) /* These functions are used to translate to and from VMS and Unix syntax file, directory and path specifications. */ +#define MAXPATH 256 #define MAXNAMES 256 #define NEW_CANONICAL_FILELIST_INCREMENT 64 -static char new_canonical_dirspec[255]; -static char new_canonical_filespec[255]; -static char new_canonical_pathspec[MAXNAMES*255]; +static char new_canonical_dirspec [MAXPATH]; +static char new_canonical_filespec [MAXPATH]; +static char new_canonical_pathspec [MAXNAMES*MAXPATH]; static unsigned new_canonical_filelist_index; static unsigned new_canonical_filelist_in_use; static unsigned new_canonical_filelist_allocated; static char **new_canonical_filelist; -static char new_host_pathspec[MAXNAMES*255]; -static char new_host_dirspec[255]; -static char new_host_filespec[255]; +static char new_host_pathspec [MAXNAMES*MAXPATH]; +static char new_host_dirspec [MAXPATH]; +static char new_host_filespec [MAXPATH]; /* Routine is called repeatedly by decc$from_vms via - __gnat_to_canonical_file_list_init until it returns 0 or the expansion runs - out. */ + __gnat_to_canonical_file_list_init until it returns 0 or the expansion + runs out. */ static int -wildcard_translate_unix (name) - char *name; +wildcard_translate_unix (char *name) { char *ver; - char buff[256]; + char buff [MAXPATH]; - strcpy (buff, name); + strncpy (buff, name, MAXPATH); + buff [MAXPATH - 1] = (char) 0; ver = strrchr (buff, '.'); /* Chop off the version. */ @@ -1888,19 +1967,19 @@ wildcard_translate_unix (name) one at a time (_next). If onlydirs set, only expand directory files. */ int -__gnat_to_canonical_file_list_init (filespec, onlydirs) - char *filespec; - int onlydirs; +__gnat_to_canonical_file_list_init (char *filespec, int onlydirs) { int len; - char buff[256]; + char buff [MAXPATH]; len = strlen (filespec); - strcpy (buff, filespec); + strncpy (buff, filespec, MAXPATH); + + /* Only look for directories */ + if (onlydirs && !strstr (&buff [len-5], "*.dir")) + strncat (buff, "*.dir", MAXPATH); - /* Only look for directories. */ - if (onlydirs && !strstr (&buff[len - 5], "*.dir")) - strcat (buff, "*.dir"); + buff [MAXPATH - 1] = (char) 0; decc$from_vms (buff, wildcard_translate_unix, 1); @@ -1953,9 +2032,7 @@ __gnat_to_canonical_file_list_free () slashes, in case it's a logical name. */ char * -__gnat_to_canonical_dir_spec (dirspec, prefixflag) - char *dirspec; - int prefixflag; +__gnat_to_canonical_dir_spec (char *dirspec, int prefixflag) { int len; @@ -1965,16 +2042,28 @@ __gnat_to_canonical_dir_spec (dirspec, prefixflag) char *dirspec1; if (strchr (dirspec, ']') || strchr (dirspec, ':')) - strcpy (new_canonical_dirspec, (char *) decc$translate_vms (dirspec)); + { + strncpy (new_canonical_dirspec, + (char *) decc$translate_vms (dirspec), + MAXPATH); + } else if (!strchr (dirspec, '/') && (dirspec1 = getenv (dirspec)) != 0) - strcpy (new_canonical_dirspec, (char *) decc$translate_vms (dirspec1)); + { + strncpy (new_canonical_dirspec, + (char *) decc$translate_vms (dirspec1), + MAXPATH); + } else - strcpy (new_canonical_dirspec, dirspec); + { + strncpy (new_canonical_dirspec, dirspec, MAXPATH); + } } len = strlen (new_canonical_dirspec); - if (prefixflag && new_canonical_dirspec[len - 1] != '/') - strcat (new_canonical_dirspec, "/"); + if (prefixflag && new_canonical_dirspec [len-1] != '/') + strncat (new_canonical_dirspec, "/", MAXPATH); + + new_canonical_dirspec [MAXPATH - 1] = (char) 0; return new_canonical_dirspec; @@ -1984,14 +2073,22 @@ __gnat_to_canonical_dir_spec (dirspec, prefixflag) If no indicators of VMS syntax found, return input string. */ char * -__gnat_to_canonical_file_spec (filespec) - char *filespec; +__gnat_to_canonical_file_spec (char *filespec) { - strcpy (new_canonical_filespec, ""); + strncpy (new_canonical_filespec, "", MAXPATH); + if (strchr (filespec, ']') || strchr (filespec, ':')) - strcpy (new_canonical_filespec, (char *) decc$translate_vms (filespec)); + { + strncpy (new_canonical_filespec, + (char *) decc$translate_vms (filespec), + MAXPATH); + } else - strcpy (new_canonical_filespec, filespec); + { + strncpy (new_canonical_filespec, filespec, MAXPATH); + } + + new_canonical_filespec [MAXPATH - 1] = (char) 0; return new_canonical_filespec; } @@ -2000,10 +2097,9 @@ __gnat_to_canonical_file_spec (filespec) If no indicators of VMS syntax found, return input string. */ char * -__gnat_to_canonical_path_spec (pathspec) - char *pathspec; +__gnat_to_canonical_path_spec (char *pathspec) { - char *curr, *next, buff[256]; + char *curr, *next, buff [MAXPATH]; if (pathspec == 0) return pathspec; @@ -2035,37 +2131,38 @@ __gnat_to_canonical_path_spec (pathspec) char *next_dir; next_dir = __gnat_to_canonical_file_list_next (); - strcat (new_canonical_pathspec, next_dir); + strncat (new_canonical_pathspec, next_dir, MAXPATH); /* Don't append the separator after the last expansion. */ if (i+1 < dirs) - strcat (new_canonical_pathspec, ":"); + strncat (new_canonical_pathspec, ":", MAXPATH); } __gnat_to_canonical_file_list_free (); } else - strcat (new_canonical_pathspec, - __gnat_to_canonical_dir_spec (buff, 0)); + strncat (new_canonical_pathspec, + __gnat_to_canonical_dir_spec (buff, 0), MAXPATH); if (*next == 0) break; - strcat (new_canonical_pathspec, ":"); + strncat (new_canonical_pathspec, ":", MAXPATH); curr = next + 1; } + new_canonical_pathspec [MAXPATH - 1] = (char) 0; + return new_canonical_pathspec; } -static char filename_buff[256]; +static char filename_buff [MAXPATH]; static int -translate_unix (name, type) - char *name; - int type; +translate_unix (char *name, int type) { - strcpy (filename_buff, name); + strncpy (filename_buff, name, MAXPATH); + filename_buff [MAXPATH - 1] = (char) 0; return 0; } @@ -2073,10 +2170,9 @@ translate_unix (name, type) directories. */ static char * -to_host_path_spec (pathspec) - char *pathspec; +to_host_path_spec (char *pathspec) { - char *curr, *next, buff[256]; + char *curr, *next, buff [MAXPATH]; if (pathspec == 0) return pathspec; @@ -2097,13 +2193,15 @@ to_host_path_spec (pathspec) strncpy (buff, curr, next - curr); buff[next - curr] = 0; - strcat (new_host_pathspec, __gnat_to_host_dir_spec (buff, 0)); + strncat (new_host_pathspec, __gnat_to_host_dir_spec (buff, 0), MAXPATH); if (*next == 0) break; - strcat (new_host_pathspec, ","); + strncat (new_host_pathspec, ",", MAXPATH); curr = next + 1; } + new_host_pathspec [MAXPATH - 1] = (char) 0; + return new_host_pathspec; } @@ -2113,13 +2211,12 @@ to_host_path_spec (pathspec) string. */ char * -__gnat_to_host_dir_spec (dirspec, prefixflag) - char *dirspec; - int prefixflag ATTRIBUTE_UNUSED; +__gnat_to_host_dir_spec (char *dirspec, int prefixflag ATTRIBUTE_UNUSED) { int len = strlen (dirspec); - strcpy (new_host_dirspec, dirspec); + strncpy (new_host_dirspec, dirspec, MAXPATH); + new_host_dirspec [MAXPATH - 1] = (char) 0; if (strchr (new_host_dirspec, ']') || strchr (new_host_dirspec, ':')) return new_host_dirspec; @@ -2131,28 +2228,31 @@ __gnat_to_host_dir_spec (dirspec, prefixflag) } decc$to_vms (new_host_dirspec, translate_unix, 1, 2); - strcpy (new_host_dirspec, filename_buff); + strncpy (new_host_dirspec, filename_buff, MAXPATH); + new_host_dirspec [MAXPATH - 1] = (char) 0; return new_host_dirspec; - } /* Translate a Unix syntax file specification into VMS syntax. If indicators of VMS syntax found, return input string. */ char * -__gnat_to_host_file_spec (filespec) - char *filespec; +__gnat_to_host_file_spec (char *filespec) { - strcpy (new_host_filespec, ""); + strncpy (new_host_filespec, "", MAXPATH); if (strchr (filespec, ']') || strchr (filespec, ':')) - strcpy (new_host_filespec, filespec); + { + strncpy (new_host_filespec, filespec, MAXPATH); + } else { decc$to_vms (filespec, translate_unix, 1, 1); - strcpy (new_host_filespec, filename_buff); + strncpy (new_host_filespec, filename_buff, MAXPATH); } + new_host_filespec [MAXPATH - 1] = (char) 0; + return new_host_filespec; } @@ -2162,14 +2262,13 @@ __gnat_adjust_os_resource_limits () SYS$ADJWSL (131072, 0); } -#else +#else /* VMS */ /* Dummy functions for Osint import for non-VMS systems. */ int -__gnat_to_canonical_file_list_init (dirspec, onlydirs) - char *dirspec ATTRIBUTE_UNUSED; - int onlydirs ATTRIBUTE_UNUSED; +__gnat_to_canonical_file_list_init + (char *dirspec ATTRIBUTE_UNUSED, int onlydirs ATTRIBUTE_UNUSED) { return 0; } @@ -2186,38 +2285,31 @@ __gnat_to_canonical_file_list_free () } char * -__gnat_to_canonical_dir_spec (dirspec, prefixflag) - char *dirspec; - int prefixflag ATTRIBUTE_UNUSED; +__gnat_to_canonical_dir_spec (char *dirspec, int prefixflag ATTRIBUTE_UNUSED) { return dirspec; } char * -__gnat_to_canonical_file_spec (filespec) - char *filespec; +__gnat_to_canonical_file_spec (char *filespec) { return filespec; } char * -__gnat_to_canonical_path_spec (pathspec) - char *pathspec; +__gnat_to_canonical_path_spec (char *pathspec) { return pathspec; } char * -__gnat_to_host_dir_spec (dirspec, prefixflag) - char *dirspec; - int prefixflag ATTRIBUTE_UNUSED; +__gnat_to_host_dir_spec (char *dirspec, int prefixflag ATTRIBUTE_UNUSED) { return dirspec; } char * -__gnat_to_host_file_spec (filespec) - char *filespec; +__gnat_to_host_file_spec (char *filespec) { return filespec; } @@ -2238,7 +2330,8 @@ void __dummy () {} #endif #if defined (__mips_vxworks) -int _flush_cache() +int +_flush_cache() { CACHE_USER_FLUSH (0, ENTIRE_CACHE); } @@ -2246,21 +2339,21 @@ int _flush_cache() #if defined (CROSS_COMPILE) \ || (! (defined (sparc) && defined (sun) && defined (__SVR4)) \ - && ! defined (linux) \ + && ! (defined (linux) && defined (i386)) \ && ! defined (hpux) \ + && ! defined (_AIX) \ && ! (defined (__alpha__) && defined (__osf__)) \ && ! defined (__MINGW32__)) /* Dummy function to satisfy g-trasym.o. Currently Solaris sparc, HP/UX, - GNU/Linux, Tru64 & Windows provide a non-dummy version of this procedure in - libaddr2line.a. */ + GNU/Linux x86, Tru64 & Windows provide a non-dummy version of this + procedure in libaddr2line.a. */ void -convert_addresses (addrs, n_addr, buf, len) - char *addrs[] ATTRIBUTE_UNUSED; - int n_addr ATTRIBUTE_UNUSED; - void *buf ATTRIBUTE_UNUSED; - int *len; +convert_addresses (void *addrs ATTRIBUTE_UNUSED, + int n_addr ATTRIBUTE_UNUSED, + void *buf ATTRIBUTE_UNUSED, + int *len ATTRIBUTE_UNUSED) { *len = 0; } @@ -2271,3 +2364,84 @@ int __gnat_argument_needs_quote = 1; #else int __gnat_argument_needs_quote = 0; #endif + +/* This option is used to enable/disable object files handling from the + binder file by the GNAT Project module. For example, this is disabled on + Windows as it is already done by the mdll module. */ +#if defined (_WIN32) +int __gnat_prj_add_obj_files = 0; +#else +int __gnat_prj_add_obj_files = 1; +#endif + +/* char used as prefix/suffix for environment variables */ +#if defined (_WIN32) +char __gnat_environment_char = '%'; +#else +char __gnat_environment_char = '$'; +#endif + +/* This functions copy the file attributes from a source file to a + destination file. + + mode = 0 : In this mode copy only the file time stamps (last access and + last modification time stamps). + + mode = 1 : In this mode, time stamps and read/write/execute attributes are + copied. + + Returns 0 if operation was successful and -1 in case of error. */ + +int +__gnat_copy_attribs (char *from, char *to, int mode) +{ +#if defined (VMS) || defined (__vxworks) + return -1; +#else + struct stat fbuf; + struct utimbuf tbuf; + + if (stat (from, &fbuf) == -1) + { + return -1; + } + + tbuf.actime = fbuf.st_atime; + tbuf.modtime = fbuf.st_mtime; + + if (utime (to, &tbuf) == -1) + { + return -1; + } + + if (mode == 1) + { + if (chmod (to, fbuf.st_mode) == -1) + { + return -1; + } + } + + return 0; +#endif +} + +/* This function is installed in libgcc.a. */ +extern void __gnat_install_locks (void (*) (void), void (*) (void)); + +/* This function offers a hook for libgnarl to set the + locking subprograms for libgcc_eh. */ + +void +__gnatlib_install_locks (lock, unlock) + void (*lock) (void) ATTRIBUTE_UNUSED; + void (*unlock) (void) ATTRIBUTE_UNUSED; +{ +#ifdef IN_RTS + __gnat_install_locks (lock, unlock); + /* There is a bootstrap path issue if adaint is build with this + symbol unresolved for the stage1 compiler. Since the compiler + does not use tasking, we simply make __gnatlib_install_locks + a no-op in this case. */ +#endif +} |