Small cosmetic changes

- Do not declare variables as local if they are also declared using
  `typeset'.
- Slightly improve man page.
- Change license links to https.
- Update TODO

8 files changed, 14 insertions, 15 deletions

diff --git a/COPYING b/COPYING
index dba13ed..be3f7b2 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -658,4 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
diff --git a/Makefile.in b/Makefile.in
index 4aded23..656c116 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-# along with ctct.  If not, see <http://www.gnu.org/licenses/>.
+# along with ctct.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 TARGET = @PACKAGE_NAME@
diff --git a/TODO b/TODO
index 08e860e..9ac9810 100644
--- a/TODO
+++ b/TODO
@@ -16,8 +16,6 @@ TODO file for ctct
 * strange behaviour:
  `- `ctct -S $'mobile\nabc'
  `- `ctct -S $'mobile\na'
-* Does not build on OpenBSD
- `- Both autoconf and a remotely generated ./configure fail.
 
 [MISC]
 * Merge the many versions' different CHANGELOGs.
diff --git a/configure b/configure
index 6beb27b..7201b7f 100755
--- a/configure
+++ b/configure
@@ -1738,7 +1738,7 @@ if test -z "$default_confdir"; then
 	# Vim has problems with '\"' in "doubled" double quotes after '!=':
 	while test "$default_confdir" \
 		!= "$(eval "printf '%s\n' \"$default_confdir\"")"; do									#"
-		default_confdir="$(eval "printf '%s\n' \"$default_confdir\"")"					#"
+		default_confdir="$(eval "printf '%s\n' \"$default_confdir\"")"				#"
 	done
 	$reset_prefix && prefix=NONE
 fi
diff --git a/configure.ac b/configure.ac
index 98ed960..96f4cb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-# along with ctct.  If not, see <http://www.gnu.org/licenses/>.
+# along with ctct.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 AC_INIT([ctct], [0.2.X], [alguien@respiranto.de])
@@ -50,7 +50,7 @@ if test -z "$default_confdir"; then
 	# Vim has problems with '\"' in "doubled" double quotes after '!=':
 	while test "$default_confdir" \
 		!= "$(eval "printf '%s\n' \"$default_confdir\"")"; do									#"
-		default_confdir="$(eval "printf '%s\n' \"$default_confdir\"")"					#"
+		default_confdir="$(eval "printf '%s\n' \"$default_confdir\"")"				#"
 	done
 	$reset_prefix && prefix=NONE
 fi
diff --git a/ctct.1.in b/ctct.1.in
index 5ac4292..7d51d34 100644
--- a/ctct.1.in
+++ b/ctct.1.in
@@ -15,7 +15,7 @@
 .\" GNU Affero General Public License for more details.
 .\"
 .\" You should have received a copy of the GNU Affero General Public License
-.\" along with ctct.  If not, see <http://www.gnu.org/licenses/>.
+.\" along with ctct.  If not, see <https://www.gnu.org/licenses/>.
 .\"
 .TH CTCT 1 "January 2016"
 .SH NAME
@@ -111,6 +111,7 @@ The location of the directory where the contact data are stored\.
 .RI "the " --edit " option\.
 .RB "If set, supersedes both the " EDITOR " environment variable"
 .RB "and the " fallback_editor \.
+.R By default, unset.
 .TP
 .B fallback_editor
 .RB "The editor to fall back to if neither the environment variable " EDITOR
diff --git a/ctct.bash_completion.in b/ctct.bash_completion.in
index 5dd08b9..9b33daa 100644
--- a/ctct.bash_completion.in
+++ b/ctct.bash_completion.in
@@ -17,7 +17,7 @@
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-# along with ctct.  If not, see <http://www.gnu.org/licenses/>.
+# along with ctct.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 _ctct()
@@ -39,7 +39,7 @@ _ctct()
 	)
 	test -n "$temp" && datadir="$temp"
 
-	local cur action opts i
+	local cur action opts
 	typeset -i i
 	COMPREPLY=()
 	cur="${COMP_WORDS[COMP_CWORD]}"
diff --git a/ctct.in b/ctct.in
index cf68a76..172437b 100644
--- a/ctct.in
+++ b/ctct.in
@@ -15,7 +15,7 @@
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
-# along with ctct.  If not, see <http://www.gnu.org/licenses/>.
+# along with ctct.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 ## DEFAULT SETTINGS:
@@ -276,7 +276,7 @@ function rename_file()
 
 function delete_file()
 {
-	local i files name file str
+	local name file str
 	typeset -i i=0
 	typeset -a files
 	
@@ -393,7 +393,7 @@ cat << EOF
 ctct - Version @PACKAGE_VERSION@
 Copyright 2015, 2016 Einhard Leichtfuß.
 License AGPLv3+: GNU Affero General Public License, version 3 or later
-                 - <http://gnu.org/licenses/agpl.html>
+                 - <https://gnu.org/licenses/agpl.html>
 This is free software: You are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 EOF