sim: nrun: use lbasename

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index d931834821e1aca3de564a3f4d0061517562e132..2e444d133c2b24a302cd10b3f1fafd8ec97a7a72 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+       * nrun.c (myname): Mark const.
+       (main): Mark name const.  Replace myname parsing loop with a
+       call to lbasename.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
        (CONFIG_CFLAGS): Delte $(SIM_HOSTENDIAN).

diff --git a/sim/common/nrun.c b/sim/common/nrun.c
index 2e477153022a873c8e4ade1da8f1d5796983f6b2..94ba35d47b29855a41df0a32dcb1582c41a44458 100644 (file)
--- a/sim/common/nrun.c
+++ b/sim/common/nrun.c
@@ -47,7 +47,7 @@ static void usage (void);
 
 extern host_callback default_callback;
 
-static char *myname;
+static const char *myname;
 
 static SIM_DESC sd;
 
@@ -64,7 +64,7 @@ cntrl_c (int sig)
 int
 main (int argc, char **argv)
 {
-  char *name;
+  const char *name;
   char **prog_argv = NULL;
   struct bfd *prog_bfd;
   enum sim_stop reason;
@@ -72,9 +72,7 @@ main (int argc, char **argv)
   int single_step = 0;
   RETSIGTYPE (*prev_sigint) ();
 
-  myname = argv[0] + strlen (argv[0]);
-  while (myname > argv[0] && myname[-1] != '/')
-    --myname;
+  myname = lbasename (argv[0]);
 
   /* INTERNAL: When MYNAME is `step', single step the simulator
      instead of allowing it to run free.  The sole purpose of this