summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--doc/coreutils.texi3
-rw-r--r--src/pwd.c8
-rwxr-xr-xtests/misc/pwd-option.sh5
4 files changed, 11 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index a72d3bd4a..4e90b793b 100644
--- a/NEWS
+++ b/NEWS
@@ -117,9 +117,6 @@ GNU coreutils NEWS -*- outline -*-
will now honor an empty or unknown TERM environment variable,
and not output colors even with --colors=always.
- pwd now conforms to POSIX and common practice with shell builtins
- to assume -L by default, outputting $PWD from the environment if appropriate.
-
** Improvements
chroot has better --userspec and --group look-ups, with numeric IDs never
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index d0c8ea8d5..96220c350 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -13738,7 +13738,8 @@ will be symbolic links.
@cindex symbolic links and @command{pwd}
If @option{-L} and @option{-P} are both given, the last one takes
precedence. If neither option is given, then this implementation uses
-@option{-L} as the default.
+@option{-P} as the default unless the @env{POSIXLY_CORRECT}
+environment variable is set.
@mayConflictWithShellBuiltIn{pwd}
diff --git a/src/pwd.c b/src/pwd.c
index af9ef50a1..d126ed754 100644
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -65,7 +65,7 @@ Print the full filename of the current working directory.\n\
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
fputs (_("\n\
-If no option is specified, -L is assumed.\n\
+If no option is specified, -P is assumed.\n\
"), stdout);
printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
emit_ancillary_info ();
@@ -327,8 +327,10 @@ int
main (int argc, char **argv)
{
char *wd;
- /* POSIX requires a default of -L. */
- bool logical = true;
+ /* POSIX requires a default of -L, but most scripts expect -P.
+ Currently shells default to -L, while stand-alone
+ pwd implementations default to -P. */
+ bool logical = (getenv ("POSIXLY_CORRECT") != NULL);
initialize_main (&argc, &argv);
set_program_name (argv[0]);
diff --git a/tests/misc/pwd-option.sh b/tests/misc/pwd-option.sh
index 9b4664d34..0eba9429c 100755
--- a/tests/misc/pwd-option.sh
+++ b/tests/misc/pwd-option.sh
@@ -40,8 +40,11 @@ printf %s\\n "$base/a/b" >> exp || fail=1
env -- pwd --physical >> out || fail=1
printf %s\\n "$base/a/b" >> exp || fail=1
-# By default, we use -L like POSIX and various shells.
+# By default, we use -P unless POSIXLY_CORRECT.
env -- pwd >> out || fail=1
+printf %s\\n "$base/a/b" >> exp || fail=1
+
+env -- POSIXLY_CORRECT=1 pwd >> out || fail=1
printf %s\\n "$base/c" >> exp || fail=1
# Make sure we reject bogus values, and silently fall back to -P.