diff src/sysdep.c @ 83376:de684325b343

Merged in changes from CVS trunk. Patches applied: * [e-mail]--2004/emacs--cvs-trunk--0--patch-6 Update from CVS * [e-mail]--2004/emacs--cvs-trunk--0--patch-7 Sync with [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-539. * [e-mail]--2004/emacs--cvs-trunk--0--version-0 Branch closed. Use [e-mail]--gnu-2005/emacs--cvs-trunk--0 instead. * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-475 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-476 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-477 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-478 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-479 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-480 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-481 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-482 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-483 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-484 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-485 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-486 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-487 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-488 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-489 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-490 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-491 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-492 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-493 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-494 Update from CVS: lisp/startup.el (command-line): Fix typo. * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-495 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-496 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-497 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-498 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-499 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-500 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-501 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-502 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-503 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-504 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-505 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-506 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-507 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-508 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-509 Update from CVS: .cvsignore: Add `lock'. * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-510 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-511 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-512 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-513 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-514 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-515 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-516 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-517 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-518 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-519 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-520 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-521 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-522 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-523 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-524 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-525 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-526 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-527 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-528 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-529 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-530 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-531 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-532 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-533 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-534 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-535 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-536 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-537 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-538 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-539 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-88 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-89 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-90 Update FSF's address in GPL notices * [e-mail]--gnu-2005/gnus--rel--5.10--patch-91 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-92 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-93 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-94 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-95 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-96 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-97 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-98 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-99 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-100 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-101 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-102 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-103 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-104 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-105 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-106 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-107 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-108 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-109 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-110 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-111 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-112 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-113 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-114 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-416

--- a/src/sysdep.c	Sun Sep 11 07:23:22 2005 +0000
+++ b/src/sysdep.c	Sun Sep 11 08:23:50 2005 +0000
@@ -49,7 +49,6 @@
 #include "sysselect.h"
 
 #include "blockinput.h"
-#undef NULL
 
 #ifdef MAC_OS8
 /* It is essential to include stdlib.h so that this file picks up
@@ -190,6 +189,7 @@
 #define _P_WAIT 0
 int _CRTAPI1 _spawnlp (int, const char *, const char *, ...);
 int _CRTAPI1 _getpid (void);
+extern char *getwd (char *);
 #endif
 
 #ifdef NONSYSTEM_DIR_LIBRARY
@@ -256,6 +256,81 @@
 
 SIGMASKTYPE sigprocmask_set;
 
+
+#ifndef HAVE_GET_CURRENT_DIR_NAME
+
+/* Return the current working directory.  Returns NULL on errors.
+   Any other returned value must be freed with free. This is used
+   only when get_current_dir_name is not defined on the system.  */
+char*
+get_current_dir_name ()
+{
+  char *buf;
+  char *pwd;
+  struct stat dotstat, pwdstat;
+  /* If PWD is accurate, use it instead of calling getwd.  PWD is
+     sometimes a nicer name, and using it may avoid a fatal error if a
+     parent directory is searchable but not readable.  */
+    if ((pwd = getenv ("PWD")) != 0
+      && (IS_DIRECTORY_SEP (*pwd) || (*pwd && IS_DEVICE_SEP (pwd[1])))
+      && stat (pwd, &pwdstat) == 0
+      && stat (".", &dotstat) == 0
+      && dotstat.st_ino == pwdstat.st_ino
+      && dotstat.st_dev == pwdstat.st_dev
+#ifdef MAXPATHLEN
+      && strlen (pwd) < MAXPATHLEN
+#endif
+      )
+    {
+      buf = (char *) malloc (strlen (pwd) + 1);
+      if (!buf)
+        return NULL;
+      strcpy (buf, pwd);
+    }
+#ifdef HAVE_GETCWD
+  else
+    {
+      size_t buf_size = 1024;
+      buf = (char *) malloc (buf_size);
+      if (!buf)
+        return NULL;
+      for (;;)
+        {
+          if (getcwd (buf, buf_size) == buf)
+            break;
+          if (errno != ERANGE)
+            {
+              int tmp_errno = errno;
+              free (buf);
+              errno = tmp_errno;
+              return NULL;
+            }
+          buf_size *= 2;
+          buf = (char *) realloc (buf, buf_size);
+          if (!buf)
+            return NULL;
+        }
+    }
+#else
+  else
+    {
+      /* We need MAXPATHLEN here.  */
+      buf = (char *) malloc (MAXPATHLEN + 1);
+      if (!buf)
+        return NULL;
+      if (getwd (buf) == NULL)
+        {
+          int tmp_errno = errno;
+          free (buf);
+          errno = tmp_errno;
+          return NULL;
+        }
+    }
+#endif
+  return buf;
+}
+#endif
+
 
 /* Discard pending input on all input descriptors.  */