From bd25266244d48e7a7254a8e5f3b893b13002a564 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 27 Aug 1997 20:08:59 +0000 Subject: [PATCH] [HAVE_SYSVIPC]: Include errno.h, as in the other case. (main) [!BSD_SYSTEM]: Fix error message for getcwd failure. --- lib-src/emacsclient.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 999be2c2a8c..97261b716ae 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -284,7 +284,13 @@ main (argc, argv) if (cwd == 0) { /* getwd puts message in STRING if it fails. */ - fprintf (stderr, "%s: %s (%s)\n", argv[0], string, strerror (errno)); + fprintf (stderr, "%s: %s (%s)\n", argv[0], +#ifdef BSD_SYSTEM + string, +#else + "Cannot get current working directory", +#endif + strerror (errno)); exit (1); } @@ -333,6 +339,8 @@ main (argc, argv) #include #include #include +#include +extern int errno; char *getwd (), *getcwd (), *getenv (); struct utsname system_name; @@ -408,7 +416,12 @@ main (argc, argv) } else { +#ifdef BSD_SYSTEM fprintf (stderr, "%s: %s\n", argv[0], cwd); +#else + fprintf (stderr, "%s: Cannot get current working directory: %s\n", + argv[0], strerror (errno)); +#endif exit (1); } -- 2.39.5