1
0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-07-26 10:39:01 +02:00

pwd: assume -L mode by default, as per POSIX

* src/pwd.c (main): Adjust default mode to be "logical"
and independent of the POSIXLY_CORRECT env var.
(usage): Mention the default mode of operation.
* doc/coreutils.texi (pwd invocation): Adjust accordingly.
* tests/misc/pwd-option.sh: Likewise.
* NEWS: Mention the change in behavior.
This commit is contained in:
Pádraig Brady
2014-06-30 10:15:26 +01:00
parent acb422bdd1
commit 3e89d5bb9b
4 changed files with 10 additions and 8 deletions
+3
View File
@@ -117,6 +117,9 @@ 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
+1 -2
View File
@@ -13738,8 +13738,7 @@ 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{-P} as the default unless the @env{POSIXLY_CORRECT}
environment variable is set.
@option{-L} as the default.
@mayConflictWithShellBuiltIn{pwd}
+5 -2
View File
@@ -64,6 +64,9 @@ Print the full filename of the current working directory.\n\
"), stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
fputs (_("\n\
If no option is specified, -L is assumed.\n\
"), stdout);
printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
emit_ancillary_info ();
}
@@ -324,8 +327,8 @@ int
main (int argc, char **argv)
{
char *wd;
/* POSIX requires a default of -L, but most scripts expect -P. */
bool logical = (getenv ("POSIXLY_CORRECT") != NULL);
/* POSIX requires a default of -L. */
bool logical = true;
initialize_main (&argc, &argv);
set_program_name (argv[0]);
+1 -4
View File
@@ -40,11 +40,8 @@ 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 -P unless POSIXLY_CORRECT.
# By default, we use -L like POSIX and various shells.
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.