Contents of /trunk/lynx/patches/lynx-2.8.5rel.5.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 5467 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 5467 byte(s)
-import
1 | # ------------------------------------------------------------------------------ |
2 | # CHANGES | 7 +++++++ |
3 | # configure | 2 +- |
4 | # configure.in | 4 ++-- |
5 | # lynx.cfg | 4 ++-- |
6 | # src/LYCgi.c | 40 ++++++++++++++++++++++++++++++++++++---- |
7 | # userdefs.h | 4 ++-- |
8 | # 6 files changed, 50 insertions(+), 11 deletions(-) |
9 | # ------------------------------------------------------------------------------ |
10 | Index: CHANGES |
11 | --- 2.8.5rel.4/CHANGES Tue Oct 25 17:40:26 2005 |
12 | +++ 2.8.5rel.5/CHANGES Sat Oct 29 12:36:56 2005 |
13 | @@ -1,6 +1,13 @@ |
14 | Changes since Lynx 2.8 release |
15 | =============================================================================== |
16 | |
17 | +2005-10-29 (2.8.5rel.5 fixes from 2.8.6dev.15) |
18 | +* modify LYLoadCGI() to prompt user, displaying the command that would be |
19 | + executed, to confirm that it should be. This makes it easier to notice when |
20 | + a local program would be run by activating a lynxcgi link. This is not done |
21 | + in advanced mode, since the URL is already visible in the status line (report |
22 | + by vade79, comments by Greg MacManus) -TD |
23 | + |
24 | 2005-10-25 (2.8.5rel.4 fixes from 2.8.6dev.14) |
25 | * fix error in rel.3 patch (report by Klaus Singvogel) |
26 | |
27 | Index: configure |
28 | --- 2.8.5rel.4/configure Wed Feb 4 04:07:09 2004 |
29 | +++ 2.8.5rel.5/configure Wed Feb 4 04:07:09 2004 |
30 | @@ -723,7 +723,7 @@ |
31 | |
32 | PACKAGE=lynx |
33 | # $Format: "VERSION=$ProjectVersion$"$ |
34 | -VERSION=2.8.5rel.4 |
35 | +VERSION=2.8.5rel.5 |
36 | |
37 | |
38 | |
39 | Index: configure.in |
40 | --- 2.8.5rel.4/configure.in Wed Feb 4 04:07:09 2004 |
41 | +++ 2.8.5rel.5/configure.in Wed Feb 4 04:07:09 2004 |
42 | @@ -5,7 +5,7 @@ |
43 | dnl |
44 | dnl ask PRCS to plug-in the project-version for the configure-script. |
45 | dnl $Format: "AC_REVISION($ProjectVersion$)"$ |
46 | -AC_REVISION(2.8.5rel.4) |
47 | +AC_REVISION(2.8.5rel.5) |
48 | |
49 | # Save the original $CFLAGS so we can distinguish whether the user set those |
50 | # in the environment, or whether autoconf added -O and -g options: |
51 | @@ -33,7 +33,7 @@ |
52 | PACKAGE=lynx |
53 | dnl ask PRCS to plug-in the project-version for the packages. |
54 | # $Format: "VERSION=$ProjectVersion$"$ |
55 | -VERSION=2.8.5rel.4 |
56 | +VERSION=2.8.5rel.5 |
57 | AC_SUBST(PACKAGE) |
58 | AC_SUBST(VERSION) |
59 | AC_SUBST(DESTDIR) |
60 | Index: lynx.cfg |
61 | --- 2.8.5rel.4/lynx.cfg Wed Jan 28 11:30:38 2004 |
62 | +++ 2.8.5rel.5/lynx.cfg Wed Jan 28 11:30:38 2004 |
63 | @@ -3,10 +3,10 @@ |
64 | # or Lynx_Dir:lynx.cfg (VMS) |
65 | # |
66 | # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$ |
67 | -#PRCS LYNX_VERSION "2.8.5rel.4" |
68 | +#PRCS LYNX_VERSION "2.8.5rel.5" |
69 | # |
70 | # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$ |
71 | -#PRCS LYNX_DATE "Tue, 25 Oct 2005 17:40:26 -0700" |
72 | +#PRCS LYNX_DATE "Sat, 29 Oct 2005 12:33:45 -0700" |
73 | # |
74 | # Definition pairs are of the form VARIABLE:DEFINITION |
75 | # NO spaces are allowed between the pair items. |
76 | Index: src/LYCgi.c |
77 | --- 2.8.5rel.4/src/LYCgi.c Mon Feb 2 12:02:28 2004 |
78 | +++ 2.8.5rel.5/src/LYCgi.c Sat Oct 29 12:33:45 2005 |
79 | @@ -150,6 +150,40 @@ |
80 | return -1; |
81 | } |
82 | #else |
83 | +#ifdef LYNXCGI_LINKS |
84 | +/* |
85 | + * Wrapper for exec_ok(), confirming with user if the link text is not visible |
86 | + * in the status line. |
87 | + */ |
88 | +PRIVATE BOOL can_exec_cgi ARGS2(const char *, linktext, const char *, linkargs) |
89 | +{ |
90 | + const char *format = gettext("Do you want to execute \"%s\"?"); |
91 | + char *message = NULL; |
92 | + char *command = NULL; |
93 | + char *p; |
94 | + BOOL result = TRUE; |
95 | + |
96 | + if (!exec_ok(HTLoadedDocumentURL(), linktext, CGI_PATH)) { |
97 | + /* exec_ok gives out msg. */ |
98 | + result = FALSE; |
99 | + } else if (user_mode < ADVANCED_MODE) { |
100 | + StrAllocCopy(command, linktext); |
101 | + if (non_empty(linkargs)) { |
102 | + HTSprintf(&command, " %s", linkargs); |
103 | + } |
104 | + HTUnEscape(command); |
105 | + for (p = command; *p; ++p) |
106 | + if (*p == '+') |
107 | + *p = ' '; |
108 | + HTSprintf0(&message, format, command); |
109 | + result = HTConfirm(message); |
110 | + FREE(message); |
111 | + FREE(command); |
112 | + } |
113 | + return result; |
114 | +} |
115 | +#endif /* LYNXCGI_LINKS */ |
116 | + |
117 | PRIVATE int LYLoadCGI ARGS4( |
118 | CONST char *, arg, |
119 | HTParentAnchor *, anAnchor, |
120 | @@ -281,8 +315,7 @@ |
121 | strcmp(arg, HTLoadedDocumentURL()) && |
122 | HText_AreDifferent(anAnchor, arg) && |
123 | HTUnEscape(orig_pgm) && |
124 | - !exec_ok(HTLoadedDocumentURL(), orig_pgm, |
125 | - CGI_PATH)) { /* exec_ok gives out msg. */ |
126 | + !can_exec_cgi(orig_pgm, "")) { |
127 | /* |
128 | * If we have extra path info and are not just reloading |
129 | * the current, check the full file path (after unescaping) |
130 | @@ -313,8 +346,7 @@ |
131 | !(reloading && anAnchor->document) && |
132 | strcmp(arg, HTLoadedDocumentURL()) && |
133 | HText_AreDifferent(anAnchor, arg) && |
134 | - !exec_ok(HTLoadedDocumentURL(), pgm, |
135 | - CGI_PATH)) { /* exec_ok gives out msg. */ |
136 | + !can_exec_cgi(pgm, pgm_args)) { |
137 | /* |
138 | * If we are reloading a lynxcgi document that had already been |
139 | * loaded, the various checks above should allow it even if |
140 | Index: userdefs.h |
141 | --- 2.8.5rel.4/userdefs.h Mon Feb 2 12:02:28 2004 |
142 | +++ 2.8.5rel.5/userdefs.h Mon Feb 2 12:02:28 2004 |
143 | @@ -1360,11 +1360,11 @@ |
144 | * the version definition with the Project Version on checkout. Just |
145 | * ignore it. - kw */ |
146 | /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ |
147 | -#define LYNX_VERSION "2.8.5rel.4" |
148 | +#define LYNX_VERSION "2.8.5rel.5" |
149 | #define LYNX_WWW_HOME "http://lynx.isc.org/" |
150 | #define LYNX_WWW_DIST "http://lynx.isc.org/current/" |
151 | /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ |
152 | -#define LYNX_DATE "Tue, 25 Oct 2005 17:40:26 -0700" |
153 | +#define LYNX_DATE "Sat, 29 Oct 2005 12:33:45 -0700" |
154 | #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ |
155 | #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ |
156 |