diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2008-05-03 14:36:08 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2008-05-03 14:36:08 +0800 |
| commit | 4f2272fda63451a36a3133d17d493ac4e05034be (patch) | |
| tree | ae3b49bca4745fb785184cac155969a7bff196b5 | |
| parent | [CD] Test __GLIBC__ instead of _GNU_SOURCE (diff) | |
| download | dash-4f2272fda63451a36a3133d17d493ac4e05034be.tar.gz dash-4f2272fda63451a36a3133d17d493ac4e05034be.zip | |
[CD] Restored warning when getcwd fails
Somewhere along the lines the warning when getcwd fails went missing. This patch restores it. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/cd.c | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 94b37c4..2c04c19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * Fixed _PATH_BSHELL warning. * Test __GLIBC__ instead of _GNU_SOURCE. + * Restored warning when getcwd fails. 2008-05-02 Herbert Xu <herbert@gondor.apana.org.au> diff --git a/src/cd.c b/src/cd.c index 73ccde0..624801d 100644 --- a/src/cd.c +++ b/src/cd.c @@ -52,6 +52,7 @@ #include "error.h" #include "exec.h" #include "redir.h" +#include "main.h" #include "mystring.h" #include "show.h" #include "cd.h" @@ -251,11 +252,18 @@ getpwd() { #ifdef __GLIBC__ char *dir = getcwd(0, 0); - return dir ? dir : nullstr; + + if (dir) + return dir; #else char buf[PATH_MAX]; - return getcwd(buf, sizeof(buf)) ? savestr(buf) : nullstr; + + if (getcwd(buf, sizeof(buf)) + return savestr(buf); #endif + + sh_warnx("getcwd() failed: %s", strerror(errno)); + return nullstr; } int |