]>
Commit | Line | Data |
---|---|---|
fb8ce753 AM |
1 | BASH PATCH REPORT |
2 | ================= | |
3 | ||
4 | Bash-Release: 4.0 | |
5 | Patch-ID: bash40-018 | |
6 | ||
7 | Bug-Reported-by: Dan Price <dp@eng.sun.com> | |
8 | Bug-Reference-ID: <20090324171502.GA20582@eng.sun.com> | |
9 | Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00184.html | |
10 | ||
11 | Bug-Description: | |
12 | ||
13 | A missing include file results in an empty function definition and a no-op | |
14 | when checking whether or not the window size has changed. | |
15 | ||
16 | Patch: | |
17 | ||
18 | *** ../bash-4.0-patched/lib/sh/winsize.c 2008-08-12 13:53:51.000000000 -0400 | |
19 | --- lib/sh/winsize.c 2009-04-06 10:44:20.000000000 -0400 | |
20 | *************** | |
21 | *** 31,44 **** | |
22 | #include <sys/ioctl.h> | |
23 | ||
24 | ! #if !defined (STRUCT_WINSIZE_IN_SYS_IOCTL) | |
25 | ! /* For struct winsize on SCO */ | |
26 | ! /* sys/ptem.h has winsize but needs mblk_t from sys/stream.h */ | |
27 | ! # if defined (HAVE_SYS_PTEM_H) && defined (TIOCGWINSZ) && defined (SIGWINCH) | |
28 | ! # if defined (HAVE_SYS_STREAM_H) | |
29 | ! # include <sys/stream.h> | |
30 | ! # endif | |
31 | # include <sys/ptem.h> | |
32 | ! # endif /* HAVE_SYS_PTEM_H && TIOCGWINSZ && SIGWINCH */ | |
33 | ! #endif /* !STRUCT_WINSIZE_IN_SYS_IOCTL */ | |
34 | ||
35 | #include <stdio.h> | |
36 | --- 31,57 ---- | |
37 | #include <sys/ioctl.h> | |
38 | ||
39 | ! /* Try to find the definitions of `struct winsize' and TIOGCWINSZ */ | |
40 | ! | |
41 | ! #if defined (GWINSZ_IN_SYS_IOCTL) && !defined (TIOCGWINSZ) | |
42 | ! # include <sys/ioctl.h> | |
43 | ! #endif /* GWINSZ_IN_SYS_IOCTL && !TIOCGWINSZ */ | |
44 | ! | |
45 | ! #if defined (STRUCT_WINSIZE_IN_TERMIOS) && !defined (STRUCT_WINSIZE_IN_SYS_IOCTL) | |
46 | ! # include <termios.h> | |
47 | ! #endif /* STRUCT_WINSIZE_IN_TERMIOS && !STRUCT_WINSIZE_IN_SYS_IOCTL */ | |
48 | ! | |
49 | ! /* Not in either of the standard places, look around. */ | |
50 | ! #if !defined (STRUCT_WINSIZE_IN_TERMIOS) && !defined (STRUCT_WINSIZE_IN_SYS_IOCTL) | |
51 | ! # if defined (HAVE_SYS_STREAM_H) | |
52 | ! # include <sys/stream.h> | |
53 | ! # endif /* HAVE_SYS_STREAM_H */ | |
54 | ! # if defined (HAVE_SYS_PTEM_H) /* SVR4.2, at least, has it here */ | |
55 | # include <sys/ptem.h> | |
56 | ! # define _IO_PTEM_H /* work around SVR4.2 1.1.4 bug */ | |
57 | ! # endif /* HAVE_SYS_PTEM_H */ | |
58 | ! # if defined (HAVE_SYS_PTE_H) /* ??? */ | |
59 | ! # include <sys/pte.h> | |
60 | ! # endif /* HAVE_SYS_PTE_H */ | |
61 | ! #endif /* !STRUCT_WINSIZE_IN_TERMIOS && !STRUCT_WINSIZE_IN_SYS_IOCTL */ | |
62 | ||
63 | #include <stdio.h> | |
64 | *** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 | |
65 | --- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 | |
66 | *************** | |
67 | *** 26,30 **** | |
68 | looks for to find the patch level (for the sccs version string). */ | |
69 | ||
70 | ! #define PATCHLEVEL 17 | |
71 | ||
72 | #endif /* _PATCHLEVEL_H_ */ | |
73 | --- 26,30 ---- | |
74 | looks for to find the patch level (for the sccs version string). */ | |
75 | ||
76 | ! #define PATCHLEVEL 18 | |
77 | ||
78 | #endif /* _PATCHLEVEL_H_ */ |