Mercurial > hg > xemacs-beta
view src/realpath.c @ 617:af57a77cbc92
[xemacs-hg @ 2001-06-18 07:09:50 by ben]
---------------------------------------------------------------
DOCUMENTATION FIXES:
---------------------------------------------------------------
eval.c: Correct documentation.
elhash.c: Doc correction.
---------------------------------------------------------------
LISP OBJECT CLEANUP:
---------------------------------------------------------------
bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them)
-- an expression to encapsulate a pointer into a Lisp object,
rather than the inconvenient XSET*. "wrap" was chosen because
"make" as in make_int(), make_char() is not appropriate. (It
implies allocation. The issue does not exist for ints and chars
because they are not allocated.)
Full error checking has been added to these expressions. When
used without error checking, non-union build, use of these
expressions will incur no loss of efficiency. (In fact, XSET* is
now defined in terms of wrap_* in a non-union build.) In a union
build, you will also get no loss of efficiency provided that you
have a decent optimizing compiler, and a compiler that either
understands inlines or automatically inlines those particular
functions. (And since people don't normally do their production
builds on union, it doesn't matter.)
Update the sample Lisp object definition in lrecord.h accordingly.
dumper.c: Fix places in dumper that referenced wrap_object to reference
its new name, wrap_pointer_1.
buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h,
just like for the other structures.
-- Extract out the remaining (not copied into the window config)
Lisp objects in `struct window' into winslots.h; use different
macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them.
-- Eliminate the `dead' flag of `struct frame', since it
duplicates information already available in `framemeths', and fix
FRAME_LIVE_P accordingly. (Devices and consoles already work this
way.)
-- In *slots.h, switch to system where MARKED_SLOT is automatically
undef'd at the end of the file. (Follows what winslots.h already
does.)
-- Update the comments at the beginning of *slots.h to be accurate.
-- When making any of the above objects dead, zero it out entirely
and reset all Lisp object slots to Qnil. (We were already doing
this somewhat, but not consistently.) This (1) Eliminates the
possibility of extra objects hanging around that ought to be
GC'd, (2) Causes an immediate crash if anyone tries to access a
structure in one of these objects, (3) Ensures consistent behavior
wrt dead objects.
dialog-msw.c: Use internal_object_printer, since this object should not escape.
---------------------------------------------------------------
FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR):
---------------------------------------------------------------
eval.c: Fix up some comments about the FSF implementation.
Fix two nasty bugs:
(1) condition_case_unwind frees the conses sitting in the
catch->tag slot too quickly, resulting in a crash that I hit.
(2) catches need to be unwound one at a time when calling
unwind-protect code, rather than all at once at the end; otherwise,
incorrect behavior can result. (A comment shows exactly how.)
backtrace.h: Improve comment about FSF differences in the handler stack.
---------------------------------------------------------------
FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL
UNDER MSWINDOWS:
---------------------------------------------------------------
Basic idea: My crash is due either to a dead, non-marked,
GC-collected frame inside of a window mirror, or a prematurely
freed window mirror. We need to mark the Lisp objects inside of
window mirrors. Tracking the lifespan of window mirrors and
scrollbar instances is extremely hard, and there may well be
lurking bugs where such objects are freed too soon. The only safe
way to fix these problems (and it fixes both problems at once) is
to make both of these structures Lisp objects.
lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window
mirrors in them. inline.c needs to know about scrollbar.h now.
Record the new type in lrecord.h. Fix up scrollbar-*.c
appropriately. Create a hash table in scrollbar-msw.c so that the
scrollbar instances stored in scrollbar HWND's are properly
GC-protected. Create complex_vars_of_scrollbar_mswindows() to
create the hash table at startup, and call it from emacs.c. Don't
store the scrollbar instance as a property of the GTK scrollbar,
as it's not used and if we did this, we'd have to separately
GC-protect it in a hash table, like in MS Windows.
lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window
mirrors actual Lisp objects. Tell lrecord.h about them. Change
the window mirror member of struct frame from a pointer to a Lisp
object, and add XWINDOW_MIRROR in appropriate places. Mark the
scrollbar instances in the window mirror.
redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark
frame-specific structures in mark_frame.
NOTE: I also deleted an extremely questionable call to
update_frame_window_mirrors(). It was extremely questionable
before, and now totally impossible, since it will create
Lisp objects during redisplay.
frame.c: Mark the scrollbar instances, which are now Lisp objects.
Call mark_gutter() here, not in mark_redisplay().
gutter.c: Update comments about correct marking.
---------------------------------------------------------------
ISSUES BROUGHT UP BY MARTIN:
---------------------------------------------------------------
buffer.h: Put back these macros the way Steve T and I think they ought to be.
I already explained in a previous changelog entry why I think these
macros should be the way I'd defined them. Once again:
We fix these macros so they don't care about the type of their
lvalues. The non-C-string equivalents of these already function
in the same way, and it's correct because it should be OK to pass
in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *,
etc. The whole reason for these different types is to work around
errors caused by signed-vs-unsigned non-matching types. Any
possible error that might be caught in a DFC macro would also be
caught wherever the argument is used elsewhere. So creating
multiple macro versions would add no useful error-checking and
just further complicate an already complicated area.
As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing
clean and probably never will be. Unless the board agrees to
change XEmacs in this way (and we really don't want to go down
that road), this is not a bug.
sound.h: Undo Martin's type change.
signal.c: Fix problem identified by Martin with Linux and g++ due to
non-standard declaration of setitimer().
systime.h: Update the docs for "qxe_" to point out why making the
encapsulation explicit is always the right way to go. (setitimer()
itself serves as an example.)
For 21.4:
update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get
recompiled.
author | ben |
---|---|
date | Mon, 18 Jun 2001 07:10:32 +0000 |
parents | 5fd7ba8b56e7 |
children | 943eaba38521 |
line wrap: on
line source
/* * realpath.c -- canonicalize pathname by removing symlinks * Copyright (C) 1993 Rick Sladkey <jrs@world.std.com> * This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #define DONT_ENCAPSULATE #include <config.h> #include "lisp.h" #include "sysfile.h" /* First char after start of absolute filename. */ #define ABS_START(name) (name + ABS_LENGTH (name)) #if defined (WIN32_NATIVE) /* Length of start of absolute filename. */ # define ABS_LENGTH(name) (win32_abs_start (name)) static int win32_abs_start (const char * name); /* System dependent version of readlink. */ # define system_readlink win32_readlink #else # ifdef CYGWIN # define ABS_LENGTH(name) (IS_DIRECTORY_SEP (*name) ? \ (IS_DIRECTORY_SEP (name[1]) ? 2 : 1) : 0) # define system_readlink cygwin_readlink # else # define ABS_LENGTH(name) (IS_DIRECTORY_SEP (*name) ? 1 : 0) # define system_readlink readlink # endif /* CYGWIN */ #endif /* WIN32_NATIVE */ #if defined (WIN32_NATIVE) || defined (CYGWIN) #include "syswindows.h" /* Emulate readlink on win32 - finds real name (i.e. correct case) of a file. UNC servers and shares are lower-cased. Directories must be given without trailing '/'. One day, this could read Win2K's reparse points. */ static int win32_readlink (const char * name, char * buf, int size) { WIN32_FIND_DATA find_data; HANDLE dir_handle = NULL; int len = 0; int err = 0; const char* lastname; int count = 0; const char* tmp; char* res = NULL; assert (*name); /* Sort of check we have a valid filename. */ if (strpbrk (name, "*?|<>\"") || strlen (name) >= PATH_MAX) { errno = EIO; return -1; } /* Find start of filename */ lastname = name + strlen (name); while (lastname > name && !IS_DIRECTORY_SEP (lastname[-1])) --lastname; /* Count slashes in unc path */ if (ABS_LENGTH (name) == 2) for (tmp = name; *tmp; tmp++) if (IS_DIRECTORY_SEP (*tmp)) count++; if (count >= 2 && count < 4) { /* UNC server or share name: just copy lowercased name. */ res = find_data.cFileName; for (tmp = lastname; *tmp; tmp++) *res++ = tolower (*tmp); *res = '\0'; } else dir_handle = FindFirstFile (name, &find_data); if (res || dir_handle != INVALID_HANDLE_VALUE) { if ((len = strlen (find_data.cFileName)) < size) { if (strcmp (lastname, find_data.cFileName) == 0) /* Signal that the name is already OK. */ err = EINVAL; else memcpy (buf, find_data.cFileName, len + 1); } else err = ENAMETOOLONG; if (!res) FindClose (dir_handle); } else err = ENOENT; errno = err; return err ? -1 : len; } #endif /* WIN32_NATIVE || CYGWIN */ #ifdef CYGWIN /* Call readlink and try to find out the correct case for the file. */ static int cygwin_readlink (const char * name, char * buf, int size) { int n = readlink (name, buf, size); if (n < 0 && errno == EINVAL) { /* The file may exist, but isn't a symlink. Try to find the right name. */ /* !!#### mule-bogosity */ char* tmp = (char *) alloca (cygwin_posix_to_win32_path_list_buf_size (name)); cygwin_posix_to_win32_path_list (name, tmp); n = win32_readlink (tmp, buf, size); } return n; } #endif /* CYGWIN */ #ifdef WIN32_NATIVE #ifndef ELOOP #define ELOOP 10062 /* = WSAELOOP in winsock.h */ #endif /* Length of start of absolute filename. */ static int win32_abs_start (const char * name) { if (isalpha (*name) && IS_DEVICE_SEP (name[1]) && IS_DIRECTORY_SEP (name[2])) return 3; else if (IS_DIRECTORY_SEP (*name)) return IS_DIRECTORY_SEP (name[1]) ? 2 : 1; else return 0; } #endif /* WIN32_NATIVE */ #if !defined (HAVE_GETCWD) && defined (HAVE_GETWD) #undef getcwd #define getcwd(buffer, len) getwd (buffer) #endif #ifndef PATH_MAX # if defined (_POSIX_PATH_MAX) # define PATH_MAX _POSIX_PATH_MAX # elif defined (MAXPATHLEN) # define PATH_MAX MAXPATHLEN # else # define PATH_MAX 1024 # endif #endif #define MAX_READLINKS 32 char * xrealpath (const char *path, char resolved_path []); char * xrealpath (const char *path, char resolved_path []) { char copy_path[PATH_MAX]; char *new_path = resolved_path; char *max_path; #if defined (S_IFLNK) || defined (WIN32_NATIVE) int readlinks = 0; char link_path[PATH_MAX]; int n; int abslen = ABS_LENGTH (path); #endif /* Make a copy of the source path since we may need to modify it. */ strcpy (copy_path, path); path = copy_path; max_path = copy_path + PATH_MAX - 2; #ifdef WIN32_NATIVE /* Check for c:/... or //server/... */ if (abslen == 2 || abslen == 3) { strncpy (new_path, path, abslen); /* Make sure drive letter is lowercased. */ if (abslen == 3) *new_path = tolower (*new_path); new_path += abslen; path += abslen; } /* No drive letter, but a beginning slash? Prepend drive letter. */ else if (abslen == 1) { getcwd (new_path, PATH_MAX - 1); new_path += 3; path++; } /* Just a path name, prepend the current directory */ else { getcwd (new_path, PATH_MAX - 1); new_path += strlen (new_path); if (!IS_DIRECTORY_SEP (new_path[-1])) *new_path++ = DIRECTORY_SEP; } #else /* If it's a relative pathname use getcwd for starters. */ if (abslen == 0) { getcwd (new_path, PATH_MAX - 1); new_path += strlen (new_path); if (!IS_DIRECTORY_SEP (new_path[-1])) *new_path++ = DIRECTORY_SEP; } else { /* Copy first directory sep. May have two on cygwin. */ strncpy (new_path, path, abslen); new_path += abslen; path += abslen; } #endif /* Expand each slash-separated pathname component. */ while (*path != '\0') { /* Ignore stray "/". */ if (IS_DIRECTORY_SEP (*path)) { path++; continue; } if (*path == '.') { /* Ignore ".". */ if (path[1] == '\0' || IS_DIRECTORY_SEP (path[1])) { path++; continue; } /* Handle ".." */ if (path[1] == '.' && (path[2] == '\0' || IS_DIRECTORY_SEP (path[2]))) { path += 2; /* Ignore ".." at root. */ if (new_path == ABS_START (resolved_path)) continue; /* Handle ".." by backing up. */ --new_path; while (!IS_DIRECTORY_SEP (new_path[-1])) --new_path; continue; } } /* Safely copy the next pathname component. */ while (*path != '\0' && !IS_DIRECTORY_SEP (*path)) { if (path > max_path) { errno = ENAMETOOLONG; return NULL; } *new_path++ = *path++; } #if defined (S_IFLNK) || defined (WIN32_NATIVE) /* See if latest pathname component is a symlink. */ *new_path = '\0'; n = system_readlink (resolved_path, link_path, PATH_MAX - 1); if (n < 0) { /* EINVAL means the file exists but isn't a symlink. */ #ifdef CYGWIN if (errno != EINVAL && errno != ENOENT) #else if (errno != EINVAL) #endif return NULL; } else { /* Protect against infinite loops. */ if (readlinks++ > MAX_READLINKS) { errno = ELOOP; return NULL; } /* Note: readlink doesn't add the null byte. */ link_path[n] = '\0'; if (ABS_LENGTH (link_path) > 0) /* Start over for an absolute symlink. */ new_path = resolved_path + ABS_LENGTH (link_path) - 1; else /* Otherwise back up over this component. */ for (--new_path; !IS_DIRECTORY_SEP (*new_path); --new_path) assert (new_path > resolved_path); /* Safe sex check. */ if (strlen(path) + n >= PATH_MAX) { errno = ENAMETOOLONG; return NULL; } /* Insert symlink contents into path. */ strcat(link_path, path); strcpy(copy_path, link_path); path = copy_path; } #endif /* S_IFLNK || WIN32_NATIVE */ *new_path++ = DIRECTORY_SEP; } /* Delete trailing slash but don't whomp a lone slash. */ if (new_path != ABS_START (resolved_path) && IS_DIRECTORY_SEP (new_path[-1])) new_path--; /* Make sure it's null terminated. */ *new_path = '\0'; return resolved_path; }