diff --git a/tcsh-6.15.00-fullpath.dif b/tcsh-6.15.00-fullpath.dif new file mode 100644 index 0000000..9bc8680 --- /dev/null +++ b/tcsh-6.15.00-fullpath.dif @@ -0,0 +1,22 @@ +--- tw.parse.c ++++ tw.parse.c 2008-11-26 18:52:07.190195106 +0100 +@@ -347,9 +347,19 @@ tenematch(Char *inputline, int num_read, + goto end; + } + } ++ + Strbuf_append(&wordbuf, qline.s + wordp); + Strbuf_terminate(&wordbuf); + cleanup_push(&wordbuf, Strbuf_cleanup); ++ ++ if ((looking == TW_COMMAND) && (*wordbuf.s == '/')) { ++ if (executable((Char*)0, wordbuf.s, 0)) { ++ cleanup_until(&wordbuf); ++ search_ret = 0; ++ goto end; ++ } ++ } ++ + search_ret = spell_me(&wordbuf, looking, pat, suf); + qline.len = wordp; + Strbuf_append(&qline, wordbuf.s); diff --git a/tcsh.changes b/tcsh.changes index 118a77d..5b8a8da 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 26 18:30:26 CET 2008 - werner@suse.de + +- For commands with full execution path bypass correction algorithm + if the command is found (bnc#444992) + ------------------------------------------------------------------- Wed Nov 5 15:32:16 CET 2008 - werner@suse.de diff --git a/tcsh.spec b/tcsh.spec index 249ffb0..3eb555a 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -26,7 +26,7 @@ Group: System/Shells Requires: gawk textutils AutoReqProv: on Version: 6.15.00 -Release: 92 +Release: 93 Summary: The C SHell Source: ftp.astron.com:/pub/tcsh/tcsh-6.15.00.tar.bz2 Source1: nls-iconv @@ -40,6 +40,7 @@ Patch4: tcsh-6.15.00-longjmp.dif Patch5: tcsh-6.15.00-norm-cmd.dif Patch6: tcsh-6.15.00-history.dif Patch7: tcsh-6.15.00-blanks.dif +Patch8: tcsh-6.15.00-fullpath.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -66,6 +67,7 @@ Authors: %patch6 -p0 -b .history ### disabled for know, should work on os11.1 without ### %patch7 -p0 -b .blanks +%patch8 -p0 -b .fullpath %patch sh $RPM_SOURCE_DIR/nls-iconv @@ -148,6 +150,9 @@ Authors: %{_datadir}/locale/*/LC_MESSAGES/tcsh %changelog +* Wed Nov 26 2008 werner@suse.de +- For commands with full execution path bypass correction algorithm + if the command is found (bnc#444992) * Wed Nov 05 2008 werner@suse.de - Disable patch for bnc#437295 as it cause trouble (bnc#441654) and the gcc of openSuSE 11.1 seems to be safe