From 815615463b1171cbff7c5e54f62fc708cc1bbc99 Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Wed, 28 Feb 2018 11:43:48 -0500 Subject: [PATCH] Change order of error message printed when gdbserver can't find CWD I forgot to address Pedro's comment about my last patch and change the order of the message printed when getcwd returns NULL on gdbserver. This obvious commit does it. gdb/gdbserver/ChangeLog: 2018-02-28 Sergio Durigan Junior * server.c (captured_main): Change order of error message printed when the current working directory cannot be found. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/server.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 8c3b02e..ac88a9d 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2018-02-28 Sergio Durigan Junior + * server.c (captured_main): Change order of error message printed + when the current working directory cannot be found. + +2018-02-28 Sergio Durigan Junior + * server.c: Include "filenames.h" and "pathstuff.h". (program_name): Delete variable. (program_path): New anonymous class. diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 7745027..f373d8a 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -3573,7 +3573,7 @@ captured_main (int argc, char *argv[]) current_directory = getcwd (NULL, 0); if (current_directory == NULL) { - error (_("%s: error finding working directory"), + error (_("Could not find current working directory: %s"), safe_strerror (errno)); } -- 2.7.4