diff src/buffer.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/buffer.c	Sun Sep 11 07:23:22 2005 +0000
+++ b/src/buffer.c	Sun Sep 11 08:23:50 2005 +0000
@@ -32,10 +32,6 @@
 extern int errno;
 #endif
 
-#ifndef MAXPATHLEN
-/* in 4.1 [probably SunOS? -stef] , param.h fails to define this. */
-#define MAXPATHLEN 1024
-#endif /* not MAXPATHLEN */
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -5115,7 +5111,6 @@
 void
 init_buffer ()
 {
-  char buf[MAXPATHLEN + 1];
   char *pwd;
   struct stat dotstat, pwdstat;
   Lisp_Object temp;
@@ -5138,40 +5133,28 @@
   if (NILP (buffer_defaults.enable_multibyte_characters))
     Fset_buffer_multibyte (Qnil);
 
-  /* 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
-      && strlen (pwd) < MAXPATHLEN)
-    strcpy (buf, pwd);
-#ifdef HAVE_GETCWD
-  else if (getcwd (buf, MAXPATHLEN+1) == 0)
-    fatal ("`getcwd' failed: %s\n", strerror (errno));
-#else
-  else if (getwd (buf) == 0)
-    fatal ("`getwd' failed: %s\n", buf);
-#endif
+  pwd = get_current_dir_name ();
+
+  if (!pwd)
+    fatal ("`get_current_dir_name' failed: %s\n", strerror (errno));
 
 #ifndef VMS
   /* Maybe this should really use some standard subroutine
      whose definition is filename syntax dependent.  */
-  rc = strlen (buf);
-  if (!(IS_DIRECTORY_SEP (buf[rc - 1])))
+  rc = strlen (pwd);
+  if (!(IS_DIRECTORY_SEP (pwd[rc - 1])))
     {
-      buf[rc] = DIRECTORY_SEP;
-      buf[rc + 1] = '\0';
+      /* Grow buffer to add directory separator and '\0'.  */
+      pwd = (char *) xrealloc (pwd, rc + 2);
+      pwd[rc] = DIRECTORY_SEP;
+      pwd[rc + 1] = '\0';
     }
 #endif /* not VMS */
 
-  current_buffer->directory = make_unibyte_string (buf, strlen (buf));
+  current_buffer->directory = make_unibyte_string (pwd, strlen (pwd));
   if (! NILP (buffer_defaults.enable_multibyte_characters))
-    /* At this momemnt, we still don't know how to decode the
-       direcotry name.  So, we keep the bytes in multibyte form so
+    /* At this moment, we still don't know how to decode the
+       directory name.  So, we keep the bytes in multibyte form so
        that ENCODE_FILE correctly gets the original bytes.  */
     current_buffer->directory
       = string_to_multibyte (current_buffer->directory);
@@ -5190,6 +5173,8 @@
 
   temp = get_minibuffer (0);
   XBUFFER (temp)->directory = current_buffer->directory;
+
+  free (pwd);
 }
 
 /* initialize the buffer routines */