Adding --is-tiocsti parameter (injects in prompt, which is undesired)…

…, updating year to 2023, removing WIP defines for TIOCSTI debugging #478

.gitignore

@@ -12,6 +12,7 @@
 /src/hstr
 /src/hh
 .deps/
+.vscode
 Makefile
 Makefile.in
 *.o

Changelog

@@ -1,3 +1,8 @@
+2023-03-19  Martin Dvorak  <martin.dvorak@mindforger.com>
+
+  * Released v2.7.0 - important fix release ensuring that HSTR will work
+    on operating systems and Linux kernels without TIOCSTI support.
+
 2022-12-11  Martin Dvorak  <martin.dvorak@mindforger.com>
 
   * Released v2.6.0 - fix release (several memory leak and overflow fixes,

PKGBUILD

@@ -4,7 +4,7 @@
 # Contributor: Busindre <busilezas at busindre.com>
 
 pkgname=hstr
-pkgver=2.6
+pkgver=2.7
 pkgrel=1
 pkgdesc="A command line utility that brings improved BASH command completion from the history. It aims to make completion easier and more efficient than Ctrl-r."
 arch=('x86_64'

SECURITY.md

@@ -4,18 +4,19 @@
 
 The following HSTR versions are currently being supported with security updates.
 
-| Version | Supported          |
-| ------- | ------------------ |
-| 2.6.0   | :white_check_mark: |
-| 2.5.0   | :white_check_mark: |
-| 2.4.0   | :white_check_mark: |
-| <= 2.3.0   | :x:                |
+| Version  | Supported          |
+| -------- | ------------------ |
+| 2.7.0    | :white_check_mark: |
+| 2.6.0    | :white_check_mark: |
+| 2.5.0    | :white_check_mark: |
+| 2.4.0    | :white_check_mark: |
+| <= 2.3.0 | :x:                |
 
 ## Reporting a Vulnerability
 
-Please report HSTR vulnerabilities to 
+Please report HSTR vulnerabilities to
 [martin.dvorak@mindforger.com](martin.dvorak@mindforger.com)
 
 All reported vulnerabilities will be examined, reproduced and
-expected fix release and release date will be shared with 
+expected fix release and release date will be shared with
 the reporter.

build/anigif-build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/anigif-create.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/anigif-rename.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/arch/update-pkgconfig-sha256-on-repo-change.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/debian/aptly-add-deb.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2016-2022 Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2016-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

build/debian/make-deb.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -147,8 +147,8 @@ then
   exit 1
 fi
 
-export ARG_BAZAAR_MSG="HSTR 2.6.0"
-export ARG_VERSION="2.6.0"
+export ARG_BAZAAR_MSG="HSTR 2.7.0"
+export ARG_VERSION="2.7.0"
 
 # Debian releases: https://www.debian.org/releases/
 #   6/7/8/9/10: squeeze wheezy jessie stretch buster

build/debian/upload-to-mentors.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/fedora/rpm-from-deb.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022 Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -20,7 +20,7 @@
 # This script is available from http://www.mindforger.com/fedora/fedora-rpm-from-deb.sh
 # to be easily available in VMs
 
-export MFVERSION="2.6.0"
+export MFVERSION="2.7.0"
 export MFPRJNAME="hstr-${MFVERSION}"
 export AMD64NAME="hstr_${MFVERSION}-1_amd64"
 export I386NAME="hstr_${MFVERSION}-1_i386"

build/tarball/tarball-automake.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/tarball/tarball-build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 export SCRIPT_HOME=`pwd`
 
-export HSTR_VERSION="2.6.0"
+export HSTR_VERSION="2.7.0"
 
 export NOW=`date +%Y-%m-%d--%H-%M-%S`
 export GH_RELEASE_DIR=~/p/hstr/release

build/tarball/tarball-uninstall.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/test-clean.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/test-gdb.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/test-generate-unity-test-runner.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/test-memleaks.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/test-set-env-monster-history.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/test-set-env-utf8-history.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/test-units.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/travis-ci/.travis.yml

@@ -1,6 +1,6 @@
 # .travis.yml     Travis CI configuration file for HSTR
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/ubuntu/launchpad-add-hstr-ppa.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/ubuntu/launchpad-make-all-releases.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -163,8 +163,8 @@ then
     exit 1
 fi
 
-export ARG_BAZAAR_MSG="Release 2.6"
-export ARG_MAJOR_VERSION=2.6.
+export ARG_BAZAAR_MSG="Release 2.7"
+export ARG_MAJOR_VERSION=2.7.
 export ARG_MINOR_VERSION=1 # minor version is incremented for every Ubuntu version
 
 # https://wiki.ubuntu.com/Releases

build/ubuntu/pbuilder-add-new-distro.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

build/ubuntu/pbuilder-refresh-all-distros.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

configure.ac

@@ -1,6 +1,6 @@
 # configure.ac      Autoconf configuration file
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT(hstr, 2.6.0, martin.dvorak@mindforger.com)
+AC_INIT(hstr, 2.7.0, martin.dvorak@mindforger.com)
 AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
 
 # Check src dir existence.

etc/bash-completion.d/hstr

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

hstr.pro

@@ -1,6 +1,6 @@
-# hstr.pro     Qt project file for HSTR shell history compleation utility
+# hstr.pro     Qt project file for HSTR shell history completion utility
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -61,6 +61,7 @@ hstrdebug {
 }
 QMAKE_LINK = gcc
 
-DEFINES += LINUX_KERNEL_6
+# TIOCSTI debugging:
+# DEFINES += __CYGWIN__
 
 message(DEFINES of hstr.pro build: $$DEFINES)

pad.xml

@@ -2,7 +2,7 @@
 <!--
  pad.xml        PAD file for HSTR
 
- Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+ Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -51,10 +51,10 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>HSTR</Program_Name>
-		<Program_Version>2.6.0</Program_Version>
-		<Program_Release_Month>12</Program_Release_Month>
-		<Program_Release_Day>10</Program_Release_Day>
-		<Program_Release_Year>2022</Program_Release_Year>
+		<Program_Version>2.7.0</Program_Version>
+		<Program_Release_Month>3</Program_Release_Month>
+		<Program_Release_Day>19</Program_Release_Day>
+		<Program_Release_Year>2023</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code>USD</Program_Cost_Other_Code>
 		<Program_Cost_Other />

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 # snapcraft.yaml     snap builder configuration
 #
-# Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+# Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

src/hashset.c

@@ -1,7 +1,7 @@
 /*
  hashset.c      hash set implementation
 
- Copyright (C) 2014-2022  Martin Dvorak <martin.dvorak@mindforger.com>
+ Copyright (C) 2014-2023 Martin Dvorak <martin.dvorak@mindforger.com>
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.