mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-28 15:48:45 +08:00
Fix bash PATH to use double colon
This commit is contained in:
Wildan M
parent
f706e3eb98
commit
b10ef5910d
@ -1,6 +1,6 @@
|
||||
diff -ruwN bash-5.2.15/bashline.c source/bashline.c
|
||||
--- bash-5.2.15/bashline.c 2022-04-17 15:37:12.000000000 -0700
|
||||
+++ source/bashline.c 2024-12-05 16:04:07.566380980 -0800
|
||||
diff -ruwN source/bashline.c source-new/bashline.c
|
||||
--- source/bashline.c 2022-04-18 05:37:12.000000000 +0700
|
||||
+++ source-new/bashline.c 2025-09-01 04:36:35.272926519 +0700
|
||||
@@ -2645,7 +2645,7 @@
|
||||
const char *text;
|
||||
int state;
|
||||
@ -10,9 +10,9 @@ diff -ruwN bash-5.2.15/bashline.c source/bashline.c
|
||||
return ((char *)NULL);
|
||||
#else
|
||||
static char *gname = (char *)NULL;
|
||||
diff -ruwN bash-5.2.15/builtins/ulimit.def source/builtins/ulimit.def
|
||||
--- bash-5.2.15/builtins/ulimit.def 2021-11-05 06:19:53.000000000 -0700
|
||||
+++ source/builtins/ulimit.def 2024-12-05 16:04:07.567380980 -0800
|
||||
diff -ruwN source/builtins/ulimit.def source-new/builtins/ulimit.def
|
||||
--- source/builtins/ulimit.def 2021-11-05 20:19:53.000000000 +0700
|
||||
+++ source-new/builtins/ulimit.def 2025-09-01 04:36:35.272926519 +0700
|
||||
@@ -609,7 +609,7 @@
|
||||
}
|
||||
else
|
||||
@ -22,38 +22,9 @@ diff -ruwN bash-5.2.15/builtins/ulimit.def source/builtins/ulimit.def
|
||||
if (getrlimit (limits[ind].parameter, &limit) < 0)
|
||||
return -1;
|
||||
# if defined (HPUX9)
|
||||
diff -ruwN bash-5.2.15/config-top.h source/config-top.h
|
||||
--- bash-5.2.15/config-top.h 2021-11-05 06:11:12.000000000 -0700
|
||||
+++ source/config-top.h 2024-12-06 01:06:18.324586528 -0800
|
||||
@@ -63,24 +63,24 @@
|
||||
/* The default value of the PATH variable. */
|
||||
#ifndef DEFAULT_PATH_VALUE
|
||||
#define DEFAULT_PATH_VALUE \
|
||||
- "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:."
|
||||
+ "/usr/local/bin;/usr/local/sbin;/usr/bin;/usr/sbin;/bin;/sbin;."
|
||||
#endif
|
||||
|
||||
/* If you want to unconditionally set a value for PATH in every restricted
|
||||
shell, set this. */
|
||||
-/* #define RBASH_STATIC_PATH_VALUE "/rbin:/usr/rbin" */
|
||||
+/* #define RBASH_STATIC_PATH_VALUE "/rbin;/usr/rbin" */
|
||||
|
||||
/* The value for PATH when invoking `command -p'. This is only used when
|
||||
the Posix.2 confstr () function, or CS_PATH define are not present. */
|
||||
#ifndef STANDARD_UTILS_PATH
|
||||
#define STANDARD_UTILS_PATH \
|
||||
- "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
|
||||
+ "/bin;/usr/bin;/sbin;/usr/sbin;/etc;/usr/etc"
|
||||
#endif
|
||||
|
||||
/* The default path for enable -f */
|
||||
#ifndef DEFAULT_LOADABLE_BUILTINS_PATH
|
||||
#define DEFAULT_LOADABLE_BUILTINS_PATH \
|
||||
- "/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:."
|
||||
+ "/usr/local/lib/bash;/usr/lib/bash;/opt/local/lib/bash;/usr/pkg/lib/bash;/opt/pkg/lib/bash;."
|
||||
#endif
|
||||
|
||||
/* Default primary and secondary prompt strings. */
|
||||
diff -ruwN source/config-top.h source-new/config-top.h
|
||||
--- source/config-top.h 2021-11-05 20:11:12.000000000 +0700
|
||||
+++ source-new/config-top.h 2025-09-19 21:55:55.439030906 +0700
|
||||
@@ -199,3 +199,6 @@
|
||||
/* Undefine or define to 0 if you don't want to allow associative array
|
||||
assignment using a compound list of key-value pairs. */
|
||||
@ -61,9 +32,9 @@ diff -ruwN bash-5.2.15/config-top.h source/config-top.h
|
||||
+
|
||||
+/* Don't check for a valid inode number when pattern matching on Redox */
|
||||
+#define BROKEN_DIRENT_D_INO 1
|
||||
diff -ruwN bash-5.2.15/configure source/configure
|
||||
--- bash-5.2.15/configure 2022-09-23 07:13:22.000000000 -0700
|
||||
+++ source/configure 2024-12-05 16:06:32.812286102 -0800
|
||||
diff -ruwN source/configure source-new/configure
|
||||
--- source/configure 2022-09-23 21:13:22.000000000 +0700
|
||||
+++ source-new/configure 2025-09-01 04:52:47.542177017 +0700
|
||||
@@ -3298,6 +3298,7 @@
|
||||
*-nsk*) opt_bash_malloc=no ;; # HP NonStop
|
||||
*-haiku*) opt_bash_malloc=no ;; # Haiku OS
|
||||
@ -72,9 +43,9 @@ diff -ruwN bash-5.2.15/configure source/configure
|
||||
esac
|
||||
|
||||
# memory scrambling on free()
|
||||
diff -ruwN bash-5.2.15/configure.ac source/configure.ac
|
||||
--- bash-5.2.15/configure.ac 2022-09-23 07:12:27.000000000 -0700
|
||||
+++ source/configure.ac 2024-12-05 16:04:07.571380977 -0800
|
||||
diff -ruwN source/configure.ac source-new/configure.ac
|
||||
--- source/configure.ac 2022-09-23 21:12:27.000000000 +0700
|
||||
+++ source-new/configure.ac 2025-09-01 04:36:35.275926660 +0700
|
||||
@@ -92,6 +92,7 @@
|
||||
*-nsk*) opt_bash_malloc=no ;; # HP NonStop
|
||||
*-haiku*) opt_bash_malloc=no ;; # Haiku OS
|
||||
@ -83,9 +54,9 @@ diff -ruwN bash-5.2.15/configure.ac source/configure.ac
|
||||
esac
|
||||
|
||||
# memory scrambling on free()
|
||||
diff -ruwN bash-5.2.15/execute_cmd.c source/execute_cmd.c
|
||||
--- bash-5.2.15/execute_cmd.c 2022-12-13 09:09:02.000000000 -0800
|
||||
+++ source/execute_cmd.c 2024-12-05 16:04:07.573380976 -0800
|
||||
diff -ruwN source/execute_cmd.c source-new/execute_cmd.c
|
||||
--- source/execute_cmd.c 2022-12-14 00:09:02.000000000 +0700
|
||||
+++ source-new/execute_cmd.c 2025-09-01 04:36:35.275926660 +0700
|
||||
@@ -1379,11 +1379,11 @@
|
||||
nullcmd = (command == 0) || (command->type == cm_simple && command->value.Simple->words == 0 && command->value.Simple->redirects == 0);
|
||||
if (posixly_correct && nullcmd)
|
||||
@ -100,9 +71,9 @@ diff -ruwN bash-5.2.15/execute_cmd.c source/execute_cmd.c
|
||||
before.tms_utime = before.tms_stime = before.tms_cutime = before.tms_cstime = 0;
|
||||
tbefore = shell_start_time;
|
||||
#endif
|
||||
diff -ruwN bash-5.2.15/general.c source/general.c
|
||||
--- bash-5.2.15/general.c 2022-11-23 14:10:12.000000000 -0800
|
||||
+++ source/general.c 2024-12-05 16:04:07.574380975 -0800
|
||||
diff -ruwN source/general.c source-new/general.c
|
||||
--- source/general.c 2022-11-24 05:10:12.000000000 +0700
|
||||
+++ source-new/general.c 2025-09-19 17:09:24.754782168 +0700
|
||||
@@ -589,6 +589,7 @@
|
||||
void
|
||||
check_dev_tty ()
|
||||
@ -119,22 +90,9 @@ diff -ruwN bash-5.2.15/general.c source/general.c
|
||||
}
|
||||
|
||||
/* Return 1 if PATH1 and PATH2 are the same file. This is kind of
|
||||
@@ -1031,10 +1033,10 @@
|
||||
`:'. If I is 0, then the path has a leading colon. Trailing colons
|
||||
are handled OK by the `else' part of the if statement; an empty
|
||||
string is returned in that case. */
|
||||
- if (i && string[i] == ':')
|
||||
+ if (i && string[i] == ';')
|
||||
i++;
|
||||
|
||||
- for (start = i; string[i] && string[i] != ':'; i++)
|
||||
+ for (start = i; string[i] && string[i] != ';'; i++)
|
||||
;
|
||||
|
||||
*p_index = i;
|
||||
diff -ruwN bash-5.2.15/include/posixwait.h source/include/posixwait.h
|
||||
--- bash-5.2.15/include/posixwait.h 2019-03-29 10:25:52.000000000 -0700
|
||||
+++ source/include/posixwait.h 2024-12-05 16:04:07.574380975 -0800
|
||||
diff -ruwN source/include/posixwait.h source-new/include/posixwait.h
|
||||
--- source/include/posixwait.h 2019-03-30 00:25:52.000000000 +0700
|
||||
+++ source-new/include/posixwait.h 2025-09-01 04:36:35.276926707 +0700
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
/* How to get the status of a job. For Posix, this is just an
|
||||
@ -153,9 +111,9 @@ diff -ruwN bash-5.2.15/include/posixwait.h source/include/posixwait.h
|
||||
|
||||
# if !defined (WSTOPSIG)
|
||||
# define WSTOPSIG(s) ((s) >> 8)
|
||||
diff -ruwN bash-5.2.15/lib/readline/input.c source/lib/readline/input.c
|
||||
--- bash-5.2.15/lib/readline/input.c 2022-04-08 12:43:24.000000000 -0700
|
||||
+++ source/lib/readline/input.c 2024-12-05 16:04:07.575380974 -0800
|
||||
diff -ruwN source/lib/readline/input.c source-new/lib/readline/input.c
|
||||
--- source/lib/readline/input.c 2022-04-09 02:43:24.000000000 +0700
|
||||
+++ source-new/lib/readline/input.c 2025-09-01 04:36:35.276926707 +0700
|
||||
@@ -805,7 +805,7 @@
|
||||
int result;
|
||||
unsigned char c;
|
||||
@ -165,9 +123,9 @@ diff -ruwN bash-5.2.15/lib/readline/input.c source/lib/readline/input.c
|
||||
sigset_t empty_set;
|
||||
fd_set readfds;
|
||||
#endif
|
||||
diff -ruwN bash-5.2.15/lib/readline/terminal.c source/lib/readline/terminal.c
|
||||
--- bash-5.2.15/lib/readline/terminal.c 2022-04-05 07:44:17.000000000 -0700
|
||||
+++ source/lib/readline/terminal.c 2024-12-05 16:04:07.575380974 -0800
|
||||
diff -ruwN source/lib/readline/terminal.c source-new/lib/readline/terminal.c
|
||||
--- source/lib/readline/terminal.c 2022-04-05 21:44:17.000000000 +0700
|
||||
+++ source-new/lib/readline/terminal.c 2025-09-01 04:36:35.286927174 +0700
|
||||
@@ -102,7 +102,7 @@
|
||||
|
||||
static int tcap_initialized;
|
||||
@ -177,9 +135,9 @@ diff -ruwN bash-5.2.15/lib/readline/terminal.c source/lib/readline/terminal.c
|
||||
# if defined (__EMX__) || defined (NEED_EXTERN_PC)
|
||||
extern
|
||||
# endif /* __EMX__ || NEED_EXTERN_PC */
|
||||
diff -ruwN bash-5.2.15/lib/sh/getcwd.c source/lib/sh/getcwd.c
|
||||
--- bash-5.2.15/lib/sh/getcwd.c 2012-03-10 07:48:50.000000000 -0800
|
||||
+++ source/lib/sh/getcwd.c 2024-12-05 16:04:07.575380974 -0800
|
||||
diff -ruwN source/lib/sh/getcwd.c source-new/lib/sh/getcwd.c
|
||||
--- source/lib/sh/getcwd.c 2012-03-10 22:48:50.000000000 +0700
|
||||
+++ source-new/lib/sh/getcwd.c 2025-09-01 04:36:35.286927174 +0700
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include <config.h>
|
||||
@ -189,9 +147,9 @@ diff -ruwN bash-5.2.15/lib/sh/getcwd.c source/lib/sh/getcwd.c
|
||||
|
||||
#if !defined (__GNUC__) && !defined (HAVE_ALLOCA_H) && defined (_AIX)
|
||||
#pragma alloca
|
||||
diff -ruwN bash-5.2.15/lib/sh/input_avail.c source/lib/sh/input_avail.c
|
||||
--- bash-5.2.15/lib/sh/input_avail.c 2021-05-24 08:16:33.000000000 -0700
|
||||
+++ source/lib/sh/input_avail.c 2024-12-05 16:04:07.576380974 -0800
|
||||
diff -ruwN source/lib/sh/input_avail.c source-new/lib/sh/input_avail.c
|
||||
--- source/lib/sh/input_avail.c 2021-05-24 22:16:33.000000000 +0700
|
||||
+++ source-new/lib/sh/input_avail.c 2025-09-01 04:36:35.298927735 +0700
|
||||
@@ -33,7 +33,7 @@
|
||||
# include <sys/file.h>
|
||||
#endif /* HAVE_SYS_FILE_H */
|
||||
@ -201,9 +159,9 @@ diff -ruwN bash-5.2.15/lib/sh/input_avail.c source/lib/sh/input_avail.c
|
||||
# include <signal.h>
|
||||
#endif
|
||||
|
||||
diff -ruwN bash-5.2.15/lib/sh/strtoimax.c source/lib/sh/strtoimax.c
|
||||
--- bash-5.2.15/lib/sh/strtoimax.c 2021-09-10 07:32:35.000000000 -0700
|
||||
+++ source/lib/sh/strtoimax.c 2024-12-05 16:04:07.576380974 -0800
|
||||
diff -ruwN source/lib/sh/strtoimax.c source-new/lib/sh/strtoimax.c
|
||||
--- source/lib/sh/strtoimax.c 2021-09-10 21:32:35.000000000 +0700
|
||||
+++ source-new/lib/sh/strtoimax.c 2025-09-01 04:36:35.301927876 +0700
|
||||
@@ -55,6 +55,8 @@
|
||||
extern long long strtoll PARAMS((const char *, char **, int));
|
||||
#endif
|
||||
@ -222,9 +180,9 @@ diff -ruwN bash-5.2.15/lib/sh/strtoimax.c source/lib/sh/strtoimax.c
|
||||
#ifdef TESTING
|
||||
# include <stdio.h>
|
||||
int
|
||||
diff -ruwN bash-5.2.15/parse.y source/parse.y
|
||||
--- bash-5.2.15/parse.y 2022-12-13 09:09:02.000000000 -0800
|
||||
+++ source/parse.y 2024-12-05 16:04:07.577380973 -0800
|
||||
diff -ruwN source/parse.y source-new/parse.y
|
||||
--- source/parse.y 2022-12-14 00:09:02.000000000 +0700
|
||||
+++ source-new/parse.y 2025-09-01 04:36:35.302927923 +0700
|
||||
@@ -2625,6 +2625,7 @@
|
||||
parser_state |= PST_ENDALIAS;
|
||||
/* We need to do this to make sure last_shell_getc_is_singlebyte returns
|
||||
@ -241,9 +199,9 @@ diff -ruwN bash-5.2.15/parse.y source/parse.y
|
||||
return ' '; /* END_ALIAS */
|
||||
}
|
||||
#endif
|
||||
diff -ruwN bash-5.2.15/y.tab.c source/y.tab.c
|
||||
--- bash-5.2.15/y.tab.c 2022-12-13 09:09:02.000000000 -0800
|
||||
+++ source/y.tab.c 2024-12-05 16:04:07.579380972 -0800
|
||||
diff -ruwN source/y.tab.c source-new/y.tab.c
|
||||
--- source/y.tab.c 2022-12-14 00:09:02.000000000 +0700
|
||||
+++ source-new/y.tab.c 2025-09-01 04:36:35.307928157 +0700
|
||||
@@ -4936,6 +4936,7 @@
|
||||
parser_state |= PST_ENDALIAS;
|
||||
/* We need to do this to make sure last_shell_getc_is_singlebyte returns
|
||||
|
||||
Loading…
Reference in New Issue
Block a user