Re: Proposed patch for gdb/mi 741

["J. Johnston" <jjohnstn at redhat dot com>]

Eli Zaretskii wrote:
> On Mon, 9 Dec 2002, J. Johnston wrote:
>
>
> > No problem.  Hopefully the last iteration.  I added the
> > reset option to -environment-path and also added new tests
> > to mi-basics.exp.  The Makefile.in has been cleaned
> > up properly w/r the header files and I fixed the typo you noticed
> > in the call to mi_getopt.
>
> The doco patch is approved, with one minor gripe: you don't really 
> explain the syntax of adding multiple directories.  One of the examples 
> suggests that they should be separated by a colon, but that's probably 
> not true for the DOS/Windows ports, where a semicolon should be used, 
> right?  I suggest to add something about this to the doco.
Actually, the multiple directories are input on the command, separated by blanks
(this is defined by the syntax of the command).  The separator found in
the output of the command is dependenent on the system.  I have modified the
doc slightly to add examples that specify more than one directory separated
by a blank.  Is that sufficient to handle your concern?

-- Jeff J.



Index: gdbmi.texinfo
===================================================================
RCS file: /cvs/src/src/gdb/mi/gdbmi.texinfo,v
retrieving revision 1.30
diff -u -r1.30 gdbmi.texinfo
--- gdbmi.texinfo	11 Nov 2002 17:09:50 -0000	1.30
+++ gdbmi.texinfo	10 Dec 2002 19:24:53 -0000
@@ -1665,10 +1665,18 @@
 @subsubheading Synopsis
 
 @example
- -environment-directory @var{pathdir}
+ -environment-directory [ -r ] [ @var{pathdir} ]+
 @end example
 
-Add directory @var{pathdir} to beginning of search path for source files.
+Add directories @var{pathdir} to beginning of search path for source files.
+If the @samp{-r} option is used, the search path is reset to the default
+search path.  If directories @var{pathdir} are supplied in addition to the 
+@samp{-r} option, the search path is first reset and then addition
+occurs as normal.
+Specifying multiple directories in a single command
+results in the directories added to the beginning of the
+search path in the same order they were presented in the command.
+If no directories are specified, the current search path is displayed.
 
 @subsubheading @value{GDBN} Command
 
@@ -1679,7 +1687,16 @@
 @smallexample
 (@value{GDBP})
 -environment-directory /kwikemart/marge/ezannoni/flathead-dev/devo/gdb
-^done
+^done,source-path="/kwikemart/marge/ezannoni/flathead-dev/devo/gdb:$cdir:$cwd"
+(@value{GDBP})
+-environment-directory ""
+^done,source-path="/kwikemart/marge/ezannoni/flathead-dev/devo/gdb:$cdir:$cwd"
+(@value{GDBP})
+-environment-directory -r /home/jjohnstn/src/gdb /usr/src
+^done,source-path="/home/jjohnstn/src/gdb:/usr/src:$cdir:$cwd"
+(@value{GDBP})
+-environment-directory -r
+^done,source-path="$cdir:$cwd"
 (@value{GDBP})
 @end smallexample
 
@@ -1690,10 +1707,19 @@
 @subsubheading Synopsis
 
 @example
- -environment-path ( @var{pathdir} )+
+ -environment-path [ -r ] [ @var{pathdir} ]+
 @end example
 
 Add directories @var{pathdir} to beginning of search path for object files.
+If the @samp{-r} option is used, the search path is reset to the original
+search path that existed at gdb start-up.  If directories @var{pathdir} are 
+supplied in addition to the 
+@samp{-r} option, the search path is first reset and then addition
+occurs as normal.
+Specifying multiple directories in a single command
+results in the directories added to the beginning of the
+search path in the same order they were presented in the command.
+If no directories are specified, the current path is displayed.
 
 @subsubheading @value{GDBN} Command
 
@@ -1703,8 +1729,14 @@
 
 @smallexample
 (@value{GDBP})
--environment-path /kwikemart/marge/ezannoni/flathead-dev/ppc-eabi/gdb
-^done
+-environment-path 
+^done,path="/usr/bin"
+(@value{GDBP})
+-environment-path /kwikemart/marge/ezannoni/flathead-dev/ppc-eabi/gdb /bin
+^done,path="/kwikemart/marge/ezannoni/flathead-dev/ppc-eabi/gdb:/bin:/usr/bin"
+(@value{GDBP})
+-environment-path -r /usr/local/bin
+^done,path="/usr/local/bin:/usr/bin"
 (@value{GDBP})
 @end smallexample
 
@@ -1729,8 +1761,7 @@
 @smallexample
 (@value{GDBP})
 -environment-pwd
-~Working directory /kwikemart/marge/ezannoni/flathead-dev/devo/gdb.
-^done
+^done,cwd="/kwikemart/marge/ezannoni/flathead-dev/devo/gdb"
 (@value{GDBP})
 @end smallexample