/* bucomm.c -- Bin Utils COMmon code.
- Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002, 2003
+ Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002, 2003, 2006
Free Software Foundation, Inc.
This file is part of GNU Binutils.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+ 02110-1301, USA. */
\f
/* We might put this in a library someday so it could be dynamically
loaded, but for now it's not necessary. */
#include <sys/stat.h>
#include <time.h> /* ctime, maybe time_t */
+#include <assert.h>
#ifndef HAVE_TIME_T_IN_TIME_H
#ifndef HAVE_TIME_T_IN_TYPES_H
{
const bfd_target *p = bfd_target_vector[t];
bfd *abfd = bfd_openw (dummy_name, p->name);
- int a;
+ enum bfd_architecture a;
printf ("%s\n (header %s, data %s)\n", p->name,
endian_string (p->header_byteorder),
continue;
}
- for (a = (int) bfd_arch_obscure + 1; a < (int) bfd_arch_last; a++)
+ for (a = bfd_arch_obscure + 1; a < bfd_arch_last; a++)
if (bfd_set_arch_mach (abfd, (enum bfd_architecture) a, 0))
printf (" %s\n",
bfd_printable_arch_mach ((enum bfd_architecture) a, 0));
display_info_table (int first, int last)
{
int t;
- int a;
int ret = 1;
char *dummy_name;
+ enum bfd_architecture a;
/* Print heading of target names. */
printf ("\n%*s", (int) LONGEST_ARCH, " ");
putchar ('\n');
dummy_name = make_temp_file (NULL);
- for (a = (int) bfd_arch_obscure + 1; a < (int) bfd_arch_last; a++)
+ for (a = bfd_arch_obscure + 1; a < bfd_arch_last; a++)
if (strcmp (bfd_printable_arch_mach (a, 0), "UNKNOWN!") != 0)
{
printf ("%*s ", (int) LONGEST_ARCH - 1,
fprintf (file, "%s\n", bfd_get_filename (abfd));
}
-/* Return the name of a temporary file in the same directory as FILENAME. */
+/* Return the name of a created temporary file in the same directory as FILENAME. */
char *
make_tempname (char *filename)
{
+#if defined(HAVE_MKSTEMP)
+ static char template[] = "stXXXXXXXXXX";
+ int fd;
+#else
static char template[] = "stXXXXXX";
+#endif
char *tmpname;
char *slash = strrchr (filename, '/');
{
/* We could have foo/bar\\baz, or foo\\bar, or d:bar. */
char *bslash = strrchr (filename, '\\');
+
if (slash == NULL || (bslash != NULL && bslash > slash))
slash = bslash;
if (slash == NULL && filename[0] != '\0' && filename[1] == ':')
#endif
strcat (tmpname, "/");
strcat (tmpname, template);
+#if defined(HAVE_MKSTEMP)
+ fd = mkstemp (tmpname);
+#else
mktemp (tmpname);
+#endif
*slash = c;
}
else
{
tmpname = xmalloc (sizeof (template));
strcpy (tmpname, template);
- mktemp (tmpname);
+#if defined(HAVE_MKSTEMP)
+ fd = mkstemp (tmpname);
+#endif
}
+#if defined(HAVE_MKSTEMP)
+ if (fd == -1)
+ return NULL;
+ close(fd);
+#endif
return tmpname;
}
+#if defined(HAVE_MKDTEMP)
+/* 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, '/');
+
+ 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, ".");
+#endif
+ strcat (tmpname, "/");
+ strcat (tmpname, template);
+ mkdtemp (tmpname);
+ *slash = c;
+ }
+ else
+ {
+ tmpname = xmalloc (sizeof (template));
+ strcpy (tmpname, template);
+ mkdtemp (tmpname);
+ }
+ return tmpname;
+}
+#endif /* HAVE_MKDTEMP */
+
/* Parse a string into a VMA, with a fatal error if it can't be
parsed. */
return 0;
}
+
+/* Return the filename in a static buffer. */
+
+const char *
+bfd_get_archive_filename (bfd *abfd)
+{
+ static size_t curr = 0;
+ static char *buf;
+ size_t needed;
+
+ assert (abfd != NULL);
+
+ if (!abfd->my_archive)
+ return bfd_get_filename (abfd);
+
+ needed = (strlen (bfd_get_filename (abfd->my_archive))
+ + strlen (bfd_get_filename (abfd)) + 3);
+ if (needed > curr)
+ {
+ if (curr)
+ free (buf);
+ curr = needed + (needed >> 1);
+ buf = bfd_malloc (curr);
+ /* If we can't malloc, fail safe by returning just the file name.
+ This function is only used when building error messages. */
+ if (!buf)
+ {
+ curr = 0;
+ return bfd_get_filename (abfd);
+ }
+ }
+ sprintf (buf, "%s(%s)", bfd_get_filename (abfd->my_archive),
+ bfd_get_filename (abfd));
+ return buf;
+}