From ab8c7bb13f6916e68cf5e83d4523890e1f9f95b7 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Thu, 3 Jul 2003 14:00:54 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 6 ++++++ libiberty/pex-win32.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) 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 + + * 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 * 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; } -- 2.7.4