- preserve trailing whitespaces in history (#5777)

Changed files:
    poldek-cli-hist.patch -> 1.1
    poldek.spec -> 1.229

diff --git a/poldek-cli-hist.patch b/poldek-cli-hist.patch
new file mode 100644 (file)
index 0000000..a200212
--- /dev/null
+++ b/poldek-cli-hist.patch
@@ -0,0 +1,54 @@
+===================================================================
+RCS file: /cvsroot/poldek/poldek/cli/shell.c,v
+retrieving revision 1.28
+retrieving revision 1.29
+diff -u -r1.28 -r1.29
+--- poldek/poldek/cli/shell.c  2006/01/07 01:06:48     1.28
++++ poldek/poldek/cli/shell.c  2006/05/11 09:51:53     1.29
+@@ -11,7 +11,7 @@
+ */
+ 
+ /*
+-  $Id$
++  $Id$
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+@@ -356,22 +356,34 @@
+         snprintf(prompt, sizeof(prompt), "poldek:%s%s> ",
+                  currdir == NULL ? "/" : *currdir->name == '/' ? "" : "/",
+                  currdir == NULL ? "" : currdir->name);
++
+         if ((line = readline(prompt)) == NULL)
+             break;
+ 
++        /* add to history? */
++        s = line;
++        while (isspace(*s))
++            s++;
++        
++        if (*s)
++            add_history(line);
++                
+         s = n_str_strip_ws(line);
+         if (*s) {
+             int _verbose = poldek_verbose();
+-            add_history(s);
+-            //print_mem_info("BEFORE");
++            
+             shInCmd = 1;
+             DBGF("(%s)\n", s);
++
++            MEMINF("BEFORE %s\n", s);
+             poclidek_execline(cctx, NULL, s);
++            MEMINF("AFTER  %s\n", s);
++            
+             sigint_reset();
+             shDone = 0;
+             shInCmd = 0;
++
+             poldek_set_verbose(_verbose);
+-            //print_mem_info("AFTER ");
+         }
+         free(line);
+         

diff --git a/poldek.spec b/poldek.spec
index 02e9bdbea5841723f16d65533b10c5da7f2cde95..7f526adf4c8ec15d40047f529adc044abb6ea92e 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -19,15 +19,16 @@ Source1:    %{name}.conf
 Source2:       %{name}-multilib.conf
 Source3:       %{name}-aliases.conf
 # drop?
-#PatchX:               %{name}-etc_dir.patch
+#PatchX:       %{name}-etc_dir.patch
 # drop?
-#PatchX:               %{name}-retr_term.patch
+#PatchX:       %{name}-retr_term.patch
 # is still needed?
-#Patch2:               %{name}-simplestatic.patch
+#Patch2:       %{name}-simplestatic.patch
 Patch0:                %{name}-cvs-fixes.patch
 Patch1:                %{name}-ask-abort.patch
 Patch2:                %{name}-obsoletes.patch
 Patch3:                %{name}-rpm_4_4_3.patch
+Patch4:                %{name}-cli-hist.patch
 URL:           http://poldek.pld-linux.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -79,6 +80,7 @@ shell mode of Perl's CPAN.
 %{?with_static:This version is statically linked.}
 
 %{!?with_imode:This version hasn't got interactive mode.}
+#'vim
 
 %description -l pl
 poldek jest narzêdziem linii poleceñ s³u¿±cym do weryfikacji,
@@ -135,6 +137,7 @@ Biblioteki statyczne poldka.
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p2
 
 %build
 %{__autopoint}