Accepting request 289332 from home:jdelvare:branches:Base:System
Clean up bash-4.3-loadables.dif OBS-URL: https://build.opensuse.org/request/show/289332 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=200
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
9c902feeb8
commit
e93ddf4937
16
bash-4.3-include-unistd.dif
Normal file
16
bash-4.3-include-unistd.dif
Normal file
@ -0,0 +1,16 @@
|
||||
This change was originally part of patch bash-4.3-loadables.dif.
|
||||
However the loadables build just fine with this change, so it may
|
||||
still be needed but does not belong to that patch.
|
||||
|
||||
--- shell.h.orig
|
||||
+++ shell.h
|
||||
@@ -22,6 +22,9 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
+#include <sys/types.h>
|
||||
+#include <unistd.h>
|
||||
+
|
||||
#include "bashjmp.h"
|
||||
|
||||
#include "command.h"
|
||||
@ -1,63 +1,26 @@
|
||||
--- examples/loadables/basename.c
|
||||
+++ examples/loadables/basename.c 2006-09-25 11:49:31.000000000 +0000
|
||||
@@ -27,10 +27,13 @@
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
-#include "builtins.h"
|
||||
+++ examples/loadables/basename.c
|
||||
@@ -31,6 +31,7 @@
|
||||
#include "shell.h"
|
||||
#include "common.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
|
||||
+int
|
||||
basename_builtin (list)
|
||||
WORD_LIST *list;
|
||||
{
|
||||
--- examples/loadables/cat.c
|
||||
+++ examples/loadables/cat.c 2006-09-25 11:37:46.000000000 +0000
|
||||
@@ -25,8 +25,10 @@
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
|
||||
#ifndef errno
|
||||
extern int errno;
|
||||
--- examples/loadables/dirname.c
|
||||
+++ examples/loadables/dirname.c 2006-09-25 11:49:38.000000000 +0000
|
||||
@@ -27,10 +27,13 @@
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
-#include "builtins.h"
|
||||
+++ examples/loadables/dirname.c
|
||||
@@ -31,6 +31,7 @@
|
||||
#include "shell.h"
|
||||
#include "common.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
|
||||
+int
|
||||
dirname_builtin (list)
|
||||
WORD_LIST *list;
|
||||
{
|
||||
--- examples/loadables/finfo.c
|
||||
+++ examples/loadables/finfo.c 2006-09-25 11:48:52.000000000 +0000
|
||||
@@ -38,6 +38,8 @@
|
||||
#include "bashansi.h"
|
||||
#include "shell.h"
|
||||
#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "common.h"
|
||||
|
||||
#ifndef errno
|
||||
@@ -99,7 +101,7 @@ int argc;
|
||||
+++ examples/loadables/finfo.c
|
||||
@@ -99,7 +99,7 @@ int argc;
|
||||
char **argv;
|
||||
{
|
||||
register int i;
|
||||
@ -66,7 +29,7 @@
|
||||
|
||||
sh_optind = 0; /* XXX */
|
||||
prog = base_pathname(argv[0]);
|
||||
@@ -192,7 +194,7 @@ int m;
|
||||
@@ -192,7 +192,7 @@ int m;
|
||||
return (m & (S_IRWXU|S_IRWXG|S_IRWXO|S_ISUID|S_ISGID));
|
||||
}
|
||||
|
||||
@ -75,7 +38,7 @@
|
||||
perms(m)
|
||||
int m;
|
||||
{
|
||||
@@ -236,7 +238,7 @@ int m;
|
||||
@@ -236,7 +236,7 @@ int m;
|
||||
printf ("u=%s,g=%s,o=%s", ubits, gbits, obits);
|
||||
}
|
||||
|
||||
@ -84,7 +47,7 @@
|
||||
printmode(mode)
|
||||
int mode;
|
||||
{
|
||||
@@ -331,13 +333,13 @@ int flags;
|
||||
@@ -331,13 +331,13 @@ int flags;
|
||||
else
|
||||
printf("%ld\n", st->st_ctime);
|
||||
} else if (flags & OPT_DEV)
|
||||
@ -102,7 +65,7 @@
|
||||
else if (flags & OPT_LNKNAM) {
|
||||
#ifdef S_ISLNK
|
||||
b = xmalloc(4096);
|
||||
@@ -387,7 +389,6 @@ finfo_builtin(list)
|
||||
@@ -387,7 +387,6 @@ finfo_builtin(list)
|
||||
{
|
||||
int c, r;
|
||||
char **v;
|
||||
@ -111,17 +74,8 @@
|
||||
v = make_builtin_argv (list, &c);
|
||||
r = finfo_main (c, v);
|
||||
--- examples/loadables/head.c
|
||||
+++ examples/loadables/head.c 2006-09-25 11:55:24.000000000 +0000
|
||||
@@ -38,6 +38,8 @@
|
||||
|
||||
#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "bashgetopt.h"
|
||||
#include "common.h"
|
||||
|
||||
@@ -88,8 +90,10 @@ file_head (fp, cnt)
|
||||
+++ examples/loadables/head.c
|
||||
@@ -88,8 +88,10 @@ file_head (fp, cnt)
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -132,7 +86,7 @@
|
||||
head_builtin (list)
|
||||
WORD_LIST *list;
|
||||
{
|
||||
@@ -97,8 +101,6 @@ head_builtin (list)
|
||||
@@ -97,8 +99,6 @@ head_builtin (list)
|
||||
WORD_LIST *l;
|
||||
FILE *fp;
|
||||
|
||||
@ -141,32 +95,9 @@
|
||||
munge_list (list); /* change -num into -n num */
|
||||
|
||||
reset_internal_getopt ();
|
||||
--- examples/loadables/hello.c
|
||||
+++ examples/loadables/hello.c 2006-09-25 11:38:25.000000000 +0000
|
||||
@@ -29,8 +29,10 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "bashgetopt.h"
|
||||
|
||||
/* A builtin `xxx' is normally implemented with an `xxx_builtin' function.
|
||||
--- examples/loadables/id.c
|
||||
+++ examples/loadables/id.c 2006-09-25 11:57:41.000000000 +0000
|
||||
@@ -47,6 +47,8 @@ extern struct group *getgrgid ();
|
||||
|
||||
#include "shell.h"
|
||||
#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "stdc.h"
|
||||
#include "common.h"
|
||||
#include "bashgetopt.h"
|
||||
@@ -64,8 +66,6 @@ static int id_flags;
|
||||
+++ examples/loadables/id.c
|
||||
@@ -64,8 +64,6 @@ static int id_flags;
|
||||
static uid_t ruid, euid;
|
||||
static gid_t rgid, egid;
|
||||
|
||||
@ -176,20 +107,8 @@
|
||||
|
||||
static int id_pruser ();
|
||||
--- examples/loadables/ln.c
|
||||
+++ examples/loadables/ln.c 2006-09-25 11:59:09.000000000 +0000
|
||||
@@ -33,8 +33,10 @@
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "bashgetopt.h"
|
||||
#include "common.h"
|
||||
|
||||
@@ -50,6 +52,7 @@ typedef int unix_link_syscall_t __P((con
|
||||
+++ examples/loadables/ln.c
|
||||
@@ -50,6 +50,7 @@ typedef int unix_link_syscall_t __P((con
|
||||
static unix_link_syscall_t *linkfn;
|
||||
static int dolink ();
|
||||
|
||||
@ -198,34 +117,18 @@
|
||||
WORD_LIST *list;
|
||||
{
|
||||
--- examples/loadables/logname.c
|
||||
+++ examples/loadables/logname.c 2006-09-25 11:30:40.000000000 +0000
|
||||
@@ -27,8 +27,10 @@
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/common.h"
|
||||
+#include "builtins/builtext.h"
|
||||
#include "common.h"
|
||||
|
||||
#if !defined (errno)
|
||||
--- examples/loadables/mkdir.c
|
||||
+++ examples/loadables/mkdir.c 2006-09-25 11:56:07.000000000 +0000
|
||||
@@ -31,8 +31,10 @@
|
||||
# include <unistd.h>
|
||||
+++ examples/loadables/logname.c
|
||||
@@ -35,6 +35,7 @@
|
||||
extern int errno;
|
||||
#endif
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "bashgetopt.h"
|
||||
#include "common.h"
|
||||
|
||||
@@ -52,7 +54,7 @@ int
|
||||
+int
|
||||
logname_builtin (list)
|
||||
WORD_LIST *list;
|
||||
{
|
||||
--- examples/loadables/mkdir.c
|
||||
+++ examples/loadables/mkdir.c
|
||||
@@ -52,7 +52,7 @@ int
|
||||
mkdir_builtin (list)
|
||||
WORD_LIST *list;
|
||||
{
|
||||
@ -234,7 +137,7 @@
|
||||
char *mode;
|
||||
WORD_LIST *l;
|
||||
|
||||
@@ -169,7 +171,7 @@ make_path (path, nmode, parent_mode)
|
||||
@@ -169,7 +169,7 @@ make_path (path, nmode, parent_mode)
|
||||
while (*p == '/')
|
||||
p++;
|
||||
|
||||
@ -243,40 +146,9 @@
|
||||
{
|
||||
*p = '\0';
|
||||
if (stat (npath, &sb) != 0)
|
||||
--- examples/loadables/necho.c
|
||||
+++ examples/loadables/necho.c 2006-09-25 11:39:26.000000000 +0000
|
||||
@@ -21,9 +21,15 @@
|
||||
along with Bash. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+# include <config.h>
|
||||
+#endif
|
||||
+
|
||||
#include <stdio.h>
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
|
||||
necho_builtin (list)
|
||||
WORD_LIST *list;
|
||||
--- examples/loadables/pathchk.c
|
||||
+++ examples/loadables/pathchk.c 2006-09-25 11:53:13.000000000 +0000
|
||||
@@ -58,8 +58,10 @@
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "stdc.h"
|
||||
#include "bashgetopt.h"
|
||||
#include "maxpath.h"
|
||||
@@ -98,6 +100,7 @@ extern char *strerror ();
|
||||
+++ examples/loadables/pathchk.c
|
||||
@@ -98,6 +98,7 @@ extern char *strerror ();
|
||||
|
||||
static int validate_path ();
|
||||
|
||||
@ -284,16 +156,7 @@
|
||||
pathchk_builtin (list)
|
||||
WORD_LIST *list;
|
||||
{
|
||||
@@ -278,7 +281,7 @@ validate_path (path, portability)
|
||||
char *path;
|
||||
int portability;
|
||||
{
|
||||
- int path_max;
|
||||
+ size_t path_max;
|
||||
int last_elem; /* Nonzero if checking last element of path. */
|
||||
int exists; /* 2 if the path element exists. */
|
||||
char *slash;
|
||||
@@ -290,10 +293,8 @@ validate_path (path, portability)
|
||||
@@ -290,10 +291,8 @@ validate_path (path, portability)
|
||||
if (*path == '\0')
|
||||
return 0;
|
||||
|
||||
@ -304,27 +167,18 @@
|
||||
|
||||
/* Figure out the parent of the first element in PATH. */
|
||||
parent = xstrdup (*path == '/' ? "/" : ".");
|
||||
@@ -370,7 +371,7 @@ validate_path (path, portability)
|
||||
@@ -370,7 +369,7 @@ validate_path (path, portability)
|
||||
free (parent);
|
||||
if (strlen (path) > path_max)
|
||||
{
|
||||
- builtin_error ("path `%s' has length %d; exceeds limit of %d",
|
||||
+ builtin_error ("path `%s' has length %zu; exceeds limit of %zu",
|
||||
+ builtin_error ("path `%s' has length %zu; exceeds limit of %d",
|
||||
path, strlen (path), path_max);
|
||||
return 1;
|
||||
}
|
||||
--- examples/loadables/print.c
|
||||
+++ examples/loadables/print.c 2006-09-25 11:23:46.000000000 +0000
|
||||
@@ -33,6 +33,8 @@
|
||||
#include "bashansi.h"
|
||||
#include "shell.h"
|
||||
#include "builtins.h"
|
||||
+#include "builtins/common.h"
|
||||
+#include "builtins/builtext.h"
|
||||
#include "stdc.h"
|
||||
#include "bashgetopt.h"
|
||||
#include "builtext.h"
|
||||
@@ -77,7 +79,7 @@ print_builtin (list)
|
||||
+++ examples/loadables/print.c
|
||||
@@ -77,7 +77,7 @@ print_builtin (list)
|
||||
{
|
||||
int c, r, nflag, raw, ofd, sflag;
|
||||
intmax_t lfd;
|
||||
@ -333,49 +187,9 @@
|
||||
WORD_LIST *l;
|
||||
|
||||
nflag = raw = sflag = 0;
|
||||
--- examples/loadables/printenv.c
|
||||
+++ examples/loadables/printenv.c 2006-09-25 11:39:47.000000000 +0000
|
||||
@@ -26,8 +26,10 @@
|
||||
#include <config.h>
|
||||
#include <stdio.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "bashgetopt.h"
|
||||
#include "common.h"
|
||||
|
||||
--- examples/loadables/push.c
|
||||
+++ examples/loadables/push.c 2006-09-25 11:39:53.000000000 +0000
|
||||
@@ -25,8 +25,10 @@
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "jobs.h"
|
||||
#include "bashgetopt.h"
|
||||
#include "common.h"
|
||||
--- examples/loadables/realpath.c
|
||||
+++ examples/loadables/realpath.c 2006-09-25 12:03:01.000000000 +0000
|
||||
@@ -49,8 +49,10 @@
|
||||
#include <maxpath.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "bashgetopt.h"
|
||||
#include "common.h"
|
||||
|
||||
@@ -60,6 +62,7 @@ extern int errno;
|
||||
+++ examples/loadables/realpath.c
|
||||
@@ -60,6 +60,7 @@ extern int errno;
|
||||
|
||||
extern char *sh_realpath();
|
||||
|
||||
@ -384,19 +198,8 @@
|
||||
WORD_LIST *list;
|
||||
{
|
||||
--- examples/loadables/rmdir.c
|
||||
+++ examples/loadables/rmdir.c 2006-09-25 11:56:28.000000000 +0000
|
||||
@@ -24,14 +24,17 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "common.h"
|
||||
|
||||
#if !defined (errno)
|
||||
+++ examples/loadables/rmdir.c
|
||||
@@ -32,6 +32,7 @@
|
||||
extern int errno;
|
||||
#endif
|
||||
|
||||
@ -404,42 +207,10 @@
|
||||
rmdir_builtin (list)
|
||||
WORD_LIST *list;
|
||||
{
|
||||
--- examples/loadables/sleep.c
|
||||
+++ examples/loadables/sleep.c 2006-09-25 11:24:54.000000000 +0000
|
||||
@@ -46,6 +46,8 @@
|
||||
|
||||
#include "shell.h"
|
||||
#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "common.h"
|
||||
|
||||
#define RETURN(x) \
|
||||
--- examples/loadables/strftime.c
|
||||
+++ examples/loadables/strftime.c 2006-09-25 11:40:17.000000000 +0000
|
||||
@@ -31,8 +31,10 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "common.h"
|
||||
|
||||
int
|
||||
--- examples/loadables/sync.c
|
||||
+++ examples/loadables/sync.c 2006-09-25 11:58:50.000000000 +0000
|
||||
@@ -24,10 +24,13 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
-#include "builtins.h"
|
||||
+++ examples/loadables/sync.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "bashgetopt.h"
|
||||
|
||||
+int
|
||||
@ -447,20 +218,8 @@
|
||||
WORD_LIST *list;
|
||||
{
|
||||
--- examples/loadables/tee.c
|
||||
+++ examples/loadables/tee.c 2006-09-25 11:54:21.000000000 +0000
|
||||
@@ -38,8 +38,10 @@
|
||||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "bashgetopt.h"
|
||||
#include "common.h"
|
||||
|
||||
@@ -61,6 +63,7 @@ extern volatile sig_atomic_t interrupt_i
|
||||
+++ examples/loadables/tee.c
|
||||
@@ -60,6 +60,7 @@ extern int interrupt_immediately;
|
||||
|
||||
extern char *strerror ();
|
||||
|
||||
@ -468,7 +227,7 @@
|
||||
tee_builtin (list)
|
||||
WORD_LIST *list;
|
||||
{
|
||||
@@ -69,8 +72,6 @@ tee_builtin (list)
|
||||
@@ -68,8 +69,6 @@ tee_builtin (list)
|
||||
FLIST *fl;
|
||||
char *buf, *bp;
|
||||
|
||||
@ -477,35 +236,10 @@
|
||||
reset_internal_getopt ();
|
||||
append = nointr = 0;
|
||||
tee_flist = (FLIST *)NULL;
|
||||
--- examples/loadables/template.c
|
||||
+++ examples/loadables/template.c 2006-09-25 11:40:33.000000000 +0000
|
||||
@@ -11,8 +11,10 @@
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "bashgetopt.h"
|
||||
|
||||
#if !defined (errno)
|
||||
--- examples/loadables/truefalse.c
|
||||
+++ examples/loadables/truefalse.c 2006-09-25 11:40:42.000000000 +0000
|
||||
@@ -20,31 +20,37 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+# include <config.h>
|
||||
+#endif
|
||||
+
|
||||
#include "bashtypes.h"
|
||||
#include "shell.h"
|
||||
+++ examples/loadables/truefalse.c
|
||||
@@ -25,26 +25,26 @@
|
||||
#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "common.h"
|
||||
|
||||
-true_builtin (list)
|
||||
@ -536,18 +270,8 @@
|
||||
"",
|
||||
"Return an unsuccessful result.",
|
||||
--- examples/loadables/tty.c
|
||||
+++ examples/loadables/tty.c 2006-09-25 11:49:53.000000000 +0000
|
||||
@@ -23,13 +23,16 @@
|
||||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "bashgetopt.h"
|
||||
#include "common.h"
|
||||
+++ examples/loadables/tty.c
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
extern char *ttyname ();
|
||||
|
||||
@ -556,20 +280,8 @@
|
||||
WORD_LIST *list;
|
||||
{
|
||||
--- examples/loadables/uname.c
|
||||
+++ examples/loadables/uname.c 2006-09-25 11:58:18.000000000 +0000
|
||||
@@ -42,8 +42,10 @@ struct utsname {
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "bashgetopt.h"
|
||||
#include "common.h"
|
||||
|
||||
@@ -63,10 +65,11 @@ static void uprint();
|
||||
+++ examples/loadables/uname.c
|
||||
@@ -63,10 +63,11 @@ static void uprint();
|
||||
|
||||
static int uname_flags;
|
||||
|
||||
@ -583,19 +295,8 @@
|
||||
|
||||
uname_flags = 0;
|
||||
--- examples/loadables/unlink.c
|
||||
+++ examples/loadables/unlink.c 2006-09-25 11:59:37.000000000 +0000
|
||||
@@ -30,14 +30,17 @@
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
#include "common.h"
|
||||
|
||||
#ifndef errno
|
||||
+++ examples/loadables/unlink.c
|
||||
@@ -38,6 +38,7 @@
|
||||
extern int errno;
|
||||
#endif
|
||||
|
||||
@ -604,16 +305,8 @@
|
||||
WORD_LIST *list;
|
||||
{
|
||||
--- examples/loadables/whoami.c
|
||||
+++ examples/loadables/whoami.c 2006-09-25 11:57:54.000000000 +0000
|
||||
@@ -23,11 +23,14 @@
|
||||
#include <config.h>
|
||||
#include <stdio.h>
|
||||
|
||||
-#include "builtins.h"
|
||||
#include "shell.h"
|
||||
+#include "builtins.h"
|
||||
+#include "builtins/builtext.h"
|
||||
+#include "builtins/common.h"
|
||||
+++ examples/loadables/whoami.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "bashgetopt.h"
|
||||
#include "common.h"
|
||||
|
||||
@ -621,15 +314,3 @@
|
||||
whoami_builtin (list)
|
||||
WORD_LIST *list;
|
||||
{
|
||||
--- shell.h
|
||||
+++ shell.h 2009-08-26 11:13:08.000000000 +0000
|
||||
@@ -22,6 +22,9 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
+#include <sys/types.h>
|
||||
+#include <unistd.h>
|
||||
+
|
||||
#include "bashjmp.h"
|
||||
|
||||
#include "command.h"
|
||||
|
||||
17
bash.changes
17
bash.changes
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 4 22:52:17 CET 2015 - jdelvare@suse.de
|
||||
|
||||
- bash-4.3-loadables.dif: One more warning fixed, in
|
||||
examples/loadables/logname.c.
|
||||
- bash-4.3-loadables.dif: Reverted one warning fix, which was
|
||||
introducing another warning and possibly a bug.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 4 11:30:12 CET 2015 - jdelvare@suse.de
|
||||
|
||||
- bash-4.3-loadables.dif: Split changes to shell.h to a separate
|
||||
patch "bash-4.3-include-unistd.dif", as the loadables build just
|
||||
fine without these changes.
|
||||
- bash-4.3-loadables.dif: Drop all header file inclusion fixups,
|
||||
upstream fixed the problem differently 5 years ago.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 18 15:14:47 UTC 2015 - werner@suse.de
|
||||
|
||||
|
||||
@ -73,6 +73,7 @@ Patch5: bash-3.0-warn-locale.patch
|
||||
Patch6: bash-4.2-endpw.dif
|
||||
Patch7: bash-4.3-decl.patch
|
||||
Patch8: bash-4.0-async-bnc523667.dif
|
||||
Patch9: bash-4.3-include-unistd.dif
|
||||
Patch10: bash-3.2-printf.patch
|
||||
Patch11: bash-4.3-loadables.dif
|
||||
Patch12: bash-4.1-completion.dif
|
||||
@ -295,6 +296,7 @@ done
|
||||
#%patch6 -p0 -b .endpw
|
||||
%patch7 -p0 -b .decl
|
||||
%patch8 -p0 -b .async
|
||||
%patch9 -p0 -b .unistd
|
||||
%patch10 -p0 -b .printf
|
||||
%patch11 -p0 -b .plugins
|
||||
%patch12 -p0 -b .completion
|
||||
|
||||
Loading…
Reference in New Issue
Block a user