diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:11 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:11 +0000 |
| commit | c8a87639c7cb7aef72630978a0e5a0d92618140c (patch) | |
| tree | 862068307dff135870c4ae58be677408c4942a39 /lisp/helper.c | |
| parent | 0a193e032ba1ecf3f003e027e833dc9d274cb740 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'lisp/helper.c')
| -rw-r--r-- | lisp/helper.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/lisp/helper.c b/lisp/helper.c index 65749c5..021198c 100644 --- a/lisp/helper.c +++ b/lisp/helper.c @@ -27,15 +27,15 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/helper.c,v 1.47 2002/11/26 04:06:28 paulo Exp $ */ - -#include "helper.h" -#include "pathname.h" -#include "package.h" -#include "read.h" -#include "stream.h" -#include "write.h" -#include "hash.h" +/* $XFree86: xc/programs/xedit/lisp/helper.c,v 1.51 2003/09/17 22:28:08 paulo Exp $ */ + +#include "lisp/helper.h" +#include "lisp/pathname.h" +#include "lisp/package.h" +#include "lisp/read.h" +#include "lisp/stream.h" +#include "lisp/write.h" +#include "lisp/hash.h" #include <ctype.h> #include <fcntl.h> #include <errno.h> @@ -691,14 +691,12 @@ LispDo(LispBuiltin *builtin, int refs) do* init test &rest body */ { - int jumped, *pjumped; - LispObj *result, **presult; + int jumped; + LispObj *result; LispBlock *block; jumped = 1; result = NIL; - presult = &result; - pjumped = &jumped; block = LispBeginBlock(NIL, LispBlockTag); if (setjmp(block->jmp) == 0) { result = LispReallyDo(builtin, refs); @@ -982,7 +980,7 @@ LispPathnameField(int field, int string) pathname = ARGUMENT(0); - if (PATHNAMEP(pathname)) + if (!PATHNAMEP(pathname)) pathname = APPLY1(Oparse_namestring, pathname); result = pathname->data.pathname; @@ -1062,8 +1060,12 @@ LispProbeFile(LispBuiltin *builtin, int probe) else if (STREAMP(pathname) && pathname->data.stream.type == LispStreamFile) name = THESTR(CAR(pathname->data.stream.pathname->data.pathname)); +#ifndef __UNIXOS2__ if (realpath(name, &resolved[0]) == NULL || stat(resolved, &st)) { +#else + if ((name == NULL) || stat(resolved, &st)) { +#endif if (probe) return (NIL); LispDestroy("%s: realpath(\"%s\"): %s", |