/* bucomm.c -- Bin Utils COMmon code.
- Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002, 2003, 2006
+ Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002,
+ 2003, 2006, 2007
Free Software Foundation, Inc.
This file is part of GNU Binutils.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
/* We might put this in a library someday so it could be dynamically
loaded, but for now it's not necessary. */
+#include "sysdep.h"
#include "bfd.h"
-#include "bfdver.h"
#include "libiberty.h"
-#include "bucomm.h"
#include "filenames.h"
#include "libbfd.h"
#include <sys/stat.h>
#include <time.h> /* ctime, maybe time_t */
#include <assert.h>
+#include "bucomm.h"
#ifndef HAVE_TIME_T_IN_TIME_H
#ifndef HAVE_TIME_T_IN_TYPES_H
fprintf (stderr, "%s: %s\n", program_name, errmsg);
}
+/* Issue a non fatal error message. FILENAME, or if NULL then BFD,
+ are used to indicate the problematic file. SECTION, if non NULL,
+ is used to provide a section name. If FORMAT is non-null, then it
+ is used to print additional information via vfprintf. Finally the
+ bfd error message is printed. In summary, error messages are of
+ one of the following forms:
+
+ PROGRAM:file: bfd-error-message
+ PROGRAM:file[section]: bfd-error-message
+ PROGRAM:file: printf-message: bfd-error-message
+ PROGRAM:file[section]: printf-message: bfd-error-message
+*/
+
+void
+bfd_nonfatal_message (const char *filename,
+ const bfd *bfd, const asection *section,
+ const char *format, ...)
+{
+ const char *errmsg = bfd_errmsg (bfd_get_error ());
+ const char *section_name = NULL;
+ va_list args;
+
+ va_start (args, format);
+ fprintf (stderr, "%s", program_name);
+
+ if (bfd)
+ {
+ if (!filename)
+ filename = bfd_get_filename (bfd);
+ if (section)
+ section_name = bfd_get_section_name (bfd, section);
+ }
+ if (section_name)
+ fprintf (stderr, ":%s[%s]", filename, section_name);
+ else
+ fprintf (stderr, ":%s", filename);
+
+ if (format)
+ {
+ fprintf (stderr, ": ");
+ vfprintf (stderr, format, args);
+ }
+ fprintf (stderr, ": %s\n", errmsg);
+ va_end (args);
+}
+
void
bfd_fatal (const char *string)
{
fprintf (file, "%s\n", bfd_get_filename (abfd));
}
-/* Return the name of a created temporary file in the same directory as FILENAME. */
+/* Return a path for a new temporary file in the same directory
+ as file PATH. */
-char *
-make_tempname (char *filename)
+static char *
+template_in_dir (const char *path)
{
-#if defined(HAVE_MKSTEMP)
- static char template[] = "stXXXXXXXXXX";
- int fd;
-#else
- static char template[] = "stXXXXXX";
-#endif
+#define template "stXXXXXX"
+ const char *slash = strrchr (path, '/');
char *tmpname;
- char *slash = strrchr (filename, '/');
+ size_t len;
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
{
/* We could have foo/bar\\baz, or foo\\bar, or d:bar. */
- char *bslash = strrchr (filename, '\\');
+ char *bslash = strrchr (path, '\\');
if (slash == NULL || (bslash != NULL && bslash > slash))
slash = bslash;
- if (slash == NULL && filename[0] != '\0' && filename[1] == ':')
- slash = filename + 1;
+ if (slash == NULL && path[0] != '\0' && path[1] == ':')
+ slash = path + 1;
}
#endif
if (slash != (char *) NULL)
{
- char c;
+ len = slash - path;
+ tmpname = xmalloc (len + sizeof (template) + 2);
+ memcpy (tmpname, path, len);
- c = *slash;
- *slash = 0;
- tmpname = xmalloc (strlen (filename) + sizeof (template) + 2);
- strcpy (tmpname, filename);
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
/* If tmpname is "X:", appending a slash will make it a root
directory on drive X, which is NOT the same as the current
directory on drive X. */
- if (tmpname[1] == ':' && tmpname[2] == '\0')
- strcat (tmpname, ".");
-#endif
- strcat (tmpname, "/");
- strcat (tmpname, template);
-#if defined(HAVE_MKSTEMP)
- fd = mkstemp (tmpname);
-#else
- mktemp (tmpname);
+ if (len == 2 && tmpname[1] == ':')
+ tmpname[len++] = '.';
#endif
- *slash = c;
+ tmpname[len++] = '/';
}
else
{
tmpname = xmalloc (sizeof (template));
- strcpy (tmpname, template);
-#if defined(HAVE_MKSTEMP)
- fd = mkstemp (tmpname);
-#endif
+ len = 0;
}
-#if defined(HAVE_MKSTEMP)
- if (fd == -1)
+
+ memcpy (tmpname + len, template, sizeof (template));
+ return tmpname;
+#undef template
+}
+
+/* Return the name of a created temporary file in the same directory
+ as FILENAME. */
+
+char *
+make_tempname (char *filename)
+{
+ char *tmpname = template_in_dir (filename);
+ int fd;
+
+#ifdef HAVE_MKSTEMP
+ fd = mkstemp (tmpname);
+#else
+ tmpname = mktemp (tmpname);
+ if (tmpname == NULL)
return NULL;
- close(fd);
+ fd = open (tmpname, O_RDWR | O_CREAT | O_EXCL, 0600);
#endif
+ if (fd == -1)
+ return NULL;
+ close (fd);
return tmpname;
}
-#if defined(HAVE_MKDTEMP)
-/* Return the name of a created temporary directory inside the directory containing FILENAME. */
+/* Return the name of a created temporary directory inside the
+ directory containing FILENAME. */
char *
make_tempdir (char *filename)
{
- static char template[] = "stXXXXXXXXXX";
- char *tmpname;
- char *slash = strrchr (filename, '/');
+ char *tmpname = template_in_dir (filename);
- if (slash != (char *) NULL)
- {
- char c;
-
- c = *slash;
- *slash = 0;
- tmpname = xmalloc (strlen (filename) + sizeof (template) + 1);
- strcpy (tmpname, filename);
-#ifdef HAVE_DOS_BASED_FILE_SYSTEM
- /* If tmpname is "X:", appending a slash will make it a root
- directory on drive X, which is NOT the same as the current
- directory on drive X. */
- if (tmpname[1] == ':' && tmpname[2] == '\0')
- strcat (tmpname, ".");
+#ifdef HAVE_MKDTEMP
+ return mkdtemp (tmpname);
+#else
+ tmpname = mktemp (tmpname);
+ if (tmpname == NULL)
+ return NULL;
+#if defined (_WIN32) && !defined (__CYGWIN32__)
+ if (mkdir (tmpname) != 0)
+ return NULL;
+#else
+ if (mkdir (tmpname, 0700) != 0)
+ return NULL;
#endif
- strcat (tmpname, "/");
- strcat (tmpname, template);
- mkdtemp (tmpname);
- *slash = c;
- }
- else
- {
- tmpname = xmalloc (sizeof (template));
- strcpy (tmpname, template);
- mkdtemp (tmpname);
- }
return tmpname;
+#endif
}
-#endif /* HAVE_MKDTEMP */
/* Parse a string into a VMA, with a fatal error if it can't be
parsed. */