[RFA] apply shell fix for win32-nat.c in 5.2 branch

[RFA] apply shell fix for win32-nat.c in 5.2 branch

[Pierre Muller]

[-- Attachment #1: Type: text/plain, Size: 670 bytes --]


This patch was applied previoulsy to the main branch by
Christopher Faylor.

It disables shell use unless explicitly enabled.
As shell use is still experimental and has several 
problems, I think that this must also be applied to 
5.2 branch.

As Christopher asked me to do this, the 
RFA is mainly about the format of the 
ChangeLog entry...


ChangeLog entry:

2002-04-08  Pierre Muller  <muller@ics.u-strasbg.fr>

	from 2002-03-22  Christopher Faylor  <cgf@redhat.com> patch in main branch.
	* win32-nat.c (child_create_inferior): Check for proper shell to use here, in
	case the user changes it on the fly.
	(_initialize_inftarg): Remove shell path considerations.

[-- Attachment #2: win32-nat.diff2 --]
[-- Type: text/plain, Size: 1445 bytes --]

Index: win32-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/win32-nat.c,v
retrieving revision 1.56
diff -r1.56 win32-nat.c
126c126,127
< static DWORD main_thread_id;	/* Thread ID of the main thread */
---
> static DWORD main_thread_id;		/* Thread ID of the main thread */
> static pid_t cygwin_pid;		/* pid of cygwin process */
142,144d142
< /* Path to shell */
< static char shell[MAX_PATH + 1];
< 
1463a1462,1463
>   char shell[MAX_PATH + 1]; /* Path to shell */
>   const char *sh;
1471c1471
<   if (!useshell || !shell[0])
---
>   if (!useshell)
1479,1480c1479,1485
<       char *newallargs = alloca (sizeof (" -c 'exec  '") + strlen (exec_file)
< 				 + strlen (allargs) + 2);
---
>       char *newallargs;
>       sh = getenv ("SHELL");
>       if (!sh)
> 	sh = "/bin/sh";
>       cygwin_conv_to_win32_path (sh, shell);
>       newallargs = alloca (sizeof (" -c 'exec  '") + strlen (exec_file)
> 			   + strlen (allargs) + 2);
1500c1505
<     /* This code use to assume all env vars were file names and would
---
>     /* This code used to assume all env vars were file names and would
1816d1820
<   const char *sh;
1823,1836d1826
< 
<   sh = getenv ("SHELL");
<   if (!sh)
<     sh = "/bin/sh";
<   if (access (sh, X_OK) != 0)
<     {
<       shell[0] = '\0';
<       useshell = 0;
<     }
<   else
<     {
<       cygwin_conv_to_win32_path (sh, shell);
<       useshell = 1;
<     }

[-- Attachment #3: Type: text/plain, Size: 176 bytes --]



Pierre Muller
Institut Charles Sadron
6,rue Boussingault
F 67083 STRASBOURG CEDEX (France)
mailto:muller@ics.u-strasbg.fr
Phone : (33)-3-88-41-40-07  Fax : (33)-3-88-41-40-99

Re: [RFA] apply shell fix for win32-nat.c in 5.2 branch

[Christopher Faylor]

On Mon, Apr 08, 2002 at 05:35:59PM +0200, Pierre Muller wrote:
>
>This patch was applied previoulsy to the main branch by
>Christopher Faylor.
>
>It disables shell use unless explicitly enabled.
>As shell use is still experimental and has several 
>problems, I think that this must also be applied to 
>5.2 branch.
>
>As Christopher asked me to do this, the 
>RFA is mainly about the format of the 
>ChangeLog entry...

I have no objections to your ChangeLog.  You could just apply the ChangeLog
as is from the trunk, too.

cgf

Re: [RFA] apply shell fix for win32-nat.c in 5.2 branch

[Pierre Muller]

At 01:07 09/04/2002 , Christopher Faylor a écrit:
>On Mon, Apr 08, 2002 at 05:35:59PM +0200, Pierre Muller wrote:
> >
> >This patch was applied previoulsy to the main branch by
> >Christopher Faylor.
> >
> >It disables shell use unless explicitly enabled.
> >As shell use is still experimental and has several 
> >problems, I think that this must also be applied to 
> >5.2 branch.
> >
> >As Christopher asked me to do this, the 
> >RFA is mainly about the format of the 
> >ChangeLog entry...
>
>I have no objections to your ChangeLog.  You could just apply the ChangeLog
>as is from the trunk, too.

I already sometimes saw ChangeLogs
with names of people that didn't  even know
that their names where used, so I prefer to stick with
the real name of the committer.

I committed the patch to 5.2 branch.


Pierre Muller
Institut Charles Sadron
6,rue Boussingault
F 67083 STRASBOURG CEDEX (France)
mailto:muller@ics.u-strasbg.fr
Phone : (33)-3-88-41-40-07  Fax : (33)-3-88-41-40-99

Re: [RFA] apply shell fix for win32-nat.c in 5.2 branch

[Eli Zaretskii]

On Tue, 9 Apr 2002, Pierre Muller wrote:

> >I have no objections to your ChangeLog.  You could just apply the ChangeLog
> >as is from the trunk, too.
> 
> I already sometimes saw ChangeLogs
> with names of people that didn't  even know
> that their names where used, so I prefer to stick with
> the real name of the committer.

The real name of the committer is in the CVS log ("cvs annotate" should 
show it for every line), so you don't need to make a point of repeating 
that in the ChangeLog.  ChangeLog should (IMHO) state the name of the 
person who did the actual work on the code change.