Mercurial > gub
annotate patches/guile-1.9.14-gnulib-mingw.patch @ 6469:f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
author | Jan Nieuwenhuizen <janneke@gnu.org> |
---|---|
date | Tue, 01 Feb 2011 15:24:46 +0100 |
parents | d0006ae646bd |
children |
rev | line source |
---|---|
6469
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
1 From e8f8f8dc840bfd2c960f86a5e6799420ec755e8c Mon Sep 17 00:00:00 2001 |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
2 From: Jan Nieuwenhuizen <janneke@gnu.org> |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
3 Date: Tue, 1 Feb 2011 14:47:50 +0100 |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
4 Subject: [PATCH 6/6] canonicalize-lgpl: Add an implementation for canonicalize_file_name. |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
5 |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
6 2011-02-01 Jan Nieuwenhuizen <janneke@gnu.org> |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
7 |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
8 * lib/canonicalize-lgpl.c (__realpath)[__MINGW32__]: Add an |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
9 implementation for canonicalize_file_name. This marked the first |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
10 running of guile.exe (1.9) in wine. |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
11 |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
12 * tests/test-canonicalize-lgpl.c (main)[__MINGW32__]: Do not abort |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
13 on `nonexistent/..'; in Windows that works fine. |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
14 --- |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
15 ChangeLog | 9 ++++ |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
16 lib/canonicalize-lgpl.c | 87 ++++++++++++++++++++++++++++++++++++++++ |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
17 tests/test-canonicalize-lgpl.c | 8 ++++ |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
18 3 files changed, 104 insertions(+), 0 deletions(-) |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
19 |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
20 diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
21 index 9bfb44f..3c22195 100644 |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
22 --- a/lib/canonicalize-lgpl.c |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
23 +++ b/lib/canonicalize-lgpl.c |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
24 @@ -84,6 +84,9 @@ |
6452
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
25 #endif |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
26 |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
27 #if !FUNC_REALPATH_WORKS || defined _LIBC |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
28 + |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
29 +#ifndef __MINGW32__ |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
30 + |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
31 /* Return the canonical absolute name of file NAME. A canonical name |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
32 does not contain any `.', `..' components nor any repeated path |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
33 separators ('/') or symlinks. All path components must exist. If |
6469
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
34 @@ -342,6 +345,90 @@ error: |
6452
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
35 } |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
36 return NULL; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
37 } |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
38 + |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
39 +#else /* __MINGW32__ */ |
6469
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
40 +#include <ctype.h> |
6452
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
41 +#include <direct.h> |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
42 +#include <windows.h> |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
43 + |
6469
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
44 +static char const * |
6452
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
45 +slashify (char const *str) |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
46 +{ |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
47 + char *p = (char*)str; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
48 + |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
49 + while (*p) |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
50 + { |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
51 + if (*p == '\\') |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
52 + *p = '/'; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
53 + p++; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
54 + } |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
55 + return str; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
56 +} |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
57 + |
6469
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
58 +static char * |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
59 +strlower (char *str) |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
60 +{ |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
61 + char *p = str; |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
62 + while (*p) |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
63 + { |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
64 + *p = (char)tolower (*p); |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
65 + p++; |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
66 + } |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
67 + return str; |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
68 +} |
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
69 + |
6452
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
70 +char * |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
71 +__realpath (const char *name, char *resolved) |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
72 +{ |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
73 + char *rpath = NULL; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
74 + |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
75 + if (name == NULL) |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
76 + { |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
77 + /* As per Single Unix Specification V2 we must return an error if |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
78 + either parameter is a null pointer. We extend this to allow |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
79 + the RESOLVED parameter to be NULL in case the we are expected to |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
80 + allocate the room for the return value. */ |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
81 + __set_errno (EINVAL); |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
82 + return NULL; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
83 + } |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
84 + |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
85 + if (name[0] == '\0') |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
86 + { |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
87 + /* As per Single Unix Specification V2 we must return an error if |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
88 + the name argument points to an empty string. */ |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
89 + __set_errno (ENOENT); |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
90 + return NULL; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
91 + } |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
92 + |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
93 + if (resolved == NULL) |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
94 + { |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
95 + rpath = malloc (PATH_MAX + 1); |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
96 + if (rpath == NULL) |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
97 + { |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
98 + /* It's easier to set errno to ENOMEM than to rely on the |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
99 + 'malloc-posix' gnulib module. */ |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
100 + errno = ENOMEM; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
101 + return NULL; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
102 + } |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
103 + } |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
104 + else |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
105 + rpath = resolved; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
106 + |
6469
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
107 + GetFullPathName (name, PATH_MAX, rpath, NULL); |
6452
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
108 + slashify (rpath); |
6469
f0ee9df1e3f2
mingw::guile: update for gnulib:canonicalize-lgpl patch.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
6452
diff
changeset
|
109 + strlower (rpath); |
6452
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
110 + struct stat st; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
111 + if (lstat (rpath, &st) < 0) |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
112 + { |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
113 + if (resolved == NULL) |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
114 + free (rpath); |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
115 + return NULL; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
116 + } |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
117 + return rpath; |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
118 +} |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
119 + |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
120 +#endif /* __MINGW32__ */ |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
121 + |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
122 versioned_symbol (libc, __realpath, realpath, GLIBC_2_3); |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
123 #endif /* !FUNC_REALPATH_WORKS || defined _LIBC */ |
d0006ae646bd
guile: mingw and linux fixes. Now also runs on mingw.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff
changeset
|
124 |