Mercurial > mxe-octave
annotate src/readline-1-fixes.patch @ 7207:9ed6500e56d3 default tip @
maint: Merge release to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Fri, 17 May 2024 20:16:41 +0200 |
| parents | 41e50d658de0 |
| children |
| rev | line source |
|---|---|
|
5607
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
1 diff -ur readline-8.1/colors.c readline-8.1.1/colors.c |
|
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
2 --- readline-8.1/colors.c 2019-11-19 10:30:54.000000000 -0500 |
|
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
3 +++ readline-8.1.1/colors.c 2020-12-19 07:54:28.888704198 -0500 |
|
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
4 @@ -207,8 +207,10 @@ |
| 5007 | 5 #endif |
| 6 if (is_colored (C_CAP) && 0) //f->has_capability) | |
| 7 colored_filetype = C_CAP; | |
| 8 +#if defined(S_IXUGO) | |
| 9 else if ((mode & S_IXUGO) != 0 && is_colored (C_EXEC)) | |
| 10 colored_filetype = C_EXEC; | |
| 11 +#endif | |
| 12 else if ((1 < astat.st_nlink) && is_colored (C_MULTIHARDLINK)) | |
| 13 colored_filetype = C_MULTIHARDLINK; | |
| 14 } | |
|
5607
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
15 @@ -222,8 +224,10 @@ |
| 5007 | 16 colored_filetype = C_STICKY_OTHER_WRITABLE; |
| 17 else | |
| 18 #endif | |
| 19 +#if defined (S_IWOTH) | |
| 20 if ((mode & S_IWOTH) != 0 && is_colored (C_OTHER_WRITABLE)) | |
| 21 colored_filetype = C_OTHER_WRITABLE; | |
| 22 +#endif | |
| 23 #if defined (S_ISVTX) | |
| 24 else if ((mode & S_ISVTX) != 0 && is_colored (C_STICKY)) | |
| 25 colored_filetype = C_STICKY; | |
|
5607
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
26 Only in readline-8.1.1: colors.c.orig |
|
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
27 diff -ur readline-8.1/colors.h readline-8.1.1/colors.h |
|
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
28 --- readline-8.1/colors.h 2016-01-25 10:38:11.000000000 -0500 |
|
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
29 +++ readline-8.1.1/colors.h 2020-12-19 07:54:28.888704198 -0500 |
|
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
30 @@ -96,7 +96,7 @@ |
| 5007 | 31 }; |
| 32 | |
| 33 | |
| 34 -#if !S_IXUGO | |
| 35 +#if !S_IXUGO && defined(S_IXUSR) && defined(S_IXGRP) && defined(S_IXOTH) | |
| 36 # define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) | |
| 37 #endif | |
| 38 | |
|
5607
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
39 diff -ur readline-8.1/posixstat.h readline-8.1.1/posixstat.h |
|
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
40 --- readline-8.1/posixstat.h 2019-12-19 11:24:37.000000000 -0500 |
|
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
41 +++ readline-8.1.1/posixstat.h 2020-12-19 07:54:28.888704198 -0500 |
| 5007 | 42 @@ -78,30 +78,44 @@ |
| 43 | |
| 44 #if defined (S_IFBLK) && !defined (S_ISBLK) | |
| 45 #define S_ISBLK(m) (((m)&S_IFMT) == S_IFBLK) /* block device */ | |
| 46 +#elif !defined (S_IFBLK) | |
| 47 +#define S_ISBLK(m) 0 | |
| 48 #endif | |
| 49 | |
| 50 #if defined (S_IFCHR) && !defined (S_ISCHR) | |
| 51 #define S_ISCHR(m) (((m)&S_IFMT) == S_IFCHR) /* character device */ | |
| 52 +#elif !defined (S_IFCHR) | |
| 53 +#define S_ISCHR(m) 0 | |
| 54 #endif | |
| 55 | |
| 56 #if defined (S_IFDIR) && !defined (S_ISDIR) | |
| 57 #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) /* directory */ | |
| 58 +#elif !defined (S_IFDIR) | |
| 59 +#define S_ISDIR(m) 0 | |
| 60 #endif | |
| 61 | |
| 62 #if defined (S_IFREG) && !defined (S_ISREG) | |
| 63 #define S_ISREG(m) (((m)&S_IFMT) == S_IFREG) /* file */ | |
| 64 +#elif !defined (S_IFREG) | |
| 65 +#define S_ISREG(m) 0 | |
| 66 #endif | |
| 67 | |
| 68 #if defined (S_IFIFO) && !defined (S_ISFIFO) | |
| 69 #define S_ISFIFO(m) (((m)&S_IFMT) == S_IFIFO) /* fifo - named pipe */ | |
| 70 +#elif !defined (S_IFIFO) | |
| 71 +#define S_ISFIFO(m) 0 | |
| 72 #endif | |
| 73 | |
| 74 #if defined (S_IFLNK) && !defined (S_ISLNK) | |
| 75 #define S_ISLNK(m) (((m)&S_IFMT) == S_IFLNK) /* symbolic link */ | |
| 76 +#elif !defined (S_IFLNK) | |
| 77 +#define S_ISLNK(m) 0 | |
| 78 #endif | |
| 79 | |
| 80 #if defined (S_IFSOCK) && !defined (S_ISSOCK) | |
| 81 #define S_ISSOCK(m) (((m)&S_IFMT) == S_IFSOCK) /* socket */ | |
| 82 +#elif !defined (S_IFSOCK) | |
| 83 +#define S_ISSOCK(m) 0 | |
| 84 #endif | |
| 85 | |
| 86 /* | |
|
5607
41e50d658de0
readline: update to v8.1
John Donoghue <john.donoghue@ieee.org>
parents:
5007
diff
changeset
|
87 @@ -157,6 +171,8 @@ |
| 5007 | 88 /* These are non-standard, but are used in builtins.c$symbolic_umask() */ |
| 89 #define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) | |
| 90 #define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) | |
| 91 +#if defined(S_IXUSR) && defined(S_IXGRP) && defined(S_IXOTH) | |
| 92 #define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) | |
| 93 +#endif | |
| 94 | |
| 95 #endif /* _POSIXSTAT_H_ */ |