rpms/lynx
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fix 311031 - fix argument parsing

Browse Source
This commit is contained in:
Ivana Varekova 2007-10-02 11:58:06 +00:00
parent b649d1c0da
commit d256fa6a2c
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lynx-2.8.6-options.patch Normal file
View File

@ -0,0 +1,30 @@
--- lynx2-8-6/src/LYMain.c.pom 2006-09-19 02:28:28.000000000 +0200
+++ lynx2-8-6/src/LYMain.c 2007-10-02 13:42:07.000000000 +0200
@@ -4083,6 +4083,7 @@ static BOOL parse_arg(char **argv,
#if EXTENDED_STARTFILE_RECALL
static BOOLEAN no_options_further = FALSE; /* set to TRUE after '--' argument */
+ static int nof_index = 0; /* set the index of -- argument */
#endif
arg_name = argv[0];
@@ -4102,9 +4103,9 @@ static BOOL parse_arg(char **argv,
/*
* Check for a command line startfile. - FM
*/
- if (*arg_name != '-'
+ if (*arg_name != '-'
#if EXTENDED_OPTION_LOGIC
- || no_options_further == TRUE
+ || (no_options_further == TRUE && nof_index<(*countp))
#endif
) {
#if EXTENDED_STARTFILE_RECALL
@@ -4140,6 +4141,7 @@ static BOOL parse_arg(char **argv,
#if EXTENDED_OPTION_LOGIC
if (strcmp(arg_name, "--") == 0) {
no_options_further = TRUE;
+ nof_index = *countp;
return TRUE;
}
#endif

7
lynx.spec
View File

@ -1,13 +1,14 @@
Summary: A text-based Web browser Summary: A text-based Web browser
Name: lynx Name: lynx
Version: 2.8.6 Version: 2.8.6
Release: 5%{?dist} Release: 6%{?dist}
License: GPL License: GPL
Group: Applications/Internet Group: Applications/Internet
Source: http://lynx.isc.org/current/lynx%{version}.tar.bz2 Source: http://lynx.isc.org/current/lynx%{version}.tar.bz2
URL: http://lynx.isc.org/ URL: http://lynx.isc.org/
Patch0: lynx-2.8.6-redhat.patch Patch0: lynx-2.8.6-redhat.patch
Patch1: lynx-crash.patch Patch1: lynx-crash.patch
Patch2: lynx-2.8.6-options.patch
Requires: indexhtml Requires: indexhtml
Provides: webclient Provides: webclient
BuildRequires: openssl-devel, pkgconfig, ncurses-devel >= 5.3-5, BuildRequires: openssl-devel, pkgconfig, ncurses-devel >= 5.3-5,
@ -24,6 +25,7 @@ exits quickly and swiftly displays webpages.
%setup -q -n lynx2-8-6 %setup -q -n lynx2-8-6
%patch0 -p1 -b .redhat %patch0 -p1 -b .redhat
%patch1 -p1 -b .crash %patch1 -p1 -b .crash
%patch2 -p1 -b .opt
perl -pi -e "s,^HELPFILE:.*,HELPFILE:file://localhost/usr/share/doc/lynx-%{version}/lynx_help/lynx_help_main.html,g" lynx.cfg perl -pi -e "s,^HELPFILE:.*,HELPFILE:file://localhost/usr/share/doc/lynx-%{version}/lynx_help/lynx_help_main.html,g" lynx.cfg
perl -pi -e "s,^DEFAULT_INDEX_FILE:.*,DEFAULT_INDEX_FILE:http://www.google.com/,g" lynx.cfg perl -pi -e "s,^DEFAULT_INDEX_FILE:.*,DEFAULT_INDEX_FILE:http://www.google.com/,g" lynx.cfg
perl -pi -e 's,^#LOCALE_CHARSET:.*,LOCALE_CHARSET:TRUE,' lynx.cfg perl -pi -e 's,^#LOCALE_CHARSET:.*,LOCALE_CHARSET:TRUE,' lynx.cfg
@ -95,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
%changelog %changelog
* Tue Oct 2 2007 Ivana Varekova <varekova@redhat.com> - 2.8.6-6
- fix 311031 - fix argument parsing
* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.8.6-5 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.8.6-5
- Rebuild for selinux ppc32 issue. - Rebuild for selinux ppc32 issue.