From 8e2219b09c513e6e0e8f83cca73baa05cd876f12 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Wed, 2 Jul 2014 11:28:05 +0100 Subject: pwd: revert default mode back to -P Revert commit v8.22-131-g3e89d5b as even though POSIX states that the default mode should be -L, common practice for stand-alone pwd implementations is to default to -P. * src/pwd.c (usage): Retain mention of the default mode of operation. Suggested by Bob Proulx --- src/pwd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') 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]); -- cgit v1.2.3-54-g00ecf