* choose-temp.c: Sync with gcc.

From-SVN: r17394
This commit is contained in:
Jeffrey A Law 1998-01-17 21:23:29 +00:00 committed by Jeff Law
parent 51549d7665
commit 84f79fea91
2 changed files with 12 additions and 9 deletions

View File

@ -1,3 +1,7 @@
Sat Jan 17 22:25:53 1998 Jeffrey A Law (law@cygnus.com)
* choose-temp.c: Sync with gcc version.
Thu Dec 4 17:25:19 1997 Jeffrey A Law (law@cygnus.com) Thu Dec 4 17:25:19 1997 Jeffrey A Law (law@cygnus.com)
* strsignal.c (sys_nsig): Try NSIG and _NSIG. * strsignal.c (sys_nsig): Try NSIG and _NSIG.

View File

@ -1,5 +1,5 @@
/* Utility to pick a temporary filename prefix. /* Utility to pick a temporary filename prefix.
Copyright (C) 1996 Free Software Foundation, Inc. Copyright (C) 1996, 1997 Free Software Foundation, Inc.
This file is part of the libiberty library. This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or Libiberty is free software; you can redistribute it and/or
@ -22,7 +22,11 @@ Boston, MA 02111-1307, USA. */
/* This file lives in at least two places: libiberty and gcc. /* This file lives in at least two places: libiberty and gcc.
Don't change one without the other. */ Don't change one without the other. */
#ifndef NO_SYS_FILE_H #ifdef IN_GCC
#include "config.h"
#endif
#ifdef HAVE_SYS_FILE_H
#include <sys/types.h> #include <sys/types.h>
#include <sys/file.h> /* May get R_OK, etc. on some systems. */ #include <sys/file.h> /* May get R_OK, etc. on some systems. */
#endif #endif
@ -36,7 +40,6 @@ Boston, MA 02111-1307, USA. */
#include <stdio.h> /* May get P_tmpdir. */ #include <stdio.h> /* May get P_tmpdir. */
#ifdef IN_GCC #ifdef IN_GCC
#include "config.h"
#include "gansidecl.h" #include "gansidecl.h"
extern char *xmalloc (); extern char *xmalloc ();
#else #else
@ -54,7 +57,7 @@ extern char *xmalloc ();
/* On MSDOS, write temp files in current dir /* On MSDOS, write temp files in current dir
because there's no place else we can expect to use. */ because there's no place else we can expect to use. */
/* ??? Although the current directory is tried as a last resort, /* ??? Although the current directory is tried as a last resort,
this is left in so that on MSDOS it is prefered to /tmp on the this is left in so that on MSDOS it is preferred to /tmp on the
off chance that someone requires this, since that was the previous off chance that someone requires this, since that was the previous
behaviour. */ behaviour. */
#ifdef __MSDOS__ #ifdef __MSDOS__
@ -68,7 +71,7 @@ extern char *xmalloc ();
#define TEMP_FILE "ccXXXXXX" #define TEMP_FILE "ccXXXXXX"
/* Subroutine of choose_temp_base. /* Subroutine of choose_temp_base.
If BASE is non-NULL, returh it. If BASE is non-NULL, return it.
Otherwise it checks if DIR is a usable directory. Otherwise it checks if DIR is a usable directory.
If success, DIR is returned. If success, DIR is returned.
Otherwise NULL is returned. */ Otherwise NULL is returned. */
@ -114,11 +117,7 @@ choose_temp_base ()
/* If all else fails, use the current directory! */ /* If all else fails, use the current directory! */
if (base == 0) if (base == 0)
#ifdef VMS
base = "[";
#else
base = "."; base = ".";
#endif
#else /* MPW */ #else /* MPW */
base = ":"; base = ":";