aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2003-07-03 14:00:54 +0000
committerDJ Delorie <dj@redhat.com>2003-07-03 14:00:54 +0000
commitab8c7bb13f6916e68cf5e83d4523890e1f9f95b7 (patch)
treecf1430f7c208024897aa35b461234c56f0dfee17
parent3a871b371bd72137b4fc4fc504f02080878e2540 (diff)
downloadgdb-ab8c7bb13f6916e68cf5e83d4523890e1f9f95b7.zip
gdb-ab8c7bb13f6916e68cf5e83d4523890e1f9f95b7.tar.gz
gdb-ab8c7bb13f6916e68cf5e83d4523890e1f9f95b7.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog6
-rw-r--r--libiberty/pex-win32.c8
2 files changed, 13 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 99f2f0a..770ef95 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-02 Danny Smith <dannysmith@users.source.forge.net>
+
+ * pex-win32.c (fix_argv): Ensure that the executable pathname
+ uses Win32 backslashes.
+ (pexecute): Cast away constness when assigning *errmsg_arg.
+
2003-06-26 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/demangle-expected: Add more GNU V3 testcases.
diff --git a/libiberty/pex-win32.c b/libiberty/pex-win32.c
index bd097a4..24a55e8 100644
--- a/libiberty/pex-win32.c
+++ b/libiberty/pex-win32.c
@@ -57,7 +57,13 @@ fix_argv (argvec)
char **argvec;
{
int i;
+ char * command0 = argvec[0];
+ /* Ensure that the executable pathname uses Win32 backslashes. */
+ for (; *command0 != '\0'; command0++)
+ if (*command0 == '/')
+ *command0 = '\\';
+
for (i = 1; argvec[i] != 0; i++)
{
int len, j;
@@ -203,7 +209,7 @@ pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
if (pid == -1)
{
*errmsg_fmt = install_error_msg;
- *errmsg_arg = program;
+ *errmsg_arg = (char*) program;
return -1;
}